src - FreeBSD source tree

diff options


context:
space:
mode:

author	Peter Wemm <peter@FreeBSD.org>	2001-08-23 01:46:23 +0000
committer	Peter Wemm <peter@FreeBSD.org>	2001-08-23 01:46:23 +0000
commit	2ddb1aff195a5217089e42994b509ea386548ab7 (patch)
tree	bcf65f5f5aa4718db7022f260e1fd02a71240977
parent	2fb7d2e4c2723655743c60fbaf49585943e8ef72 (diff)
download	src-2ddb1aff195a5217089e42994b509ea386548ab7.tar.gz src-2ddb1aff195a5217089e42994b509ea386548ab7.zip

Merge i386/machdep.c rev 1.469: whitespace changes to fit 80 columns

Forgotten by: jhb

Notes

Notes: svn path=/head/; revision=82163

Diffstat

-rw-r--r--

sys/pc98/i386/machdep.c

-rw-r--r--

sys/pc98/pc98/machdep.c

2 files changed, 120 insertions, 64 deletions

diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c
index 58df35116190..ae40b8a7a10a 100644
--- a/sys/pc98/i386/machdep.c
+++ b/sys/pc98/i386/machdep.c

@@ -235,7 +235,8 @@ cpu_startup(dummy)

#ifdef PERFMON

perfmon_init();

#endif

- printf("real memory = %u (%uK bytes)\n", ptoa(Maxmem), ptoa(Maxmem) / 1024);

+ printf("real memory = %u (%uK bytes)\n", ptoa(Maxmem),

+ ptoa(Maxmem) / 1024);

* Display any holes after the first chunk of extended memory.

@@ -244,8 +245,9 @@ cpu_startup(dummy)

printf("Physical memory chunk(s):\n");

for (indx = 0; phys_avail[indx + 1] != 0; indx += 2) {

- unsigned int size1 = phys_avail[indx + 1] - phys_avail[indx];

+ unsigned int size1;

+ size1 = phys_avail[indx + 1] - phys_avail[indx];

printf("0x%08x - 0x%08x, %u bytes (%u pages)\n",

phys_avail[indx], phys_avail[indx + 1] - 1, size1,

size1 / PAGE_SIZE);

@@ -318,7 +320,8 @@ again:

nbuf = 50;

if (physmem_est > 1024)

- nbuf += min((physmem_est - 1024) / factor, 16384 / factor);

+ nbuf += min((physmem_est - 1024) / factor,

+ 16384 / factor);

if (physmem_est > 16384)

nbuf += (physmem_est - 16384) * 2 / (factor * 5);

@@ -771,7 +774,8 @@ osigreturn(p, uap)

(eflags & VME_USERCHANGE) | PSL_VM;

} else {

vm86->vm86_eflags = eflags; /* save VIF, VIP */

- eflags = (tf->tf_eflags & ~VM_USERCHANGE) | (eflags & VM_USERCHANGE) | PSL_VM;

+ eflags = (tf->tf_eflags & ~VM_USERCHANGE) |

+ (eflags & VM_USERCHANGE) | PSL_VM;

}

tf->tf_vm86_ds = scp->sc_ds;

tf->tf_vm86_es = scp->sc_es;

@@ -895,7 +899,8 @@ sigreturn(p, uap)

(eflags & VME_USERCHANGE) | PSL_VM;

} else {

vm86->vm86_eflags = eflags; /* save VIF, VIP */

- eflags = (tf->tf_eflags & ~VM_USERCHANGE) | (eflags & VM_USERCHANGE) | PSL_VM;

+ eflags = (tf->tf_eflags & ~VM_USERCHANGE) |

+ (eflags & VM_USERCHANGE) | PSL_VM;

}

bcopy(&ucp->uc_mcontext.mc_fs, tf, sizeof(struct trapframe));

tf->tf_eflags = eflags;

