little reorganization

2019-03-09 21:46:09 +01:00 · 2019-03-09 21:46:09 +01:00 · 2b8ebc6c57
parent 476b30fb20
commit 2b8ebc6c57
3 changed files with 8 additions and 2 deletions
--- 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
--- a/boot/loader/cpu/cpu32.inc
+++ b/boot/loader/cpu/cpu32.inc
--- 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