From 2dd6ce9dc7941c3f6c5ae2a92e9d1ccbcfcdf10a Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Thu, 28 Mar 2019 22:53:16 +0100 Subject: [PATCH] end of prepaging reorg --- Makefile | 2 +- boot/loader/mem/management.inc | 2 +- kaleid/kernel/init/init.c | 25 ------------------------- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/Makefile b/Makefile index f14c939..319aa68 100644 --- a/Makefile +++ b/Makefile @@ -192,7 +192,7 @@ $(KOBJDIR)/kernel/sched.o: $(KERNELDIR)/kernel/proc/sched.c $(KERNELDIR)/include .PHONY: test test: all - @qemu-system-x86_64 -m 5G -mem-prealloc -hda build/bin/disk.img -d cpu_reset,guest_errors,pcall,int 2> qemu.log & + @qemu-system-x86_64 -m 8G -mem-prealloc -hda build/bin/disk.img -d cpu_reset,guest_errors,pcall,int 2> qemu.log & @ndisasm $(BINDIR)/kaleid -o 0x00100000 -b 64 > loader_disasm64.asm @ndisasm $(BINDIR)/kaleid -o 0x00100000 -b 32 > loader_disasm32.asm .PHONY: test32 diff --git a/boot/loader/mem/management.inc b/boot/loader/mem/management.inc index 43ab13e..5edec03 100644 --- a/boot/loader/mem/management.inc +++ b/boot/loader/mem/management.inc @@ -23,7 +23,7 @@ ; along with OS/K. If not, see . ; ;=----------------------------------------------------------------------------=; -%define MAX_MEMORY 8 ; GiB +%define MAX_MEMORY 4 ; GiB [BITS 32] [section .text] diff --git a/kaleid/kernel/init/init.c b/kaleid/kernel/init/init.c index 0aae959..09456e8 100644 --- a/kaleid/kernel/init/init.c +++ b/kaleid/kernel/init/init.c @@ -150,31 +150,6 @@ noreturn void BtStartKern(multiboot_info_t *mbInfo, int mbMagic) //if(rc)KernLog("error\n"); //KernLog((char*)buf->buf); - uchar *addr = (uchar *)(ullong)(10); - *addr = 2; - - addr = (uchar *)(ullong)(1*GB+10); - *addr = 4; - - addr = (uchar *)(ullong)(2*GB+10); - *addr = 9; - - addr = (uchar *)(ullong)(4*GB + 10); - *addr = 16; - - addr = (uchar *)(ullong)(10); - KernLog("Test, valeur autour de %p: %hhu\n", addr, *addr); - - addr = (uchar *)(ullong)(1*GB+10); - KernLog("Test, valeur autour de %p: %hhu\n", addr, *addr); - - addr = (uchar *)(ullong)(2*GB+10); - KernLog("Test, valeur autour de %p: %hhu\n", addr, *addr); - - addr = (uchar *)(ullong)(4*GB + 10); - KernLog("Test, valeur autour de %p: %hhu\n", addr, *addr); - - // We're out PsFiniSched(); KeCrashSystem(); //yay