@@ -1804,7 +1809,8 @@ physmap_done:

} else {

pa_indx++;

if (pa_indx == PHYS_AVAIL_ARRAY_END) {

- printf("Too many holes in the physical address space, giving up\n");

+ printf(

+ "Too many holes in the physical address space, giving up\n");

pa_indx--;

break;

}

@@ -1961,29 +1967,49 @@ init386(first)

/* exceptions */

for (x = 0; x < NIDT; x++)

- setidt(x, &IDTVEC(rsvd), SDT_SYS386TGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));

- setidt(0, &IDTVEC(div), SDT_SYS386TGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));

- setidt(1, &IDTVEC(dbg), SDT_SYS386IGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));

- setidt(2, &IDTVEC(nmi), SDT_SYS386TGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));

- setidt(3, &IDTVEC(bpt), SDT_SYS386IGT, SEL_UPL, GSEL(GCODE_SEL, SEL_KPL));

- setidt(4, &IDTVEC(ofl), SDT_SYS386TGT, SEL_UPL, GSEL(GCODE_SEL, SEL_KPL));

- setidt(5, &IDTVEC(bnd), SDT_SYS386TGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));

- setidt(6, &IDTVEC(ill), SDT_SYS386TGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));

- setidt(7, &IDTVEC(dna), SDT_SYS386TGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));

+ setidt(x, &IDTVEC(rsvd), SDT_SYS386TGT, SEL_KPL,

+ GSEL(GCODE_SEL, SEL_KPL));

+ setidt(0, &IDTVEC(div), SDT_SYS386TGT, SEL_KPL,

+ GSEL(GCODE_SEL, SEL_KPL));

+ setidt(1, &IDTVEC(dbg), SDT_SYS386IGT, SEL_KPL,

+ GSEL(GCODE_SEL, SEL_KPL));

+ setidt(2, &IDTVEC(nmi), SDT_SYS386TGT, SEL_KPL,

+ GSEL(GCODE_SEL, SEL_KPL));

+ setidt(3, &IDTVEC(bpt), SDT_SYS386IGT, SEL_UPL,

+ GSEL(GCODE_SEL, SEL_KPL));

+ setidt(4, &IDTVEC(ofl), SDT_SYS386TGT, SEL_UPL,

+ GSEL(GCODE_SEL, SEL_KPL));

+ setidt(5, &IDTVEC(bnd), SDT_SYS386TGT, SEL_KPL,

+ GSEL(GCODE_SEL, SEL_KPL));

+ setidt(6, &IDTVEC(ill), SDT_SYS386TGT, SEL_KPL,

+ GSEL(GCODE_SEL, SEL_KPL));

+ setidt(7, &IDTVEC(dna), SDT_SYS386TGT, SEL_KPL

+ , GSEL(GCODE_SEL, SEL_KPL));

setidt(8, 0, SDT_SYSTASKGT, SEL_KPL, GSEL(GPANIC_SEL, SEL_KPL));

- setidt(9, &IDTVEC(fpusegm), SDT_SYS386TGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));

- setidt(10, &IDTVEC(tss), SDT_SYS386TGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));

- setidt(11, &IDTVEC(missing), SDT_SYS386TGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));

- setidt(12, &IDTVEC(stk), SDT_SYS386TGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));

- setidt(13, &IDTVEC(prot), SDT_SYS386TGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));

- setidt(14, &IDTVEC(page), SDT_SYS386IGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));

- setidt(15, &IDTVEC(rsvd), SDT_SYS386TGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));

- setidt(16, &IDTVEC(fpu), SDT_SYS386TGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));

- setidt(17, &IDTVEC(align), SDT_SYS386TGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));

- setidt(18, &IDTVEC(mchk), SDT_SYS386TGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));

- setidt(19, &IDTVEC(xmm), SDT_SYS386TGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));

- setidt(0x80, &IDTVEC(int0x80_syscall),

- SDT_SYS386TGT, SEL_UPL, GSEL(GCODE_SEL, SEL_KPL));

+ setidt(9, &IDTVEC(fpusegm), SDT_SYS386TGT, SEL_KPL,

+ GSEL(GCODE_SEL, SEL_KPL));

