diff --git a/boot/loader/cpu/cpu.inc b/boot/loader/cpu/cpu.inc index 1dc5158..8b92819 100644 --- a/boot/loader/cpu/cpu.inc +++ b/boot/loader/cpu/cpu.inc @@ -55,3 +55,9 @@ tritemporize: loop .looping pop rcx ret + + +; ---------------------------------------------------------------------------- ; +; Returns the CPU Vendor String.pointer in eax ; +; ---------------------------------------------------------------------------- ; +cpu_vendor diff --git a/boot/loader/cpu/cpuid.inc b/boot/loader/cpu/cpu32.inc similarity index 100% rename from boot/loader/cpu/cpuid.inc rename to boot/loader/cpu/cpu32.inc diff --git a/boot/loader/loader.asm b/boot/loader/loader.asm index c1cd9ac..ed1b828 100644 --- a/boot/loader/loader.asm +++ b/boot/loader/loader.asm @@ -25,7 +25,7 @@ %include "boot/loader/multiboot/header.inc" %include "boot/loader/multiboot/check.inc" -%include "boot/loader/cpu/cpuid.inc" +%include "boot/loader/cpu/cpu32.inc" %include "boot/loader/mem/management.inc" %include "boot/loader/io/terminal.inc" %include "boot/loader/cpu/cpu.inc" @@ -152,7 +152,7 @@ _loader64: call tritemporize ; Let time to see extern StartKern - jmp StartKern + ;jmp StartKern ;; We must never reach this point ------------------------------------------- ;; jmp Die