greg/xv6
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix comments

Browse source
This commit is contained in:
rtm 2007-09-15 20:05:47 +00:00
parent e9f8419fbe
commit 411ee74127
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bootasm.S
View file

@ -44,7 +44,7 @@ seta20.2:
//PAGEBREAK! //PAGEBREAK!
# Switch from real to protected mode, using a bootstrap GDT # Switch from real to protected mode, using a bootstrap GDT
# and segment translation that makes virtual addresses # and segment translation that makes virtual addresses
# identical to their physical addresses, so that the # identical to physical addresses, so that the
# effective memory map does not change during the switch. # effective memory map does not change during the switch.
lgdt gdtdesc lgdt gdtdesc
movl %cr0, %eax movl %cr0, %eax

12
bootmain.c
View file

@ -1,10 +1,9 @@
// Boot loader. // Boot loader.
// //
// The BIOS loads boot sector (bootasm.S) from sector 0 of the disk // Part of the boot sector, along with bootasm.S, which calls bootmain().
// into memory and executes it. The boot sector puts the processor // bootasm.S has put the processor into protected 32-bit mode.
// in 32-bit mode and calls bootmain below, which loads an ELF kernel // bootmain() loads an ELF kernel image from the disk starting at
// image from the disk starting at sector 1 and then jumps to the // sector 1 and then jumps to the kernel entry routine.
// kernel entry routine.
#include "types.h" #include "types.h"
#include "elf.h" #include "elf.h"
@ -34,7 +33,7 @@ bootmain(void)
ph = (struct proghdr*)((uchar*)elf + elf->phoff); ph = (struct proghdr*)((uchar*)elf + elf->phoff);
eph = ph + elf->phnum; eph = ph + elf->phnum;
for(; ph < eph; ph++) for(; ph < eph; ph++)
readseg(ph->va, ph->memsz, ph->offset); readseg(ph->va & 0xFFFFFF, ph->memsz, ph->offset);
// Call the entry point from the ELF header. // Call the entry point from the ELF header.
// Does not return! // Does not return!
@ -81,7 +80,6 @@ readseg(uint va, uint count, uint offset)
{ {
uint eva; uint eva;
va &= 0xFFFFFF;
eva = va + count; eva = va + count;
// Round down to sector boundary. // Round down to sector boundary.

4
mkfs.c
View file

@ -81,7 +81,7 @@ main(int argc, char *argv[])
usedblocks = ninodes / IPB + 3 + bitblocks; usedblocks = ninodes / IPB + 3 + bitblocks;
freeblock = usedblocks; freeblock = usedblocks;
printf("used %d (bit %d ninode %d) free %d total %d\n", usedblocks, printf("used %d (bit %d ninode %lu) free %u total %d\n", usedblocks,
bitblocks, ninodes/IPB + 1, freeblock, nblocks+usedblocks); bitblocks, ninodes/IPB + 1, freeblock, nblocks+usedblocks);
assert(nblocks + usedblocks == size); assert(nblocks + usedblocks == size);
@ -229,7 +229,7 @@ balloc(int used)
for(i = 0; i < used; i++) { for(i = 0; i < used; i++) {
buf[i/8] = buf[i/8] | (0x1 << (i%8)); buf[i/8] = buf[i/8] | (0x1 << (i%8));
} }
printf("balloc: write bitmap block at sector %d\n", ninodes/IPB + 3); printf("balloc: write bitmap block at sector %lu\n", ninodes/IPB + 3);
wsect(ninodes / IPB + 3, buf); wsect(ninodes / IPB + 3, buf);
} }