Changeset 65394 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Jan 20, 2017 7:44:18 PM (8 years ago)

Author:

vboxsync

Message:

Runtime/common/dbg/dbgmoddwarf.cpp: A more complete fix, the DWARF spec varies greatly on the implementation between versions 2, 3 and 4 and the description for this opcode is not useful in either version...

File:

• trunk/src/VBox/Runtime/common/dbg/dbgmoddwarf.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/dbg/dbgmoddwarf.cpp

@@ -2526 +2526 @@
                 case DW_LNS_const_add_pc:
                 {
-                    uint8_t u8Inc = (255 - pLnState->Hdr.u8OpcodeBase) / pLnState->Hdr.u8LineRange;
-
-                    pLnState->Regs.uAddress += u8Inc;
-                    if (pLnState->Hdr.uVer >= 4)
-                        pLnState->Regs.idxOp += u8Inc;
-
+                    uint8_t u8Adv = (255 - pLnState->Hdr.u8OpcodeBase) / pLnState->Hdr.u8LineRange;
+
+                    if (pLnState->Hdr.cMaxOpsPerInstr < 2)
+                        pLnState->Regs.uAddress += pLnState->Hdr.cbMinInstr * u8Adv;
+                    else
+                    {
+                        pLnState->Regs.uAddress += pLnState->Hdr.cbMinInstr
+                                                 * ((pLnState->Regs.idxOp + u8Adv) / pLnState->Hdr.cMaxOpsPerInstr);
+                        pLnState->Regs.idxOp = (pLnState->Regs.idxOp + u8Adv) % pLnState->Hdr.cMaxOpsPerInstr;
+                    }
                     Log2(("%08x: DW_LNS_const_add_pc\n", offOpCode));
                     break;