Changeset 101539 in vbox for trunk/src/VBox/Debugger/DBGPlugInLinux.cpp

Timestamp:

Oct 22, 2023 2:43:09 AM (13 months ago)

Author:

vboxsync

Message:

DIS,VMM,DBGC,IPRT,++: Some disassembler tweaks and TB disassembly work. bugref:10371 bugref:9898

File:

• trunk/src/VBox/Debugger/DBGPlugInLinux.cpp (modified) (6 diffs)

trunk/src/VBox/Debugger/DBGPlugInLinux.cpp

@@ -438 +438 @@
                                     || (    (DisState.Param1.fUse & (DISUSE_BASE | DISUSE_REG_GEN64))
                                          && cbVal == sizeof(uint64_t)))
-                                && DisState.Param1.arch.x86.Base.idxGenReg == DISGREG_RAX)
+                                && DisState.Param1.x86.Base.idxGenReg == DISGREG_RAX)
                             {
                                 /* Parse the source. */
@@ -448 +448 @@
 
                                     if (DisState.Param2.fUse & DISUSE_RIPDISPLACEMENT32)
-                                        GCPtrVal = GCPtrCur + DisState.Param2.arch.x86.uDisp.i32 + cbInstr;
+                                        GCPtrVal = GCPtrCur + DisState.Param2.x86.uDisp.i32 + cbInstr;
                                     else if (DisState.Param2.fUse & DISUSE_DISPLACEMENT32)
-                                        GCPtrVal = (RTGCPTR)DisState.Param2.arch.x86.uDisp.u32;
+                                        GCPtrVal = (RTGCPTR)DisState.Param2.x86.uDisp.u32;
                                     else if (DisState.Param2.fUse & DISUSE_DISPLACEMENT64)
-                                        GCPtrVal = (RTGCPTR)DisState.Param2.arch.x86.uDisp.u64;
+                                        GCPtrVal = (RTGCPTR)DisState.Param2.x86.uDisp.u64;
                                     else
                                         AssertMsgFailedBreakStmt(("Invalid displacement\n"), rc = VERR_INVALID_STATE);
@@ -571 +571 @@
                              */
                             if (   (DisState.Param2.fUse & DISUSE_REG_GEN8)
-                                && (   (DisState.Param2.arch.x86.Base.idxGenReg == DISGREG_AL && !pThis->f64Bit)
-                                    || (DisState.Param2.arch.x86.Base.idxGenReg == DISGREG_DIL && pThis->f64Bit))
+                                && (   (DisState.Param2.x86.Base.idxGenReg == DISGREG_AL && !pThis->f64Bit)
+                                    || (DisState.Param2.x86.Base.idxGenReg == DISGREG_DIL && pThis->f64Bit))
                                 && DISUSE_IS_EFFECTIVE_ADDR(DisState.Param1.fUse))
                             {
@@ -657 +657 @@
                                  */
                                 if (   (DisState.Param1.fUse & (DISUSE_BASE | DISUSE_REG_GEN32 | DISUSE_REG_GEN64))
-                                    && (DisState.Param2.arch.x86.cb == sizeof(uint32_t) || DisState.Param2.arch.x86.cb == sizeof(uint64_t))
+                                    && (DisState.Param2.x86.cb == sizeof(uint32_t) || DisState.Param2.x86.cb == sizeof(uint64_t))
                                     && (DisState.Param2.fUse & (DISUSE_RIPDISPLACEMENT32|DISUSE_DISPLACEMENT32|DISUSE_DISPLACEMENT64)))
                                 {
@@ -663 +663 @@
 
                                     if (DisState.Param2.fUse & DISUSE_RIPDISPLACEMENT32)
-                                        GCPtrVal = GCPtrCur + DisState.Param2.arch.x86.uDisp.i32 + cbInstr;
+                                        GCPtrVal = GCPtrCur + DisState.Param2.x86.uDisp.i32 + cbInstr;
                                     else if (DisState.Param2.fUse & DISUSE_DISPLACEMENT32)
-                                        GCPtrVal = (RTGCPTR)DisState.Param2.arch.x86.uDisp.u32;
+                                        GCPtrVal = (RTGCPTR)DisState.Param2.x86.uDisp.u32;
                                     else if (DisState.Param2.fUse & DISUSE_DISPLACEMENT64)
-                                        GCPtrVal = (RTGCPTR)DisState.Param2.arch.x86.uDisp.u64;
+                                        GCPtrVal = (RTGCPTR)DisState.Param2.x86.uDisp.u64;
                                     else
                                         AssertMsgFailedBreakStmt(("Invalid displacement\n"), rc = VERR_INVALID_STATE);
@@ -677 +677 @@
                                             aAddresses[cAddressesUsed].cb = sizeof(uint32_t);
                                         else
-                                            aAddresses[cAddressesUsed].cb = DisState.Param2.arch.x86.cb;
+                                            aAddresses[cAddressesUsed].cb = DisState.Param2.x86.cb;
                                         aAddresses[cAddressesUsed].GCPtrOrigSrc = GCPtrVal;
                                         cAddressesUsed++;