Index: /trunk/include/VBox/dis.h
===================================================================
--- /trunk/include/VBox/dis.h	(revision 9215)
+++ /trunk/include/VBox/dis.h	(revision 9216)
@@ -384,5 +384,5 @@
 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;
 
Index: /trunk/include/VBox/pdmcritsect.h
===================================================================
--- /trunk/include/VBox/pdmcritsect.h	(revision 9215)
+++ /trunk/include/VBox/pdmcritsect.h	(revision 9216)
@@ -48,5 +48,5 @@
 {
     /** 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). */
Index: /trunk/src/VBox/VMM/CPUM.cpp
===================================================================
--- /trunk/src/VBox/VMM/CPUM.cpp	(revision 9215)
+++ /trunk/src/VBox/VMM/CPUM.cpp	(revision 9216)
@@ -1684,5 +1684,5 @@
  *                      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;
Index: /trunk/src/VBox/VMM/PATM/CSAM.cpp
===================================================================
--- /trunk/src/VBox/VMM/PATM/CSAM.cpp	(revision 9215)
+++ /trunk/src/VBox/VMM/PATM/CSAM.cpp	(revision 9216)
@@ -600,5 +600,5 @@
  *
  */
-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;
Index: /trunk/src/VBox/VMM/PATM/PATM.cpp
===================================================================
--- /trunk/src/VBox/VMM/PATM/PATM.cpp	(revision 9215)
+++ /trunk/src/VBox/VMM/PATM/PATM.cpp	(revision 9216)
@@ -514,5 +514,5 @@
  *
  */
-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;
Index: /trunk/src/VBox/VMM/PATM/PATMInternal.h
===================================================================
--- /trunk/src/VBox/VMM/PATM/PATMInternal.h	(revision 9215)
+++ /trunk/src/VBox/VMM/PATM/PATMInternal.h	(revision 9216)
@@ -673,5 +673,5 @@
  *
  */
-int patmReadBytes(RTHCUINTPTR pSrc, uint8_t *pDest, unsigned size, void *pvUserdata);
+int patmReadBytes(RTUINTPTR pSrc, uint8_t *pDest, unsigned size, void *pvUserdata);
 
 
Index: /trunk/src/VBox/VMM/SELMInternal.h
===================================================================
--- /trunk/src/VBox/VMM/SELMInternal.h	(revision 9215)
+++ /trunk/src/VBox/VMM/SELMInternal.h	(revision 9216)
@@ -110,5 +110,5 @@
     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];
Index: /trunk/src/VBox/VMM/VMMAll/EMAll.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/EMAll.cpp	(revision 9215)
+++ /trunk/src/VBox/VMM/VMMAll/EMAll.cpp	(revision 9216)
@@ -89,5 +89,5 @@
  *
  */
-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;