X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fmn10300-tdep.c;h=37d0b84b645c2ae134a5ae7614bd0d13ca9a1f74;hb=94afd7a6d348a66ea3fb35fdb8234b050ec8c779;hp=0cdc273694262004e47f8b06fde071400653daca;hpb=e9a2674e1d04f307ae4ffb7e4571c9878f63ff66;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c
index 0cdc273694..37d0b84b64 100644
--- a/gdb/mn10300-tdep.c
+++ b/gdb/mn10300-tdep.c
@@ -1,13 +1,13 @@
/* Target-dependent code for the Matsushita MN10300 for GDB, the GNU debugger.
- Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software
- Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+ 2007, 2008 Free Software Foundation, Inc.
This file is part of GDB.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -16,68 +16,200 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
#include "defs.h"
+#include "arch-utils.h"
+#include "dis-asm.h"
+#include "gdbtypes.h"
+#include "regcache.h"
+#include "gdb_string.h"
+#include "gdb_assert.h"
+#include "gdbcore.h" /* for write_memory_unsigned_integer */
+#include "value.h"
+#include "gdbtypes.h"
#include "frame.h"
-#include "inferior.h"
+#include "frame-unwind.h"
+#include "frame-base.h"
+#include "trad-frame.h"
+#include "symtab.h"
+#include "dwarf2-frame.h"
+#include "osabi.h"
+#include "infcall.h"
#include "target.h"
-#include "value.h"
-#include "bfd.h"
-#include "gdb_string.h"
-#include "gdbcore.h"
-#include "symfile.h"
-#include "regcache.h"
-#include "arch-utils.h"
-#define D0_REGNUM 0
-#define D2_REGNUM 2
-#define D3_REGNUM 3
-#define A0_REGNUM 4
-#define A2_REGNUM 6
-#define A3_REGNUM 7
-#define MDR_REGNUM 10
-#define PSW_REGNUM 11
-#define LIR_REGNUM 12
-#define LAR_REGNUM 13
-#define MDRQ_REGNUM 14
-#define E0_REGNUM 15
-#define MCRH_REGNUM 26
-#define MCRL_REGNUM 27
-#define MCVF_REGNUM 28
-
-enum movm_register_bits {
- movm_exother_bit = 0x01,
- movm_exreg1_bit = 0x02,
- movm_exreg0_bit = 0x04,
- movm_other_bit = 0x08,
- movm_a3_bit = 0x10,
- movm_a2_bit = 0x20,
- movm_d3_bit = 0x40,
- movm_d2_bit = 0x80
-};
+#include "mn10300-tdep.h"
-extern void _initialize_mn10300_tdep (void);
-static CORE_ADDR mn10300_analyze_prologue (struct frame_info *fi,
- CORE_ADDR pc);
+/* Forward decl. */
+extern struct trad_frame_cache *mn10300_frame_unwind_cache (struct frame_info*,
+ void **);
-/* mn10300 private data */
-struct gdbarch_tdep
+/* Compute the alignment required by a type. */
+
+static int
+mn10300_type_align (struct type *type)
{
- int am33_mode;
-#define AM33_MODE (gdbarch_tdep (current_gdbarch)->am33_mode)
-};
+ int i, align = 1;
-/* Additional info used by the frame */
+ switch (TYPE_CODE (type))
+ {
+ case TYPE_CODE_INT:
+ case TYPE_CODE_ENUM:
+ case TYPE_CODE_SET:
+ case TYPE_CODE_RANGE:
+ case TYPE_CODE_CHAR:
+ case TYPE_CODE_BOOL:
+ case TYPE_CODE_FLT:
+ case TYPE_CODE_PTR:
+ case TYPE_CODE_REF:
+ return TYPE_LENGTH (type);
+
+ case TYPE_CODE_COMPLEX:
+ return TYPE_LENGTH (type) / 2;
+
+ case TYPE_CODE_STRUCT:
+ case TYPE_CODE_UNION:
+ for (i = 0; i < TYPE_NFIELDS (type); i++)
+ {
+ int falign = mn10300_type_align (TYPE_FIELD_TYPE (type, i));
+ while (align < falign)
+ align <<= 1;
+ }
+ return align;
-struct frame_extra_info
- {
- int status;
- int stack_size;
- };
+ case TYPE_CODE_ARRAY:
+ /* HACK! Structures containing arrays, even small ones, are not
+ elligible for returning in registers. */
+ return 256;
+
+ case TYPE_CODE_TYPEDEF:
+ return mn10300_type_align (check_typedef (type));
+
+ default:
+ internal_error (__FILE__, __LINE__, _("bad switch"));
+ }
+}
+
+/* Should call_function allocate stack space for a struct return? */
+static int
+mn10300_use_struct_convention (struct type *type)
+{
+ /* Structures bigger than a pair of words can't be returned in
+ registers. */
+ if (TYPE_LENGTH (type) > 8)
+ return 1;
+
+ switch (TYPE_CODE (type))
+ {
+ case TYPE_CODE_STRUCT:
+ case TYPE_CODE_UNION:
+ /* Structures with a single field are handled as the field
+ itself. */
+ if (TYPE_NFIELDS (type) == 1)
+ return mn10300_use_struct_convention (TYPE_FIELD_TYPE (type, 0));
+
+ /* Structures with word or double-word size are passed in memory, as
+ long as they require at least word alignment. */
+ if (mn10300_type_align (type) >= 4)
+ return 0;
+
+ return 1;
+
+ /* Arrays are addressable, so they're never returned in
+ registers. This condition can only hold when the array is
+ the only field of a struct or union. */
+ case TYPE_CODE_ARRAY:
+ return 1;
+
+ case TYPE_CODE_TYPEDEF:
+ return mn10300_use_struct_convention (check_typedef (type));
+
+ default:
+ return 0;
+ }
+}
+
+static void
+mn10300_store_return_value (struct gdbarch *gdbarch, struct type *type,
+ struct regcache *regcache, const void *valbuf)
+{
+ int len = TYPE_LENGTH (type);
+ int reg, regsz;
+
+ if (TYPE_CODE (type) == TYPE_CODE_PTR)
+ reg = 4;
+ else
+ reg = 0;
+
+ regsz = register_size (gdbarch, reg);
+
+ if (len <= regsz)
+ regcache_raw_write_part (regcache, reg, 0, len, valbuf);
+ else if (len <= 2 * regsz)
+ {
+ regcache_raw_write (regcache, reg, valbuf);
+ gdb_assert (regsz == register_size (gdbarch, reg + 1));
+ regcache_raw_write_part (regcache, reg+1, 0,
+ len - regsz, (char *) valbuf + regsz);
+ }
+ else
+ internal_error (__FILE__, __LINE__,
+ _("Cannot store return value %d bytes long."), len);
+}
+
+static void
+mn10300_extract_return_value (struct gdbarch *gdbarch, struct type *type,
+ struct regcache *regcache, void *valbuf)
+{
+ char buf[MAX_REGISTER_SIZE];
+ int len = TYPE_LENGTH (type);
+ int reg, regsz;
+
+ if (TYPE_CODE (type) == TYPE_CODE_PTR)
+ reg = 4;
+ else
+ reg = 0;
+
+ regsz = register_size (gdbarch, reg);
+ if (len <= regsz)
+ {
+ regcache_raw_read (regcache, reg, buf);
+ memcpy (valbuf, buf, len);
+ }
+ else if (len <= 2 * regsz)
+ {
+ regcache_raw_read (regcache, reg, buf);
+ memcpy (valbuf, buf, regsz);
+ gdb_assert (regsz == register_size (gdbarch, reg + 1));
+ regcache_raw_read (regcache, reg + 1, buf);
+ memcpy ((char *) valbuf + regsz, buf, len - regsz);
+ }
+ else
+ internal_error (__FILE__, __LINE__,
+ _("Cannot extract return value %d bytes long."), len);
+}
+
+/* Determine, for architecture GDBARCH, how a return value of TYPE
+ should be returned. If it is supposed to be returned in registers,
+ and READBUF is non-zero, read the appropriate value from REGCACHE,
+ and copy it into READBUF. If WRITEBUF is non-zero, write the value
+ from WRITEBUF into REGCACHE. */
+
+static enum return_value_convention
+mn10300_return_value (struct gdbarch *gdbarch, struct type *func_type,
+ struct type *type, struct regcache *regcache,
+ gdb_byte *readbuf, const gdb_byte *writebuf)
+{
+ if (mn10300_use_struct_convention (type))
+ return RETURN_VALUE_STRUCT_CONVENTION;
+
+ if (readbuf)
+ mn10300_extract_return_value (gdbarch, type, regcache, readbuf);
+ if (writebuf)
+ mn10300_store_return_value (gdbarch, type, regcache, writebuf);
+ return RETURN_VALUE_REGISTER_CONVENTION;
+}
static char *
register_name (int reg, char **regs, long sizeof_regs)
@@ -89,7 +221,7 @@ register_name (int reg, char **regs, long sizeof_regs)
}
static const char *
-mn10300_generic_register_name (int reg)
+mn10300_generic_register_name (struct gdbarch *gdbarch, int reg)
{
static char *regs[] =
{ "d0", "d1", "d2", "d3", "a0", "a1", "a2", "a3",
@@ -102,7 +234,7 @@ mn10300_generic_register_name (int reg)
static const char *
-am33_register_name (int reg)
+am33_register_name (struct gdbarch *gdbarch, int reg)
{
static char *regs[] =
{ "d0", "d1", "d2", "d3", "a0", "a1", "a2", "a3",
@@ -112,78 +244,42 @@ am33_register_name (int reg)
};
return register_name (reg, regs, sizeof regs);
}
-
-static CORE_ADDR
-mn10300_saved_pc_after_call (struct frame_info *fi)
+
+static const char *
+am33_2_register_name (struct gdbarch *gdbarch, int reg)
{
- return read_memory_integer (read_register (SP_REGNUM), 4);
+ static char *regs[] =
+ {
+ "d0", "d1", "d2", "d3", "a0", "a1", "a2", "a3",
+ "sp", "pc", "mdr", "psw", "lir", "lar", "mdrq", "r0",
+ "r1", "r2", "r3", "r4", "r5", "r6", "r7", "ssp",
+ "msp", "usp", "mcrh", "mcrl", "mcvf", "fpcr", "", "",
+ "fs0", "fs1", "fs2", "fs3", "fs4", "fs5", "fs6", "fs7",
+ "fs8", "fs9", "fs10", "fs11", "fs12", "fs13", "fs14", "fs15",
+ "fs16", "fs17", "fs18", "fs19", "fs20", "fs21", "fs22", "fs23",
+ "fs24", "fs25", "fs26", "fs27", "fs28", "fs29", "fs30", "fs31"
+ };
+ return register_name (reg, regs, sizeof regs);
}
-static void
-mn10300_extract_return_value (struct type *type, char *regbuf, char *valbuf)
+static struct type *
+mn10300_register_type (struct gdbarch *gdbarch, int reg)
{
- if (TYPE_CODE (type) == TYPE_CODE_PTR)
- memcpy (valbuf, regbuf + REGISTER_BYTE (4), TYPE_LENGTH (type));
- else
- memcpy (valbuf, regbuf + REGISTER_BYTE (0), TYPE_LENGTH (type));
+ return builtin_type_int;
}
static CORE_ADDR
-mn10300_extract_struct_value_address (char *regbuf)
+mn10300_read_pc (struct regcache *regcache)
{
- return extract_address (regbuf + REGISTER_BYTE (4),
- REGISTER_RAW_SIZE (4));
+ ULONGEST val;
+ regcache_cooked_read_unsigned (regcache, E_PC_REGNUM, &val);
+ return val;
}
static void
-mn10300_store_return_value (struct type *type, char *valbuf)
-{
- if (TYPE_CODE (type) == TYPE_CODE_PTR)
- deprecated_write_register_bytes (REGISTER_BYTE (4), valbuf,
- TYPE_LENGTH (type));
- else
- deprecated_write_register_bytes (REGISTER_BYTE (0), valbuf,
- TYPE_LENGTH (type));
-}
-
-static struct frame_info *analyze_dummy_frame (CORE_ADDR, CORE_ADDR);
-static struct frame_info *
-analyze_dummy_frame (CORE_ADDR pc, CORE_ADDR frame)
-{
- static struct frame_info *dummy = NULL;
- if (dummy == NULL)
- {
- struct frame_extra_info *extra_info;
- CORE_ADDR *saved_regs;
- dummy = deprecated_frame_xmalloc ();
- saved_regs = xmalloc (SIZEOF_FRAME_SAVED_REGS);
- deprecated_set_frame_saved_regs_hack (dummy, saved_regs);
- extra_info = XMALLOC (struct frame_extra_info);
- deprecated_set_frame_extra_info_hack (dummy, extra_info);
- }
- deprecated_set_frame_next_hack (dummy, NULL);
- deprecated_set_frame_prev_hack (dummy, NULL);
- deprecated_update_frame_pc_hack (dummy, pc);
- deprecated_update_frame_base_hack (dummy, frame);
- get_frame_extra_info (dummy)->status = 0;
- get_frame_extra_info (dummy)->stack_size = 0;
- memset (get_frame_saved_regs (dummy), '\000', SIZEOF_FRAME_SAVED_REGS);
- mn10300_analyze_prologue (dummy, 0);
- return dummy;
-}
-
-/* Values for frame_info.status */
-
-#define MY_FRAME_IN_SP 0x1
-#define MY_FRAME_IN_FP 0x2
-#define NO_MORE_FRAMES 0x4
-
-
-/* Should call_function allocate stack space for a struct return? */
-static int
-mn10300_use_struct_convention (int gcc_p, struct type *type)
+mn10300_write_pc (struct regcache *regcache, CORE_ADDR val)
{
- return (TYPE_NFIELDS (type) > 1 || TYPE_LENGTH (type) > 8);
+ regcache_cooked_write_unsigned (regcache, E_PC_REGNUM, val);
}
/* The breakpoint instruction must be the same size as the smallest
@@ -194,106 +290,141 @@ mn10300_use_struct_convention (int gcc_p, struct type *type)
one, so we defined it ourselves. */
const static unsigned char *
-mn10300_breakpoint_from_pc (CORE_ADDR *bp_addr, int *bp_size)
+mn10300_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *bp_addr,
+ int *bp_size)
{
- static char breakpoint[] =
- {0xff};
+ static char breakpoint[] = {0xff};
*bp_size = 1;
return breakpoint;
}
-
-/* Fix fi->frame if it's bogus at this point. This is a helper
- function for mn10300_analyze_prologue. */
+/* Set offsets of saved registers.
+ This is a helper function for mn10300_analyze_prologue. */
static void
-fix_frame_pointer (struct frame_info *fi, int stack_size)
+set_reg_offsets (struct frame_info *fi,
+ void **this_cache,
+ int movm_args,
+ int fpregmask,
+ int stack_extra_size,
+ int frame_in_fp)
{
- if (fi && get_next_frame (fi) == NULL)
+ struct gdbarch *gdbarch;
+ struct trad_frame_cache *cache;
+ int offset = 0;
+ CORE_ADDR base;
+
+ if (fi == NULL || this_cache == NULL)
+ return;
+
+ cache = mn10300_frame_unwind_cache (fi, this_cache);
+ if (cache == NULL)
+ return;
+ gdbarch = get_frame_arch (fi);
+
+ if (frame_in_fp)
{
- if (get_frame_extra_info (fi)->status & MY_FRAME_IN_SP)
- deprecated_update_frame_base_hack (fi, read_sp () - stack_size);
- else if (get_frame_extra_info (fi)->status & MY_FRAME_IN_FP)
- deprecated_update_frame_base_hack (fi, read_register (A3_REGNUM));
+ base = frame_unwind_register_unsigned (fi, E_A3_REGNUM);
+ }
+ else
+ {
+ base = frame_unwind_register_unsigned (fi, E_SP_REGNUM)
+ + stack_extra_size;
}
-}
-
-/* Set offsets of registers saved by movm instruction.
- This is a helper function for mn10300_analyze_prologue. */
+ trad_frame_set_this_base (cache, base);
-static void
-set_movm_offsets (struct frame_info *fi, int movm_args)
-{
- int offset = 0;
+ if (AM33_MODE (gdbarch) == 2)
+ {
+ /* If bit N is set in fpregmask, fsN is saved on the stack.
+ The floating point registers are saved in ascending order.
+ For example: fs16 <- Frame Pointer
+ fs17 Frame Pointer + 4 */
+ if (fpregmask != 0)
+ {
+ int i;
+ for (i = 0; i < 32; i++)
+ {
+ if (fpregmask & (1 << i))
+ {
+ trad_frame_set_reg_addr (cache, E_FS0_REGNUM + i,
+ base + offset);
+ offset += 4;
+ }
+ }
+ }
+ }
- if (fi == NULL || movm_args == 0)
- return;
if (movm_args & movm_other_bit)
{
/* The `other' bit leaves a blank area of four bytes at the
beginning of its block of saved registers, making it 32 bytes
long in total. */
- get_frame_saved_regs (fi)[LAR_REGNUM] = get_frame_base (fi) + offset + 4;
- get_frame_saved_regs (fi)[LIR_REGNUM] = get_frame_base (fi) + offset + 8;
- get_frame_saved_regs (fi)[MDR_REGNUM] = get_frame_base (fi) + offset + 12;
- get_frame_saved_regs (fi)[A0_REGNUM + 1] = get_frame_base (fi) + offset + 16;
- get_frame_saved_regs (fi)[A0_REGNUM] = get_frame_base (fi) + offset + 20;
- get_frame_saved_regs (fi)[D0_REGNUM + 1] = get_frame_base (fi) + offset + 24;
- get_frame_saved_regs (fi)[D0_REGNUM] = get_frame_base (fi) + offset + 28;
+ trad_frame_set_reg_addr (cache, E_LAR_REGNUM, base + offset + 4);
+ trad_frame_set_reg_addr (cache, E_LIR_REGNUM, base + offset + 8);
+ trad_frame_set_reg_addr (cache, E_MDR_REGNUM, base + offset + 12);
+ trad_frame_set_reg_addr (cache, E_A0_REGNUM + 1, base + offset + 16);
+ trad_frame_set_reg_addr (cache, E_A0_REGNUM, base + offset + 20);
+ trad_frame_set_reg_addr (cache, E_D0_REGNUM + 1, base + offset + 24);
+ trad_frame_set_reg_addr (cache, E_D0_REGNUM, base + offset + 28);
offset += 32;
}
+
if (movm_args & movm_a3_bit)
{
- get_frame_saved_regs (fi)[A3_REGNUM] = get_frame_base (fi) + offset;
+ trad_frame_set_reg_addr (cache, E_A3_REGNUM, base + offset);
offset += 4;
}
if (movm_args & movm_a2_bit)
{
- get_frame_saved_regs (fi)[A2_REGNUM] = get_frame_base (fi) + offset;
+ trad_frame_set_reg_addr (cache, E_A2_REGNUM, base + offset);
offset += 4;
}
if (movm_args & movm_d3_bit)
{
- get_frame_saved_regs (fi)[D3_REGNUM] = get_frame_base (fi) + offset;
+ trad_frame_set_reg_addr (cache, E_D3_REGNUM, base + offset);
offset += 4;
}
if (movm_args & movm_d2_bit)
{
- get_frame_saved_regs (fi)[D2_REGNUM] = get_frame_base (fi) + offset;
+ trad_frame_set_reg_addr (cache, E_D2_REGNUM, base + offset);
offset += 4;
}
- if (AM33_MODE)
+ if (AM33_MODE (gdbarch))
{
if (movm_args & movm_exother_bit)
{
- get_frame_saved_regs (fi)[MCVF_REGNUM] = get_frame_base (fi) + offset;
- get_frame_saved_regs (fi)[MCRL_REGNUM] = get_frame_base (fi) + offset + 4;
- get_frame_saved_regs (fi)[MCRH_REGNUM] = get_frame_base (fi) + offset + 8;
- get_frame_saved_regs (fi)[MDRQ_REGNUM] = get_frame_base (fi) + offset + 12;
- get_frame_saved_regs (fi)[E0_REGNUM + 1] = get_frame_base (fi) + offset + 16;
- get_frame_saved_regs (fi)[E0_REGNUM + 0] = get_frame_base (fi) + offset + 20;
+ trad_frame_set_reg_addr (cache, E_MCVF_REGNUM, base + offset);
+ trad_frame_set_reg_addr (cache, E_MCRL_REGNUM, base + offset + 4);
+ trad_frame_set_reg_addr (cache, E_MCRH_REGNUM, base + offset + 8);
+ trad_frame_set_reg_addr (cache, E_MDRQ_REGNUM, base + offset + 12);
+ trad_frame_set_reg_addr (cache, E_E1_REGNUM, base + offset + 16);
+ trad_frame_set_reg_addr (cache, E_E0_REGNUM, base + offset + 20);
offset += 24;
}
if (movm_args & movm_exreg1_bit)
{
- get_frame_saved_regs (fi)[E0_REGNUM + 7] = get_frame_base (fi) + offset;
- get_frame_saved_regs (fi)[E0_REGNUM + 6] = get_frame_base (fi) + offset + 4;
- get_frame_saved_regs (fi)[E0_REGNUM + 5] = get_frame_base (fi) + offset + 8;
- get_frame_saved_regs (fi)[E0_REGNUM + 4] = get_frame_base (fi) + offset + 12;
+ trad_frame_set_reg_addr (cache, E_E7_REGNUM, base + offset);
+ trad_frame_set_reg_addr (cache, E_E6_REGNUM, base + offset + 4);
+ trad_frame_set_reg_addr (cache, E_E5_REGNUM, base + offset + 8);
+ trad_frame_set_reg_addr (cache, E_E4_REGNUM, base + offset + 12);
offset += 16;
}
if (movm_args & movm_exreg0_bit)
{
- get_frame_saved_regs (fi)[E0_REGNUM + 3] = get_frame_base (fi) + offset;
- get_frame_saved_regs (fi)[E0_REGNUM + 2] = get_frame_base (fi) + offset + 4;
+ trad_frame_set_reg_addr (cache, E_E3_REGNUM, base + offset);
+ trad_frame_set_reg_addr (cache, E_E2_REGNUM, base + offset + 4);
offset += 8;
}
}
+ /* The last (or first) thing on the stack will be the PC. */
+ trad_frame_set_reg_addr (cache, E_PC_REGNUM, base + offset);
+ /* Save the SP in the 'traditional' way.
+ This will be the same location where the PC is saved. */
+ trad_frame_set_reg_value (cache, E_SP_REGNUM, base + offset);
}
-
/* The main purpose of this file is dealing with prologues to extract
information about stack frames and saved registers.
@@ -390,70 +521,55 @@ set_movm_offsets (struct frame_info *fi, int movm_args)
frame chain to not bother trying to unwind past this frame. */
static CORE_ADDR
-mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
+mn10300_analyze_prologue (struct gdbarch *gdbarch, struct frame_info *fi,
+ void **this_cache,
+ CORE_ADDR pc)
{
CORE_ADDR func_addr, func_end, addr, stop;
- CORE_ADDR stack_size;
+ long stack_extra_size = 0;
int imm_size;
unsigned char buf[4];
- int status, movm_args = 0;
+ int status;
+ int movm_args = 0;
+ int fpregmask = 0;
char *name;
+ int frame_in_fp = 0;
/* Use the PC in the frame if it's provided to look up the
- start of this function. */
- pc = (fi ? get_frame_pc (fi) : pc);
+ start of this function.
+
+ Note: kevinb/2003-07-16: We used to do the following here:
+ pc = (fi ? get_frame_pc (fi) : pc);
+ But this is (now) badly broken when called from analyze_dummy_frame().
+ */
+ if (fi)
+ {
+ pc = (pc ? pc : get_frame_pc (fi));
+ }
/* Find the start of this function. */
status = find_pc_partial_function (pc, &name, &func_addr, &func_end);
- /* Do nothing if we couldn't find the start of this function or if we're
- stopped at the first instruction in the prologue. */
+ /* Do nothing if we couldn't find the start of this function
+
+ MVS: comment went on to say "or if we're stopped at the first
+ instruction in the prologue" -- but code doesn't reflect that,
+ and I don't want to do that anyway. */
if (status == 0)
{
- return pc;
+ addr = pc;
+ goto finish_prologue;
}
/* If we're in start, then give up. */
if (strcmp (name, "start") == 0)
{
- if (fi != NULL)
- get_frame_extra_info (fi)->status = NO_MORE_FRAMES;
- return pc;
- }
-
- /* At the start of a function our frame is in the stack pointer. */
- if (fi)
- get_frame_extra_info (fi)->status = MY_FRAME_IN_SP;
-
- /* Get the next two bytes into buf, we need two because rets is a two
- byte insn and the first isn't enough to uniquely identify it. */
- status = read_memory_nobpt (pc, buf, 2);
- if (status != 0)
- return pc;
-
- /* If we're physically on an "rets" instruction, then our frame has
- already been deallocated. Note this can also be true for retf
- and ret if they specify a size of zero.
-
- In this case fi->frame is bogus, we need to fix it. */
- if (fi && buf[0] == 0xf0 && buf[1] == 0xfc)
- {
- if (get_next_frame (fi) == NULL)
- deprecated_update_frame_base_hack (fi, read_sp ());
- return get_frame_pc (fi);
- }
-
- /* Similarly if we're stopped on the first insn of a prologue as our
- frame hasn't been allocated yet. */
- if (fi && get_frame_pc (fi) == func_addr)
- {
- if (get_next_frame (fi) == NULL)
- deprecated_update_frame_base_hack (fi, read_sp ());
- return get_frame_pc (fi);
+ addr = pc;
+ goto finish_prologue;
}
/* Figure out where to stop scanning. */
- stop = fi ? get_frame_pc (fi) : func_end;
+ stop = fi ? pc : func_end;
/* Don't walk off the end of the function. */
stop = stop > func_end ? func_end : stop;
@@ -462,21 +578,15 @@ mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
addr = func_addr;
/* Suck in two bytes. */
- status = read_memory_nobpt (addr, buf, 2);
- if (status != 0)
- {
- fix_frame_pointer (fi, 0);
- return addr;
- }
+ if (addr + 2 > stop || !safe_frame_unwind_memory (fi, addr, buf, 2))
+ goto finish_prologue;
/* First see if this insn sets the stack pointer from a register; if
so, it's probably the initialization of the stack pointer in _start,
so mark this as the bottom-most frame. */
if (buf[0] == 0xf2 && (buf[1] & 0xf3) == 0xf0)
{
- if (fi)
- get_frame_extra_info (fi)->status = NO_MORE_FRAMES;
- return addr;
+ goto finish_prologue;
}
/* Now look for movm [regs],sp, which saves the callee saved registers.
@@ -487,34 +597,175 @@ mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
if (buf[0] == 0xcf)
{
/* Extract the register list for the movm instruction. */
- status = read_memory_nobpt (addr + 1, buf, 1);
- movm_args = *buf;
+ movm_args = buf[1];
addr += 2;
/* Quit now if we're beyond the stop point. */
if (addr >= stop)
- {
- /* Fix fi->frame since it's bogus at this point. */
- if (fi && get_next_frame (fi) == NULL)
- deprecated_update_frame_base_hack (fi, read_sp ());
+ goto finish_prologue;
- /* Note if/where callee saved registers were saved. */
- set_movm_offsets (fi, movm_args);
- return addr;
- }
+ /* Get the next two bytes so the prologue scan can continue. */
+ if (!safe_frame_unwind_memory (fi, addr, buf, 2))
+ goto finish_prologue;
+ }
+
+ /* Check for "mov pc, a2", an instruction found in optimized, position
+ independent code. Skip it if found. */
+ if (buf[0] == 0xf0 && buf[1] == 0x2e)
+ {
+ addr += 2;
+
+ /* Quit now if we're beyond the stop point. */
+ if (addr >= stop)
+ goto finish_prologue;
/* Get the next two bytes so the prologue scan can continue. */
- status = read_memory_nobpt (addr, buf, 2);
+ status = target_read_memory (addr, buf, 2);
if (status != 0)
+ goto finish_prologue;
+ }
+
+ if (AM33_MODE (gdbarch) == 2)
+ {
+ /* Determine if any floating point registers are to be saved.
+ Look for one of the following three prologue formats:
+
+ [movm [regs],(sp)] [movm [regs],(sp)] [movm [regs],(sp)]
+
+ add -SIZE,sp add -SIZE,sp add -SIZE,sp
+ fmov fs#,(sp) mov sp,a0/a1 mov sp,a0/a1
+ fmov fs#,(#,sp) fmov fs#,(a0/a1+) add SIZE2,a0/a1
+ ... ... fmov fs#,(a0/a1+)
+ ... ... ...
+ fmov fs#,(#,sp) fmov fs#,(a0/a1+) fmov fs#,(a0/a1+)
+
+ [mov sp,a3] [mov sp,a3]
+ [add -SIZE2,sp] [add -SIZE2,sp] */
+
+ /* Remember the address at which we started in the event that we
+ don't ultimately find an fmov instruction. Once we're certain
+ that we matched one of the above patterns, we'll set
+ ``restore_addr'' to the appropriate value. Note: At one time
+ in the past, this code attempted to not adjust ``addr'' until
+ there was a fair degree of certainty that the pattern would be
+ matched. However, that code did not wait until an fmov instruction
+ was actually encountered. As a consequence, ``addr'' would
+ sometimes be advanced even when no fmov instructions were found. */
+ CORE_ADDR restore_addr = addr;
+ int fmov_found = 0;
+
+ /* First, look for add -SIZE,sp (i.e. add imm8,sp (0xf8feXX)
+ or add imm16,sp (0xfafeXXXX)
+ or add imm32,sp (0xfcfeXXXXXXXX)) */
+ imm_size = 0;
+ if (buf[0] == 0xf8 && buf[1] == 0xfe)
+ imm_size = 1;
+ else if (buf[0] == 0xfa && buf[1] == 0xfe)
+ imm_size = 2;
+ else if (buf[0] == 0xfc && buf[1] == 0xfe)
+ imm_size = 4;
+ if (imm_size != 0)
{
- /* Fix fi->frame since it's bogus at this point. */
- if (fi && get_next_frame (fi) == NULL)
- deprecated_update_frame_base_hack (fi, read_sp ());
+ /* An "add -#,sp" instruction has been found. "addr + 2 + imm_size"
+ is the address of the next instruction. Don't modify "addr" until
+ the next "floating point prologue" instruction is found. If this
+ is not a prologue that saves floating point registers we need to
+ be able to back out of this bit of code and continue with the
+ prologue analysis. */
+ if (addr + 2 + imm_size < stop)
+ {
+ if (!safe_frame_unwind_memory (fi, addr + 2 + imm_size, buf, 3))
+ goto finish_prologue;
+ if ((buf[0] & 0xfc) == 0x3c)
+ {
+ /* Occasionally, especially with C++ code, the "fmov"
+ instructions will be preceded by "mov sp,aN"
+ (aN => a0, a1, a2, or a3).
+
+ This is a one byte instruction: mov sp,aN = 0011 11XX
+ where XX is the register number.
+
+ Skip this instruction by incrementing addr. The "fmov"
+ instructions will have the form "fmov fs#,(aN+)" in this
+ case, but that will not necessitate a change in the
+ "fmov" parsing logic below. */
+
+ addr++;
+
+ if ((buf[1] & 0xfc) == 0x20)
+ {
+ /* Occasionally, especially with C++ code compiled with
+ the -fomit-frame-pointer or -O3 options, the
+ "mov sp,aN" instruction will be followed by an
+ "add #,aN" instruction. This indicates the
+ "stack_size", the size of the portion of the stack
+ containing the arguments. This instruction format is:
+ add #,aN = 0010 00XX YYYY YYYY
+ where XX is the register number
+ YYYY YYYY is the constant.
+ Note the size of the stack (as a negative number) in
+ the frame info structure. */
+ if (fi)
+ stack_extra_size += -buf[2];
+
+ addr += 2;
+ }
+ }
- /* Note if/where callee saved registers were saved. */
- set_movm_offsets (fi, movm_args);
- return addr;
+ if ((buf[0] & 0xfc) == 0x3c ||
+ buf[0] == 0xf9 || buf[0] == 0xfb)
+ {
+ /* An "fmov" instruction has been found indicating that this
+ prologue saves floating point registers (or, as described
+ above, a "mov sp,aN" and possible "add #,aN" have been
+ found and we will assume an "fmov" follows). Process the
+ consecutive "fmov" instructions. */
+ for (addr += 2 + imm_size;;addr += imm_size)
+ {
+ int regnum;
+
+ /* Read the "fmov" instruction. */
+ if (addr >= stop ||
+ !safe_frame_unwind_memory (fi, addr, buf, 4))
+ goto finish_prologue;
+
+ if (buf[0] != 0xf9 && buf[0] != 0xfb)
+ break;
+
+ /* An fmov instruction has just been seen. We can
+ now really commit to the pattern match. */
+
+ fmov_found = 1;
+
+ /* Get the floating point register number from the
+ 2nd and 3rd bytes of the "fmov" instruction:
+ Machine Code: 0000 00X0 YYYY 0000 =>
+ Regnum: 000X YYYY */
+ regnum = (buf[1] & 0x02) << 3;
+ regnum |= ((buf[2] & 0xf0) >> 4) & 0x0f;
+
+ /* Add this register number to the bit mask of floating
+ point registers that have been saved. */
+ fpregmask |= 1 << regnum;
+
+ /* Determine the length of this "fmov" instruction.
+ fmov fs#,(sp) => 3 byte instruction
+ fmov fs#,(#,sp) => 4 byte instruction */
+ imm_size = (buf[0] == 0xf9) ? 3 : 4;
+ }
+ }
+ }
+ }
+ /* If no fmov instructions were found by the above sequence, reset
+ the state and pretend that the above bit of code never happened. */
+ if (!fmov_found)
+ {
+ addr = restore_addr;
+ status = target_read_memory (addr, buf, 2);
+ if (status != 0)
+ goto finish_prologue;
+ stack_extra_size = 0;
}
}
@@ -526,32 +777,16 @@ mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
/* The frame pointer is now valid. */
if (fi)
{
- get_frame_extra_info (fi)->status |= MY_FRAME_IN_FP;
- get_frame_extra_info (fi)->status &= ~MY_FRAME_IN_SP;
+ frame_in_fp = 1;
}
/* Quit now if we're beyond the stop point. */
if (addr >= stop)
- {
- /* Fix fi->frame if it's bogus at this point. */
- fix_frame_pointer (fi, 0);
-
- /* Note if/where callee saved registers were saved. */
- set_movm_offsets (fi, movm_args);
- return addr;
- }
+ goto finish_prologue;
/* Get two more bytes so scanning can continue. */
- status = read_memory_nobpt (addr, buf, 2);
- if (status != 0)
- {
- /* Fix fi->frame if it's bogus at this point. */
- fix_frame_pointer (fi, 0);
-
- /* Note if/where callee saved registers were saved. */
- set_movm_offsets (fi, movm_args);
- return addr;
- }
+ if (!safe_frame_unwind_memory (fi, addr, buf, 2))
+ goto finish_prologue;
}
/* Next we should allocate the local frame. No more prologue insns
@@ -564,17 +799,6 @@ mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
If none of the above was found, then this prologue has no
additional stack. */
- status = read_memory_nobpt (addr, buf, 2);
- if (status != 0)
- {
- /* Fix fi->frame if it's bogus at this point. */
- fix_frame_pointer (fi, 0);
-
- /* Note if/where callee saved registers were saved. */
- set_movm_offsets (fi, movm_args);
- return addr;
- }
-
imm_size = 0;
if (buf[0] == 0xf8 && buf[1] == 0xfe)
imm_size = 1;
@@ -587,192 +811,180 @@ mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc)
{
/* Suck in imm_size more bytes, they'll hold the size of the
current frame. */
- status = read_memory_nobpt (addr + 2, buf, imm_size);
- if (status != 0)
- {
- /* Fix fi->frame if it's bogus at this point. */
- fix_frame_pointer (fi, 0);
+ if (!safe_frame_unwind_memory (fi, addr + 2, buf, imm_size))
+ goto finish_prologue;
- /* Note if/where callee saved registers were saved. */
- set_movm_offsets (fi, movm_args);
- return addr;
- }
-
- /* Note the size of the stack in the frame info structure. */
- stack_size = extract_signed_integer (buf, imm_size);
- if (fi)
- get_frame_extra_info (fi)->stack_size = stack_size;
+ /* Note the size of the stack. */
+ stack_extra_size -= extract_signed_integer (buf, imm_size);
/* We just consumed 2 + imm_size bytes. */
addr += 2 + imm_size;
/* No more prologue insns follow, so begin preparation to return. */
- /* Fix fi->frame if it's bogus at this point. */
- fix_frame_pointer (fi, stack_size);
-
- /* Note if/where callee saved registers were saved. */
- set_movm_offsets (fi, movm_args);
- return addr;
+ goto finish_prologue;
}
-
- /* We never found an insn which allocates local stack space, regardless
- this is the end of the prologue. */
- /* Fix fi->frame if it's bogus at this point. */
- fix_frame_pointer (fi, 0);
-
+ /* Do the essentials and get out of here. */
+ finish_prologue:
/* Note if/where callee saved registers were saved. */
- set_movm_offsets (fi, movm_args);
+ if (fi)
+ set_reg_offsets (fi, this_cache, movm_args, fpregmask, stack_extra_size,
+ frame_in_fp);
return addr;
}
+/* Function: skip_prologue
+ Return the address of the first inst past the prologue of the function. */
-/* Function: saved_regs_size
- Return the size in bytes of the register save area, based on the
- saved_regs array in FI. */
-static int
-saved_regs_size (struct frame_info *fi)
+static CORE_ADDR
+mn10300_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
{
- int adjust = 0;
- int i;
-
- /* Reserve four bytes for every register saved. */
- for (i = 0; i < NUM_REGS; i++)
- if (get_frame_saved_regs (fi)[i])
- adjust += 4;
-
- /* If we saved LIR, then it's most likely we used a `movm'
- instruction with the `other' bit set, in which case the SP is
- decremented by an extra four bytes, "to simplify calculation
- of the transfer area", according to the processor manual. */
- if (get_frame_saved_regs (fi)[LIR_REGNUM])
- adjust += 4;
-
- return adjust;
+ return mn10300_analyze_prologue (gdbarch, NULL, NULL, pc);
}
-
-/* Function: frame_chain
- Figure out and return the caller's frame pointer given current
- frame_info struct.
-
- We don't handle dummy frames yet but we would probably just return the
- stack pointer that was in use at the time the function call was made? */
-
-static CORE_ADDR
-mn10300_frame_chain (struct frame_info *fi)
+/* Simple frame_unwind_cache.
+ This finds the "extra info" for the frame. */
+struct trad_frame_cache *
+mn10300_frame_unwind_cache (struct frame_info *this_frame,
+ void **this_prologue_cache)
{
- struct frame_info *dummy;
- /* Walk through the prologue to determine the stack size,
- location of saved registers, end of the prologue, etc. */
- if (get_frame_extra_info (fi)->status == 0)
- mn10300_analyze_prologue (fi, (CORE_ADDR) 0);
+ struct gdbarch *gdbarch;
+ struct trad_frame_cache *cache;
+ CORE_ADDR pc, start, end;
+ void *cache_p;
+
+ if (*this_prologue_cache)
+ return (*this_prologue_cache);
+
+ gdbarch = get_frame_arch (this_frame);
+ cache_p = trad_frame_cache_zalloc (this_frame);
+ pc = get_frame_register_unsigned (this_frame, E_PC_REGNUM);
+ mn10300_analyze_prologue (gdbarch, this_frame, &cache_p, pc);
+ cache = cache_p;
+
+ if (find_pc_partial_function (pc, NULL, &start, &end))
+ trad_frame_set_id (cache,
+ frame_id_build (trad_frame_get_this_base (cache),
+ start));
+ else
+ {
+ start = get_frame_func (this_frame);
+ trad_frame_set_id (cache,
+ frame_id_build (trad_frame_get_this_base (cache),
+ start));
+ }
- /* Quit now if mn10300_analyze_prologue set NO_MORE_FRAMES. */
- if (get_frame_extra_info (fi)->status & NO_MORE_FRAMES)
- return 0;
+ (*this_prologue_cache) = cache;
+ return cache;
+}
- /* Now that we've analyzed our prologue, determine the frame
- pointer for our caller.
+/* Here is a dummy implementation. */
+static struct frame_id
+mn10300_dummy_id (struct gdbarch *gdbarch, struct frame_info *this_frame)
+{
+ CORE_ADDR sp = get_frame_register_unsigned (this_frame, E_SP_REGNUM);
+ CORE_ADDR pc = get_frame_register_unsigned (this_frame, E_PC_REGNUM);
+ return frame_id_build (sp, pc);
+}
- If our caller has a frame pointer, then we need to
- find the entry value of $a3 to our function.
+/* Trad frame implementation. */
+static void
+mn10300_frame_this_id (struct frame_info *this_frame,
+ void **this_prologue_cache,
+ struct frame_id *this_id)
+{
+ struct trad_frame_cache *cache =
+ mn10300_frame_unwind_cache (this_frame, this_prologue_cache);
- If fsr.regs[A3_REGNUM] is nonzero, then it's at the memory
- location pointed to by fsr.regs[A3_REGNUM].
+ trad_frame_get_id (cache, this_id);
+}
- Else it's still in $a3.
+static struct value *
+mn10300_frame_prev_register (struct frame_info *this_frame,
+ void **this_prologue_cache, int regnum)
+{
+ struct trad_frame_cache *cache =
+ mn10300_frame_unwind_cache (this_frame, this_prologue_cache);
- If our caller does not have a frame pointer, then his
- frame base is fi->frame + -caller's stack size. */
+ return trad_frame_get_register (cache, this_frame, regnum);
+}
- /* The easiest way to get that info is to analyze our caller's frame.
- So we set up a dummy frame and call mn10300_analyze_prologue to
- find stuff for us. */
- dummy = analyze_dummy_frame (DEPRECATED_FRAME_SAVED_PC (fi), get_frame_base (fi));
+static const struct frame_unwind mn10300_frame_unwind = {
+ NORMAL_FRAME,
+ mn10300_frame_this_id,
+ mn10300_frame_prev_register,
+ NULL,
+ default_frame_sniffer
+};
- if (get_frame_extra_info (dummy)->status & MY_FRAME_IN_FP)
- {
- /* Our caller has a frame pointer. So find the frame in $a3 or
- in the stack. */
- if (get_frame_saved_regs (fi)[A3_REGNUM])
- return (read_memory_integer (get_frame_saved_regs (fi)[A3_REGNUM], REGISTER_SIZE));
- else
- return read_register (A3_REGNUM);
- }
- else
- {
- int adjust = saved_regs_size (fi);
+static CORE_ADDR
+mn10300_frame_base_address (struct frame_info *this_frame,
+ void **this_prologue_cache)
+{
+ struct trad_frame_cache *cache =
+ mn10300_frame_unwind_cache (this_frame, this_prologue_cache);
- /* Our caller does not have a frame pointer. So his frame starts
- at the base of our frame (fi->frame) + register save space
- + . */
- return get_frame_base (fi) + adjust + -get_frame_extra_info (dummy)->stack_size;
- }
+ return trad_frame_get_this_base (cache);
}
-/* Function: skip_prologue
- Return the address of the first inst past the prologue of the function. */
+static const struct frame_base mn10300_frame_base = {
+ &mn10300_frame_unwind,
+ mn10300_frame_base_address,
+ mn10300_frame_base_address,
+ mn10300_frame_base_address
+};
static CORE_ADDR
-mn10300_skip_prologue (CORE_ADDR pc)
+mn10300_unwind_pc (struct gdbarch *gdbarch, struct frame_info *next_frame)
{
- /* We used to check the debug symbols, but that can lose if
- we have a null prologue. */
- return mn10300_analyze_prologue (NULL, pc);
+ ULONGEST pc;
+
+ pc = frame_unwind_register_unsigned (next_frame, E_PC_REGNUM);
+ return pc;
}
-/* generic_pop_current_frame calls this function if the current
- frame isn't a dummy frame. */
-static void
-mn10300_pop_frame_regular (struct frame_info *frame)
+static CORE_ADDR
+mn10300_unwind_sp (struct gdbarch *gdbarch, struct frame_info *next_frame)
{
- int regnum;
-
- write_register (PC_REGNUM, DEPRECATED_FRAME_SAVED_PC (frame));
-
- /* Restore any saved registers. */
- for (regnum = 0; regnum < NUM_REGS; regnum++)
- if (get_frame_saved_regs (frame)[regnum] != 0)
- {
- ULONGEST value;
-
- value = read_memory_unsigned_integer (get_frame_saved_regs (frame)[regnum],
- REGISTER_RAW_SIZE (regnum));
- write_register (regnum, value);
- }
+ ULONGEST sp;
- /* Actually cut back the stack. */
- write_register (SP_REGNUM, get_frame_base (frame));
-
- /* Don't we need to set the PC?!? XXX FIXME. */
+ sp = frame_unwind_register_unsigned (next_frame, E_SP_REGNUM);
+ return sp;
}
-/* Function: pop_frame
- This routine gets called when either the user uses the `return'
- command, or the call dummy breakpoint gets hit. */
static void
-mn10300_pop_frame (void)
+mn10300_frame_unwind_init (struct gdbarch *gdbarch)
{
- /* This function checks for and handles generic dummy frames, and
- calls back to our function for ordinary frames. */
- generic_pop_current_frame (mn10300_pop_frame_regular);
-
- /* Throw away any cached frame information. */
- flush_cached_frames ();
+ dwarf2_append_unwinders (gdbarch);
+ frame_unwind_append_unwinder (gdbarch, &mn10300_frame_unwind);
+ frame_base_set_default (gdbarch, &mn10300_frame_base);
+ set_gdbarch_dummy_id (gdbarch, mn10300_dummy_id);
+ set_gdbarch_unwind_pc (gdbarch, mn10300_unwind_pc);
+ set_gdbarch_unwind_sp (gdbarch, mn10300_unwind_sp);
}
-/* Function: push_arguments
- Setup arguments for a call to the target. Arguments go in
- order on the stack. */
+/* Function: push_dummy_call
+ *
+ * Set up machine state for a target call, including
+ * function arguments, stack, return address, etc.
+ *
+ */
static CORE_ADDR
-mn10300_push_arguments (int nargs, struct value **args, CORE_ADDR sp,
- int struct_return, CORE_ADDR struct_addr)
+mn10300_push_dummy_call (struct gdbarch *gdbarch,
+ struct value *target_func,
+ struct regcache *regcache,
+ CORE_ADDR bp_addr,
+ int nargs, struct value **args,
+ CORE_ADDR sp,
+ int struct_return,
+ CORE_ADDR struct_addr)
{
- int argnum = 0;
- int len = 0;
+ const int push_size = register_size (gdbarch, E_PC_REGNUM);
+ int regs_used;
+ int len, arg_len;
int stack_offset = 0;
- int regsused = struct_return ? 1 : 0;
+ int argnum;
+ char *val, valbuf[MAX_REGISTER_SIZE];
/* This should be a nop, but align the stack just in case something
went wrong. Stacks are four byte aligned on the mn10300. */
@@ -782,56 +994,63 @@ mn10300_push_arguments (int nargs, struct value **args, CORE_ADDR sp,
XXX This doesn't appear to handle pass-by-invisible reference
arguments. */
- for (argnum = 0; argnum < nargs; argnum++)
+ regs_used = struct_return ? 1 : 0;
+ for (len = 0, argnum = 0; argnum < nargs; argnum++)
{
- int arg_length = (TYPE_LENGTH (VALUE_TYPE (args[argnum])) + 3) & ~3;
-
- while (regsused < 2 && arg_length > 0)
+ arg_len = (TYPE_LENGTH (value_type (args[argnum])) + 3) & ~3;
+ while (regs_used < 2 && arg_len > 0)
{
- regsused++;
- arg_length -= 4;
+ regs_used++;
+ arg_len -= push_size;
}
- len += arg_length;
+ len += arg_len;
}
/* Allocate stack space. */
sp -= len;
- regsused = struct_return ? 1 : 0;
+ if (struct_return)
+ {
+ regs_used = 1;
+ regcache_cooked_write_unsigned (regcache, E_D0_REGNUM, struct_addr);
+ }
+ else
+ regs_used = 0;
+
/* Push all arguments onto the stack. */
for (argnum = 0; argnum < nargs; argnum++)
{
- int len;
- char *val;
-
- /* XXX Check this. What about UNIONS? */
- if (TYPE_CODE (VALUE_TYPE (*args)) == TYPE_CODE_STRUCT
- && TYPE_LENGTH (VALUE_TYPE (*args)) > 8)
+ /* FIXME what about structs? Unions? */
+ if (TYPE_CODE (value_type (*args)) == TYPE_CODE_STRUCT
+ && TYPE_LENGTH (value_type (*args)) > 8)
{
- /* XXX Wrong, we want a pointer to this argument. */
- len = TYPE_LENGTH (VALUE_TYPE (*args));
- val = (char *) VALUE_CONTENTS (*args);
+ /* Change to pointer-to-type. */
+ arg_len = push_size;
+ store_unsigned_integer (valbuf, push_size,
+ VALUE_ADDRESS (*args));
+ val = &valbuf[0];
}
else
{
- len = TYPE_LENGTH (VALUE_TYPE (*args));
- val = (char *) VALUE_CONTENTS (*args);
+ arg_len = TYPE_LENGTH (value_type (*args));
+ val = (char *) value_contents (*args);
}
- while (regsused < 2 && len > 0)
+ while (regs_used < 2 && arg_len > 0)
{
- write_register (regsused, extract_unsigned_integer (val, 4));
- val += 4;
- len -= 4;
- regsused++;
+ regcache_cooked_write_unsigned (regcache, regs_used,
+ extract_unsigned_integer (val, push_size));
+ val += push_size;
+ arg_len -= push_size;
+ regs_used++;
}
- while (len > 0)
+ while (arg_len > 0)
{
- write_memory (sp + stack_offset, val, 4);
- len -= 4;
- val += 4;
- stack_offset += 4;
+ write_memory (sp + stack_offset, val, push_size);
+ arg_len -= push_size;
+ val += push_size;
+ stack_offset += push_size;
}
args++;
@@ -839,140 +1058,45 @@ mn10300_push_arguments (int nargs, struct value **args, CORE_ADDR sp,
/* Make space for the flushback area. */
sp -= 8;
- return sp;
-}
-
-/* Function: push_return_address (pc)
- Set up the return address for the inferior function call.
- Needed for targets where we don't actually execute a JSR/BSR instruction */
-
-static CORE_ADDR
-mn10300_push_return_address (CORE_ADDR pc, CORE_ADDR sp)
-{
- unsigned char buf[4];
- store_unsigned_integer (buf, 4, CALL_DUMMY_ADDRESS ());
- write_memory (sp - 4, buf, 4);
- return sp - 4;
-}
-
-/* Function: store_struct_return (addr,sp)
- Store the structure value return address for an inferior function
- call. */
-
-static void
-mn10300_store_struct_return (CORE_ADDR addr, CORE_ADDR sp)
-{
- /* The structure return address is passed as the first argument. */
- write_register (0, addr);
-}
-
-/* Function: frame_saved_pc
- Find the caller of this frame. We do this by seeing if RP_REGNUM
- is saved in the stack anywhere, otherwise we get it from the
- registers. If the inner frame is a dummy frame, return its PC
- instead of RP, because that's where "caller" of the dummy-frame
- will be found. */
-
-static CORE_ADDR
-mn10300_frame_saved_pc (struct frame_info *fi)
-{
- int adjust = saved_regs_size (fi);
-
- return (read_memory_integer (get_frame_base (fi) + adjust, REGISTER_SIZE));
-}
-
-/* Function: mn10300_init_extra_frame_info
- Setup the frame's frame pointer, pc, and frame addresses for saved
- registers. Most of the work is done in mn10300_analyze_prologue().
-
- Note that when we are called for the last frame (currently active frame),
- that get_frame_pc (fi) and fi->frame will already be setup. However, fi->frame will
- be valid only if this routine uses FP. For previous frames, fi-frame will
- always be correct. mn10300_analyze_prologue will fix fi->frame if
- it's not valid.
-
- We can be called with the PC in the call dummy under two circumstances.
- First, during normal backtracing, second, while figuring out the frame
- pointer just prior to calling the target function (see run_stack_dummy). */
-
-static void
-mn10300_init_extra_frame_info (int fromleaf, struct frame_info *fi)
-{
- if (get_next_frame (fi))
- deprecated_update_frame_pc_hack (fi, DEPRECATED_FRAME_SAVED_PC (get_next_frame (fi)));
-
- frame_saved_regs_zalloc (fi);
- frame_extra_info_zalloc (fi, sizeof (struct frame_extra_info));
-
- get_frame_extra_info (fi)->status = 0;
- get_frame_extra_info (fi)->stack_size = 0;
-
- mn10300_analyze_prologue (fi, 0);
-}
-
-
-/* This function's job is handled by init_extra_frame_info. */
-static void
-mn10300_frame_init_saved_regs (struct frame_info *frame)
-{
-}
-
-
-/* Function: mn10300_virtual_frame_pointer
- Return the register that the function uses for a frame pointer,
- plus any necessary offset to be applied to the register before
- any frame pointer offsets. */
-
-static void
-mn10300_virtual_frame_pointer (CORE_ADDR pc,
- int *reg,
- LONGEST *offset)
-{
- struct frame_info *dummy = analyze_dummy_frame (pc, 0);
- /* Set up a dummy frame_info, Analyze the prolog and fill in the
- extra info. */
- /* Results will tell us which type of frame it uses. */
- if (get_frame_extra_info (dummy)->status & MY_FRAME_IN_SP)
- {
- *reg = SP_REGNUM;
- *offset = -(get_frame_extra_info (dummy)->stack_size);
- }
- else
- {
- *reg = A3_REGNUM;
- *offset = 0;
- }
-}
-
-static int
-mn10300_reg_struct_has_addr (int gcc_p, struct type *type)
-{
- return (TYPE_LENGTH (type) > 8);
-}
-
-static struct type *
-mn10300_register_virtual_type (int reg)
-{
- return builtin_type_int;
-}
-
-static int
-mn10300_register_byte (int reg)
-{
- return (reg * 4);
-}
-
-static int
-mn10300_register_virtual_size (int reg)
-{
- return 4;
-}
+ /* Push the return address that contains the magic breakpoint. */
+ sp -= 4;
+ write_memory_unsigned_integer (sp, push_size, bp_addr);
+
+ /* The CPU also writes the return address always into the
+ MDR register on "call". */
+ regcache_cooked_write_unsigned (regcache, E_MDR_REGNUM, bp_addr);
+
+ /* Update $sp. */
+ regcache_cooked_write_unsigned (regcache, E_SP_REGNUM, sp);
+
+ /* On the mn10300, it's possible to move some of the stack adjustment
+ and saving of the caller-save registers out of the prologue and
+ into the call sites. (When using gcc, this optimization can
+ occur when using the -mrelax switch.) If this occurs, the dwarf2
+ info will reflect this fact. We can test to see if this is the
+ case by creating a new frame using the current stack pointer and
+ the address of the function that we're about to call. We then
+ unwind SP and see if it's different than the SP of our newly
+ created frame. If the SP values are the same, the caller is not
+ expected to allocate any additional stack. On the other hand, if
+ the SP values are different, the difference determines the
+ additional stack that must be allocated.
+
+ Note that we don't update the return value though because that's
+ the value of the stack just after pushing the arguments, but prior
+ to performing the call. This value is needed in order to
+ construct the frame ID of the dummy call. */
+ {
+ CORE_ADDR func_addr = find_function_addr (target_func, NULL);
+ CORE_ADDR unwound_sp
+ = mn10300_unwind_sp (gdbarch, create_new_frame (sp, func_addr));
+ if (sp != unwound_sp)
+ regcache_cooked_write_unsigned (regcache, E_SP_REGNUM,
+ sp - (unwound_sp - sp));
+ }
-static int
-mn10300_register_raw_size (int reg)
-{
- return 4;
+ return sp;
}
/* If DWARF2 is a register number appearing in Dwarf2 debug info, then
@@ -983,237 +1107,119 @@ mn10300_register_raw_size (int reg)
to work with the existing GDB, neither of them can change. So we
just have to cope. */
static int
-mn10300_dwarf2_reg_to_regnum (int dwarf2)
+mn10300_dwarf2_reg_to_regnum (struct gdbarch *gdbarch, int dwarf2)
{
- /* This table is supposed to be shaped like the REGISTER_NAMES
+ /* This table is supposed to be shaped like the gdbarch_register_name
initializer in gcc/config/mn10300/mn10300.h. Registers which
appear in GCC's numbering, but have no counterpart in GDB's
world, are marked with a -1. */
static int dwarf2_to_gdb[] = {
0, 1, 2, 3, 4, 5, 6, 7, -1, 8,
- 15, 16, 17, 18, 19, 20, 21, 22
+ 15, 16, 17, 18, 19, 20, 21, 22,
+ 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63,
+ 9
};
- int gdb;
if (dwarf2 < 0
- || dwarf2 >= (sizeof (dwarf2_to_gdb) / sizeof (dwarf2_to_gdb[0]))
- || dwarf2_to_gdb[dwarf2] == -1)
- internal_error (__FILE__, __LINE__,
- "bogus register number in debug info: %d", dwarf2);
-
- return dwarf2_to_gdb[dwarf2];
-}
-
-static void
-mn10300_print_register (const char *name, int regnum, int reg_width)
-{
- char *raw_buffer = alloca (MAX_REGISTER_RAW_SIZE);
-
- if (reg_width)
- printf_filtered ("%*s: ", reg_width, name);
- else
- printf_filtered ("%s: ", name);
-
- /* Get the data */
- if (!frame_register_read (deprecated_selected_frame, regnum, raw_buffer))
+ || dwarf2 >= ARRAY_SIZE (dwarf2_to_gdb))
{
- printf_filtered ("[invalid]");
- return;
+ warning (_("Bogus register number in debug info: %d"), dwarf2);
+ return -1;
}
- else
- {
- int byte;
- if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG)
- {
- for (byte = REGISTER_RAW_SIZE (regnum) - REGISTER_VIRTUAL_SIZE (regnum);
- byte < REGISTER_RAW_SIZE (regnum);
- byte++)
- printf_filtered ("%02x", (unsigned char) raw_buffer[byte]);
- }
- else
- {
- for (byte = REGISTER_VIRTUAL_SIZE (regnum) - 1;
- byte >= 0;
- byte--)
- printf_filtered ("%02x", (unsigned char) raw_buffer[byte]);
- }
- }
-}
-static void
-mn10300_do_registers_info (int regnum, int fpregs)
-{
- if (regnum >= 0)
- {
- const char *name = REGISTER_NAME (regnum);
- if (name == NULL || name[0] == '\0')
- error ("Not a valid register for the current processor type");
- mn10300_print_register (name, regnum, 0);
- printf_filtered ("\n");
- }
- else
- {
- /* print registers in an array 4x8 */
- int r;
- int reg;
- const int nr_in_row = 4;
- const int reg_width = 4;
- for (r = 0; r < NUM_REGS; r += nr_in_row)
- {
- int c;
- int printing = 0;
- int padding = 0;
- for (c = r; c < r + nr_in_row; c++)
- {
- const char *name = REGISTER_NAME (c);
- if (name != NULL && *name != '\0')
- {
- printing = 1;
- while (padding > 0)
- {
- printf_filtered (" ");
- padding--;
- }
- mn10300_print_register (name, c, reg_width);
- printf_filtered (" ");
- }
- else
- {
- padding += (reg_width + 2 + 8 + 1);
- }
- }
- if (printing)
- printf_filtered ("\n");
- }
- }
-}
-
-/* Dump out the mn10300 speciic architecture information. */
-
-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);
+ return dwarf2_to_gdb[dwarf2];
}
static struct gdbarch *
mn10300_gdbarch_init (struct gdbarch_info info,
struct gdbarch_list *arches)
{
- static LONGEST mn10300_call_dummy_words[] = { 0 };
struct gdbarch *gdbarch;
- struct gdbarch_tdep *tdep = NULL;
- int am33_mode;
- gdbarch_register_name_ftype *register_name;
- int mach;
+ struct gdbarch_tdep *tdep;
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_mn10300)
- mach = info.bfd_arch_info->mach;
- else
- mach = 0;
- switch (mach)
+ switch (info.bfd_arch_info->mach)
{
case 0:
case bfd_mach_mn10300:
- am33_mode = 0;
- register_name = mn10300_generic_register_name;
+ set_gdbarch_register_name (gdbarch, mn10300_generic_register_name);
+ tdep->am33_mode = 0;
num_regs = 32;
break;
case bfd_mach_am33:
- am33_mode = 1;
- register_name = am33_register_name;
+ set_gdbarch_register_name (gdbarch, am33_register_name);
+ tdep->am33_mode = 1;
num_regs = 32;
break;
+ case bfd_mach_am33_2:
+ set_gdbarch_register_name (gdbarch, am33_2_register_name);
+ tdep->am33_mode = 2;
+ num_regs = 64;
+ set_gdbarch_fp0_regnum (gdbarch, 32);
+ break;
default:
internal_error (__FILE__, __LINE__,
- "mn10300_gdbarch_init: Unknown mn10300 variant");
- return NULL; /* keep GCC happy. */
+ _("mn10300_gdbarch_init: Unknown mn10300 variant"));
+ break;
}
/* Registers. */
set_gdbarch_num_regs (gdbarch, num_regs);
- set_gdbarch_register_name (gdbarch, register_name);
- set_gdbarch_register_size (gdbarch, 4);
- set_gdbarch_register_bytes (gdbarch,
- num_regs * gdbarch_register_size (gdbarch));
- set_gdbarch_deprecated_max_register_raw_size (gdbarch, 4);
- set_gdbarch_register_raw_size (gdbarch, mn10300_register_raw_size);
- set_gdbarch_register_byte (gdbarch, mn10300_register_byte);
- set_gdbarch_deprecated_max_register_virtual_size (gdbarch, 4);
- set_gdbarch_register_virtual_size (gdbarch, mn10300_register_virtual_size);
- set_gdbarch_register_virtual_type (gdbarch, mn10300_register_virtual_type);
+ set_gdbarch_register_type (gdbarch, mn10300_register_type);
+ set_gdbarch_skip_prologue (gdbarch, mn10300_skip_prologue);
+ set_gdbarch_read_pc (gdbarch, mn10300_read_pc);
+ set_gdbarch_write_pc (gdbarch, mn10300_write_pc);
+ set_gdbarch_pc_regnum (gdbarch, E_PC_REGNUM);
+ set_gdbarch_sp_regnum (gdbarch, E_SP_REGNUM);
set_gdbarch_dwarf2_reg_to_regnum (gdbarch, mn10300_dwarf2_reg_to_regnum);
- set_gdbarch_deprecated_do_registers_info (gdbarch, mn10300_do_registers_info);
- set_gdbarch_sp_regnum (gdbarch, 8);
- set_gdbarch_pc_regnum (gdbarch, 9);
- set_gdbarch_fp_regnum (gdbarch, 31);
- set_gdbarch_virtual_frame_pointer (gdbarch, mn10300_virtual_frame_pointer);
+ /* Stack unwinding. */
+ set_gdbarch_inner_than (gdbarch, core_addr_lessthan);
/* Breakpoints. */
set_gdbarch_breakpoint_from_pc (gdbarch, mn10300_breakpoint_from_pc);
- set_gdbarch_function_start_offset (gdbarch, 0);
- set_gdbarch_decr_pc_after_break (gdbarch, 0);
+ /* decr_pc_after_break? */
+ /* Disassembly. */
+ set_gdbarch_print_insn (gdbarch, print_insn_mn10300);
- /* Stack unwinding. */
- set_gdbarch_inner_than (gdbarch, core_addr_lessthan);
- set_gdbarch_saved_pc_after_call (gdbarch, mn10300_saved_pc_after_call);
- set_gdbarch_deprecated_init_extra_frame_info (gdbarch, mn10300_init_extra_frame_info);
- set_gdbarch_deprecated_init_frame_pc (gdbarch, init_frame_pc_noop);
- set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, mn10300_frame_init_saved_regs);
- set_gdbarch_deprecated_frame_chain (gdbarch, mn10300_frame_chain);
- set_gdbarch_deprecated_frame_saved_pc (gdbarch, mn10300_frame_saved_pc);
- set_gdbarch_deprecated_extract_return_value (gdbarch, mn10300_extract_return_value);
- set_gdbarch_deprecated_extract_struct_value_address
- (gdbarch, mn10300_extract_struct_value_address);
- set_gdbarch_deprecated_store_return_value (gdbarch, mn10300_store_return_value);
- set_gdbarch_deprecated_store_struct_return (gdbarch, mn10300_store_struct_return);
- set_gdbarch_deprecated_pop_frame (gdbarch, mn10300_pop_frame);
- set_gdbarch_skip_prologue (gdbarch, mn10300_skip_prologue);
- set_gdbarch_frame_args_skip (gdbarch, 0);
- set_gdbarch_frame_num_args (gdbarch, frame_num_args_unknown);
- /* That's right, we're using the stack pointer as our frame pointer. */
- set_gdbarch_read_fp (gdbarch, generic_target_read_sp);
-
- /* Calling functions in the inferior from GDB. */
- set_gdbarch_call_dummy_breakpoint_offset_p (gdbarch, 1);
- set_gdbarch_call_dummy_breakpoint_offset (gdbarch, 0);
- set_gdbarch_call_dummy_words (gdbarch, mn10300_call_dummy_words);
- set_gdbarch_sizeof_call_dummy_words (gdbarch,
- sizeof (mn10300_call_dummy_words));
- set_gdbarch_call_dummy_length (gdbarch, 0);
- set_gdbarch_fix_call_dummy (gdbarch, generic_fix_call_dummy);
- set_gdbarch_call_dummy_start_offset (gdbarch, 0);
- set_gdbarch_deprecated_pc_in_call_dummy (gdbarch, deprecated_pc_in_call_dummy_at_entry_point);
- set_gdbarch_deprecated_push_arguments (gdbarch, mn10300_push_arguments);
- set_gdbarch_reg_struct_has_addr (gdbarch, mn10300_reg_struct_has_addr);
- set_gdbarch_deprecated_push_return_address (gdbarch, mn10300_push_return_address);
- set_gdbarch_save_dummy_frame_tos (gdbarch, generic_save_dummy_frame_tos);
- set_gdbarch_use_struct_convention (gdbarch, mn10300_use_struct_convention);
-
- tdep->am33_mode = am33_mode;
-
- /* Should be using push_dummy_call. */
- set_gdbarch_deprecated_dummy_write_sp (gdbarch, generic_target_write_sp);
+ /* Stage 2 */
+ set_gdbarch_return_value (gdbarch, mn10300_return_value);
+
+ /* Stage 3 -- get target calls working. */
+ set_gdbarch_push_dummy_call (gdbarch, mn10300_push_dummy_call);
+ /* set_gdbarch_return_value (store, extract) */
+
+
+ mn10300_frame_unwind_init (gdbarch);
+
+ /* Hook in ABI-specific overrides, if they have been registered. */
+ gdbarch_init_osabi (info, gdbarch);
return gdbarch;
}
+/* Dump out the mn10300 specific architecture information. */
+
+static void
+mn10300_dump_tdep (struct gdbarch *gdbarch, struct ui_file *file)
+{
+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+ fprintf_unfiltered (file, "mn10300_dump_tdep: am33_mode = %d\n",
+ tdep->am33_mode);
+}
+
void
_initialize_mn10300_tdep (void)
{
-/* printf("_initialize_mn10300_tdep\n"); */
-
- tm_print_insn = print_insn_mn10300;
-
- register_gdbarch_init (bfd_arch_mn10300, mn10300_gdbarch_init);
+ gdbarch_register (bfd_arch_mn10300, mn10300_gdbarch_init, mn10300_dump_tdep);
}
+