From: DeaDDooMER Date: Mon, 20 Aug 2018 23:00:54 +0000 (+0300) Subject: Fix memory manager init, so now it works on more hardware. Also kernel now requires... X-Git-Url: http://deadsoftware.ru/gitweb?a=commitdiff_plain;h=4c5d9c51eb4c3d15574923f734592345efcdc688;p=bmbb.git Fix memory manager init, so now it works on more hardware. Also kernel now requires 11-12 mb ram to boot. --- diff --git a/Boot486/2run.sh b/Boot486/2run.sh index 8a26c50..b14f800 100755 --- 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"' \ + 'magic_break: enabled=1' \ 2> bochs.log diff --git a/Boot486/boot0.S b/Boot486/boot0.S index 9ff81fa..ef70f6b 100644 --- a/Boot486/boot0.S +++ b/Boot486/boot0.S @@ -19,7 +19,7 @@ .set BootDiskDxAdr, 0x7e06 .set BootDiskCxAdr, 0x7e08 .set MemoryMapAdr, 0x7e0A -.set ImageBase, 0x1000000 +.set ImageBase, 0x100000 # =========================================================================== # # Stage 1 diff --git a/Boot486/run.sh b/Boot486/run.sh index 43e93b0..2044e8a 100755 --- a/Boot486/run.sh +++ b/Boot486/run.sh @@ -1,4 +1,4 @@ #!/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 d12dca6..38b5cb8 100644 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 77388ed..c901174 100644 Binary files a/System/Mod486/Kernel.odc and b/System/Mod486/Kernel.odc differ