Changeset 36769 in vbox

Timestamp:

Apr 20, 2011 6:51:05 PM (14 years ago)

Author:

vboxsync

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

71314

Message:

build fixes.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAll.cpp (modified) (6 diffs)
• IEMAllInstructions.cpp.h (modified) (1 diff)

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

@@ -1940 +1940 @@
         case IEMMODE_32BIT:
         {
-            RTGCPTR32 GCPtrFirst32 = *pGCPtrMem;
+            RTGCPTR32 GCPtrFirst32 = (RTGCPTR32)*pGCPtrMem;
             RTGCPTR32 GCPtrLast32  = GCPtrFirst32 + cbMem - 1;
 
@@ -2225 +2225 @@
     uint8_t        *pbBuf        = &pIemCpu->aBounceBuffers[iMemMap].ab[0];
     uint32_t const  cbFirstPage  = PAGE_SIZE - (GCPhysFirst & PAGE_OFFSET_MASK);
-    uint32_t const  cbSecondPage = cbMem - cbFirstPage;
+    uint32_t const  cbSecondPage = (uint32_t)(cbMem - cbFirstPage);
 
     if (fAccess & (IEM_ACCESS_TYPE_READ | IEM_ACCESS_TYPE_EXEC))
@@ -3109 +3109 @@
 static VBOXSTRICTRC iemMemStackPushBeginSpecial(PIEMCPU pIemCpu, size_t cbMem, void **ppvMem, uint64_t *puNewRsp)
 {
+    Assert(cbMem < UINT8_MAX);
     PCPUMCTX    pCtx     = pIemCpu->CTX_SUFF(pCtx);
-    RTGCPTR     GCPtrTop = iemRegGetRspForPush(pCtx, cbMem, puNewRsp);
+    RTGCPTR     GCPtrTop = iemRegGetRspForPush(pCtx, (uint8_t)cbMem, puNewRsp);
     return iemMemMap(pIemCpu, ppvMem, cbMem, X86_SREG_SS, GCPtrTop, IEM_ACCESS_STACK_W);
 }
@@ -3151 +3152 @@
 static VBOXSTRICTRC iemMemStackPopBeginSpecial(PIEMCPU pIemCpu, size_t cbMem, void const **ppvMem, uint64_t *puNewRsp)
 {
+    Assert(cbMem < UINT8_MAX);
     PCPUMCTX    pCtx     = pIemCpu->CTX_SUFF(pCtx);
-    RTGCPTR     GCPtrTop = iemRegGetRspForPop(pCtx, cbMem, puNewRsp);
+    RTGCPTR     GCPtrTop = iemRegGetRspForPop(pCtx, (uint8_t)cbMem, puNewRsp);
     return iemMemMap(pIemCpu, (void **)ppvMem, cbMem, X86_SREG_SS, GCPtrTop, IEM_ACCESS_STACK_R);
 }
@@ -3198 +3200 @@
     {
         if (   !pCtx->ldtrHid.Attr.n.u1Present
-            || (uSel | 0x7) > pCtx->ldtrHid.u32Limit )
+            || (uSel | 0x7U) > pCtx->ldtrHid.u32Limit )
         {
             Log(("iemMemFetchSelDesc: LDT selector %#x is out of bounds (%3x) or ldtr is NP (%#x)\n",
@@ -3211 +3213 @@
     else
     {
-        if ((uSel | 0x7) > pCtx->gdtr.cbGdt)
+        if ((uSel | 0x7U) > pCtx->gdtr.cbGdt)
         {
             Log(("iemMemFetchSelDesc: GDT selector %#x is out of bounds (%3x)\n", uSel, pCtx->gdtr.cbGdt));

trunk/src/VBox/VMM/VMMAll/IEMAllInstructions.cpp.h

@@ -7713 +7713 @@
 {
     uint8_t bRm; IEM_OPCODE_GET_NEXT_BYTE(pIemCpu, &bRm);
-    PCIEMOPUNARYSIZES pImpl;
     switch ((bRm >> X86_MODRM_REG_SHIFT) & X86_MODRM_REG_SMASK)
     {