diff --git a/.gitignore b/.gitignore index 85c53b8..301b097 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /sol?/ /myapi.key /.suf +tags diff --git a/bios-256k.bin b/bios-256k.bin new file mode 100644 index 0000000..c6e25ac Binary files /dev/null and b/bios-256k.bin differ diff --git a/efi-e1000.rom b/efi-e1000.rom new file mode 100644 index 0000000..4e29d9d Binary files /dev/null and b/efi-e1000.rom differ diff --git a/grade-lab1 b/grade-lab1 index 94bcb0f..f6451bb 100755 --- a/grade-lab1 +++ b/grade-lab1 @@ -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]+)" diff --git a/kern/init.c b/kern/init.c index 2512cfe..d4fdf63 100644 --- a/kern/init.c +++ b/kern/init.c @@ -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(); diff --git a/kvmvapic.bin b/kvmvapic.bin new file mode 100644 index 0000000..045f5c2 Binary files /dev/null and b/kvmvapic.bin differ diff --git a/vgabios-stdvga.bin b/vgabios-stdvga.bin new file mode 100644 index 0000000..00cb73c Binary files /dev/null and b/vgabios-stdvga.bin differ