diff options
| author | Ulrich Weigand <uweigand@de.ibm.com> | 2007-06-13 17:30:01 +0000 |
|---|---|---|
| committer | Ulrich Weigand <uweigand@de.ibm.com> | 2007-06-13 17:30:01 +0000 |
| commit | 819844ad98d84ef944ff721239ba2b55c2a34061 (patch) | |
| tree | e2505e4efb99c7a77e3b6a0e1a3241a9333f71ed /gdb/hppa-tdep.c | |
| parent | 0cc93a06b3ed13ecf7962515b8af93654874a303 (diff) | |
| download | gdb-819844ad98d84ef944ff721239ba2b55c2a34061.zip gdb-819844ad98d84ef944ff721239ba2b55c2a34061.tar.gz gdb-819844ad98d84ef944ff721239ba2b55c2a34061.tar.bz2 | |
2007-06-13 Markus Deuling <deuling@de.ibm.com>
* gdbarch.sh (TARGET_PTR_BIT): Replace with gdbarch_ptr_bit.
* solib-svr4.c (svr4_truncate_ptr): Likewise.
* solib-pa64.c (read_dynamic_info): Likewise.
* solib-legacy.c (legacy_svr4_fetch_link_map_offsets): Likewise.
* solib.c (info_sharedlibrary_command): Likewise.
* s390-nat.c (SUBOFF): Likewise.
* p-valprint.c (pascal_val_print): Likewise.
* procfs.c (info_proc_mappings): Likewise.
* printcmd.c (decode_format): Likewise.
* nto-tdep.c (nto_truncate_ptr): Likewise.
* mips-linux-tdep.c (mips_linux_get_longjmp_target)
(mips64_linux_get_longjmp_target): Likewise.
* m68k-tdep.c (m68k_get_longjmp_target): Likewise.
* jv-valprint.c (java_value_print): Likewise.
* jv-lang.c (get_java_object_header_size): Likewise.
* hppa-tdep.c (skip_prologue_hard_way, hppa_frame_cache): Likewise.
* hppa-hpux-tdep.c (hppa_hpux_skip_trampoline_code)
(hppa_hpux_unwind_adjust_stub): Likewise.
* gnu-v3-abi.c (build_gdb_vtable_type): Likewise.
* gdbtypes.c (make_pointer_type, make_reference_type)
(smash_to_memberptr_type): Likewise.
* gdbarch.c, gdbarch.h: Regenerate.
Diffstat (limited to 'gdb/hppa-tdep.c')
| -rw-r--r-- | gdb/hppa-tdep.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c index 7658aec..cf660ad 100644 --- a/gdb/hppa-tdep.c +++ b/gdb/hppa-tdep.c @@ -1601,9 +1601,11 @@ restart: FIXME. Can still die if we have a mix of GR and FR argument stores! */ - if (reg_num >= (TARGET_PTR_BIT == 64 ? 19 : 23) && reg_num <= 26) + if (reg_num >= (gdbarch_ptr_bit (current_gdbarch) == 64 ? 19 : 23) + && reg_num <= 26) { - while (reg_num >= (TARGET_PTR_BIT == 64 ? 19 : 23) && reg_num <= 26) + while (reg_num >= (gdbarch_ptr_bit (current_gdbarch) == 64 ? 19 : 23) + && reg_num <= 26) { pc += 4; status = read_memory_nobpt (pc, buf, 4); @@ -1630,7 +1632,8 @@ restart: save. */ if ((inst & 0xfc000000) == 0x34000000 && inst_saves_fr (next_inst) >= 4 - && inst_saves_fr (next_inst) <= (TARGET_PTR_BIT == 64 ? 11 : 7)) + && inst_saves_fr (next_inst) + <= (gdbarch_ptr_bit (current_gdbarch) == 64 ? 11 : 7)) { /* So we drop into the code below in a reasonable state. */ reg_num = inst_saves_fr (next_inst); @@ -1641,9 +1644,12 @@ restart: This is a kludge as on the HP compiler sets this bit and it never does prologue scheduling. So once we see one, skip past all of them. */ - if (reg_num >= 4 && reg_num <= (TARGET_PTR_BIT == 64 ? 11 : 7)) + if (reg_num >= 4 + && reg_num <= (gdbarch_ptr_bit (current_gdbarch) == 64 ? 11 : 7)) { - while (reg_num >= 4 && reg_num <= (TARGET_PTR_BIT == 64 ? 11 : 7)) + while (reg_num >= 4 + && reg_num + <= (gdbarch_ptr_bit (current_gdbarch) == 64 ? 11 : 7)) { pc += 8; status = read_memory_nobpt (pc, buf, 4); @@ -2101,7 +2107,8 @@ hppa_frame_cache (struct frame_info *next_frame, void **this_cache) /* Both we're expecting the SP to be saved and the SP has been saved. The entry SP value is saved at this frame's SP address. */ - cache->base = read_memory_integer (this_sp, TARGET_PTR_BIT / 8); + cache->base = read_memory_integer + (this_sp, gdbarch_ptr_bit (current_gdbarch) / 8); if (hppa_debug) fprintf_unfiltered (gdb_stdlog, " (base=0x%s) [saved]", |