+ setidt(10, &IDTVEC(tss), SDT_SYS386TGT, SEL_KPL,

+ GSEL(GCODE_SEL, SEL_KPL));

+ setidt(11, &IDTVEC(missing), SDT_SYS386TGT, SEL_KPL,

+ GSEL(GCODE_SEL, SEL_KPL));

+ setidt(12, &IDTVEC(stk), SDT_SYS386TGT, SEL_KPL,

+ GSEL(GCODE_SEL, SEL_KPL));

+ setidt(13, &IDTVEC(prot), SDT_SYS386TGT, SEL_KPL,

+ GSEL(GCODE_SEL, SEL_KPL));

+ setidt(14, &IDTVEC(page), SDT_SYS386IGT, SEL_KPL,

+ GSEL(GCODE_SEL, SEL_KPL));

+ setidt(15, &IDTVEC(rsvd), SDT_SYS386TGT, SEL_KPL,

+ GSEL(GCODE_SEL, SEL_KPL));

+ setidt(16, &IDTVEC(fpu), SDT_SYS386TGT, SEL_KPL,

+ GSEL(GCODE_SEL, SEL_KPL));

+ setidt(17, &IDTVEC(align), SDT_SYS386TGT, SEL_KPL,

+ GSEL(GCODE_SEL, SEL_KPL));

+ setidt(18, &IDTVEC(mchk), SDT_SYS386TGT, SEL_KPL,

+ GSEL(GCODE_SEL, SEL_KPL));

+ setidt(19, &IDTVEC(xmm), SDT_SYS386TGT, SEL_KPL,

+ GSEL(GCODE_SEL, SEL_KPL));

+ setidt(0x80, &IDTVEC(int0x80_syscall), SDT_SYS386TGT, SEL_UPL,

+ GSEL(GCODE_SEL, SEL_KPL));

r_idt.rd_limit = sizeof(idt0) - 1;

r_idt.rd_base = (int) idt;

@@ -2008,8 +2034,10 @@ init386(first)

#endif

finishidentcpu(); /* Final stage of CPU initialization */

- setidt(6, &IDTVEC(ill), SDT_SYS386TGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));

- setidt(13, &IDTVEC(prot), SDT_SYS386TGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));

+ setidt(6, &IDTVEC(ill), SDT_SYS386TGT, SEL_KPL,

+ GSEL(GCODE_SEL, SEL_KPL));

+ setidt(13, &IDTVEC(prot), SDT_SYS386TGT, SEL_KPL,

+ GSEL(GCODE_SEL, SEL_KPL));

initializecpu(); /* Initialize CPU registers */

/* make an initial tss so cpu can get interrupt stack on syscall! */

@@ -2024,11 +2052,11 @@ init386(first)

ltr(gsel_tss);

dblfault_tss.tss_esp = dblfault_tss.tss_esp0 = dblfault_tss.tss_esp1 =

- dblfault_tss.tss_esp2 = (int) &dblfault_stack[sizeof(dblfault_stack)];

+ dblfault_tss.tss_esp2 = (int)&dblfault_stack[sizeof(dblfault_stack)];

dblfault_tss.tss_ss = dblfault_tss.tss_ss0 = dblfault_tss.tss_ss1 =

dblfault_tss.tss_ss2 = GSEL(GDATA_SEL, SEL_KPL);

dblfault_tss.tss_cr3 = (int)IdlePTD;

- dblfault_tss.tss_eip = (int) dblfault_handler;

+ dblfault_tss.tss_eip = (int)dblfault_handler;

dblfault_tss.tss_eflags = PSL_KERNEL;

dblfault_tss.tss_ds = dblfault_tss.tss_es =

dblfault_tss.tss_gs = GSEL(GDATA_SEL, SEL_KPL);

diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c
index 58df35116190..ae40b8a7a10a 100644
--- a/sys/pc98/pc98/machdep.c
+++ b/sys/pc98/pc98/machdep.c