Changeset 9223 in vbox

Timestamp:

May 29, 2008 1:47:32 PM (17 years ago)

Author:

vboxsync

Message:

Introduced RTRCPTR type. Raw mode context pointer aka 32 guest context pointer.

Location:

trunk

Files:

• include/VBox/cpum.h (modified) (1 diff)
• include/iprt/asmdefs.mac (modified) (2 diffs)
• include/iprt/cdefs.h (modified) (1 diff)
• include/iprt/types.h (modified) (1 diff)
• src/VBox/VMM/TRPMInternal.h (modified) (2 diffs)
• src/VBox/VMM/TRPMInternal.mac (modified) (1 diff)
• src/VBox/VMM/VMMAll/TRPMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMGC/TRPMGC.cpp (modified) (1 diff)

trunk/include/VBox/cpum.h

@@ -930 +930 @@
  *
  */
-DECLASM(void) CPUMGCCallGuestTrapHandler(PCPUMCTXCORE pRegFrame, uint32_t selCS, RTGCPTR32 pHandler, uint32_t eflags, uint32_t selSS, RTGCPTR32 pEsp);
+DECLASM(void) CPUMGCCallGuestTrapHandler(PCPUMCTXCORE pRegFrame, uint32_t selCS, RTRCPTR pHandler, uint32_t eflags, uint32_t selSS, RTRCPTR pEsp);
 
 /**

trunk/include/iprt/asmdefs.mac

@@ -449 +449 @@
 
 
+;; @def RTRCPTR_DEF
+; The pesudo-instruction used to declare an initialized pointer variable in the raw mode context.
+%define RTRCPTR_DEF    dd
+
+;; @def RTRCPTR_RES
+; The pesudo-instruction used to declare (=reserve space for) an uninitialized pointer
+; variable of the raw mode context.
+%define RTRCPTR_RES    resd
+
+;; @def RTRCPTR_PRE
+; The memory operand prefix used for a pointer in the raw mode context.
+%define RTRCPTR_PRE    dword
+
+;; @def RTRCPTR_CB
+; The size in bytes of a pointer in the raw mode context.
+%define RTRCPTR_CB     4
+
 
 ;; @def RT_CCPTR_DEF
@@ -464 +481 @@
 
 %ifdef IN_GC
- %define RTCCPTR_DEF        RTGCPTR_DEF
- %define RTCCPTR_RES        RTGCPTR_RES
- %define RTCCPTR_PRE        RTGCPTR_PRE
- %define RTCCPTR_CB         RTGCPTR_CB
+ %define RTCCPTR_DEF        RTRCPTR_DEF
+ %define RTCCPTR_RES        RTRCPTR_RES
+ %define RTCCPTR_PRE        RTRCPTR_PRE
+ %define RTCCPTR_CB         RTRCPTR_CB
 %else
  %ifdef IN_RING0

trunk/include/iprt/cdefs.h

@@ -237 +237 @@
 
 /** @def RCPTRTYPE
- * Declare a pointer which is used in GC but appears in structure(s) used by
- * both HC and GC. The main purpose is to make sure structures have the same
+ * Declare a pointer which is used in the raw mode context but appears in structure(s) used by
+ * both HC and RC. The main purpose is to make sure structures have the same
  * size when built for different architectures.
  *
- * @param   GCType  The GC type.
- */
-#define RCPTRTYPE(GCType)       CTXTYPE(GCType, RTGCPTR32, RTGCPTR32)
+ * @param   RCType  The RC type.
+ */
+#define RCPTRTYPE(RCType)       CTXTYPE(RCType, RTRCPTR, RTRCPTR)
 
 /** @def R3R0PTRTYPE

trunk/include/iprt/types.h

@@ -891 +891 @@
 /** @} */
 
+/** @defgroup grp_rt_types_rc  Raw mode Context Basic Types
+ * @ingroup grp_rt_types
+ * @{
+ */
+
+/** Raw mode context pointer; a 32 bits guest context pointer
+ * Keep in mind that this type is an unsigned integer in
+ * HC and void pointer in GC.
+ */
+#ifdef IN_GC
+typedef void *          RTRCPTR;
+#else
+typedef uint32_t        RTRCPTR;
+#endif
+/** Pointer to a raw mode context pointer. */
+typedef RTRCPTR        *PRTRCPTR;
+/** Pointer to a const raw mode context pointer. */
+typedef const RTRCPTR  *PCRTRCPTR;
+/** @def NIL_RTGCPTR 
+ * NIL RC pointer.
+ */
+#define NIL_RTRCPTR    ((RTRCPTR)0)
+/** @} */
+
 
 /** @defgroup grp_rt_types_cc  Current Context Basic Types

trunk/src/VBox/VMM/TRPMInternal.h

@@ -152 +152 @@
     /** Temporary Hypervisor trap handlers.
      * NULL means default action. */
-    RTGCPTR32       aTmpTrapHandlers[256];
+    RCPTRTYPE(void *) aTmpTrapHandlers[256];
 
     /** GC Pointer to the IDT shadow area (aIdt) placed in Hypervisor memory arena. */
-    RTGCPTR32       GCPtrIdt;
+    RCPTRTYPE(void *) GCPtrIdt;
     /** Current (last) Guest's IDTR. */
     VBOXIDTR        GuestIdtr;
@@ -163 +163 @@
 
     /** Checked trap & interrupt handler array */
-    RTGCPTR32       aGuestTrapHandler[256];
+    RCPTRTYPE(void *) aGuestTrapHandler[256];
 
     /** GC: The number of times writes to the Guest IDT were detected. */

trunk/src/VBox/VMM/TRPMInternal.mac

@@ -52 +52 @@
     .aIdt               resd 512
     .au32IdtPatched     resd 8
-    .aTmpTrapHandlers   RTGCPTR32_RES 256
+    .aTmpTrapHandlers   RTRCPTR_RES 256
 
-    .GCPtrIdt           RTGCPTR32_RES 1
+    .GCPtrIdt           RTRCPTR_RES 1
     .GuestIdtr          resb 6
     .au8Padding         resb 2
 
-    .aGuestTrapHandler  resd 256
+    .aGuestTrapHandler  RTRCPTR_RES 256
 
     .StatGCWriteGuestIDTFault  resb STAMCOUNTER_size

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

@@ -694 +694 @@
                         STAM_PROFILE_ADV_STOP(&pVM->trpm.s.aStatGCTraps[iOrgTrap], o);
 
-                    CPUMGCCallGuestTrapHandler(pRegFrame, GuestIdte.Gen.u16SegSel | 1, pVM->trpm.s.aGuestTrapHandler[iGate], eflags.u32, ss_r0, (RTGCPTR32)esp_r0);
+                    CPUMGCCallGuestTrapHandler(pRegFrame, GuestIdte.Gen.u16SegSel | 1, pVM->trpm.s.aGuestTrapHandler[iGate], eflags.u32, ss_r0, (RTRCPTR)esp_r0);
                     /* does not return */
 #else

trunk/src/VBox/VMM/VMMGC/TRPMGC.cpp

@@ -69 +69 @@
      * Install handler.
      */
-    pVM->trpm.s.aTmpTrapHandlers[iTrap] = (RTGCPTR32)(RTGCUINTPTR)pfnHandler;
+    pVM->trpm.s.aTmpTrapHandlers[iTrap] = (RTRCPTR)pfnHandler;
     return VINF_SUCCESS;
 }