Changeset 65393 in vbox

Timestamp:

Jan 20, 2017 7:16:52 PM (8 years ago)

Author:

vboxsync

Message:

Runtime/common/dbg/dbgmoddwarf.cpp: Fix implementation of DW_LNS_const_add_pc fixing address calculation for files and line numbers for gcc emitted debug information

File:

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

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

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