Changeset 62419 in vbox

Timestamp:

Jul 22, 2016 10:57:09 AM (9 years ago)

Author:

vboxsync

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

108970

Message:

IEMAll.cpp: Fixes for some MSC level 4 warnings.

File:

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

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

@@ -229 +229 @@
  * due to GCC lacking knowledge about the value range of a switch. */
 #define IEM_NOT_REACHED_DEFAULT_CASE_RET() default: AssertFailedReturn(VERR_IPE_NOT_REACHED_DEFAULT_CASE)
+
+/** Variant of IEM_NOT_REACHED_DEFAULT_CASE_RET that returns a custom value. */
+#define IEM_NOT_REACHED_DEFAULT_CASE_RET2(a_RetValue) default: AssertFailedReturn(a_RetValue)
 
 /**
@@ -861 +864 @@
     pVCpu->iem.s.enmDefOpSize       = (IEMMODE)0xc0fe;
     pVCpu->iem.s.enmEffOpSize       = (IEMMODE)0xc0fe;
-    pVCpu->iem.s.fPrefixes          = (IEMMODE)0xfeedbeef;
+    pVCpu->iem.s.fPrefixes          = 0xfeedbeef;
     pVCpu->iem.s.uRexReg            = 127;
     pVCpu->iem.s.uRexB              = 127;
@@ -9188 +9191 @@
     else
     {
-        uint32_t uTmp;
+        uint32_t uTmp = 0; /* (Visual C++ maybe used uninitialized) */
         if (enmOpSize == IEMMODE_32BIT)
         {
@@ -12275 +12278 @@
                         case 6: u32EffAddr = pCtx->esi; break;
                         case 7: u32EffAddr = pCtx->edi; break;
-                        IEM_NOT_REACHED_DEFAULT_CASE_RET();
+                        IEM_NOT_REACHED_DEFAULT_CASE_RET2(RTGCPTR_MAX);
                     }
                     u32EffAddr <<= (bSib >> X86_SIB_SCALE_SHIFT) & X86_SIB_SCALE_SMASK;
@@ -12302 +12305 @@
                         case 6: u32EffAddr += pCtx->esi; break;
                         case 7: u32EffAddr += pCtx->edi; break;
-                        IEM_NOT_REACHED_DEFAULT_CASE_RET();
+                        IEM_NOT_REACHED_DEFAULT_CASE_RET2(RTGCPTR_MAX);
                     }
                     break;
@@ -12309 +12312 @@
                 case 6: u32EffAddr = pCtx->esi; break;
                 case 7: u32EffAddr = pCtx->edi; break;
-                IEM_NOT_REACHED_DEFAULT_CASE_RET();
+                IEM_NOT_REACHED_DEFAULT_CASE_RET2(RTGCPTR_MAX);
             }
 
@@ -12330 +12333 @@
                 }
                 default:
-                    AssertFailedReturn(VERR_IEM_IPE_2); /* (caller checked for these) */
+                    AssertFailedReturn(RTGCPTR_MAX); /* (caller checked for these) */
             }
         }
@@ -12396 +12399 @@
                     case 14: u64EffAddr = pCtx->r14; break;
                     case 15: u64EffAddr = pCtx->r15; break;
-                    IEM_NOT_REACHED_DEFAULT_CASE_RET();
+                    IEM_NOT_REACHED_DEFAULT_CASE_RET2(RTGCPTR_MAX);
                 }
                 u64EffAddr <<= (bSib >> X86_SIB_SCALE_SHIFT) & X86_SIB_SCALE_SMASK;
@@ -12437 +12440 @@
                         }
                         break;
-                    IEM_NOT_REACHED_DEFAULT_CASE_RET();
+                    IEM_NOT_REACHED_DEFAULT_CASE_RET2(RTGCPTR_MAX);
                 }
                 break;
             }
-            IEM_NOT_REACHED_DEFAULT_CASE_RET();
+            IEM_NOT_REACHED_DEFAULT_CASE_RET2(RTGCPTR_MAX);
         }
 
@@ -12463 +12466 @@
                 break;
             }
-            IEM_NOT_REACHED_DEFAULT_CASE_RET(); /* (caller checked for these) */
+            IEM_NOT_REACHED_DEFAULT_CASE_RET2(RTGCPTR_MAX); /* (caller checked for these) */
         }