Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 21:42:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[BOOTLIB][CRT]

Browse source 
- Fix GCC build

svn path=/trunk/; revision=73688
This commit is contained in:
Thomas Faber 2017-02-04 23:50:32 +00:00
parent 28dad177a0
commit 0e90ca425c
3 changed files with 29 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
reactos/boot/environ/lib/arch/i386/transfer.s
View file

@ -11,10 +11,10 @@
#include <asm.inc> #include <asm.inc>
#include <ks386.inc> #include <ks386.inc>
EXTERN _GdtRegister:DWORD EXTERN _GdtRegister:FWORD
EXTERN _IdtRegister:DWORD EXTERN _IdtRegister:FWORD
EXTERN _BootAppGdtRegister:DWORD EXTERN _BootAppGdtRegister:FWORD
EXTERN _BootAppIdtRegister:DWORD EXTERN _BootAppIdtRegister:FWORD
EXTERN _BootApp32Stack:DWORD EXTERN _BootApp32Stack:DWORD
EXTERN _BootApp32EntryRoutine:DWORD EXTERN _BootApp32EntryRoutine:DWORD
EXTERN _BootApp32Parameters:DWORD EXTERN _BootApp32Parameters:DWORD
@ -39,10 +39,10 @@ _Archx86TransferTo32BitApplicationAsm:
mov ebx, esp mov ebx, esp
/* Save current GDT/IDT, then load new one */ /* Save current GDT/IDT, then load new one */
sgdt fword ptr _GdtRegister sgdt _GdtRegister
sidt fword ptr _IdtRegister sidt _IdtRegister
lgdt fword ptr _BootAppGdtRegister lgdt _BootAppGdtRegister
lidt fword ptr _BootAppIdtRegister lidt _BootAppIdtRegister
/* Load the new stack */ /* Load the new stack */
xor ebp, ebp xor ebp, ebp
@ -62,8 +62,8 @@ _Archx86TransferTo32BitApplicationAsm:
mov esp, ebx mov esp, ebx
/* Restore old GDT/IDT */ /* Restore old GDT/IDT */
lgdt fword ptr _GdtRegister lgdt _GdtRegister
lidt fword ptr _IdtRegister lidt _IdtRegister
/* Retore old segments */ /* Retore old segments */
pop ds pop ds
@ -76,6 +76,6 @@ _Archx86TransferTo32BitApplicationAsm:
pop ebp pop ebp
/* All done */ /* All done */
retn ret
END END

5
reactos/sdk/include/crt/mingw32/intrin_x86.h
View file

@ -1815,6 +1815,11 @@ __INTRIN_INLINE void __sidt(void *Destination)
__asm__ __volatile__("sidt %0" : : "m"(*(short*)Destination) : "memory"); __asm__ __volatile__("sidt %0" : : "m"(*(short*)Destination) : "memory");
} }
__INTRIN_INLINE void _sgdt(void *Destination)
{
__asm__ __volatile__("sgdt %0" : : "m"(*(short*)Destination) : "memory");
}
/*** Misc operations ***/ /*** Misc operations ***/
__INTRIN_INLINE void _mm_pause(void) __INTRIN_INLINE void _mm_pause(void)

13
reactos/sdk/include/crt/msc/intrin.h
View file

@ -342,6 +342,19 @@ void __forceinline __invlpg_fixed(void * Address)
#pragma intrinsic(__wbinvd) #pragma intrinsic(__wbinvd)
#pragma intrinsic(__lidt) #pragma intrinsic(__lidt)
#pragma intrinsic(__sidt) #pragma intrinsic(__sidt)
#if (_MSC_VER >= 1800)
#pragma intrinsic(_sgdt)
#else
__forceinline
void _sgdt(void *Destination)
{
__asm
{
mov eax, Destination
sgdt [eax]
}
}
#endif
#pragma intrinsic(_mm_pause) #pragma intrinsic(_mm_pause)
#endif #endif
#if defined(_M_ARM) #if defined(_M_ARM)