diff options
| author | Jim Blandy <jimb@codesourcery.com> | 2004-09-27 23:52:49 +0000 |
|---|---|---|
| committer | Jim Blandy <jimb@codesourcery.com> | 2004-09-27 23:52:49 +0000 |
| commit | d73838b3b1651f49e0ccf926a597fb490c57fc5a (patch) | |
| tree | c331d4f618481fd5ea9722cbf002bcb9178f70b4 | |
| parent | c182e1c896482e9645589b7fe00637637f5fd8ee (diff) | |
| download | gdb-d73838b3b1651f49e0ccf926a597fb490c57fc5a.tar.gz | |
Merge from trunk:
2004-07-23 Martin Hunt <hunt@redhat.com>
Kevin Buettner <kevinb@redhat.com>
* dwarf2-frame.c (execute_cfa_program): Fix typo in which the
alignment was being added to the offset instead of multiplied.
| -rw-r--r-- | gdb/ChangeLog | 10 | ||||
| -rw-r--r-- | gdb/dwarf2-frame.c | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 46f907dc9b8..8a7e30be2a8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2004-09-27 Jim Blandy <jimb@redhat.com> + + Merge from trunk: + + 2004-07-23 Martin Hunt <hunt@redhat.com> + Kevin Buettner <kevinb@redhat.com> + + * dwarf2-frame.c (execute_cfa_program): Fix typo in which the + alignment was being added to the offset instead of multiplied. + 2004-09-22 Jim Blandy <jimb@redhat.com> * dwarf2loc.c (dwarf2_evaluate_loc_desc): Fix misapplied patch. diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c index 7ee18db892a..7e61838a235 100644 --- a/gdb/dwarf2-frame.c +++ b/gdb/dwarf2-frame.c @@ -426,7 +426,7 @@ bad CFI data; mismatched DW_CFA_restore_state at 0x%s", paddr (fs->pc)); case DW_CFA_offset_extended_sf: insn_ptr = read_uleb128 (insn_ptr, insn_end, ®); insn_ptr = read_sleb128 (insn_ptr, insn_end, &offset); - offset += fs->data_align; + offset *= fs->data_align; dwarf2_frame_state_alloc_regs (&fs->regs, reg + 1); fs->regs.reg[reg].how = DWARF2_FRAME_REG_SAVED_OFFSET; fs->regs.reg[reg].loc.offset = offset; |