Changeset 9216 in vbox

Timestamp:

May 29, 2008 11:29:55 AM (17 years ago)

Author:

vboxsync

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

31386

Message:

Compile issues (32 bits host/64 bits guest)

Location:

trunk

Files:

• include/VBox/dis.h (modified) (1 diff)
• include/VBox/pdmcritsect.h (modified) (1 diff)
• src/VBox/VMM/CPUM.cpp (modified) (1 diff)
• src/VBox/VMM/PATM/CSAM.cpp (modified) (1 diff)
• src/VBox/VMM/PATM/PATM.cpp (modified) (1 diff)
• src/VBox/VMM/PATM/PATMInternal.h (modified) (1 diff)
• src/VBox/VMM/SELMInternal.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/EMAll.cpp (modified) (1 diff)

trunk/include/VBox/dis.h

@@ -384 +384 @@
 typedef const struct _OPCODE *PCOPCODE;
 
-typedef DECLCALLBACK(int) FN_DIS_READBYTES(RTUINTPTR pSrc, uint8_t *pDest, uint32_t size, void *pvUserdata);
+typedef DECLCALLBACK(int) FN_DIS_READBYTES(RTUINTPTR pSrc, uint8_t *pDest, unsigned size, void *pvUserdata);
 typedef FN_DIS_READBYTES *PFN_DIS_READBYTES;
 

trunk/include/VBox/pdmcritsect.h

@@ -48 +48 @@
 {
     /** Padding. */
-    uint8_t padding[HC_ARCH_BITS == 64 ? 0xb8 : 0x80];
+    uint8_t padding[HC_ARCH_BITS == 64 ? 0xb8 : 0x88];
 #ifdef PDMCRITSECTINT_DECLARED
     /** The internal structure (not normally visible). */

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(RTUINTPTR PtrSrc, uint8_t *pu8Dst, uint32_t cbRead, void *uDisCpu)
+static DECLCALLBACK(int) cpumR3DisasInstrRead(RTUINTPTR PtrSrc, uint8_t *pu8Dst, unsigned cbRead, void *uDisCpu)
 {
     PDISCPUSTATE pCpu = (PDISCPUSTATE)uDisCpu;

trunk/src/VBox/VMM/PATM/CSAM.cpp

@@ -600 +600 @@
  *
  */
-static DECLCALLBACK(int) CSAMR3ReadBytes(RTHCUINTPTR pSrc, uint8_t *pDest, unsigned size, void *pvUserdata)
+static DECLCALLBACK(int) CSAMR3ReadBytes(RTUINTPTR pSrc, uint8_t *pDest, unsigned size, void *pvUserdata)
 {
     DISCPUSTATE  *pCpu     = (DISCPUSTATE *)pvUserdata;

trunk/src/VBox/VMM/PATM/PATM.cpp

@@ -514 +514 @@
  *
  */
-int patmReadBytes(RTHCUINTPTR pSrc, uint8_t *pDest, unsigned size, void *pvUserdata)
+int patmReadBytes(RTUINTPTR pSrc, uint8_t *pDest, unsigned size, void *pvUserdata)
 {
     DISCPUSTATE  *pCpu     = (DISCPUSTATE *)pvUserdata;

trunk/src/VBox/VMM/PATM/PATMInternal.h

@@ -673 +673 @@
  *
  */
-int patmReadBytes(RTHCUINTPTR pSrc, uint8_t *pDest, unsigned size, void *pvUserdata);
+int patmReadBytes(RTUINTPTR pSrc, uint8_t *pDest, unsigned size, void *pvUserdata);
 
 

trunk/src/VBox/VMM/SELMInternal.h

@@ -110 +110 @@
     RTUINT                  offLdtHyper;
 
-#if HC_ARCH_BITS == 32 || GC_ARCH_BITS == 64
+#if (HC_ARCH_BITS == 32 || GC_ARCH_BITS == 64) && !(HC_ARCH_BITS == 32 && GC_ARCH_BITS == 64)
     /** TSS alignment padding. */
     RTUINT                  auPadding[2];

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

@@ -89 +89 @@
  *
  */
-DECLCALLBACK(int) EMReadBytes(RTHCUINTPTR pSrc, uint8_t *pDest, unsigned cb, void *pvUserdata)
+DECLCALLBACK(int) EMReadBytes(RTUINTPTR pSrc, uint8_t *pDest, unsigned cb, void *pvUserdata)
 {
     DISCPUSTATE  *pCpu     = (DISCPUSTATE *)pvUserdata;