diff options
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/dwarf2-frame.c | 18 |
2 files changed, 20 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9650674..c7d69d9 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2004-02-16 Andrew Cagney <cagney@redhat.com> + * dwarf2-frame.c (dwarf2_frame_ops): New function. + (dwarf2_frame_set_init_reg): Use, instead of gdbarch_data. + (dwarf2_frame_init_reg): Ditto. + * printcmd.c (display_command): Check that EXP isn't NULL. Fix suggested by Joshua Neuheisel diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c index 1012f44..8c62419 100644 --- a/gdb/dwarf2-frame.c +++ b/gdb/dwarf2-frame.c @@ -518,6 +518,20 @@ dwarf2_frame_init (struct gdbarch *gdbarch) return ops; } +static struct dwarf2_frame_ops * +dwarf2_frame_ops (struct gdbarch *gdbarch) +{ + struct dwarf2_frame_ops *ops = gdbarch_data (gdbarch, dwarf2_frame_data); + if (ops == NULL) + { + /* ULGH, called during architecture initialization. Patch + things up. */ + ops = dwarf2_frame_init (gdbarch); + set_gdbarch_data (gdbarch, dwarf2_frame_data, ops); + } + return ops; +} + /* Set the architecture-specific register state initialization function for GDBARCH to INIT_REG. */ @@ -528,7 +542,7 @@ dwarf2_frame_set_init_reg (struct gdbarch *gdbarch, { struct dwarf2_frame_ops *ops; - ops = gdbarch_data (gdbarch, dwarf2_frame_data); + ops = dwarf2_frame_ops (gdbarch); ops->init_reg = init_reg; } @@ -540,7 +554,7 @@ dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, { struct dwarf2_frame_ops *ops; - ops = gdbarch_data (gdbarch, dwarf2_frame_data); + ops = dwarf2_frame_ops (gdbarch); ops->init_reg (gdbarch, regnum, reg); } |