|
@@ -176,14 +176,6 @@ ENTRY(startup_32)
|
|
lret
|
|
lret
|
|
ENDPROC(startup_32)
|
|
ENDPROC(startup_32)
|
|
|
|
|
|
-no_longmode:
|
|
|
|
- /* This isn't an x86-64 CPU so hang */
|
|
|
|
-1:
|
|
|
|
- hlt
|
|
|
|
- jmp 1b
|
|
|
|
-
|
|
|
|
-#include "../../kernel/verify_cpu.S"
|
|
|
|
-
|
|
|
|
/*
|
|
/*
|
|
* Be careful here startup_64 needs to be at a predictable
|
|
* Be careful here startup_64 needs to be at a predictable
|
|
* address so I can export it in an ELF header. Bootloaders
|
|
* address so I can export it in an ELF header. Bootloaders
|
|
@@ -349,6 +341,15 @@ relocated:
|
|
*/
|
|
*/
|
|
jmp *%rbp
|
|
jmp *%rbp
|
|
|
|
|
|
|
|
+ .code32
|
|
|
|
+no_longmode:
|
|
|
|
+ /* This isn't an x86-64 CPU so hang */
|
|
|
|
+1:
|
|
|
|
+ hlt
|
|
|
|
+ jmp 1b
|
|
|
|
+
|
|
|
|
+#include "../../kernel/verify_cpu.S"
|
|
|
|
+
|
|
.data
|
|
.data
|
|
gdt:
|
|
gdt:
|
|
.word gdt_end - gdt
|
|
.word gdt_end - gdt
|