From e91669b7a466b5c95cd6bc7b8b0c94e1a693f207 Mon Sep 17 00:00:00 2001 From: John Hodge Date: Wed, 1 Aug 2012 09:18:02 +0800 Subject: [PATCH] Kernel - (minor) Debug changes in x86_64 --- KernelLand/Kernel/arch/x86_64/main.c | 6 ++++-- KernelLand/Kernel/arch/x86_64/start32.asm | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/KernelLand/Kernel/arch/x86_64/main.c b/KernelLand/Kernel/arch/x86_64/main.c index 4fb66701..cefeeb47 100644 --- a/KernelLand/Kernel/arch/x86_64/main.c +++ b/KernelLand/Kernel/arch/x86_64/main.c @@ -5,6 +5,9 @@ #include #include +// === CONSTANTS === +#define MAX_PMEMMAP_ENTS 16 + // === IMPORTS === extern void Desctab_Init(void); extern void MM_InitVirt(void); @@ -24,8 +27,7 @@ void kmain(Uint MbMagic, void *MbInfoPtr) { tMBoot_Info *mbInfo; - LogF("Acess2 x86_64 v"EXPAND_STR(KERNEL_VERSION)"\n"); - LogF(" Build %i, Git Hash %s\n", BUILD_NUM, gsGitHash); + LogF("%s\r\n", gsBuildInfo); Desctab_Init(); diff --git a/KernelLand/Kernel/arch/x86_64/start32.asm b/KernelLand/Kernel/arch/x86_64/start32.asm index 52b133c6..ac059711 100644 --- a/KernelLand/Kernel/arch/x86_64/start32.asm +++ b/KernelLand/Kernel/arch/x86_64/start32.asm @@ -183,6 +183,6 @@ gInitialKernelStack: [section .rodata] csNot64BitCapable: - db "Not 64-bit Capable",0 + db "CPU does not support long-mode, please use the x86 build",0 ; vim: ft=nasm -- 2.20.1