Changeset 62109 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Jul 7, 2016 2:45:16 PM (9 years ago)

Author:

vboxsync

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

108592

Message:

IEM: Enable setjmp for all hosts.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAll.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAll.cpp

@@ -219 +219 @@
  * for more optimal return value passing (return regs instead of stack buffer).
  */
-#if defined(DOXYGEN_RUNNING) || defined(RT_OS_WINDOWS)
+#if defined(DOXYGEN_RUNNING) || defined(RT_OS_WINDOWS) || 1
 # define IEM_WITH_SETJMP
 #endif
@@ -7842 +7842 @@
     {
         void *pvMem;
-        VBOXSTRICTRC rcStrict = iemMemBounceBufferMapCrossPage(pVCpu, iMemMap, &pvMem, cbMem, GCPtrMem, fAccess);
+        rcStrict = iemMemBounceBufferMapCrossPage(pVCpu, iMemMap, &pvMem, cbMem, GCPtrMem, fAccess);
         if (rcStrict == VINF_SUCCESS)
             return pvMem;
@@ -7864 +7864 @@
     else
     {
-        void *pvMem;
         rcStrict = iemMemBounceBufferMapPhys(pVCpu, iMemMap, &pvMem, cbMem, GCPhysFirst, fAccess, rcStrict);
         if (rcStrict == VINF_SUCCESS)
@@ -12672 +12671 @@
  *                      POP SS and MOV SS,GR.
  */
+#ifdef __GNUC__
+DECLINLINE(VBOXSTRICTRC)        iemExecOneInner(PVMCPU pVCpu, bool fExecuteInhibit)
+#else
 DECL_FORCE_INLINE(VBOXSTRICTRC) iemExecOneInner(PVMCPU pVCpu, bool fExecuteInhibit)
+#endif
 {
 #ifdef IEM_WITH_SETJMP
@@ -13111 +13114 @@
             pVCpu->iem.s.cLongJumps++;
         }
+        pVCpu->iem.s.CTX_SUFF(pJmpBuf) = pSavedJmpBuf;
 # endif