Convert bootup code (int18/int19) to 32bit mode.

[seabios.git] / src / romlayout.S

diff --git a/src/romlayout.S b/src/romlayout.S
index cd1de84f8ebe609014b3aaadffb3339f6a993bff..6eda03681874de5b0906854b051e2f5a49de9f90 100644 (file)
--- a/src/romlayout.S
+++ b/src/romlayout.S
@@ -110,6 +110,7 @@
         xorw %ax, %ax
         movw %ax, %ss
         movl $ BUILD_STACK_ADDR , %esp
+        cld
         .endm
 
         // Specify a location in the fixed part of bios area.
@@ -130,8 +131,6 @@ post16:
 
         pushl $_code32__start
 
-        cld
-
         // Fall through to transition32 function below
 
 
@@ -432,12 +431,14 @@ pnp_string:
         .global entry_19
 entry_19:
         RESET_STACK
-        ENTRY handle_19
+        pushl $_code32_handle_19
+        jmp transition32
 
         .global entry_18
 entry_18:
         RESET_STACK
-        ENTRY handle_18
+        pushl $_code32_handle_18
+        jmp transition32
 
         // IRQ trampolines
         .macro IRQ_TRAMPOLINE num