Fix memory manager init, so now it works on more hardware. Also kernel now requires...

diff --git a/Boot486/2run.sh b/Boot486/2run.sh
index 8a26c50b8d975c5e52b41e1522b77833a2204a42..b14f80051ab0c8d89d160fba1016310d43fd46aa 100755 (executable)
--- a/Boot486/2run.sh
+++ b/Boot486/2run.sh
@@ -15,4 +15,5 @@ bochs -q \
        'ata0-master: type=disk, path="../BlackBox.img", mode=flat' \
        'com1: enabled=1, mode=file, dev=serial.txt' \
        'display_library: x, options="gui_debug"' \
        'ata0-master: type=disk, path="../BlackBox.img", mode=flat' \
        'com1: enabled=1, mode=file, dev=serial.txt' \
        'display_library: x, options="gui_debug"' \

+       'magic_break: enabled=1' \

        2> bochs.log
        2> bochs.log

diff --git a/Boot486/boot0.S b/Boot486/boot0.S
index 9ff81fabebf11bf2e9238c4cedc89178d7359357..ef70f6b024d135b74de734c7cc0cfab290471872 100644 (file)
--- a/Boot486/boot0.S
+++ b/Boot486/boot0.S
@@ -19,7 +19,7 @@
 .set BootDiskDxAdr, 0x7e06
 .set BootDiskCxAdr, 0x7e08
 .set MemoryMapAdr, 0x7e0A
 .set BootDiskDxAdr, 0x7e06
 .set BootDiskCxAdr, 0x7e08
 .set MemoryMapAdr, 0x7e0A

-.set ImageBase, 0x1000000
+.set ImageBase, 0x100000

 
 # =========================================================================== #
 # Stage 1
 
 # =========================================================================== #
 # Stage 1

diff --git a/Boot486/run.sh b/Boot486/run.sh
index 43e93b00a7f0667aea39c25754475c75b090071d..2044e8a4f765f628100457be51b3af0629b980a4 100755 (executable)
--- a/Boot486/run.sh
+++ b/Boot486/run.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 set -e
 #!/bin/sh
 
 set -e

-qemu-system-i386 -s -m 64M -hda ../BlackBox.img -hdb ../minix.img
+qemu-system-i386 -s -m 16M -hda ../BlackBox.img -hdb ../minix.img

diff --git a/Dsw/Mod/Linker.odc b/Dsw/Mod/Linker.odc
index d12dca6dc38d83fe43b25f1152e5aae25ee904e1..38b5cb8a5bf178528c7db01afbc4b76a43a87bbb 100644 (file)
Binary files a/Dsw/Mod/Linker.odc and b/Dsw/Mod/Linker.odc differ

diff --git a/System/Mod486/Kernel.odc b/System/Mod486/Kernel.odc
index 77388ed98d55d1e2dd0556fd1a324b05035455aa..c90117495382ea0cc1789a0a0d8c0f480224102f 100644 (file)
Binary files a/System/Mod486/Kernel.odc and b/System/Mod486/Kernel.odc differ