Merge r7347 (fixes #155091,#156960: Warning [...] unhandled DW_OP_

opcode 0x23)

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_3_BRANCH@8085

diff --git a/coregrind/m_debuginfo/readdwarf.c b/coregrind/m_debuginfo/readdwarf.c
index d6a784396eb32dd969a9bdccb82416ca69d925bb..360396f55af6236b429da980ce5181db510e1ff4 100644 (file)
--- a/coregrind/m_debuginfo/readdwarf.c
+++ b/coregrind/m_debuginfo/readdwarf.c
@@ -2638,6 +2638,7 @@ static Int dwarfexpr_to_dag ( UnwindContext* ctx,
    Int    ix, ix2, reg;
    UChar  opcode;
    Word   sw;
+   UWord  uw;
    CfiOp  op;
    HChar* opname;
 
@@ -2712,6 +2713,16 @@ static Int dwarfexpr_to_dag ( UnwindContext* ctx,
                VG_(printf)("DW_OP_breg%d: %ld", reg, sw);
             break;
 
+         case DW_OP_plus_uconst:
+            uw = read_leb128U( &expr );
+            PUSH( ML_(CfiExpr_Const)( dst, uw ) );
+            POP( ix );
+            POP( ix2 );
+            PUSH( ML_(CfiExpr_Binop)( dst, op, ix2, ix ) );
+            if (ddump_frames)
+               VG_(printf)("DW_OP_plus_uconst: %lu", uw);
+            break;
+
          case DW_OP_const4s:
             /* push: 32-bit signed immediate */
             sw = read_le_s_encoded_literal( expr, 4 );