From 4d60522e88df07944748ac9155520e19ac9c3bb1 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Thu, 2 Sep 2004 16:01:33 +0000 Subject: [PATCH] 2004-09-02 Andrew Cagney * gdbarch.sh: Delete check for GDB_MULTI_ARCH_PARTIAL when validating architecture methods. * gdbarch.c: Re-generate. --- gdb/ChangeLog | 4 ++++ gdb/gdbarch.c | 15 +++++---------- gdb/gdbarch.sh | 6 ++---- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 67281603af5..d064ea1cf82 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2004-09-02 Andrew Cagney + * gdbarch.sh: Delete check for GDB_MULTI_ARCH_PARTIAL when + validating architecture methods. + * gdbarch.c: Re-generate. + * gdbarch.sh: Delete check for consistency between GDB_MULTI_ARCH and GDB_TM_FILE. Check for GDB_TM_FILE instead of GDB_MULTI_ARCH_PARTIAL. diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 185447b15e0..fdf7bb29639 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -528,8 +528,7 @@ verify_gdbarch (struct gdbarch *current_gdbarch) /* Skip verify of virtual_frame_pointer, invalid_p == 0 */ /* Skip verify of pseudo_register_read, has predicate */ /* Skip verify of pseudo_register_write, has predicate */ - if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) - && (current_gdbarch->num_regs == -1)) + if (current_gdbarch->num_regs == -1) fprintf_unfiltered (log, "\n\tnum_regs"); /* Skip verify of num_pseudo_regs, invalid_p == 0 */ /* Skip verify of sp_regnum, invalid_p == 0 */ @@ -567,14 +566,11 @@ verify_gdbarch (struct gdbarch *current_gdbarch) /* Skip verify of store_return_value, invalid_p == 0 */ /* Skip verify of deprecated_use_struct_convention, invalid_p == 0 */ /* Skip verify of deprecated_extract_struct_value_address, has predicate */ - if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) - && (current_gdbarch->skip_prologue == 0)) + if (current_gdbarch->skip_prologue == 0) fprintf_unfiltered (log, "\n\tskip_prologue"); - if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) - && (current_gdbarch->inner_than == 0)) + if (current_gdbarch->inner_than == 0) fprintf_unfiltered (log, "\n\tinner_than"); - if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) - && (current_gdbarch->breakpoint_from_pc == 0)) + if (current_gdbarch->breakpoint_from_pc == 0) fprintf_unfiltered (log, "\n\tbreakpoint_from_pc"); /* Skip verify of adjust_breakpoint_address, has predicate */ /* Skip verify of memory_insert_breakpoint, invalid_p == 0 */ @@ -595,8 +591,7 @@ verify_gdbarch (struct gdbarch *current_gdbarch) /* Skip verify of addr_bits_remove, invalid_p == 0 */ /* Skip verify of smash_text_address, invalid_p == 0 */ /* Skip verify of software_single_step, has predicate */ - if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) - && (current_gdbarch->print_insn == 0)) + if (current_gdbarch->print_insn == 0) fprintf_unfiltered (log, "\n\tprint_insn"); /* Skip verify of skip_trampoline_code, invalid_p == 0 */ /* Skip verify of skip_solib_resolver, invalid_p == 0 */ diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 90edd83349d..298faf03cac 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -1451,13 +1451,11 @@ do printf " current_gdbarch->${function} = ${postdefault};\n" elif [ -n "${invalid_p}" ] then - printf " if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL)\n" - printf " && (${invalid_p}))\n" + printf " if (${invalid_p})\n" printf " fprintf_unfiltered (log, \"\\\\n\\\\t${function}\");\n" elif [ -n "${predefault}" ] then - printf " if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL)\n" - printf " && (current_gdbarch->${function} == ${predefault}))\n" + printf " if (current_gdbarch->${function} == ${predefault})\n" printf " fprintf_unfiltered (log, \"\\\\n\\\\t${function}\");\n" fi fi -- 2.30.2