Changeset 53564 in vbox for trunk/src/VBox

Timestamp:

Dec 18, 2014 2:48:14 AM (10 years ago)

Author:

vboxsync

Message:

cidet: darwin fixes.

Location:

trunk/src/VBox/ValidationKit/utils/cpu

Files:

• cidet-app.cpp (modified) (4 diffs)
• cidet-appA.asm (modified) (2 diffs)
• cidet-core.cpp (modified) (1 diff)

trunk/src/VBox/ValidationKit/utils/cpu/cidet-app.cpp

@@ -50 +50 @@
 #endif
 
+
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
+/** @def CIDET_LEAVE_GS_ALONE
+ * Leave GS alone on 64-bit darwin (gs is 0, no ldt or gdt entry to load that'll
+ * restore the lower 32-bits of the base when saving and restoring the register).
+ */
+#if defined(RT_OS_DARWIN) && defined(RT_ARCH_AMD64)
+# define CIDET_LEAVE_GS_ALONE
+#endif
 
 
@@ -923 +934 @@
 static DECLCALLBACK(bool) CidetAppCbExecute(PCIDETCORE pThis)
 {
-#if defined(RT_OS_WINDOWS)
+#if defined(RT_OS_WINDOWS) || defined(RT_OS_DARWIN)
     /* Skip tricky stack because windows cannot dispatch exception if RSP/ESP is bad. */
     if (pThis->InCtx.fTrickyStack)
@@ -1057 +1068 @@
                     pThis->Core.InTemplateCtx.aGRegs[X86_GREG_xSP] = (uintptr_t)pThis->pbStackEnd - 64;
 
+                    pThis->Core.fTestCfg |= CIDET_TESTCFG_SEG_PRF_CS;
+                    pThis->Core.fTestCfg |= CIDET_TESTCFG_SEG_PRF_DS;
+                    pThis->Core.fTestCfg |= CIDET_TESTCFG_SEG_PRF_ES;
+#if !defined(RT_OS_WINDOWS)
+                    pThis->Core.fTestCfg |= CIDET_TESTCFG_SEG_PRF_FS;
+#endif
+#if !defined(CIDET_LEAVE_GS_ALONE)
+                    pThis->Core.fTestCfg |= CIDET_TESTCFG_SEG_PRF_GS;
+#endif
+
                     *ppThis = pThis;
                     return VINF_SUCCESS;
@@ -1148 +1169 @@
      */
     /* Alternative stack so we can play with esp/rsp. */
-    struct sigaltstack AltStack;
+    stack_t AltStack;
     RT_ZERO(AltStack);
-    AltStack.ss_flags = SS_ONSTACK;
+    AltStack.ss_flags = 0;
 # ifdef SIGSTKSZ
     AltStack.ss_size  = RT_MAX(SIGSTKSZ, _128K);

trunk/src/VBox/ValidationKit/utils/cpu/cidet-appA.asm

@@ -43 +43 @@
 %endif
 
+
+;;
+; Leave GS alone on 64-bit darwin (gs is 0, no ldt or gdt entry to load that'll
+; restore the lower 32-bits of the base when saving and restoring the register).
+%ifdef RT_OS_DARWIN
+ %ifdef RT_ARCH_AMD64
+  %define CIDET_LEAVE_GS_ALONE
+ %endif
+%endif
+
+
+
+BEGINCODE
 
 ;;
@@ -153 +166 @@
         mov     es, [xDX + CIDETCPUCTX.aSRegs + X86_SREG_ES * 2]
         mov     fs, [xDX + CIDETCPUCTX.aSRegs + X86_SREG_FS * 2]
+%ifndef CIDET_LEAVE_GS_ALONE
         mov     gs, [xDX + CIDETCPUCTX.aSRegs + X86_SREG_GS * 2]
+%endif
 
         ; Restore most GPRs (except xCX, xAX and xSP).

trunk/src/VBox/ValidationKit/utils/cpu/cidet-core.cpp

@@ -61 +61 @@
 /** @def CIDET_DPRINTF
  * Debug printf. */
-#if 0 //def DEBUG_bird
+#ifdef DEBUG_bird
 # define CIDET_DPRINTF(a)   do { RTPrintf a; } while (0)
 #else