[FREELDR] Adapt the bootsectors for the future base address change (reactos#7785)

Author: iLauncherDev

boot/freeldr/bootsect/btrfs.S

@@ -386,7 +386,7 @@ FreeLdrFound:
     //mov  dh, 0    // Load boot partition into DH (not needed, FreeLbr detects it itself)
 
     /* Transfer execution to the bootloader */
-    ljmp16 0, FREELDR_BASE
+    ljmp16 FREELDR_BASE / 16, 0
 
 
 // Insert chunk into chunk map (located at DS:[CHUNK_MAP_OFFSET])

boot/freeldr/bootsect/fat.S

@@ -48,10 +48,10 @@ DataAreaStartLow        =   4
 BiosCHSDriveSizeHigh    =   6
 BiosCHSDriveSizeLow     =   8
 BiosCHSDriveSize        =   8
-ReadSectorsOffset       =   10
-ReadClusterOffset       =   12
-PutCharsOffset          =   14
-BootSectorStackTop      =   HEX(7c00) - 16
+ReadSectorsOffset       =   12
+ReadClusterOffset       =   16
+PutCharsOffset          =   20
+BootSectorStackTop      =   HEX(7c00) - 22
 
 
 // org 7c00h
@@ -218,17 +218,22 @@ FoundFreeLoader:
 
     // Save the addresses of needed functions so
     // the helper code will know where to call them.
-    mov word ptr [bp-ReadSectorsOffset], offset ReadSectors     // Save the address of ReadSectors
-    mov word ptr [bp-ReadClusterOffset], offset ReadCluster     // Save the address of ReadCluster
-    mov word ptr [bp-PutCharsOffset],    offset PutChars        // Save the address of PutChars
+    xor bx, bx
+    mov word ptr [bp-(ReadSectorsOffset-2)], bx                 // Save the segment of ReadSectors
+    mov word ptr [bp-(ReadClusterOffset-2)], bx                 // Save the segment of ReadCluster
+    mov word ptr [bp-(PutCharsOffset-2)],    bx                 // Save the segment of PutChars
+    mov word ptr [bp-ReadSectorsOffset],     offset ReadSectors // Save the address of ReadSectors
+    mov word ptr [bp-ReadClusterOffset],     offset ReadCluster // Save the address of ReadCluster
+    mov word ptr [bp-PutCharsOffset],        offset PutChars    // Save the address of PutChars
+    mov byte ptr [PatchedRet],               HEX(CB)            // Patch 'ret' with 'retf'
 
     // Now AX has start cluster of FreeLoader and we
     // have loaded the helper code in the first 512 bytes
     // of FreeLoader to 0000:F800. Now transfer control
     // to the helper code. Skip the first three bytes
     // because they contain a jump instruction to skip
     // over the helper code in the FreeLoader image.
-    ljmp16 0, FREELDR_BASE + 3
+    ljmp16 FREELDR_BASE / 16, 3
 
 
 
@@ -249,13 +254,11 @@ Reboot:
 PutChars:
     lodsb
     or al,al
-    jz short Done
+    jz PatchedRet
     mov ah, HEX(0e)
     mov bx, 7
     int HEX(10)
     jmp short PutChars
-Done:
-    ret
 
 // Displays a bad boot message
 // And reboots
@@ -265,7 +268,6 @@ BadBoot:
 
     jmp short Reboot
 
-
 // Reads cluster number in AX into [ES:0000]
 ReadCluster:
     // StartSector = ((Cluster - 2) * SectorsPerCluster) + ReservedSectors + HiddenSectors;
@@ -354,7 +356,7 @@ ReadSectorsLBALoop:
 
     loop ReadSectorsLBALoop                 // Read next sector
 
-    ret
+    jmp PatchedRet
 
 
 // Reads logical sectors into [ES:BX]
@@ -403,11 +405,12 @@ NoCarryCHS:
                             // Increment read buffer for next sector
     loop ReadSectorsCHSLoop // Read next sector
 
+PatchedRet:
     ret
 
-
 msgDiskError:
-    .ascii "Disk error", CR, LF, NUL
+//  .ascii "Disk error", CR, LF, NUL
+    .ascii "ERR", CR, LF, NUL
 msgFreeLdr:
     .ascii "Ldr not found", CR, LF, NUL
 // Sorry, need the space...

boot/freeldr/bootsect/fat32.S

@@ -425,7 +425,7 @@ LoadFileDone:
     mov  dh, byte ptr ds:[BootPartition]    // Load boot partition into DH
 
     /* Transfer execution to the bootloader */
-    ljmp16 0, FREELDR_BASE
+    ljmp16 FREELDR_BASE / 16, 0
 
 // Returns the FAT entry for a given cluster number
 // On entry EAX has cluster number

boot/freeldr/bootsect/faty.S

@@ -400,7 +400,7 @@ main:
 
     /* Now the complete freeldr imag is loaded.
        Jump to the realmode entry point. */
-    ljmp16 0, FREELDR_BASE
+    ljmp16 FREELDR_BASE / 16, 0
 
 
 

boot/freeldr/bootsect/isoboot.S

@@ -303,7 +303,7 @@ found_drive:
 
 .jump_to_freeldr:
     // Transfer execution to the bootloader.
-    ljmp16 0, FREELDR_BASE
+    ljmp16 FREELDR_BASE / 16, 0
 
 
 /* FUNCTIONS *****************************************************************/

boot/freeldr/bootsect/ntfs.S

@@ -417,7 +417,7 @@ StartSearch:
 
     mov    dl, byte ptr [BootDrive]
     mov    dh, byte ptr [BootPartition]
-    ljmp16 0, FREELDR_BASE
+    ljmp16 FREELDR_BASE / 16, 0
 
 // Error message if Freeldr is compressed, encrypted or sparse
 CompressedFreeldr:

boot/freeldr/bootsect/pc98/fat12fdd.S

@@ -25,10 +25,10 @@ DataAreaStartLow     = 4
 BiosCHSDriveSizeHigh = 6
 BiosCHSDriveSizeLow  = 8
 BiosCHSDriveSize     = 8
-ReadSectorsOffset    = 10
-ReadClusterOffset    = 12
-PutCharsOffset       = 14
-BootSectorStackTop   = HEX(7C00) - 16
+ReadSectorsOffset    = 12
+ReadClusterOffset    = 16
+PutCharsOffset       = 20
+BootSectorStackTop   = HEX(7C00) - 22
 
 if 0
 .macro DEBUG_STOP
@@ -244,9 +244,14 @@ FoundFreeLoader:
      * Save the addresses of needed functions so
      * the helper code will know where to call them
      */
-    mov word ptr [bp - ReadSectorsOffset], offset ReadSectors   // Save the address of ReadSectors
-    mov word ptr [bp - ReadClusterOffset], offset ReadCluster   // Save the address of ReadCluster
-    mov word ptr [bp - PutCharsOffset], offset PrintString      // Save the address of PrintString
+    xor bx, bx
+    mov word ptr [bp-(ReadSectorsOffset-2)], bx                 // Save the segment of ReadSectors
+    mov word ptr [bp-(ReadClusterOffset-2)], bx                 // Save the segment of ReadCluster
+    mov word ptr [bp-(PutCharsOffset-2)],    bx                 // Save the segment of PrintString
+    mov word ptr [bp-ReadSectorsOffset],     offset ReadSectors // Save the address of ReadSectors
+    mov word ptr [bp-ReadClusterOffset],     offset ReadCluster // Save the address of ReadCluster
+    mov word ptr [bp-PutCharsOffset],        offset PrintString // Save the address of PrintString
+    mov byte ptr [PatchedRet],               HEX(CB)            // Patch 'ret' with 'retf'
 
     /*
      * Now AX has start cluster of FreeLoader and we
@@ -256,7 +261,7 @@ FoundFreeLoader:
      * because they contain a jump instruction to skip
      * over the helper code in the FreeLoader image
      */
-    ljmp16 0, FREELDR_BASE + 3
+    ljmp16 FREELDR_BASE / 16, 3
 
 /*
  * Reads cluster number in AX into [ES:BX]
@@ -347,7 +352,7 @@ ReadSectors:
         pop bx
     loop .ReadSectorsLoop                       // Increment read buffer for next sector, read next sector
 
-    ret
+    jmp PatchedRet
 
 /*
  * Prints a character
@@ -385,7 +390,7 @@ PrintString:
     lodsb                                       // Get a single char from a ptr
 
     or al, al
-    jz short .PrintEnd                          // Found NULL
+    jz short PatchedRet                         // Found NULL
 
     cmp al, HEX(0D)
     jz short .PrintStringHandleCR               // Found CR
@@ -403,7 +408,7 @@ PrintString:
         inc si                                  // Skip the next LF character
      jmp short PrintString
 
-.PrintEnd:
+PatchedRet:
     ret
 
 if 0
@@ -479,7 +484,8 @@ msgDiskError:
 msgNotFoundError:
     .ascii "NFE", CR, LF, NUL
 msgAnyKey:
-    .ascii "Press any key", NUL
+//  .ascii "Press any key", NUL
+    .ascii "Press key", NULL
 filename:
     .ascii "FREELDR SYS"