Merge branch 'lab4' into lab5

This commit is contained in:
Yeongjin Jang 2019-04-01 00:01:55 -07:00
commit adbb69750a
7 changed files with 3 additions and 2 deletions

1
.gitignore vendored
View File

@ -16,3 +16,4 @@
/sol?/
/myapi.key
/.suf
tags

BIN
bios-256k.bin Normal file

Binary file not shown.

BIN
efi-e1000.rom Normal file

Binary file not shown.

View File

@ -12,7 +12,7 @@ def test_jos():
@test(20, parent=test_jos)
def test_printf():
r.match("6828 decimal is 15254 octal!")
r.match("444544 decimal is 1544200 octal!")
BACKTRACE_RE = r"^ *ebp +f01[0-9a-z]{5} +eip +f0100[0-9a-z]{3} +args +([0-9a-z]+)"

View File

@ -25,7 +25,7 @@ i386_init(void)
// Can't call cprintf until after we do this!
cons_init();
cprintf("6828 decimal is %o octal!\n", 6828);
cprintf("444544 decimal is %o octal!\n", 444544);
// Lab 2 memory management initialization functions
mem_init();

BIN
kvmvapic.bin Normal file

Binary file not shown.

BIN
vgabios-stdvga.bin Normal file

Binary file not shown.