os-k-team/os-k
os-k-team
/
os-k
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

end of prepaging reorg

This commit is contained in:
Adrien Bourmault 2019-03-28 22:53:16 +01:00
parent c49941df7c
commit 2dd6ce9dc7
3 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -192,7 +192,7 @@ $(KOBJDIR)/kernel/sched.o: $(KERNELDIR)/kernel/proc/sched.c $(KERNELDIR)/include
.PHONY: test .PHONY: test
test: all 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 64 > loader_disasm64.asm
@ndisasm $(BINDIR)/kaleid -o 0x00100000 -b 32 > loader_disasm32.asm @ndisasm $(BINDIR)/kaleid -o 0x00100000 -b 32 > loader_disasm32.asm
.PHONY: test32 .PHONY: test32

2
boot/loader/mem/management.inc
View File

@ -23,7 +23,7 @@
; along with OS/K. If not, see <https://www.gnu.org/licenses/>. ; ; along with OS/K. If not, see <https://www.gnu.org/licenses/>. ;
;=----------------------------------------------------------------------------=; ;=----------------------------------------------------------------------------=;
%define MAX_MEMORY 8 ; GiB %define MAX_MEMORY 4 ; GiB
[BITS 32] [BITS 32]
[section .text] [section .text]

25
kaleid/kernel/init/init.c
View File

@ -150,31 +150,6 @@ noreturn void BtStartKern(multiboot_info_t *mbInfo, int mbMagic)
//if(rc)KernLog("error\n"); //if(rc)KernLog("error\n");
//KernLog((char*)buf->buf); //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 // We're out
PsFiniSched(); PsFiniSched();
KeCrashSystem(); //yay KeCrashSystem(); //yay