From 9122588356d7557602e9eac617b1a4f61c862ed1 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Fri, 11 Aug 2000 07:54:49 +0000 Subject: [PATCH] Enable multi-arch for the mn10300. --- gdb/ChangeLog | 18 +++++ gdb/config/mn10300/tm-mn10300.h | 9 ++- gdb/mn10300-tdep.c | 147 +++++++++++++++++++++++++++++----------- 3 files changed, 131 insertions(+), 43 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7373a59..e2a3393 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,21 @@ +2000-08-10 Andrew Cagney + + * config/mn10300/tm-mn10300.h, mn10300-tdep.c + (mn10300_push_arguments): Fix function signature to match gdbarch + vector. + * config/mn10300/tm-mn10300.h (REGISTER_NAME): Delete. + * mn10300-tdep.c (struct gdbarch_tdep): Define. + (mn10300_generic_register_names, am33_register_names): Convert to + functions. + (set_machine_hook): Delete. + (register_name): New function. + (mn10300_register_name): Delete. + (mn10300_dump_tdep, mn10300_gdbarch_init): New functions. + (_initialize_mn10300_tdep): Call register_gdbarch_init instead of + specify_exec_file_hook. + (AM33_MODE): Define. + (set_movm_offsets): Update. + 2000-08-10 Mark Kettenis Adapt support for SSE registers in Linux/x86 for Linux 2.4. diff --git a/gdb/config/mn10300/tm-mn10300.h b/gdb/config/mn10300/tm-mn10300.h index 28981ab..93af48a 100644 --- a/gdb/config/mn10300/tm-mn10300.h +++ b/gdb/config/mn10300/tm-mn10300.h @@ -1,5 +1,5 @@ /* Parameters for execution on a Matsushita mn10300 processor. - Copyright 1996, 1997 Free Software Foundation, Inc. + Copyright 1996, 1997, 2000 Free Software Foundation, Inc. Contributed by Geoffrey Noer @@ -20,6 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#define GDB_MULTI_ARCH 1 + /* The mn10300 is little endian. */ #define TARGET_BYTE_ORDER_DEFAULT LITTLE_ENDIAN @@ -38,9 +40,6 @@ #define REGISTER_BYTES (NUM_REGS * REGISTER_SIZE) -extern char *mn10300_register_name (int regnr); -#define REGISTER_NAME(i) (mn10300_register_name (i)) - #define D2_REGNUM 2 #define D3_REGNUM 3 #define A2_REGNUM 6 @@ -141,7 +140,7 @@ extern CORE_ADDR mn10300_push_return_address (CORE_ADDR, CORE_ADDR); extern CORE_ADDR mn10300_push_arguments (int, struct value **, CORE_ADDR, - unsigned char, CORE_ADDR); + int, CORE_ADDR); #define PUSH_ARGUMENTS(NARGS, ARGS, SP, STRUCT_RETURN, STRUCT_ADDR) \ (mn10300_push_arguments (NARGS, ARGS, SP, STRUCT_RETURN, STRUCT_ADDR)) diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c index a30b56c..3ad0fd2 100644 --- a/gdb/mn10300-tdep.c +++ b/gdb/mn10300-tdep.c @@ -1,5 +1,5 @@ /* Target-dependent code for the Matsushita MN10300 for GDB, the GNU debugger. - Copyright 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright 1996, 1997, 1998, 2000 Free Software Foundation, Inc. This file is part of GDB. @@ -33,6 +33,13 @@ extern void _initialize_mn10300_tdep (void); static CORE_ADDR mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc); +/* mn10300 private data */ +struct gdbarch_tdep +{ + int am33_mode; +#define AM33_MODE (gdbarch_tdep (current_gdbarch)->am33_mode) +}; + /* Additional info used by the frame */ struct frame_extra_info @@ -42,27 +49,40 @@ struct frame_extra_info }; -static char *mn10300_generic_register_names[] = -{"d0", "d1", "d2", "d3", "a0", "a1", "a2", "a3", - "sp", "pc", "mdr", "psw", "lir", "lar", "", "", - "", "", "", "", "", "", "", "", - "", "", "", "", "", "", "", "fp"}; - -static char **mn10300_register_names = mn10300_generic_register_names; -static char *am33_register_names[] = +static char * +register_name (int reg, char **regs, long sizeof_regs) { - "d0", "d1", "d2", "d3", "a0", "a1", "a2", "a3", - "sp", "pc", "mdr", "psw", "lir", "lar", "", - "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", - "ssp", "msp", "usp", "mcrh", "mcrl", "mcvf", "", "", ""}; -static int am33_mode; - -char * -mn10300_register_name (int i) + if (reg < 0 || reg >= sizeof_regs / sizeof (regs[0])) + return NULL; + else + return regs[reg]; +} + +static char * +mn10300_generic_register_name (int reg) { - return mn10300_register_names[i]; + static char *regs[] = + { "d0", "d1", "d2", "d3", "a0", "a1", "a2", "a3", + "sp", "pc", "mdr", "psw", "lir", "lar", "", "", + "", "", "", "", "", "", "", "", + "", "", "", "", "", "", "", "fp" + }; + return register_name (reg, regs, sizeof regs); } + +static char * +am33_register_name (int reg) +{ + static char *regs[] = + { "d0", "d1", "d2", "d3", "a0", "a1", "a2", "a3", + "sp", "pc", "mdr", "psw", "lir", "lar", "", + "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", + "ssp", "msp", "usp", "mcrh", "mcrl", "mcvf", "", "", "" + }; + return register_name (reg, regs, sizeof regs); +} + CORE_ADDR mn10300_saved_pc_after_call (struct frame_info *fi) { @@ -194,7 +214,7 @@ set_movm_offsets (struct frame_info *fi, int movm_args) fi->saved_regs[D2_REGNUM] = fi->frame + offset; offset += 4; } - if (am33_mode && movm_args & 0x02) + if (AM33_MODE && movm_args & 0x02) { fi->saved_regs[E0_REGNUM + 5] = fi->frame + offset; fi->saved_regs[E0_REGNUM + 4] = fi->frame + offset + 4; @@ -543,7 +563,7 @@ mn10300_frame_chain (struct frame_info *fi) adjust += (fi->saved_regs[D3_REGNUM] ? 4 : 0); adjust += (fi->saved_regs[A2_REGNUM] ? 4 : 0); adjust += (fi->saved_regs[A3_REGNUM] ? 4 : 0); - if (am33_mode) + if (AM33_MODE) { adjust += (fi->saved_regs[E0_REGNUM + 5] ? 4 : 0); adjust += (fi->saved_regs[E0_REGNUM + 4] ? 4 : 0); @@ -611,8 +631,8 @@ mn10300_pop_frame (struct frame_info *frame) order on the stack. */ CORE_ADDR -mn10300_push_arguments (int nargs, value_ptr *args, CORE_ADDR sp, - unsigned char struct_return, CORE_ADDR struct_addr) +mn10300_push_arguments (int nargs, struct value **args, CORE_ADDR sp, + int struct_return, CORE_ADDR struct_addr) { int argnum = 0; int len = 0; @@ -729,7 +749,7 @@ mn10300_frame_saved_pc (struct frame_info *fi) adjust += (fi->saved_regs[D3_REGNUM] ? 4 : 0); adjust += (fi->saved_regs[A2_REGNUM] ? 4 : 0); adjust += (fi->saved_regs[A3_REGNUM] ? 4 : 0); - if (am33_mode) + if (AM33_MODE) { adjust += (fi->saved_regs[E0_REGNUM + 5] ? 4 : 0); adjust += (fi->saved_regs[E0_REGNUM + 4] ? 4 : 0); @@ -794,27 +814,78 @@ mn10300_virtual_frame_pointer (CORE_ADDR pc, long *reg, long *offset) } } -/* This can be made more generic later. */ -static void -set_machine_hook (char *filename) +static int +mn10300_reg_struct_has_addr (int gcc_p, struct type *type) { - int i; + return (TYPE_LENGTH (type) > 8); +} - if (bfd_get_mach (exec_bfd) == bfd_mach_mn10300 - || bfd_get_mach (exec_bfd) == 0) - { - mn10300_register_names = mn10300_generic_register_names; - } +/* Dump out the mn10300 speciic architecture information. */ - am33_mode = 0; - if (bfd_get_mach (exec_bfd) == bfd_mach_am33) - { +static void +mn10300_dump_tdep (struct gdbarch *current_gdbarch, struct ui_file *file) +{ + struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); + fprintf_unfiltered (file, "mn10300_dump_tdep: am33_mode = %d\n", + tdep->am33_mode); +} - mn10300_register_names = am33_register_names; +static struct gdbarch * +mn10300_gdbarch_init (struct gdbarch_info info, + struct gdbarch_list *arches) +{ + struct gdbarch *gdbarch; + struct gdbarch_tdep *tdep = NULL; + int am33_mode; + gdbarch_register_name_ftype *register_name; + int mach; + int num_regs; + + arches = gdbarch_list_lookup_by_info (arches, &info); + if (arches != NULL) + return arches->gdbarch; + tdep = xmalloc (sizeof (struct gdbarch_tdep)); + gdbarch = gdbarch_alloc (&info, tdep); + + if (info.bfd_arch_info != NULL + && info.bfd_arch_info->arch == bfd_arch_mips) + mach = info.bfd_arch_info->mach; + else + mach = 0; + switch (mach) + { + case 0: + am33_mode = 0; + register_name = mn10300_generic_register_name; + num_regs = 32; + break; + case bfd_mach_am33: am33_mode = 1; + register_name = am33_register_name; + num_regs = 32; + break; + default: + internal_error ("mn10300_gdbarch_init: Unknown mn10300 variant"); + return NULL; /* keep GCC happy. */ } -} + set_gdbarch_call_dummy_p (gdbarch, 1); + set_gdbarch_register_name (gdbarch, register_name); + set_gdbarch_use_generic_dummy_frames (gdbarch, 1); + set_gdbarch_call_dummy_breakpoint_offset_p (gdbarch, 0); + set_gdbarch_call_dummy_stack_adjust_p (gdbarch, 0); + set_gdbarch_get_saved_register (gdbarch, generic_get_saved_register); + set_gdbarch_push_arguments (gdbarch, mn10300_push_arguments); + set_gdbarch_push_return_address (gdbarch, mn10300_push_return_address); + set_gdbarch_frame_chain_valid (gdbarch, generic_file_frame_chain_valid); + set_gdbarch_reg_struct_has_addr (gdbarch, mn10300_reg_struct_has_addr); + set_gdbarch_save_dummy_frame_tos (gdbarch, generic_save_dummy_frame_tos); + set_gdbarch_num_regs (gdbarch, num_regs); + tdep->am33_mode = am33_mode; + + return gdbarch; +} + void _initialize_mn10300_tdep (void) { @@ -822,5 +893,5 @@ _initialize_mn10300_tdep (void) tm_print_insn = print_insn_mn10300; - specify_exec_file_hook (set_machine_hook); + register_gdbarch_init (bfd_arch_mn10300, mn10300_gdbarch_init); } -- 2.7.4