Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-04 17:21:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FREELDR] Fix MSVC x64 compilation after d2f73877b7

Browse source
This commit is contained in:
Hervé Poussineau 2021-01-29 07:45:13 +01:00
parent d2f73877b7
commit db35a7861f
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
boot/freeldr/freeldr/arch/amd64/entry.S
View file

@ -222,7 +222,11 @@ __fastfail:
// void __lgdt(void *Source<rcx>); // void __lgdt(void *Source<rcx>);
PUBLIC __lgdt PUBLIC __lgdt
__lgdt: __lgdt:
#ifdef _USE_ML
lgdt fword ptr [rcx]
#else
lgdt cs:[rcx] lgdt cs:[rcx]
#endif
ret ret
// void __ltr(unsigned short Source<rcx>); // void __ltr(unsigned short Source<rcx>);
@ -234,7 +238,11 @@ __ltr:
// void _sgdt(void *Destination<rcx>); // void _sgdt(void *Destination<rcx>);
PUBLIC __sgdt PUBLIC __sgdt
__sgdt: __sgdt:
#ifdef _USE_ML
sgdt fword ptr [rcx]
#else
sgdt cs:[rcx] sgdt cs:[rcx]
#endif
ret ret

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

@ -67,7 +67,11 @@ Msg_LongModeSupported:
call writestr call writestr
/* Load the GDT */ /* Load the GDT */
#ifdef _USE_ML
lgdt fword ptr [gdtptr]
#else
lgdt cs:[gdtptr] lgdt cs:[gdtptr]
#endif
/* Build the startup page tables */ /* Build the startup page tables */
call BuildPageTables call BuildPageTables