Fix DW_CFA_expression output in readelf.

diff --git a/src/ChangeLog b/src/ChangeLog
index e05aac10ed25d20a019d911a5ab4fb74852a1db4..26056db460059158f70a78399e436e64b6161068 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,7 @@
        * objdump.c (show_relocs_x): Minor cleanups.
 
        * readelf.c (print_cfa_program): Correct a few labels.
+       Print first DW_CFA_expression parameter as register.
 
 2009-02-01  Ulrich Drepper  <drepper@redhat.com>
 

diff --git a/src/readelf.c b/src/readelf.c
index d687b7fdfb95d82684c91500fd72caac67fd1fa0..ccf2cb61801825e4a6cfabe8af65506ee68db66c 100644 (file)
--- a/src/readelf.c
+++ b/src/readelf.c
@@ -4335,13 +4335,14 @@ print_cfa_program (const unsigned char *readp, const unsigned char *const endp,
            printf ("     def_cfa_expression %" PRIu64 "\n", op1);
            print_ops (dwflmod, dbg, 10, 10, ptr_size, op1, readp);
            readp += op1;
-           error (1,0,"need to implement BLOCK reading");
+           //error (1,0,"need to implement BLOCK reading");
            break;
          case DW_CFA_expression:
            // XXX overflow check
            get_uleb128 (op1, readp);
            get_uleb128 (op2, readp);   /* Length of DW_FORM_block.  */
-           printf ("     expression %" PRIu64 "\n", op1);
+           printf ("     expression r%" PRIu64 " (%s) \n",
+                   op1, regname (op1));
            print_ops (dwflmod, dbg, 10, 10, ptr_size, op2, readp);
            readp += op2;
            break;