diff options
author | rtm <rtm> | 2006-06-13 22:08:20 +0000 |
---|---|---|
committer | rtm <rtm> | 2006-06-13 22:08:20 +0000 |
commit | cb83c71628378bc0e295dd71bf6641379fbcdf37 (patch) | |
tree | dfad6b06b7cb267bfe587e975e8f30e7427d21db /main.c | |
parent | 84eb544b23b17fed07b8c33142d48fdceffce10c (diff) | |
download | xv6-labs-cb83c71628378bc0e295dd71bf6641379fbcdf37.tar.gz xv6-labs-cb83c71628378bc0e295dd71bf6641379fbcdf37.tar.bz2 xv6-labs-cb83c71628378bc0e295dd71bf6641379fbcdf37.zip |
fix some trap bugs
Diffstat (limited to 'main.c')
-rw-r--r-- | main.c | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -5,12 +5,20 @@ #include "defs.h" #include "x86.h" -char junk1[20000]; -char junk2[20000] = { 1 }; +extern char edata[], end[]; main() { struct proc *p; + + // clear BSS + memset(edata, 0, end - edata); + + // partially initizialize PIC + outb(0x20+1, 0xFF); // IO_PIC1 + outb(0xA0+1, 0xFF); // IO_PIC2 + outb(0x20, 0x11); + outb(0x20+1, 32); cprintf("\nxV6\n\n"); |