From 97f529ab5dad4aae9b1057397de84addcc42cacc Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Thu, 23 Jul 2009 11:53:03 +0200 Subject: [PATCH] Adjust to new elfutils dwarf_frame_cfa interface. * dwflpp.cxx (get_cfa_ops): Call dwarf_frame_cfa with cfa_nops size_t. * loc2c-test.c (main): Likewise. --- dwflpp.cxx | 5 +++-- loc2c-test.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dwflpp.cxx b/dwflpp.cxx index 5fec20e23..427f1d744 100644 --- a/dwflpp.cxx +++ b/dwflpp.cxx @@ -2543,6 +2543,7 @@ Dwarf_Op * dwflpp::get_cfa_ops (Dwarf_Addr pc) { Dwarf_Op *cfa_ops = NULL; + size_t cfa_nops; if (sess.verbose > 2) clog << "get_cfa_ops @0x" << hex << pc << dec @@ -2559,7 +2560,7 @@ dwflpp::get_cfa_ops (Dwarf_Addr pc) clog << "got dwarf cfi bias: 0x" << hex << bias << dec << endl; Dwarf_Frame *frame = NULL; if (dwarf_cfi_addrframe (cfi, pc - bias, &frame) == 0) - dwarf_frame_cfa (frame, &cfa_ops); + dwarf_frame_cfa (frame, &cfa_ops, &cfa_nops); else if (sess.verbose > 3) clog << "dwarf_cfi_addrframe failed: " << dwarf_errmsg(-1) << endl; } @@ -2575,7 +2576,7 @@ dwflpp::get_cfa_ops (Dwarf_Addr pc) clog << "got eh cfi bias: 0x" << hex << bias << dec << endl; Dwarf_Frame *frame = NULL; if (dwarf_cfi_addrframe (cfi, pc - bias, &frame) == 0) - dwarf_frame_cfa (frame, &cfa_ops); + dwarf_frame_cfa (frame, &cfa_ops, &cfa_nops); else if (sess.verbose > 3) clog << "dwarf_cfi_addrframe failed: " << dwarf_errmsg(-1) << endl; } diff --git a/loc2c-test.c b/loc2c-test.c index 7bfa6938d..88e9047c3 100644 --- a/loc2c-test.c +++ b/loc2c-test.c @@ -526,6 +526,7 @@ main (int argc, char **argv) else { Dwarf_Op *cfa_ops = NULL; + size_t cfa_nops; #ifdef _ELFUTILS_PREREQ #if _ELFUTILS_PREREQ(0,142) @@ -539,7 +540,7 @@ main (int argc, char **argv) { Dwarf_Frame *frame = NULL; if (dwarf_cfi_addrframe (cfi, pc, &frame) == 0) - dwarf_frame_cfa (frame, &cfa_ops); + dwarf_frame_cfa (frame, &cfa_ops, &cfa_nops); } if (cfa_ops == NULL) { @@ -548,7 +549,7 @@ main (int argc, char **argv) { Dwarf_Frame *frame = NULL; if (dwarf_cfi_addrframe (cfi, pc, &frame) == 0) - dwarf_frame_cfa (frame, &cfa_ops); + dwarf_frame_cfa (frame, &cfa_ops, &cfa_nops); } } } -- 2.43.5