/* Target-dependent code for Mitsubishi D10V, for GDB.
- Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc.
+
+ Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software
+ Foundation, Inc.
This file is part of GDB.
#include "objfiles.h"
#include "language.h"
#include "arch-utils.h"
+#include "regcache.h"
-#include "sim-d10v.h"
-
-#undef XMALLOC
-#define XMALLOC(TYPE) ((TYPE*) xmalloc (sizeof (TYPE)))
+#include "floatformat.h"
+#include "gdb/sim-d10v.h"
+#include "sim-regno.h"
struct frame_extra_info
{
int nr_dmap_regs;
unsigned long (*dmap_register) (int nr);
unsigned long (*imap_register) (int nr);
- int (*register_sim_regno) (int nr);
};
/* These are the addresses the D10V-EVA board maps data and
instruction memory to. */
-#define DMEM_START 0x2000000
-#define IMEM_START 0x1000000
-#define STACK_START 0x0007ffe
+enum memspace {
+ DMEM_START = 0x2000000,
+ IMEM_START = 0x1000000,
+ STACK_START = 0x200bffe
+};
/* d10v register names. */
enum
{
R0_REGNUM = 0,
+ R3_REGNUM = 3,
+ _FP_REGNUM = 11,
LR_REGNUM = 13,
+ _SP_REGNUM = 15,
PSW_REGNUM = 16,
+ _PC_REGNUM = 18,
NR_IMAP_REGS = 2,
- NR_A_REGS = 2
+ NR_A_REGS = 2,
+ TS2_NUM_REGS = 37,
+ TS3_NUM_REGS = 42,
+ /* d10v calling convention. */
+ ARG1_REGNUM = R0_REGNUM,
+ ARGN_REGNUM = R3_REGNUM,
+ RET1_REGNUM = R0_REGNUM,
};
+
#define NR_DMAP_REGS (gdbarch_tdep (current_gdbarch)->nr_dmap_regs)
#define A0_REGNUM (gdbarch_tdep (current_gdbarch)->a0_regnum)
-/* d10v calling convention. */
-
-#define ARG1_REGNUM R0_REGNUM
-#define ARGN_REGNUM 3
-#define RET1_REGNUM R0_REGNUM
-
/* Local functions */
extern void _initialize_d10v_tdep (void);
+static CORE_ADDR d10v_read_sp (void);
+
+static CORE_ADDR d10v_read_fp (void);
+
static void d10v_eva_prepare_to_trace (void);
static void d10v_eva_get_trace_data (void);
static int prologue_find_regs (unsigned short op, struct frame_info *fi,
CORE_ADDR addr);
-extern void d10v_frame_init_saved_regs (struct frame_info *);
+static void d10v_frame_init_saved_regs (struct frame_info *);
static void do_d10v_pop_frame (struct frame_info *fi);
-int
-d10v_frame_chain_valid (chain, frame)
- CORE_ADDR chain;
- struct frame_info *frame; /* not used here */
+static int
+d10v_frame_chain_valid (CORE_ADDR chain, struct frame_info *frame)
{
- return ((chain) != 0 && (frame) != 0 && (frame)->pc > IMEM_START);
+ if (chain != 0 && frame != NULL)
+ {
+ if (PC_IN_CALL_DUMMY (frame->pc, frame->frame, frame->frame))
+ return 1; /* Path back from a call dummy must be valid. */
+ return ((frame)->pc > IMEM_START
+ && !inside_main_func (frame->pc));
+ }
+ else return 0;
}
static CORE_ADDR
The d10v returns anything less than 8 bytes in size in
registers. */
-int
-d10v_use_struct_convention (gcc_p, type)
- int gcc_p;
- struct type *type;
+static int
+d10v_use_struct_convention (int gcc_p, struct type *type)
{
- return (TYPE_LENGTH (type) > 8);
+ long alignment;
+ int i;
+ /* The d10v only passes a struct in a register when that structure
+ has an alignment that matches the size of a register. */
+ /* If the structure doesn't fit in 4 registers, put it on the
+ stack. */
+ if (TYPE_LENGTH (type) > 8)
+ return 1;
+ /* If the struct contains only one field, don't put it on the stack
+ - gcc can fit it in one or more registers. */
+ if (TYPE_NFIELDS (type) == 1)
+ return 0;
+ alignment = TYPE_LENGTH (TYPE_FIELD_TYPE (type, 0));
+ for (i = 1; i < TYPE_NFIELDS (type); i++)
+ {
+ /* If the alignment changes, just assume it goes on the
+ stack. */
+ if (TYPE_LENGTH (TYPE_FIELD_TYPE (type, i)) != alignment)
+ return 1;
+ }
+ /* If the alignment is suitable for the d10v's 16 bit registers,
+ don't put it on the stack. */
+ if (alignment == 2 || alignment == 4)
+ return 0;
+ return 1;
}
-unsigned char *
-d10v_breakpoint_from_pc (pcptr, lenptr)
- CORE_ADDR *pcptr;
- int *lenptr;
+static const unsigned char *
+d10v_breakpoint_from_pc (CORE_ADDR *pcptr, int *lenptr)
{
static unsigned char breakpoint[] =
{0x2f, 0x90, 0x5e, 0x00};
return register_names[reg_nr];
}
-/* Access the DMAP/IMAP registers in a target independant way. */
+/* Access the DMAP/IMAP registers in a target independent way.
+
+ Divide the D10V's 64k data space into four 16k segments:
+ 0x0000 -- 0x3fff, 0x4000 -- 0x7fff, 0x8000 -- 0xbfff, and
+ 0xc000 -- 0xffff.
+
+ On the TS2, the first two segments (0x0000 -- 0x3fff, 0x4000 --
+ 0x7fff) always map to the on-chip data RAM, and the fourth always
+ maps to I/O space. The third (0x8000 - 0xbfff) can be mapped into
+ unified memory or instruction memory, under the control of the
+ single DMAP register.
+
+ On the TS3, there are four DMAP registers, each of which controls
+ one of the segments. */
static unsigned long
d10v_ts2_dmap_register (int reg_nr)
static int
d10v_ts2_register_sim_regno (int nr)
{
+ if (legacy_register_sim_regno (nr) < 0)
+ return legacy_register_sim_regno (nr);
if (nr >= TS2_IMAP0_REGNUM
&& nr < TS2_IMAP0_REGNUM + NR_IMAP_REGS)
return nr - TS2_IMAP0_REGNUM + SIM_D10V_IMAP0_REGNUM;
static int
d10v_ts3_register_sim_regno (int nr)
{
+ if (legacy_register_sim_regno (nr) < 0)
+ return legacy_register_sim_regno (nr);
if (nr >= TS3_IMAP0_REGNUM
&& nr < TS3_IMAP0_REGNUM + NR_IMAP_REGS)
return nr - TS3_IMAP0_REGNUM + SIM_D10V_IMAP0_REGNUM;
return nr;
}
-int
-d10v_register_sim_regno (int nr)
-{
- return gdbarch_tdep (current_gdbarch)->register_sim_regno (nr);
-}
-
/* Index within `registers' of the first byte of the space for
register REG_NR. */
-int
-d10v_register_byte (reg_nr)
- int reg_nr;
+static int
+d10v_register_byte (int reg_nr)
{
if (reg_nr < A0_REGNUM)
return (reg_nr * 2);
/* Number of bytes of storage in the actual machine representation for
register REG_NR. */
-int
-d10v_register_raw_size (reg_nr)
- int reg_nr;
+static int
+d10v_register_raw_size (int reg_nr)
{
if (reg_nr < A0_REGNUM)
return 2;
return 2;
}
-/* Number of bytes of storage in the program's representation
- for register N. */
-
-int
-d10v_register_virtual_size (reg_nr)
- int reg_nr;
-{
- return TYPE_LENGTH (REGISTER_VIRTUAL_TYPE (reg_nr));
-}
-
/* Return the GDB type object for the "standard" data type
of data in register N. */
-struct type *
-d10v_register_virtual_type (reg_nr)
- int reg_nr;
+static struct type *
+d10v_register_virtual_type (int reg_nr)
{
- if (reg_nr >= A0_REGNUM
+ if (reg_nr == PC_REGNUM)
+ return builtin_type_void_func_ptr;
+ if (reg_nr == _SP_REGNUM || reg_nr == _FP_REGNUM)
+ return builtin_type_void_data_ptr;
+ else if (reg_nr >= A0_REGNUM
&& reg_nr < (A0_REGNUM + NR_A_REGS))
return builtin_type_int64;
- else if (reg_nr == PC_REGNUM
- || reg_nr == SP_REGNUM)
- return builtin_type_int32;
else
return builtin_type_int16;
}
-/* convert $pc and $sp to/from virtual addresses */
-int
-d10v_register_convertible (nr)
- int nr;
+static int
+d10v_daddr_p (CORE_ADDR x)
{
- return ((nr) == PC_REGNUM || (nr) == SP_REGNUM);
+ return (((x) & 0x3000000) == DMEM_START);
}
-void
-d10v_register_convert_to_virtual (regnum, type, from, to)
- int regnum;
- struct type *type;
- char *from;
- char *to;
+static int
+d10v_iaddr_p (CORE_ADDR x)
{
- ULONGEST x = extract_unsigned_integer (from, REGISTER_RAW_SIZE (regnum));
- if (regnum == PC_REGNUM)
- x = (x << 2) | IMEM_START;
- else
- x |= DMEM_START;
- store_unsigned_integer (to, TYPE_LENGTH (type), x);
+ return (((x) & 0x3000000) == IMEM_START);
}
-void
-d10v_register_convert_to_raw (type, regnum, from, to)
- struct type *type;
- int regnum;
- char *from;
- char *to;
+static CORE_ADDR
+d10v_make_daddr (CORE_ADDR x)
{
- ULONGEST x = extract_unsigned_integer (from, TYPE_LENGTH (type));
- x &= 0x3ffff;
- if (regnum == PC_REGNUM)
- x >>= 2;
- store_unsigned_integer (to, 2, x);
+ return ((x) | DMEM_START);
}
-
-CORE_ADDR
-d10v_make_daddr (x)
- CORE_ADDR x;
+static CORE_ADDR
+d10v_make_iaddr (CORE_ADDR x)
{
- return ((x) | DMEM_START);
+ if (d10v_iaddr_p (x))
+ return x; /* Idempotency -- x is already in the IMEM space. */
+ else
+ return (((x) << 2) | IMEM_START);
}
-CORE_ADDR
-d10v_make_iaddr (x)
- CORE_ADDR x;
+static CORE_ADDR
+d10v_convert_iaddr_to_raw (CORE_ADDR x)
{
- return (((x) << 2) | IMEM_START);
+ return (((x) >> 2) & 0xffff);
}
-int
-d10v_daddr_p (x)
- CORE_ADDR x;
+static CORE_ADDR
+d10v_convert_daddr_to_raw (CORE_ADDR x)
{
- return (((x) & 0x3000000) == DMEM_START);
+ return ((x) & 0xffff);
}
-int
-d10v_iaddr_p (x)
- CORE_ADDR x;
+static void
+d10v_address_to_pointer (struct type *type, void *buf, CORE_ADDR addr)
{
- return (((x) & 0x3000000) == IMEM_START);
+ /* Is it a code address? */
+ if (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_FUNC
+ || TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_METHOD)
+ {
+ store_unsigned_integer (buf, TYPE_LENGTH (type),
+ d10v_convert_iaddr_to_raw (addr));
+ }
+ else
+ {
+ /* Strip off any upper segment bits. */
+ store_unsigned_integer (buf, TYPE_LENGTH (type),
+ d10v_convert_daddr_to_raw (addr));
+ }
}
-
-CORE_ADDR
-d10v_convert_iaddr_to_raw (x)
- CORE_ADDR x;
+static CORE_ADDR
+d10v_pointer_to_address (struct type *type, void *buf)
{
- return (((x) >> 2) & 0xffff);
+ CORE_ADDR addr = extract_address (buf, TYPE_LENGTH (type));
+
+ /* Is it a code address? */
+ if (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_FUNC
+ || TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_METHOD
+ || TYPE_CODE_SPACE (TYPE_TARGET_TYPE (type)))
+ return d10v_make_iaddr (addr);
+ else
+ return d10v_make_daddr (addr);
}
-CORE_ADDR
-d10v_convert_daddr_to_raw (x)
- CORE_ADDR x;
+/* Don't do anything if we have an integer, this way users can type 'x
+ <addr>' w/o having gdb outsmart them. The internal gdb conversions
+ to the correct space are taken care of in the pointer_to_address
+ function. If we don't do this, 'x $fp' wouldn't work. */
+static CORE_ADDR
+d10v_integer_to_address (struct type *type, void *buf)
{
- return ((x) & 0xffff);
+ LONGEST val;
+ val = unpack_long (type, buf);
+ return val;
}
/* Store the address of the place in which to copy the structure the
We store structs through a pointer passed in the first Argument
register. */
-void
-d10v_store_struct_return (addr, sp)
- CORE_ADDR addr;
- CORE_ADDR sp;
+static void
+d10v_store_struct_return (CORE_ADDR addr, CORE_ADDR sp)
{
write_register (ARG1_REGNUM, (addr));
}
Things always get returned in RET1_REGNUM, RET2_REGNUM, ... */
-void
-d10v_store_return_value (type, valbuf)
- struct type *type;
- char *valbuf;
+static void
+d10v_store_return_value (struct type *type, char *valbuf)
{
- write_register_bytes (REGISTER_BYTE (RET1_REGNUM),
- valbuf,
- TYPE_LENGTH (type));
+ char tmp = 0;
+ /* Only char return values need to be shifted right within R0. */
+ if (TYPE_LENGTH (type) == 1
+ && TYPE_CODE (type) == TYPE_CODE_INT)
+ {
+ write_register_bytes (REGISTER_BYTE (RET1_REGNUM),
+ &tmp, 1); /* zero the high byte */
+ write_register_bytes (REGISTER_BYTE (RET1_REGNUM) + 1,
+ valbuf, 1); /* copy the low byte */
+ }
+ else
+ write_register_bytes (REGISTER_BYTE (RET1_REGNUM),
+ valbuf,
+ TYPE_LENGTH (type));
}
/* Extract from an array REGBUF containing the (raw) register state
the address in which a function should return its structure value,
as a CORE_ADDR (or an expression that can be used as one). */
-CORE_ADDR
-d10v_extract_struct_value_address (regbuf)
- char *regbuf;
+static CORE_ADDR
+d10v_extract_struct_value_address (char *regbuf)
{
return (extract_address ((regbuf) + REGISTER_BYTE (ARG1_REGNUM),
REGISTER_RAW_SIZE (ARG1_REGNUM))
| DMEM_START);
}
-CORE_ADDR
-d10v_frame_saved_pc (frame)
- struct frame_info *frame;
-{
- return ((frame)->extra_info->return_pc);
-}
-
-CORE_ADDR
-d10v_frame_args_address (fi)
- struct frame_info *fi;
-{
- return (fi)->frame;
-}
-
-CORE_ADDR
-d10v_frame_locals_address (fi)
- struct frame_info *fi;
+static CORE_ADDR
+d10v_frame_saved_pc (struct frame_info *frame)
{
- return (fi)->frame;
+ if (PC_IN_CALL_DUMMY (frame->pc, frame->frame, frame->frame))
+ return d10v_make_iaddr (generic_read_register_dummy (frame->pc,
+ frame->frame,
+ PC_REGNUM));
+ else
+ return ((frame)->extra_info->return_pc);
}
/* Immediately after a function call, return the saved pc. We can't
use frame->return_pc beause that is determined by reading R13 off
the stack and that may not be written yet. */
-CORE_ADDR
-d10v_saved_pc_after_call (frame)
- struct frame_info *frame;
+static CORE_ADDR
+d10v_saved_pc_after_call (struct frame_info *frame)
{
return ((read_register (LR_REGNUM) << 2)
| IMEM_START);
/* Discard from the stack the innermost frame, restoring all saved
registers. */
-void
-d10v_pop_frame ()
+static void
+d10v_pop_frame (void)
{
generic_pop_current_frame (do_d10v_pop_frame);
}
static void
-do_d10v_pop_frame (fi)
- struct frame_info *fi;
+do_d10v_pop_frame (struct frame_info *fi)
{
CORE_ADDR fp;
int regnum;
}
static int
-check_prologue (op)
- unsigned short op;
+check_prologue (unsigned short op)
{
/* st rn, @-sp */
if ((op & 0x7E1F) == 0x6C1F)
return 0;
}
-CORE_ADDR
-d10v_skip_prologue (pc)
- CORE_ADDR pc;
+static CORE_ADDR
+d10v_skip_prologue (CORE_ADDR pc)
{
unsigned long op;
unsigned short op1, op2;
INIT_EXTRA_FRAME_INFO and INIT_FRAME_PC will be called for the new frame.
*/
-CORE_ADDR
-d10v_frame_chain (fi)
- struct frame_info *fi;
+static CORE_ADDR
+d10v_frame_chain (struct frame_info *fi)
{
+ CORE_ADDR addr;
+
+ /* A generic call dummy's frame is the same as caller's. */
+ if (PC_IN_CALL_DUMMY (fi->pc, fi->frame, fi->frame))
+ return fi->frame;
+
d10v_frame_init_saved_regs (fi);
+
if (fi->extra_info->return_pc == IMEM_START
|| inside_entry_file (fi->extra_info->return_pc))
- return (CORE_ADDR) 0;
+ {
+ /* This is meant to halt the backtrace at "_start".
+ Make sure we don't halt it at a generic dummy frame. */
+ if (!PC_IN_CALL_DUMMY (fi->extra_info->return_pc, 0, 0))
+ return (CORE_ADDR) 0;
+ }
if (!fi->saved_regs[FP_REGNUM])
{
return fi->saved_regs[SP_REGNUM];
}
- if (!read_memory_unsigned_integer (fi->saved_regs[FP_REGNUM],
- REGISTER_RAW_SIZE (FP_REGNUM)))
+ addr = read_memory_unsigned_integer (fi->saved_regs[FP_REGNUM],
+ REGISTER_RAW_SIZE (FP_REGNUM));
+ if (addr == 0)
return (CORE_ADDR) 0;
- return D10V_MAKE_DADDR (read_memory_unsigned_integer (fi->saved_regs[FP_REGNUM],
- REGISTER_RAW_SIZE (FP_REGNUM)));
+ return d10v_make_daddr (addr);
}
static int next_addr, uses_frame;
static int
-prologue_find_regs (op, fi, addr)
- unsigned short op;
- struct frame_info *fi;
- CORE_ADDR addr;
+prologue_find_regs (unsigned short op, struct frame_info *fi, CORE_ADDR addr)
{
int n;
in the stack frame. sp is even more special: the address we return
for it IS the sp for the next frame. */
-void
-d10v_frame_init_saved_regs (fi)
- struct frame_info *fi;
+static void
+d10v_frame_init_saved_regs (struct frame_info *fi)
{
CORE_ADDR fp, pc;
unsigned long op;
op1 = (op & 0x3FFF8000) >> 15;
op2 = op & 0x7FFF;
}
- if (!prologue_find_regs (op1, fi, pc) || !prologue_find_regs (op2, fi, pc))
+ if (!prologue_find_regs (op1, fi, pc)
+ || !prologue_find_regs (op2, fi, pc))
break;
}
pc += 4;
fi->extra_info->size = -next_addr;
if (!(fp & 0xffff))
- fp = D10V_MAKE_DADDR (read_register (SP_REGNUM));
+ fp = d10v_read_sp ();
for (i = 0; i < NUM_REGS - 1; i++)
if (fi->saved_regs[i])
if (fi->saved_regs[LR_REGNUM])
{
- CORE_ADDR return_pc = read_memory_unsigned_integer (fi->saved_regs[LR_REGNUM], REGISTER_RAW_SIZE (LR_REGNUM));
- fi->extra_info->return_pc = D10V_MAKE_IADDR (return_pc);
+ CORE_ADDR return_pc
+ = read_memory_unsigned_integer (fi->saved_regs[LR_REGNUM],
+ REGISTER_RAW_SIZE (LR_REGNUM));
+ fi->extra_info->return_pc = d10v_make_iaddr (return_pc);
}
else
{
- fi->extra_info->return_pc = D10V_MAKE_IADDR (read_register (LR_REGNUM));
+ fi->extra_info->return_pc = d10v_make_iaddr (read_register (LR_REGNUM));
}
- /* th SP is not normally (ever?) saved, but check anyway */
+ /* The SP is not normally (ever?) saved, but check anyway */
if (!fi->saved_regs[SP_REGNUM])
{
/* if the FP was saved, that means the current FP is valid, */
/* otherwise, it isn't being used, so we use the SP instead */
if (uses_frame)
- fi->saved_regs[SP_REGNUM] = read_register (FP_REGNUM) + fi->extra_info->size;
+ fi->saved_regs[SP_REGNUM]
+ = d10v_read_fp () + fi->extra_info->size;
else
{
fi->saved_regs[SP_REGNUM] = fp + fi->extra_info->size;
}
}
-void
-d10v_init_extra_frame_info (fromleaf, fi)
- int fromleaf;
- struct frame_info *fi;
+static void
+d10v_init_extra_frame_info (int fromleaf, struct frame_info *fi)
{
fi->extra_info = (struct frame_extra_info *)
frame_obstack_alloc (sizeof (struct frame_extra_info));
fi->extra_info->size = 0;
fi->extra_info->return_pc = 0;
+ /* If fi->pc is zero, but this is not the outermost frame,
+ then let's snatch the return_pc from the callee, so that
+ PC_IN_CALL_DUMMY will work. */
+ if (fi->pc == 0 && fi->level != 0 && fi->next != NULL)
+ fi->pc = d10v_frame_saved_pc (fi->next);
+
/* The call dummy doesn't save any registers on the stack, so we can
return now. */
if (PC_IN_CALL_DUMMY (fi->pc, fi->frame, fi->frame))
}
static void
-show_regs (args, from_tty)
- char *args;
- int from_tty;
+show_regs (char *args, int from_tty)
{
int a;
printf_filtered ("PC=%04lx (0x%lx) PSW=%04lx RPT_S=%04lx RPT_E=%04lx RPT_C=%04lx\n",
(long) read_register (PC_REGNUM),
- (long) D10V_MAKE_IADDR (read_register (PC_REGNUM)),
+ (long) d10v_make_iaddr (read_register (PC_REGNUM)),
(long) read_register (PSW_REGNUM),
(long) read_register (24),
(long) read_register (25),
printf_filtered ("\n");
}
-CORE_ADDR
-d10v_read_pc (pid)
- int pid;
+static CORE_ADDR
+d10v_read_pc (ptid_t ptid)
{
- int save_pid;
+ ptid_t save_ptid;
CORE_ADDR pc;
CORE_ADDR retval;
- save_pid = inferior_pid;
- inferior_pid = pid;
+ save_ptid = inferior_ptid;
+ inferior_ptid = ptid;
pc = (int) read_register (PC_REGNUM);
- inferior_pid = save_pid;
- retval = D10V_MAKE_IADDR (pc);
+ inferior_ptid = save_ptid;
+ retval = d10v_make_iaddr (pc);
return retval;
}
-void
-d10v_write_pc (val, pid)
- CORE_ADDR val;
- int pid;
+static void
+d10v_write_pc (CORE_ADDR val, ptid_t ptid)
{
- int save_pid;
+ ptid_t save_ptid;
- save_pid = inferior_pid;
- inferior_pid = pid;
- write_register (PC_REGNUM, D10V_CONVERT_IADDR_TO_RAW (val));
- inferior_pid = save_pid;
+ save_ptid = inferior_ptid;
+ inferior_ptid = ptid;
+ write_register (PC_REGNUM, d10v_convert_iaddr_to_raw (val));
+ inferior_ptid = save_ptid;
}
-CORE_ADDR
-d10v_read_sp ()
-{
- return (D10V_MAKE_DADDR (read_register (SP_REGNUM)));
-}
-
-void
-d10v_write_sp (val)
- CORE_ADDR val;
+static CORE_ADDR
+d10v_read_sp (void)
{
- write_register (SP_REGNUM, D10V_CONVERT_DADDR_TO_RAW (val));
+ return (d10v_make_daddr (read_register (SP_REGNUM)));
}
-void
-d10v_write_fp (val)
- CORE_ADDR val;
+static void
+d10v_write_sp (CORE_ADDR val)
{
- write_register (FP_REGNUM, D10V_CONVERT_DADDR_TO_RAW (val));
+ write_register (SP_REGNUM, d10v_convert_daddr_to_raw (val));
}
-CORE_ADDR
-d10v_read_fp ()
+static CORE_ADDR
+d10v_read_fp (void)
{
- return (D10V_MAKE_DADDR (read_register (FP_REGNUM)));
+ return (d10v_make_daddr (read_register (FP_REGNUM)));
}
/* 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 */
-CORE_ADDR
-d10v_push_return_address (pc, sp)
- CORE_ADDR pc;
- CORE_ADDR sp;
+static CORE_ADDR
+d10v_push_return_address (CORE_ADDR pc, CORE_ADDR sp)
{
- write_register (LR_REGNUM, D10V_CONVERT_IADDR_TO_RAW (CALL_DUMMY_ADDRESS ()));
+ write_register (LR_REGNUM, d10v_convert_iaddr_to_raw (CALL_DUMMY_ADDRESS ()));
return sp;
}
static struct stack_item *push_stack_item (struct stack_item *prev,
void *contents, int len);
static struct stack_item *
-push_stack_item (prev, contents, len)
- struct stack_item *prev;
- void *contents;
- int len;
+push_stack_item (struct stack_item *prev, void *contents, int len)
{
struct stack_item *si;
si = xmalloc (sizeof (struct stack_item));
static struct stack_item *pop_stack_item (struct stack_item *si);
static struct stack_item *
-pop_stack_item (si)
- struct stack_item *si;
+pop_stack_item (struct stack_item *si)
{
struct stack_item *dead = si;
si = si->prev;
- free (dead->data);
- free (dead);
+ xfree (dead->data);
+ xfree (dead);
return si;
}
-CORE_ADDR
-d10v_push_arguments (nargs, args, sp, struct_return, struct_addr)
- int nargs;
- value_ptr *args;
- CORE_ADDR sp;
- int struct_return;
- CORE_ADDR struct_addr;
+static CORE_ADDR
+d10v_push_arguments (int nargs, struct value **args, CORE_ADDR sp,
+ int struct_return, CORE_ADDR struct_addr)
{
int i;
int regnum = ARG1_REGNUM;
struct stack_item *si = NULL;
+ long val;
+
+ /* If struct_return is true, then the struct return address will
+ consume one argument-passing register. No need to actually
+ write the value to the register -- that's done by
+ d10v_store_struct_return(). */
+
+ if (struct_return)
+ regnum++;
/* Fill in registers and arg lists */
for (i = 0; i < nargs; i++)
{
- value_ptr arg = args[i];
+ struct value *arg = args[i];
struct type *type = check_typedef (VALUE_TYPE (arg));
char *contents = VALUE_CONTENTS (arg);
int len = TYPE_LENGTH (type);
- /* printf ("push: type=%d len=%d\n", type->code, len); */
- if (TYPE_CODE (type) == TYPE_CODE_PTR)
+ int aligned_regnum = (regnum + 1) & ~1;
+
+ /* printf ("push: type=%d len=%d\n", TYPE_CODE (type), len); */
+ if (len <= 2 && regnum <= ARGN_REGNUM)
+ /* fits in a single register, do not align */
{
- /* pointers require special handling - first convert and
- then store */
- long val = extract_signed_integer (contents, len);
- len = 2;
- if (TYPE_TARGET_TYPE (type)
- && (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_FUNC))
- {
- /* function pointer */
- val = D10V_CONVERT_IADDR_TO_RAW (val);
- }
- else if (D10V_IADDR_P (val))
- {
- /* also function pointer! */
- val = D10V_CONVERT_DADDR_TO_RAW (val);
- }
- else
- {
- /* data pointer */
- val &= 0xFFFF;
- }
- if (regnum <= ARGN_REGNUM)
- write_register (regnum++, val & 0xffff);
- else
- {
- char ptr[2];
- /* arg will go onto stack */
- store_address (ptr, 2, val & 0xffff);
- si = push_stack_item (si, ptr, 2);
- }
+ val = extract_unsigned_integer (contents, len);
+ write_register (regnum++, val);
}
- else
+ else if (len <= (ARGN_REGNUM - aligned_regnum + 1) * 2)
+ /* value fits in remaining registers, store keeping left
+ aligned */
{
- int aligned_regnum = (regnum + 1) & ~1;
- if (len <= 2 && regnum <= ARGN_REGNUM)
- /* fits in a single register, do not align */
+ int b;
+ regnum = aligned_regnum;
+ for (b = 0; b < (len & ~1); b += 2)
{
- long val = extract_unsigned_integer (contents, len);
+ val = extract_unsigned_integer (&contents[b], 2);
write_register (regnum++, val);
}
- else if (len <= (ARGN_REGNUM - aligned_regnum + 1) * 2)
- /* value fits in remaining registers, store keeping left
- aligned */
+ if (b < len)
{
- int b;
- regnum = aligned_regnum;
- for (b = 0; b < (len & ~1); b += 2)
- {
- long val = extract_unsigned_integer (&contents[b], 2);
- write_register (regnum++, val);
- }
- if (b < len)
- {
- long val = extract_unsigned_integer (&contents[b], 1);
- write_register (regnum++, (val << 8));
- }
- }
- else
- {
- /* arg will go onto stack */
- regnum = ARGN_REGNUM + 1;
- si = push_stack_item (si, contents, len);
+ val = extract_unsigned_integer (&contents[b], 1);
+ write_register (regnum++, (val << 8));
}
}
+ else
+ {
+ /* arg will go onto stack */
+ regnum = ARGN_REGNUM + 1;
+ si = push_stack_item (si, contents, len);
+ }
}
while (si)
/* Given a return value in `regbuf' with a type `valtype',
extract and copy its value into `valbuf'. */
-void
-d10v_extract_return_value (type, regbuf, valbuf)
- struct type *type;
- char regbuf[REGISTER_BYTES];
- char *valbuf;
+static void
+d10v_extract_return_value (struct type *type, char regbuf[REGISTER_BYTES],
+ char *valbuf)
{
int len;
- /* printf("RET: TYPE=%d len=%d r%d=0x%x\n",type->code, TYPE_LENGTH (type), RET1_REGNUM - R0_REGNUM, (int) extract_unsigned_integer (regbuf + REGISTER_BYTE(RET1_REGNUM), REGISTER_RAW_SIZE (RET1_REGNUM))); */
- if (TYPE_CODE (type) == TYPE_CODE_PTR
- && TYPE_TARGET_TYPE (type)
- && (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_FUNC))
+#if 0
+ printf("RET: TYPE=%d len=%d r%d=0x%x\n", TYPE_CODE (type),
+ TYPE_LENGTH (type), RET1_REGNUM - R0_REGNUM,
+ (int) extract_unsigned_integer (regbuf + REGISTER_BYTE(RET1_REGNUM),
+ REGISTER_RAW_SIZE (RET1_REGNUM)));
+#endif
+ len = TYPE_LENGTH (type);
+ if (len == 1)
{
- /* pointer to function */
- int num;
- short snum;
- snum = extract_address (regbuf + REGISTER_BYTE (RET1_REGNUM), REGISTER_RAW_SIZE (RET1_REGNUM));
- store_address (valbuf, 4, D10V_MAKE_IADDR (snum));
- }
- else if (TYPE_CODE (type) == TYPE_CODE_PTR)
- {
- /* pointer to data */
- int num;
- short snum;
- snum = extract_address (regbuf + REGISTER_BYTE (RET1_REGNUM), REGISTER_RAW_SIZE (RET1_REGNUM));
- store_address (valbuf, 4, D10V_MAKE_DADDR (snum));
+ unsigned short c;
+
+ c = extract_unsigned_integer (regbuf + REGISTER_BYTE (RET1_REGNUM),
+ REGISTER_RAW_SIZE (RET1_REGNUM));
+ store_unsigned_integer (valbuf, 1, c);
}
+ else if ((len & 1) == 0)
+ memcpy (valbuf, regbuf + REGISTER_BYTE (RET1_REGNUM), len);
else
{
- len = TYPE_LENGTH (type);
- if (len == 1)
- {
- unsigned short c = extract_unsigned_integer (regbuf + REGISTER_BYTE (RET1_REGNUM), REGISTER_RAW_SIZE (RET1_REGNUM));
- store_unsigned_integer (valbuf, 1, c);
- }
- else if ((len & 1) == 0)
- memcpy (valbuf, regbuf + REGISTER_BYTE (RET1_REGNUM), len);
- else
- {
- /* For return values of odd size, the first byte is in the
- least significant part of the first register. The
- remaining bytes in remaining registers. Interestingly,
- when such values are passed in, the last byte is in the
- most significant byte of that same register - wierd. */
- memcpy (valbuf, regbuf + REGISTER_BYTE (RET1_REGNUM) + 1, len);
- }
+ /* For return values of odd size, the first byte is in the
+ least significant part of the first register. The
+ remaining bytes in remaining registers. Interestingly,
+ when such values are passed in, the last byte is in the
+ most significant byte of that same register - wierd. */
+ memcpy (valbuf, regbuf + REGISTER_BYTE (RET1_REGNUM) + 1, len);
}
}
trace_data;
static void
-trace_command (args, from_tty)
- char *args;
- int from_tty;
+trace_command (char *args, int from_tty)
{
/* Clear the host-side trace buffer, allocating space if needed. */
trace_data.size = 0;
}
static void
-untrace_command (args, from_tty)
- char *args;
- int from_tty;
+untrace_command (char *args, int from_tty)
{
tracing = 0;
}
static void
-trace_info (args, from_tty)
- char *args;
- int from_tty;
+trace_info (char *args, int from_tty)
{
int i;
on STREAM. Returns length of the instruction, in bytes. */
static int
-print_insn (memaddr, stream)
- CORE_ADDR memaddr;
- struct ui_file *stream;
+print_insn (CORE_ADDR memaddr, struct ui_file *stream)
{
/* If there's no disassembler, something is very wrong. */
if (tm_print_insn == NULL)
- internal_error ("print_insn: no disassembler");
+ internal_error (__FILE__, __LINE__,
+ "print_insn: no disassembler");
- if (TARGET_BYTE_ORDER == BIG_ENDIAN)
+ if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG)
tm_print_insn_info.endian = BFD_ENDIAN_BIG;
else
tm_print_insn_info.endian = BFD_ENDIAN_LITTLE;
- return (*tm_print_insn) (memaddr, &tm_print_insn_info);
+ return TARGET_PRINT_INSN (memaddr, &tm_print_insn_info);
}
static void
-d10v_eva_prepare_to_trace ()
+d10v_eva_prepare_to_trace (void)
{
if (!tracing)
return;
more useful for display. */
static void
-d10v_eva_get_trace_data ()
+d10v_eva_get_trace_data (void)
{
int count, i, j, oldsize;
int trace_addr, trace_seg, trace_cnt, next_cnt;
oldsize = trace_data.size;
trace_data.size += count;
- free (tmpspace);
+ xfree (tmpspace);
if (trace_display)
display_trace (oldsize, trace_data.size);
}
static void
-tdisassemble_command (arg, from_tty)
- char *arg;
- int from_tty;
+tdisassemble_command (char *arg, int from_tty)
{
int i, count;
CORE_ADDR low, high;
}
static void
-display_trace (low, high)
- int low, high;
+display_trace (int low, int high)
{
int i, count, trace_show_source, first, suppress;
CORE_ADDR next_address;
static gdbarch_init_ftype d10v_gdbarch_init;
static struct gdbarch *
-d10v_gdbarch_init (info, arches)
- struct gdbarch_info info;
- struct gdbarch_list *arches;
+d10v_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
{
static LONGEST d10v_call_dummy_words[] =
{0};
int d10v_num_regs;
struct gdbarch_tdep *tdep;
gdbarch_register_name_ftype *d10v_register_name;
+ gdbarch_register_sim_regno_ftype *d10v_register_sim_regno;
/* Find a candidate among the list of pre-declared architectures. */
arches = gdbarch_list_lookup_by_info (arches, &info);
case bfd_mach_d10v_ts2:
d10v_num_regs = 37;
d10v_register_name = d10v_ts2_register_name;
+ d10v_register_sim_regno = d10v_ts2_register_sim_regno;
tdep->a0_regnum = TS2_A0_REGNUM;
tdep->nr_dmap_regs = TS2_NR_DMAP_REGS;
- tdep->register_sim_regno = d10v_ts2_register_sim_regno;
tdep->dmap_register = d10v_ts2_dmap_register;
tdep->imap_register = d10v_ts2_imap_register;
break;
case bfd_mach_d10v_ts3:
d10v_num_regs = 42;
d10v_register_name = d10v_ts3_register_name;
+ d10v_register_sim_regno = d10v_ts3_register_sim_regno;
tdep->a0_regnum = TS3_A0_REGNUM;
tdep->nr_dmap_regs = TS3_NR_DMAP_REGS;
- tdep->register_sim_regno = d10v_ts3_register_sim_regno;
tdep->dmap_register = d10v_ts3_dmap_register;
tdep->imap_register = d10v_ts3_imap_register;
break;
set_gdbarch_read_pc (gdbarch, d10v_read_pc);
set_gdbarch_write_pc (gdbarch, d10v_write_pc);
set_gdbarch_read_fp (gdbarch, d10v_read_fp);
- set_gdbarch_write_fp (gdbarch, d10v_write_fp);
set_gdbarch_read_sp (gdbarch, d10v_read_sp);
set_gdbarch_write_sp (gdbarch, d10v_write_sp);
set_gdbarch_register_byte (gdbarch, d10v_register_byte);
set_gdbarch_register_raw_size (gdbarch, d10v_register_raw_size);
set_gdbarch_max_register_raw_size (gdbarch, 8);
- set_gdbarch_register_virtual_size (gdbarch, d10v_register_virtual_size);
+ set_gdbarch_register_virtual_size (gdbarch, generic_register_size);
set_gdbarch_max_register_virtual_size (gdbarch, 8);
set_gdbarch_register_virtual_type (gdbarch, d10v_register_virtual_type);
- set_gdbarch_ptr_bit (gdbarch, 4 * TARGET_CHAR_BIT);
+ set_gdbarch_ptr_bit (gdbarch, 2 * TARGET_CHAR_BIT);
+ set_gdbarch_addr_bit (gdbarch, 32);
+ set_gdbarch_address_to_pointer (gdbarch, d10v_address_to_pointer);
+ set_gdbarch_pointer_to_address (gdbarch, d10v_pointer_to_address);
+ set_gdbarch_integer_to_address (gdbarch, d10v_integer_to_address);
set_gdbarch_short_bit (gdbarch, 2 * TARGET_CHAR_BIT);
set_gdbarch_int_bit (gdbarch, 2 * TARGET_CHAR_BIT);
set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT);
- set_gdbarch_long_long_bit (gdbarch, 4 * TARGET_CHAR_BIT);
+ set_gdbarch_long_long_bit (gdbarch, 8 * TARGET_CHAR_BIT);
+ /* NOTE: The d10v as a 32 bit ``float'' and ``double''. ``long
+ double'' is 64 bits. */
set_gdbarch_float_bit (gdbarch, 4 * TARGET_CHAR_BIT);
set_gdbarch_double_bit (gdbarch, 4 * TARGET_CHAR_BIT);
set_gdbarch_long_double_bit (gdbarch, 8 * TARGET_CHAR_BIT);
+ switch (info.byte_order)
+ {
+ case BFD_ENDIAN_BIG:
+ set_gdbarch_float_format (gdbarch, &floatformat_ieee_single_big);
+ set_gdbarch_double_format (gdbarch, &floatformat_ieee_single_big);
+ set_gdbarch_long_double_format (gdbarch, &floatformat_ieee_double_big);
+ break;
+ case BFD_ENDIAN_LITTLE:
+ set_gdbarch_float_format (gdbarch, &floatformat_ieee_single_little);
+ set_gdbarch_double_format (gdbarch, &floatformat_ieee_single_little);
+ set_gdbarch_long_double_format (gdbarch, &floatformat_ieee_double_little);
+ break;
+ default:
+ internal_error (__FILE__, __LINE__,
+ "d10v_gdbarch_init: bad byte order for float format");
+ }
set_gdbarch_use_generic_dummy_frames (gdbarch, 1);
set_gdbarch_call_dummy_length (gdbarch, 0);
set_gdbarch_get_saved_register (gdbarch, generic_get_saved_register);
set_gdbarch_fix_call_dummy (gdbarch, generic_fix_call_dummy);
- set_gdbarch_register_convertible (gdbarch, d10v_register_convertible);
- set_gdbarch_register_convert_to_virtual (gdbarch, d10v_register_convert_to_virtual);
- set_gdbarch_register_convert_to_raw (gdbarch, d10v_register_convert_to_raw);
-
- set_gdbarch_extract_return_value (gdbarch, d10v_extract_return_value);
+ set_gdbarch_deprecated_extract_return_value (gdbarch, d10v_extract_return_value);
set_gdbarch_push_arguments (gdbarch, d10v_push_arguments);
set_gdbarch_push_dummy_frame (gdbarch, generic_push_dummy_frame);
set_gdbarch_push_return_address (gdbarch, d10v_push_return_address);
- set_gdbarch_d10v_make_daddr (gdbarch, d10v_make_daddr);
- set_gdbarch_d10v_make_iaddr (gdbarch, d10v_make_iaddr);
- set_gdbarch_d10v_daddr_p (gdbarch, d10v_daddr_p);
- set_gdbarch_d10v_iaddr_p (gdbarch, d10v_iaddr_p);
- set_gdbarch_d10v_convert_daddr_to_raw (gdbarch, d10v_convert_daddr_to_raw);
- set_gdbarch_d10v_convert_iaddr_to_raw (gdbarch, d10v_convert_iaddr_to_raw);
-
set_gdbarch_store_struct_return (gdbarch, d10v_store_struct_return);
set_gdbarch_store_return_value (gdbarch, d10v_store_return_value);
- set_gdbarch_extract_struct_value_address (gdbarch, d10v_extract_struct_value_address);
+ set_gdbarch_deprecated_extract_struct_value_address (gdbarch, d10v_extract_struct_value_address);
set_gdbarch_use_struct_convention (gdbarch, d10v_use_struct_convention);
set_gdbarch_frame_init_saved_regs (gdbarch, d10v_frame_init_saved_regs);
set_gdbarch_frame_chain (gdbarch, d10v_frame_chain);
set_gdbarch_frame_chain_valid (gdbarch, d10v_frame_chain_valid);
set_gdbarch_frame_saved_pc (gdbarch, d10v_frame_saved_pc);
- set_gdbarch_frame_args_address (gdbarch, d10v_frame_args_address);
- set_gdbarch_frame_locals_address (gdbarch, d10v_frame_locals_address);
+ set_gdbarch_frame_args_address (gdbarch, default_frame_address);
+ set_gdbarch_frame_locals_address (gdbarch, default_frame_address);
set_gdbarch_saved_pc_after_call (gdbarch, d10v_saved_pc_after_call);
set_gdbarch_frame_num_args (gdbarch, frame_num_args_unknown);
set_gdbarch_stack_align (gdbarch, d10v_stack_align);
+ set_gdbarch_register_sim_regno (gdbarch, d10v_register_sim_regno);
+ set_gdbarch_extra_stack_alignment_needed (gdbarch, 0);
+
return gdbarch;
}
-extern void (*target_resume_hook) PARAMS ((void));
-extern void (*target_wait_loop_hook) PARAMS ((void));
+extern void (*target_resume_hook) (void);
+extern void (*target_wait_loop_hook) (void);
void
-_initialize_d10v_tdep ()
+_initialize_d10v_tdep (void)
{
register_gdbarch_init (bfd_arch_d10v, d10v_gdbarch_init);
projects / deliverable / binutils-gdb.git / blobdiff