Changeset 12795 in vbox for trunk/src

Timestamp:

Sep 29, 2008 1:07:00 PM (17 years ago)

Author:

vboxsync

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

37140

Message:

HWACCM: fixed unsigned/signed compare warning (x86.h), use const and g_.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWSVMR0.cpp (modified) (2 diffs)
• HWVMXR0.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp

@@ -51 +51 @@
 static int SVMR0InterpretInvpg(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t uASID);
 
+/*******************************************************************************
+*   Global Variables                                                           *
+*******************************************************************************/
 /* IO operation lookup arrays. */
-static uint32_t aIOSize[4]  = {1, 2, 0, 4};
+static uint32_t const g_aIOSize[4] = {1, 2, 0, 4};
 
 /**
@@ -1867 +1870 @@
                     for (unsigned i=0;i<4;i++)
                     {
-                        unsigned uBPLen = aIOSize[X86_DR7_GET_LEN(pCtx->dr[7], i)];
+                        unsigned uBPLen = g_aIOSize[X86_DR7_GET_LEN(pCtx->dr[7], i)];
 
                         if (    (IoExitInfo.n.u16Port >= pCtx->dr[i] && IoExitInfo.n.u16Port < pCtx->dr[i] + uBPLen)

trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

@@ -46 +46 @@
 *******************************************************************************/
 /* IO operation lookup arrays. */
-static uint32_t aIOSize[4]  = {1, 2, 0, 4};
-static uint32_t aIOOpAnd[4] = {0xff, 0xffff, 0, 0xffffffff};
+static uint32_t const g_aIOSize[4]  = {1, 2, 0, 4};
+static uint32_t const g_aIOOpAnd[4] = {0xff, 0xffff, 0, 0xffffffff};
 
 
@@ -2304 +2304 @@
         }
 
-        uint32_t cbSize = aIOSize[uIOWidth];
+        uint32_t cbSize = g_aIOSize[uIOWidth];
 
         if (VMX_EXIT_QUALIFICATION_IO_STRING(exitQualification))
@@ -2329 +2329 @@
         {
             /* normal in/out */
-            uint32_t uAndVal = aIOOpAnd[uIOWidth];
+            uint32_t uAndVal = g_aIOOpAnd[uIOWidth];
 
             Assert(!VMX_EXIT_QUALIFICATION_IO_REP(exitQualification));
@@ -2367 +2367 @@
                     for (unsigned i=0;i<4;i++)
                     {
-                        unsigned uBPLen = aIOSize[X86_DR7_GET_LEN(pCtx->dr[7], i)];
+                        unsigned uBPLen = g_aIOSize[X86_DR7_GET_LEN(pCtx->dr[7], i)];
 
                         if (    (uPort >= pCtx->dr[i] && uPort < pCtx->dr[i] + uBPLen)