[FREELDR] Adapt some assembly code for amd64 position relative code (reactos#7530)

CORE-19882

Author: iLauncherDev

boot/freeldr/freeldr/arch/realmode/amd64.S

@@ -28,24 +28,29 @@ Startup:
     mov byte ptr ds:[BSS_BootDrive], dl
     mov byte ptr ds:[BSS_BootPartition], dh
 
-    /* Setup a real mode stack */
-    mov sp, word ptr ds:[stack16]
-
-    /* Output first status */
-    mov si, offset Msg_Starting
-    call writestr
+    /* Setup the stack */
+    mov sp, STACK16ADDR
 
     /* Enable A20 address line */
     call EnableA20
 
+    /* Relocate FreeLdr if necessary */
+    call RelocateFreeLdr
+    ljmp16 FREELDR_BASE / 16, .SegmentRelocationPoint
+.SegmentRelocationPoint:
+
+    /* Output first status */
+    mov si, offset Msg_Starting
+    call cs_writestr
+
     /* Check the CPU */
     call CheckFor64BitSupport
     test al, al
     jnz .LongModeSupported
 
     /* Output failure message */
     mov si, offset Msg_Unsupported
-    call writestr
+    call cs_writestr
 
     /* Wait for a keypress */
     int HEX(16)
@@ -64,19 +69,17 @@ Msg_LongModeSupported:
 .LongModeSupported:
     /* Output status */
     mov si, offset Msg_LongModeSupported
-    call writestr
-
-    /* Load the GDT */
-    lgdt lXdtPrefix ds:[gdtptr]
+    call cs_writestr
 
     /* Build the startup page tables */
     call BuildPageTables
 
     /* Store real mode entry point in shared memory */
-    mov dword ptr ds:[BSS_RealModeEntry], offset RealModeEntryPoint
+    mov dword ptr ds:[BSS_RealModeEntry], offset RealModeEntryPoint + FREELDR_BASE
 
     /* Address the image with es segment */
-    mov ax, FREELDR_PE_BASE / 16
+    mov ax, cs
+    add ax, (FREELDR_PE_BASE - FREELDR_BASE) / 16
     mov es, ax
 
     /* Get address of optional header */
@@ -88,15 +91,15 @@ Msg_LongModeSupported:
     add eax, FREELDR_PE_BASE
 
     /* Save entry point */
-    mov dword ptr ds:[LongModeEntryPoint], eax
+    mov dword ptr cs:[LongModeEntryPoint], eax
 
     /* Restore es */
     xor ax, ax
     mov es, ax
 
     /* Output status */
     mov si, offset Msg_SwitchToLongMode
-    call writestr
+    call cs_writestr
 
     jmp ExitToLongMode
 
@@ -109,14 +112,15 @@ gdt:
     .word HEX(0000), HEX(0000), HEX(0000), HEX(0000) /* 08:  */
     .word HEX(0000), HEX(0000), HEX(9800), HEX(0020) /* 10: long mode CS */
     .word HEX(FFFF), HEX(0000), HEX(F300), HEX(00CF) /* 18: long mode DS */
-    .word HEX(FFFF), HEX(0000), HEX(9E00), HEX(0000) /* 20: 16-bit real mode CS */
+    .word HEX(FFFF), HEX(0000), HEX(9B00), HEX(008F) /* 20: 16-bit flat CS (!) */
     .word HEX(FFFF), HEX(0000), HEX(9200), HEX(0000) /* 28: 16-bit real mode DS */
     .word HEX(FFFF), HEX(0000), HEX(9B00), HEX(00CF) /* 30: compat mode CS */
+gdt_end:
 
 /* GDT table pointer */
 gdtptr:
-    .word HEX(37)       /* Limit */
-    .long OFF(gdt)      /* Base Address */
+    .word HEX(37)                   /* Limit */
+    .long OFF(gdt) + FREELDR_BASE   /* Base Address */
 
 
 CheckFor64BitSupport:
@@ -134,7 +138,7 @@ CheckFor64BitSupport:
     jnz .CheckForPAE
 
     mov si, offset .Msg_NoCpuidSupport
-    call writestr
+    call cs_writestr
     popad
     xor al, al
     ret
@@ -151,7 +155,7 @@ CheckFor64BitSupport:
     je .CheckForLongMode
 
     mov si, offset .Msg_NoPAE
-    call writestr
+    call cs_writestr
     popad
     xor al, al
     ret
@@ -175,7 +179,7 @@ CheckFor64BitSupport:
 
 .NoLongMode:
     mov si, offset .Msg_NoLongMode
-    call writestr
+    call cs_writestr
     popad
     xor al, al
     ret
@@ -265,7 +269,7 @@ RealModeEntryPoint:
     mov cr0, eax
 
     /* Clear prefetch queue & correct CS */
-    ljmp16 0, InRealMode
+    ljmp16 FREELDR_BASE / 16, InRealMode
 
 InRealMode:
 
@@ -290,28 +294,31 @@ InRealMode:
     xor esp, esp
 
     /* Restore real mode stack */
-    mov sp, word ptr ds:[stack16]
+    mov sp, word ptr cs:[stack16]
 
     // sti /* These are ok now */
 
     /* Do the callback, specified by bx */
     shl bx, 1
-    call word ptr ds:CallbackTable[bx]
+    call word ptr cs:CallbackTable[bx]
 
 ExitToLongMode:
     /* Disable interrupts */
     cli
 
     /* Set correct segment registers */
-    xor ax,ax
-    mov ds,ax
-    mov es,ax
-    mov fs,ax
-    mov gs,ax
-    mov ss,ax
+    xor ax, ax
+    mov ds, ax
+    mov es, ax
+    mov fs, ax
+    mov gs, ax
+    mov ss, ax
 
     /* Save current stack pointer */
-    mov word ptr ds:[stack16], sp
+    mov word ptr cs:[stack16], sp
+
+    /* Load the GDT */
+    lgdt lXdtPrefix cs:[gdtptr]
 
     /* Set PAE and PGE: 10100000b */
     mov eax, cr4
@@ -335,7 +342,7 @@ ExitToLongMode:
     mov cr0, eax
 
     /* Clear prefetch queue & correct CS */
-    ljmp16 LMODE_CS, InLongMode
+    ljmp16 LMODE_CS, InLongMode + FREELDR_BASE
 InLongMode:
     //DB 66h, 0B8h, 18h, 00h // mov ax, LMODE_DS
     //DB 66h, 8Eh, 0D8h // mov ds, ax
@@ -350,6 +357,7 @@ LongModeEntryPoint:
 
     int HEX(16)
     jmp Reboot
+LongModeEntryPointEnd:
 
 /* FNID_* functions */
 CallbackTable:
@@ -363,7 +371,7 @@ CallbackTable:
 
     /* 16-bit stack pointer */
 stack16:
-    .word STACK16ADDR
+    .word 0
 
 
 #include "int386.inc"