Changeset 92577 in vbox

Timestamp:

Nov 24, 2021 1:49:26 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

148459

Message:

IPRT,bs3kit: Made ASMWrMsr in 16-bit code. bugref:9044

Location:

trunk

Files:

• include/iprt/asm-amd64-x86.h (modified) (3 diffs)
• src/VBox/Runtime/common/asm/ASMWrMsr.asm (added)
• src/VBox/ValidationKit/bootsectors/bs3kit/Makefile.kmk (modified) (2 diffs)

trunk/include/iprt/asm-amd64-x86.h

@@ -2391 +2391 @@
  */
 #if RT_INLINE_ASM_EXTERNAL && !RT_INLINE_ASM_USES_INTRIN
-RT_ASM_DECL_PRAGMA_WATCOM(void) ASMWrMsr(uint32_t uRegister, uint64_t u64Val);
+RT_ASM_DECL_PRAGMA_WATCOM_386(void) ASMWrMsr(uint32_t uRegister, uint64_t u64Val);
 #else
 DECLINLINE(void) ASMWrMsr(uint32_t uRegister, uint64_t u64Val)
@@ -2428 +2428 @@
  */
 #if RT_INLINE_ASM_EXTERNAL
-RT_ASM_DECL_PRAGMA_WATCOM(uint64_t) ASMRdMsrEx(uint32_t uRegister, RTCCUINTXREG uXDI);
+RT_ASM_DECL_PRAGMA_WATCOM_386(uint64_t) ASMRdMsrEx(uint32_t uRegister, RTCCUINTXREG uXDI);
 #else
 DECLINLINE(uint64_t) ASMRdMsrEx(uint32_t uRegister, RTCCUINTXREG uXDI)
@@ -2466 +2466 @@
  */
 #if RT_INLINE_ASM_EXTERNAL
-RT_ASM_DECL_PRAGMA_WATCOM(void) ASMWrMsrEx(uint32_t uRegister, RTCCUINTXREG uXDI, uint64_t u64Val);
+RT_ASM_DECL_PRAGMA_WATCOM_386(void) ASMWrMsrEx(uint32_t uRegister, RTCCUINTXREG uXDI, uint64_t u64Val);
 #else
 DECLINLINE(void) ASMWrMsrEx(uint32_t uRegister, RTCCUINTXREG uXDI, uint64_t u64Val)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/Makefile.kmk

@@ -238 +238 @@
        ../../../Runtime/common/asm/ASMCpuId.asm \
        ../../../Runtime/common/asm/ASMCpuId_Idx_ECX.asm \
+       ../../../Runtime/common/asm/ASMWrMsr.asm \
        ../../../Runtime/common/asm/ASMGetXcr0.asm \
        ../../../Runtime/common/asm/ASMSetXcr0.asm \
@@ -281 +282 @@
 $(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,ASMCpuIdExSlow,32)
 $(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,ASMCpuId,20)
+$(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,ASMWrMsr,12)
 $(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,ASMSetXcr0,8)
 $(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,ASMGetXcr0,0)