Changeset 9154 in vbox for trunk/src/VBox/VMM

Timestamp:

May 27, 2008 11:33:58 AM (17 years ago)

Author:

vboxsync

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

31289

Message:

Corrected code that doesn't compile with GC_ARCH_BITS=64.

Location:

trunk/src/VBox/VMM

Files:

• CPUM.cpp (modified) (1 diff)
• DBGFDisas.cpp (modified) (2 diffs)
• PDMCritSect.cpp (modified) (1 diff)

trunk/src/VBox/VMM/CPUM.cpp

@@ -1684 +1684 @@
  *                      In this context it's always pointer to the Core of a DBGFDISASSTATE.
  */
-static DECLCALLBACK(int) cpumR3DisasInstrRead(RTHCUINTPTR PtrSrc, uint8_t *pu8Dst, uint32_t cbRead, void *uDisCpu)
+static DECLCALLBACK(int) cpumR3DisasInstrRead(RTUINTPTR PtrSrc, uint8_t *pu8Dst, uint32_t cbRead, void *uDisCpu)
 {
     PDISCPUSTATE pCpu = (PDISCPUSTATE)uDisCpu;

trunk/src/VBox/VMM/DBGFDisas.cpp

@@ -45 +45 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
-static DECLCALLBACK(int) dbgfR3DisasInstrRead(RTHCUINTPTR pSrc, uint8_t *pDest, uint32_t size, void *pvUserdata);
+static DECLCALLBACK(int) dbgfR3DisasInstrRead(RTUINTPTR pSrc, uint8_t *pDest, uint32_t size, void *pvUserdata);
 
 
@@ -168 +168 @@
  *                      In this context it's always pointer to the Core of a DBGFDISASSTATE.
  */
-static DECLCALLBACK(int) dbgfR3DisasInstrRead(RTHCUINTPTR PtrSrc, uint8_t *pu8Dst, uint32_t cbRead, void *pvDisCpu)
+static DECLCALLBACK(int) dbgfR3DisasInstrRead(RTUINTPTR PtrSrc, uint8_t *pu8Dst, uint32_t cbRead, void *pvDisCpu)
 {
     PDBGFDISASSTATE pState = (PDBGFDISASSTATE)pvDisCpu;

trunk/src/VBox/VMM/PDMCritSect.cpp

@@ -147 +147 @@
 PDMR3DECL(int) PDMR3CritSectInit(PVM pVM, PPDMCRITSECT pCritSect, const char *pszName)
 {
+#if HC_ARCH_BITS == 64 && GC_ARCH_BITS == 32
     AssertCompile(sizeof(pCritSect->padding) >= sizeof(pCritSect->s));
+#endif
     return pdmR3CritSectInitOne(pVM, &pCritSect->s, pCritSect, pszName);
 }