Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-18 16:45:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FREELDR/x64] Partly revert 5367ae5760

Browse source 
Using RealModeEntryPoint uses IMAGE_REL_I386_REL16, now supported by obj2bin
This commit is contained in:
Hervé Poussineau 2021-02-22 10:30:51 +01:00
parent 77d69c68b8
commit 05fbfb0cad
1 changed files with 1 additions and 9 deletions

10
boot/freeldr/freeldr/arch/realmode/amd64.S
View file

@ -77,11 +77,7 @@ Msg_LongModeSupported:
call BuildPageTables call BuildPageTables
/* Store real mode entry point in shared memory */ /* Store real mode entry point in shared memory */
#ifdef _USE_ML
mov dword ptr ds:[BSS_RealModeEntry], offset RealModeEntryPoint mov dword ptr ds:[BSS_RealModeEntry], offset RealModeEntryPoint
#else
mov dword ptr ds:[BSS_RealModeEntry], (FREELDR_BASE + RealModeEntryPoint - (Startup - 512))
#endif
/* Address the image with es segment */ /* Address the image with es segment */
mov ax, FREELDR_PE_BASE / 16 mov ax, FREELDR_PE_BASE / 16
@ -124,11 +120,7 @@ gdt:
/* GDT table pointer */ /* GDT table pointer */
gdtptr: gdtptr:
.word HEX(37) /* Limit */ .word HEX(37) /* Limit */
#ifdef _USE_ML .long gdt /* Base Address */
.long offset gdt /* Base Address */
#else
.long (FREELDR_BASE + gdt - (Startup - 512)) /* Base Address */
#endif
CheckFor64BitSupport: CheckFor64BitSupport: