Changeset 10016

Timestamp:

06/30/08 15:58:19 (6 months ago)

Author:

vboxsync

Message:

Corrected parameter types (const).
Use SELMToFlatEx instead of SELMValidateAndConvertCSAddr when disassembling instructions.
(the latter is too strict)

Files:

• trunk/include/VBox/dis.h (modified) (1 diff)
• trunk/include/VBox/selm.h (modified) (1 diff)
• trunk/src/VBox/Disassembler/DisasmReg.cpp (modified) (6 diffs)
• trunk/src/VBox/VMM/VMMAll/EMAll.cpp (modified) (2 diffs)
• trunk/src/VBox/VMM/VMMAll/SELMAll.cpp (modified) (3 diffs)

trunk/include/VBox/dis.h

@@ -642 +642 @@
-DISDECL(int) DISQueryParamRegPtr(PCPUMCTXCORE pCtx, PDISCPUSTATE pCpu, POP_PARAMETER pParam, void **ppReg, size_t *pcbSize);
-
-
-
-
-
-
-
+C
+C
+C
+C
+C
+C
-DISDECL(int) DISWriteReg8(PCPUMCTXCORE pRegFrame, unsigned reg8, uint8_t val8);
-DISDECL(int) DISWriteReg16(PCPUMCTXCORE pRegFrame, unsigned reg32, uint16_t val16);

trunk/include/VBox/selm.h

@@ -207 +207 @@
- * @param   ppvGC       Where to store the GC flat address.
- */
-
+C
-
-/**

trunk/src/VBox/Disassembler/DisasmReg.cpp

@@ -309 +309 @@
- *
- */
-
+C
-{
-    AssertReturn(reg8 < ELEMENTS(g_aReg8Index), VERR_INVALID_PARAMETER);
@@ -321 +321 @@
- *
- */
-
+C
-{
-    AssertReturn(reg16 < ELEMENTS(g_aReg16Index), VERR_INVALID_PARAMETER);
@@ -333 +333 @@
- *
- */
-
+C
-{
-    AssertReturn(reg32 < ELEMENTS(g_aReg32Index), VERR_INVALID_PARAMETER);
@@ -345 +345 @@
- *
- */
-
+C
-{
-    AssertReturn(reg64 < ELEMENTS(g_aReg64Index), VERR_INVALID_PARAMETER);
@@ -405 +405 @@
- *
- */
-
+C
-{
-    AssertReturn(sel < ELEMENTS(g_aRegSegIndex), VERR_INVALID_PARAMETER);
@@ -418 +418 @@
- *
- */
-
+C
-{
-    AssertReturn(sel < ELEMENTS(g_aRegSegIndex), VERR_INVALID_PARAMETER);

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

@@ -142 +142 @@
-{
-    RTGCPTR GCPtrInstr;
-ValidateAndConvertCSAddr(pVM, pCtxCore->eflags, pCtxCore->ss, pCtxCore->cs, (PCPUMSELREGHID)&pCtxCore->csHid, (RTGCPTR)pCtxCore->rip
+ToFlatEx(pVM, DIS_SELREG_CS, pCtxCore, pCtxCore->rip, 0
-    if (VBOX_FAILURE(rc))
-    {
@@ -203 +203 @@
-
-    LogFlow(("EMInterpretInstruction %VGv fault %VGv\n", pRegFrame->rip, pvFault));
-ValidateAndConvertCSAddr(pVM, pRegFrame->eflags, pRegFrame->ss, pRegFrame->cs, &pRegFrame->csHid, (RTGCPTR)pRegFrame->rip
+ToFlatEx(pVM, DIS_SELREG_CS, pRegFrame, pRegFrame->rip, 0
-    if (VBOX_SUCCESS(rc))
-    {

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

@@ -145 +145 @@
- * @param   ppvGC       Where to store the GC flat address.
- */
-
+C
-{
-    PCPUMSELREGHID pHiddenSel;
@@ -746 +746 @@
- * @param   Addr    Address part.
- * @param   ppvFlat Where to store the flat address.
- * @param   pcBits  Where to store the segment bitness (16/32/64). Optional.
- */
-DECLINLINE(int) selmValidateAndConvertCSAddrHidden(PVM pVM, RTSEL SelCPL, RTSEL SelCS, PCPUMSELREGHID pHidCS, RTGCPTR Addr, PRTGCPTR ppvFlat)
@@ -790 +789 @@
-                return VERR_OUT_OF_SELECTOR_BOUNDS;
-            }
+            Log(("Invalid RPL Attr.n.u4Type=%x cpl=%x dpl=%x\n", pHidCS->Attr.n.u4Type, uLevel, pHidCS->Attr.n.u2Dpl));
-            return VERR_INVALID_RPL;
-        }