projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pass return_method to _push_dummy_call
[deliverable/binutils-gdb.git]
/
gdb
/
xstormy16-tdep.c
diff --git
a/gdb/xstormy16-tdep.c
b/gdb/xstormy16-tdep.c
index 81b16698382ae8d303a2fbdfc00c77f5a9278ca8..82ce0256bb0d56ba0fefd978d99a17be6840cd25 100644
(file)
--- a/
gdb/xstormy16-tdep.c
+++ b/
gdb/xstormy16-tdep.c
@@
-1,13
+1,12
@@
/* Target-dependent code for the Sanyo Xstormy16a (LC590000) processor.
/* Target-dependent code for the Sanyo Xstormy16a (LC590000) processor.
- Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation,
- Inc.
+ Copyright (C) 2001-2018 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
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,
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@
-16,9
+15,7
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
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., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
#include "frame.h"
#include "defs.h"
#include "frame.h"
@@
-32,24
+29,21
@@
#include "value.h"
#include "dis-asm.h"
#include "inferior.h"
#include "value.h"
#include "dis-asm.h"
#include "inferior.h"
-#include "gdb_string.h"
-#include "gdb_assert.h"
#include "arch-utils.h"
#include "arch-utils.h"
-#include "floatformat.h"
#include "regcache.h"
#include "regcache.h"
-#include "doublest.h"
#include "osabi.h"
#include "objfiles.h"
#include "osabi.h"
#include "objfiles.h"
+#include "common/byte-vector.h"
enum gdb_regnum
{
/* Xstormy16 has 16 general purpose registers (R0-R15) plus PC.
Functions will return their values in register R2-R7 as they fit.
Otherwise a hidden pointer to an big enough area is given as argument
enum gdb_regnum
{
/* Xstormy16 has 16 general purpose registers (R0-R15) plus PC.
Functions will return their values in register R2-R7 as they fit.
Otherwise a hidden pointer to an big enough area is given as argument
- to the function in r2. Further arguments are beginning in r3 then.
+ to the function in r2.
Further arguments are beginning in r3 then.
R13 is used as frame pointer when GCC compiles w/o optimization
R14 is used as "PSW", displaying the CPU status.
R13 is used as frame pointer when GCC compiles w/o optimization
R14 is used as "PSW", displaying the CPU status.
- R15 is used implicitely as stack pointer. */
+ R15 is used implicitely as stack pointer.
*/
E_R0_REGNUM,
E_R1_REGNUM,
E_R2_REGNUM, E_1ST_ARG_REGNUM = E_R2_REGNUM, E_PTR_RET_REGNUM = E_R2_REGNUM,
E_R0_REGNUM,
E_R1_REGNUM,
E_R2_REGNUM, E_1ST_ARG_REGNUM = E_R2_REGNUM, E_PTR_RET_REGNUM = E_R2_REGNUM,
@@
-84,7
+78,7
@@
struct xstormy16_frame_cache
CORE_ADDR saved_sp;
};
CORE_ADDR saved_sp;
};
-/* Size of instructions, registers, etc. */
+/* Size of instructions, registers, etc.
*/
enum
{
xstormy16_inst_size = 2,
enum
{
xstormy16_inst_size = 2,
@@
-92,11
+86,11
@@
enum
xstormy16_pc_size = 4
};
xstormy16_pc_size = 4
};
-/* Size of return datatype which fits into the remaining return registers. */
+/* Size of return datatype which fits into the remaining return registers.
*/
#define E_MAX_RETTYPE_SIZE(regnum) ((E_LST_ARG_REGNUM - (regnum) + 1) \
* xstormy16_reg_size)
#define E_MAX_RETTYPE_SIZE(regnum) ((E_LST_ARG_REGNUM - (regnum) + 1) \
* xstormy16_reg_size)
-/* Size of return datatype which fits into all return registers. */
+/* Size of return datatype which fits into all return registers.
*/
enum
{
E_MAX_RETTYPE_SIZE_IN_REGS = E_MAX_RETTYPE_SIZE (E_R2_REGNUM)
enum
{
E_MAX_RETTYPE_SIZE_IN_REGS = E_MAX_RETTYPE_SIZE (E_R2_REGNUM)
@@
-106,9
+100,9
@@
enum
Returns the name of the standard Xstormy16 register N. */
static const char *
Returns the name of the standard Xstormy16 register N. */
static const char *
-xstormy16_register_name (int regnum)
+xstormy16_register_name (
struct gdbarch *gdbarch,
int regnum)
{
{
- static char *register_names[] = {
+ static c
onst c
har *register_names[] = {
"r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",
"r8", "r9", "r10", "r11", "r12", "r13",
"psw", "sp", "pc"
"r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",
"r8", "r9", "r10", "r11", "r12", "r13",
"psw", "sp", "pc"
@@
-127,9
+121,9
@@
static struct type *
xstormy16_register_type (struct gdbarch *gdbarch, int regnum)
{
if (regnum == E_PC_REGNUM)
xstormy16_register_type (struct gdbarch *gdbarch, int regnum)
{
if (regnum == E_PC_REGNUM)
- return builtin_type_uint32;
+ return builtin_type
(gdbarch)->builtin
_uint32;
else
else
- return builtin_type_uint16;
+ return builtin_type
(gdbarch)->builtin
_uint16;
}
/* Function: xstormy16_type_is_scalar
}
/* Function: xstormy16_type_is_scalar
@@
-163,13
+157,13
@@
xstormy16_use_struct_convention (struct type *type)
static void
xstormy16_extract_return_value (struct type *type, struct regcache *regcache,
static void
xstormy16_extract_return_value (struct type *type, struct regcache *regcache,
-
void
*valbuf)
+
gdb_byte
*valbuf)
{
int len = TYPE_LENGTH (type);
int i, regnum = E_1ST_ARG_REGNUM;
for (i = 0; i < len; i += xstormy16_reg_size)
{
int len = TYPE_LENGTH (type);
int i, regnum = E_1ST_ARG_REGNUM;
for (i = 0; i < len; i += xstormy16_reg_size)
- regcache
_raw_read (regcache, regnum++, (char *)
valbuf + i);
+ regcache
->raw_read (regnum++,
valbuf + i);
}
/* Function: xstormy16_store_return_value
}
/* Function: xstormy16_store_return_value
@@
-179,15
+173,15
@@
xstormy16_extract_return_value (struct type *type, struct regcache *regcache,
static void
xstormy16_store_return_value (struct type *type, struct regcache *regcache,
static void
xstormy16_store_return_value (struct type *type, struct regcache *regcache,
- const
void
*valbuf)
+ const
gdb_byte
*valbuf)
{
if (TYPE_LENGTH (type) == 1)
{
{
if (TYPE_LENGTH (type) == 1)
{
- /* Add leading zeros to the value. */
-
char
buf[xstormy16_reg_size];
+ /* Add leading zeros to the value.
*/
+
gdb_byte
buf[xstormy16_reg_size];
memset (buf, 0, xstormy16_reg_size);
memcpy (buf, valbuf, 1);
memset (buf, 0, xstormy16_reg_size);
memcpy (buf, valbuf, 1);
- regcache
_raw_write (regcache,
E_1ST_ARG_REGNUM, buf);
+ regcache
->raw_write (
E_1ST_ARG_REGNUM, buf);
}
else
{
}
else
{
@@
-195,13
+189,13
@@
xstormy16_store_return_value (struct type *type, struct regcache *regcache,
int i, regnum = E_1ST_ARG_REGNUM;
for (i = 0; i < len; i += xstormy16_reg_size)
int i, regnum = E_1ST_ARG_REGNUM;
for (i = 0; i < len; i += xstormy16_reg_size)
- regcache
_raw_write (regcache, regnum++, (char *)
valbuf + i);
+ regcache
->raw_write (regnum++,
valbuf + i);
}
}
static enum return_value_convention
}
}
static enum return_value_convention
-xstormy16_return_value (struct gdbarch *gdbarch, struct
type *type
,
- struct regcache *regcache,
+xstormy16_return_value (struct gdbarch *gdbarch, struct
value *function
,
+ struct
type *type, struct
regcache *regcache,
gdb_byte *readbuf, const gdb_byte *writebuf)
{
if (xstormy16_use_struct_convention (type))
gdb_byte *readbuf, const gdb_byte *writebuf)
{
if (xstormy16_use_struct_convention (type))
@@
-232,25
+226,26
@@
xstormy16_push_dummy_call (struct gdbarch *gdbarch,
struct regcache *regcache,
CORE_ADDR bp_addr, int nargs,
struct value **args,
struct regcache *regcache,
CORE_ADDR bp_addr, int nargs,
struct value **args,
- CORE_ADDR sp, int struct_return,
+ CORE_ADDR sp,
+ function_call_return_method return_method,
CORE_ADDR struct_addr)
{
CORE_ADDR struct_addr)
{
+ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
CORE_ADDR stack_dest = sp;
int argreg = E_1ST_ARG_REGNUM;
int i, j;
int typelen, slacklen;
CORE_ADDR stack_dest = sp;
int argreg = E_1ST_ARG_REGNUM;
int i, j;
int typelen, slacklen;
- const gdb_byte *val;
- char buf[xstormy16_pc_size];
+ gdb_byte buf[xstormy16_pc_size];
- /* If
struct_return is true, then the struct return address will
- consume one argument-passing register. */
- if (
struct_return
)
+ /* If
returning a struct using target ABI method, then the struct return
+
address will
consume one argument-passing register. */
+ if (
return_method == return_method_struct
)
{
regcache_cooked_write_unsigned (regcache, E_PTR_RET_REGNUM, struct_addr);
argreg++;
}
{
regcache_cooked_write_unsigned (regcache, E_PTR_RET_REGNUM, struct_addr);
argreg++;
}
- /* Arguments are passed in R2-R7 as they fit. If an argument doesn't
+ /* Arguments are passed in R2-R7 as they fit.
If an argument doesn't
fit in the remaining registers we're switching over to the stack.
No argument is put on stack partially and as soon as we switched
over to stack no further argument is put in a register even if it
fit in the remaining registers we're switching over to the stack.
No argument is put on stack partially and as soon as we switched
over to stack no further argument is put in a register even if it
@@
-261,14
+256,16
@@
xstormy16_push_dummy_call (struct gdbarch *gdbarch,
if (typelen > E_MAX_RETTYPE_SIZE (argreg))
break;
if (typelen > E_MAX_RETTYPE_SIZE (argreg))
break;
- /* Put argument into registers wordwise. */
- val = value_contents (args[i]);
+ /* Put argument into registers wordwise.
*/
+
const gdb_byte *
val = value_contents (args[i]);
for (j = 0; j < typelen; j += xstormy16_reg_size)
for (j = 0; j < typelen; j += xstormy16_reg_size)
- regcache_cooked_write_unsigned (regcache, argreg++,
- extract_unsigned_integer (val + j,
- typelen - j ==
- 1 ? 1 :
- xstormy16_reg_size));
+ {
+ ULONGEST regval;
+ int size = (typelen - j == 1) ? 1 : xstormy16_reg_size;
+
+ regval = extract_unsigned_integer (val + j, size, byte_order);
+ regcache_cooked_write_unsigned (regcache, argreg++, regval);
+ }
}
/* Align SP */
}
/* Align SP */
@@
-278,20
+275,20
@@
xstormy16_push_dummy_call (struct gdbarch *gdbarch,
wordaligned. */
for (j = nargs - 1; j >= i; j--)
{
wordaligned. */
for (j = nargs - 1; j >= i; j--)
{
- c
har *val
;
+ c
onst gdb_byte *bytes = value_contents (args[j])
;
typelen = TYPE_LENGTH (value_enclosing_type (args[j]));
slacklen = typelen & 1;
typelen = TYPE_LENGTH (value_enclosing_type (args[j]));
slacklen = typelen & 1;
-
val = alloca
(typelen + slacklen);
- memcpy (val
, value_contents (args[j])
, typelen);
- memset (val + typelen, 0, slacklen);
+
gdb::byte_vector val
(typelen + slacklen);
+ memcpy (val
.data (), bytes
, typelen);
+ memset (val
.data ()
+ typelen, 0, slacklen);
- /* Now write this data to the stack.
The stack grows upwards.
*/
- write_memory (stack_dest, val, typelen + slacklen);
+ /* Now write this data to the stack.
The stack grows upwards.
*/
+ write_memory (stack_dest, val
.data ()
, typelen + slacklen);
stack_dest += typelen + slacklen;
}
stack_dest += typelen + slacklen;
}
- store_unsigned_integer (buf, xstormy16_pc_size, bp_addr);
+ store_unsigned_integer (buf, xstormy16_pc_size, b
yte_order, b
p_addr);
write_memory (stack_dest, buf, xstormy16_pc_size);
stack_dest += xstormy16_pc_size;
write_memory (stack_dest, buf, xstormy16_pc_size);
stack_dest += xstormy16_pc_size;
@@
-311,16
+308,18
@@
xstormy16_push_dummy_call (struct gdbarch *gdbarch,
Returns the address of the first instruction after the prologue. */
static CORE_ADDR
Returns the address of the first instruction after the prologue. */
static CORE_ADDR
-xstormy16_analyze_prologue (CORE_ADDR start_addr, CORE_ADDR end_addr,
+xstormy16_analyze_prologue (struct gdbarch *gdbarch,
+ CORE_ADDR start_addr, CORE_ADDR end_addr,
struct xstormy16_frame_cache *cache,
struct xstormy16_frame_cache *cache,
- struct frame_info *
next
_frame)
+ struct frame_info *
this
_frame)
{
{
+ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
CORE_ADDR next_addr;
ULONGEST inst, inst2;
LONGEST offset;
int regnum;
CORE_ADDR next_addr;
ULONGEST inst, inst2;
LONGEST offset;
int regnum;
- /* Initialize framesize with size of PC put on stack by CALLF inst. */
+ /* Initialize framesize with size of PC put on stack by CALLF inst.
*/
cache->saved_regs[E_PC_REGNUM] = 0;
cache->framesize = xstormy16_pc_size;
cache->saved_regs[E_PC_REGNUM] = 0;
cache->framesize = xstormy16_pc_size;
@@
-330,9
+329,10
@@
xstormy16_analyze_prologue (CORE_ADDR start_addr, CORE_ADDR end_addr,
for (next_addr = start_addr;
next_addr < end_addr; next_addr += xstormy16_inst_size)
{
for (next_addr = start_addr;
next_addr < end_addr; next_addr += xstormy16_inst_size)
{
- inst = read_memory_unsigned_integer (next_addr, xstormy16_inst_size);
+ inst = read_memory_unsigned_integer (next_addr,
+ xstormy16_inst_size, byte_order);
inst2 = read_memory_unsigned_integer (next_addr + xstormy16_inst_size,
inst2 = read_memory_unsigned_integer (next_addr + xstormy16_inst_size,
- xstormy16_inst_size);
+ xstormy16_inst_size
, byte_order
);
if (inst >= 0x0082 && inst <= 0x008d) /* push r2 .. push r13 */
{
if (inst >= 0x0082 && inst <= 0x008d) /* push r2 .. push r13 */
{
@@
-341,8
+341,8
@@
xstormy16_analyze_prologue (CORE_ADDR start_addr, CORE_ADDR end_addr,
cache->framesize += xstormy16_reg_size;
}
cache->framesize += xstormy16_reg_size;
}
- /*
optional stack allocation for args and local vars <= 4 byte
*/
- else if (inst == 0x301f || inst == 0x303f) /* inc r15, #0x1/#0x3 */
+ /*
Optional stack allocation for args and local vars <= 4 byte.
*/
+ else if (inst == 0x301f || inst == 0x303f) /* inc r15, #0x1/#0x3 */
{
cache->framesize += ((inst & 0x0030) >> 4) + 1;
}
{
cache->framesize += ((inst & 0x0030) >> 4) + 1;
}
@@
-353,8
+353,8
@@
xstormy16_analyze_prologue (CORE_ADDR start_addr, CORE_ADDR end_addr,
cache->framesize += (inst & 0x00f0) >> 4;
}
cache->framesize += (inst & 0x00f0) >> 4;
}
- /*
optional stack allocation for args and local vars >= 16 byte
*/
- else if (inst == 0x314f && inst2 >= 0x0010)
/* 314f HHHH
add r15, #0xH */
+ /*
Optional stack allocation for args and local vars >= 16 byte.
*/
+ else if (inst == 0x314f && inst2 >= 0x0010)
/* 314f HHHH
add r15, #0xH */
{
cache->framesize += inst2;
next_addr += xstormy16_inst_size;
{
cache->framesize += inst2;
next_addr += xstormy16_inst_size;
@@
-365,21
+365,22
@@
xstormy16_analyze_prologue (CORE_ADDR start_addr, CORE_ADDR end_addr,
cache->uses_fp = 1;
}
cache->uses_fp = 1;
}
- /* optional copying of args in r2-r7 to r10-r13 */
- /* Probably only in optimized case but legal action for prologue */
+ /* optional copying of args in r2-r7 to r10-r13
.
*/
+ /* Probably only in optimized case but legal action for prologue
.
*/
else if ((inst & 0xff00) == 0x4600 /* 46SD mov rD, rS */
&& (inst & 0x00f0) >= 0x0020 && (inst & 0x00f0) <= 0x0070
else if ((inst & 0xff00) == 0x4600 /* 46SD mov rD, rS */
&& (inst & 0x00f0) >= 0x0020 && (inst & 0x00f0) <= 0x0070
- && (inst & 0x000f) >= 0x00
a0
&& (inst & 0x000f) <= 0x000d)
+ && (inst & 0x000f) >= 0x00
0a
&& (inst & 0x000f) <= 0x000d)
;
;
- /* optional copying of args in r2-r7 to stack */
- /* 72DS HHHH mov.b (rD, 0xHHHH), r(S-8) (bit3 always 1, bit2-0 = reg) */
+ /* Optional copying of args in r2-r7 to stack. */
+ /* 72DS HHHH mov.b (rD, 0xHHHH), r(S-8)
+ (bit3 always 1, bit2-0 = reg) */
/* 73DS HHHH mov.w (rD, 0xHHHH), r(S-8) */
else if ((inst & 0xfed8) == 0x72d8 && (inst & 0x0007) >= 2)
{
regnum = inst & 0x0007;
/* Only 12 of 16 bits of the argument are used for the
/* 73DS HHHH mov.w (rD, 0xHHHH), r(S-8) */
else if ((inst & 0xfed8) == 0x72d8 && (inst & 0x0007) >= 2)
{
regnum = inst & 0x0007;
/* Only 12 of 16 bits of the argument are used for the
- signed offset. */
+ signed offset.
*/
offset = (LONGEST) (inst2 & 0x0fff);
if (offset & 0x0800)
offset -= 0x1000;
offset = (LONGEST) (inst2 & 0x0fff);
if (offset & 0x0800)
offset -= 0x1000;
@@
-388,7
+389,7
@@
xstormy16_analyze_prologue (CORE_ADDR start_addr, CORE_ADDR end_addr,
next_addr += xstormy16_inst_size;
}
next_addr += xstormy16_inst_size;
}
- else /* Not a prologue instruction. */
+ else /* Not a prologue instruction.
*/
break;
}
break;
}
@@
-406,28
+407,29
@@
xstormy16_analyze_prologue (CORE_ADDR start_addr, CORE_ADDR end_addr,
stepped into a function call. */
static CORE_ADDR
stepped into a function call. */
static CORE_ADDR
-xstormy16_skip_prologue (CORE_ADDR pc)
+xstormy16_skip_prologue (
struct gdbarch *gdbarch,
CORE_ADDR pc)
{
CORE_ADDR func_addr = 0, func_end = 0;
{
CORE_ADDR func_addr = 0, func_end = 0;
- char *func_name;
+ c
onst c
har *func_name;
if (find_pc_partial_function (pc, &func_name, &func_addr, &func_end))
{
struct symtab_and_line sal;
struct symbol *sym;
struct xstormy16_frame_cache cache;
if (find_pc_partial_function (pc, &func_name, &func_addr, &func_end))
{
struct symtab_and_line sal;
struct symbol *sym;
struct xstormy16_frame_cache cache;
+ CORE_ADDR plg_end;
memset (&cache, 0, sizeof cache);
memset (&cache, 0, sizeof cache);
- /* Don't trust line number debug info in frameless functions. */
-
CORE_ADDR plg_end = xstormy16_analyze_prologue (
func_addr, func_end,
-
&cache, NULL);
+ /* Don't trust line number debug info in frameless functions.
*/
+
plg_end = xstormy16_analyze_prologue (gdbarch,
func_addr, func_end,
+ &cache, NULL);
if (!cache.uses_fp)
return plg_end;
/* Found a function. */
if (!cache.uses_fp)
return plg_end;
/* Found a function. */
- sym = lookup_symbol (func_name, NULL, VAR_DOMAIN, NULL
, NULL)
;
- /* Don't use line number debug info for assembly source files. */
+ sym = lookup_symbol (func_name, NULL, VAR_DOMAIN, NULL
).symbol
;
+ /* Don't use line number debug info for assembly source files.
*/
if (sym && SYMBOL_LANGUAGE (sym) != language_asm)
{
sal = find_pc_line (func_addr, 0);
if (sym && SYMBOL_LANGUAGE (sym) != language_asm)
{
sal = find_pc_line (func_addr, 0);
@@
-437,21
+439,25
@@
xstormy16_skip_prologue (CORE_ADDR pc)
return sal.end;
}
}
return sal.end;
}
}
- /* No useable line symbol. Use result of prologue parsing method. */
+ /* No useable line symbol. Use result of prologue parsing method.
*/
return plg_end;
}
return plg_end;
}
- /* No function symbol -- just return the PC. */
+ /* No function symbol -- just return the PC.
*/
return (CORE_ADDR) pc;
}
return (CORE_ADDR) pc;
}
-/* The epilogue is defined here as the area at the end of a function,
+/* Implement the stack_frame_destroyed_p gdbarch method.
+
+ The epilogue is defined here as the area at the end of a function,
either on the `ret' instruction itself or after an instruction which
either on the `ret' instruction itself or after an instruction which
- destroys the function's stack frame. */
+ destroys the function's stack frame. */
+
static int
static int
-xstormy16_
in_function_epilogue
_p (struct gdbarch *gdbarch, CORE_ADDR pc)
+xstormy16_
stack_frame_destroyed
_p (struct gdbarch *gdbarch, CORE_ADDR pc)
{
{
+ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
CORE_ADDR func_addr = 0, func_end = 0;
if (find_pc_partial_function (pc, NULL, &func_addr, &func_end))
CORE_ADDR func_addr = 0, func_end = 0;
if (find_pc_partial_function (pc, NULL, &func_addr, &func_end))
@@
-459,26
+465,30
@@
xstormy16_in_function_epilogue_p (struct gdbarch *gdbarch, CORE_ADDR pc)
ULONGEST inst, inst2;
CORE_ADDR addr = func_end - xstormy16_inst_size;
ULONGEST inst, inst2;
CORE_ADDR addr = func_end - xstormy16_inst_size;
- /* The Xstormy16 epilogue is max. 14 bytes long. */
+ /* The Xstormy16 epilogue is max. 14 bytes long.
*/
if (pc < func_end - 7 * xstormy16_inst_size)
return 0;
/* Check if we're on a `ret' instruction. Otherwise it's
if (pc < func_end - 7 * xstormy16_inst_size)
return 0;
/* Check if we're on a `ret' instruction. Otherwise it's
- too dangerous to proceed. */
- inst = read_memory_unsigned_integer (addr, xstormy16_inst_size);
+ too dangerous to proceed. */
+ inst = read_memory_unsigned_integer (addr,
+ xstormy16_inst_size, byte_order);
if (inst != 0x0003)
return 0;
while ((addr -= xstormy16_inst_size) >= func_addr)
{
if (inst != 0x0003)
return 0;
while ((addr -= xstormy16_inst_size) >= func_addr)
{
- inst = read_memory_unsigned_integer (addr, xstormy16_inst_size);
+ inst = read_memory_unsigned_integer (addr,
+ xstormy16_inst_size,
+ byte_order);
if (inst >= 0x009a && inst <= 0x009d) /* pop r10...r13 */
continue;
if (inst == 0x305f || inst == 0x307f) /* dec r15, #0x1/#0x3 */
break;
inst2 = read_memory_unsigned_integer (addr - xstormy16_inst_size,
if (inst >= 0x009a && inst <= 0x009d) /* pop r10...r13 */
continue;
if (inst == 0x305f || inst == 0x307f) /* dec r15, #0x1/#0x3 */
break;
inst2 = read_memory_unsigned_integer (addr - xstormy16_inst_size,
- xstormy16_inst_size);
- if (inst2 == 0x314f && inst >= 0x8000) /* add r15, neg. value */
+ xstormy16_inst_size,
+ byte_order);
+ if (inst2 == 0x314f && inst >= 0x8000) /* add r15, neg. value */
{
addr -= xstormy16_inst_size;
break;
{
addr -= xstormy16_inst_size;
break;
@@
-491,35
+501,33
@@
xstormy16_in_function_epilogue_p (struct gdbarch *gdbarch, CORE_ADDR pc)
return 0;
}
return 0;
}
-const static unsigned char *
-xstormy16_breakpoint_from_pc (CORE_ADDR *pcptr, int *lenptr)
-{
- static unsigned char breakpoint[] = { 0x06, 0x0 };
- *lenptr = sizeof (breakpoint);
- return breakpoint;
-}
+constexpr gdb_byte xstormy16_break_insn[] = { 0x06, 0x0 };
+
+typedef BP_MANIPULATION (xstormy16_break_insn) xstormy16_breakpoint;
/* Given a pointer to a jump table entry, return the address
/* Given a pointer to a jump table entry, return the address
- of the function it jumps to. Return 0 if not found. */
+ of the function it jumps to. Return 0 if not found.
*/
static CORE_ADDR
static CORE_ADDR
-xstormy16_resolve_jmp_table_entry (CORE_ADDR faddr)
+xstormy16_resolve_jmp_table_entry (
struct gdbarch *gdbarch,
CORE_ADDR faddr)
{
{
+ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
struct obj_section *faddr_sect = find_pc_section (faddr);
if (faddr_sect)
{
LONGEST inst, inst2, addr;
struct obj_section *faddr_sect = find_pc_section (faddr);
if (faddr_sect)
{
LONGEST inst, inst2, addr;
-
char
buf[2 * xstormy16_inst_size];
+
gdb_byte
buf[2 * xstormy16_inst_size];
- /* Return faddr if it's not pointing into the jump table. */
+ /* Return faddr if it's not pointing into the jump table.
*/
if (strcmp (faddr_sect->the_bfd_section->name, ".plt"))
return faddr;
if (!target_read_memory (faddr, buf, sizeof buf))
{
if (strcmp (faddr_sect->the_bfd_section->name, ".plt"))
return faddr;
if (!target_read_memory (faddr, buf, sizeof buf))
{
- inst = extract_unsigned_integer (buf, xstormy16_inst_size);
+ inst = extract_unsigned_integer (buf,
+ xstormy16_inst_size, byte_order);
inst2 = extract_unsigned_integer (buf + xstormy16_inst_size,
inst2 = extract_unsigned_integer (buf + xstormy16_inst_size,
- xstormy16_inst_size);
+ xstormy16_inst_size
, byte_order
);
addr = inst2 << 8 | (inst & 0xff);
return addr;
}
addr = inst2 << 8 | (inst & 0xff);
return addr;
}
@@
-529,17
+537,18
@@
xstormy16_resolve_jmp_table_entry (CORE_ADDR faddr)
/* Given a function's address, attempt to find (and return) the
address of the corresponding jump table entry. Return 0 if
/* Given a function's address, attempt to find (and return) the
address of the corresponding jump table entry. Return 0 if
- not found. */
+ not found.
*/
static CORE_ADDR
static CORE_ADDR
-xstormy16_find_jmp_table_entry (CORE_ADDR faddr)
+xstormy16_find_jmp_table_entry (
struct gdbarch *gdbarch,
CORE_ADDR faddr)
{
{
+ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
struct obj_section *faddr_sect = find_pc_section (faddr);
if (faddr_sect)
{
struct obj_section *osect;
struct obj_section *faddr_sect = find_pc_section (faddr);
if (faddr_sect)
{
struct obj_section *osect;
- /* Return faddr if it's already a pointer to a jump table entry. */
+ /* Return faddr if it's already a pointer to a jump table entry.
*/
if (!strcmp (faddr_sect->the_bfd_section->name, ".plt"))
return faddr;
if (!strcmp (faddr_sect->the_bfd_section->name, ".plt"))
return faddr;
@@
-551,18
+560,24
@@
xstormy16_find_jmp_table_entry (CORE_ADDR faddr)
if (osect < faddr_sect->objfile->sections_end)
{
if (osect < faddr_sect->objfile->sections_end)
{
- CORE_ADDR addr;
- for (addr = osect->addr;
- addr < osect->endaddr; addr += 2 * xstormy16_inst_size)
+ CORE_ADDR addr, endaddr;
+
+ addr = obj_section_addr (osect);
+ endaddr = obj_section_endaddr (osect);
+
+ for (; addr < endaddr; addr += 2 * xstormy16_inst_size)
{
LONGEST inst, inst2, faddr2;
{
LONGEST inst, inst2, faddr2;
-
char
buf[2 * xstormy16_inst_size];
+
gdb_byte
buf[2 * xstormy16_inst_size];
if (target_read_memory (addr, buf, sizeof buf))
return 0;
if (target_read_memory (addr, buf, sizeof buf))
return 0;
- inst = extract_unsigned_integer (buf, xstormy16_inst_size);
+ inst = extract_unsigned_integer (buf,
+ xstormy16_inst_size,
+ byte_order);
inst2 = extract_unsigned_integer (buf + xstormy16_inst_size,
inst2 = extract_unsigned_integer (buf + xstormy16_inst_size,
- xstormy16_inst_size);
+ xstormy16_inst_size,
+ byte_order);
faddr2 = inst2 << 8 | (inst & 0xff);
if (faddr == faddr2)
return addr;
faddr2 = inst2 << 8 | (inst & 0xff);
if (faddr == faddr2)
return addr;
@@
-573,9
+588,10
@@
xstormy16_find_jmp_table_entry (CORE_ADDR faddr)
}
static CORE_ADDR
}
static CORE_ADDR
-xstormy16_skip_trampoline_code (CORE_ADDR pc)
+xstormy16_skip_trampoline_code (
struct frame_info *frame,
CORE_ADDR pc)
{
{
- CORE_ADDR tmp = xstormy16_resolve_jmp_table_entry (pc);
+ struct gdbarch *gdbarch = get_frame_arch (frame);
+ CORE_ADDR tmp = xstormy16_resolve_jmp_table_entry (gdbarch, pc);
if (tmp && tmp != pc)
return tmp;
if (tmp && tmp != pc)
return tmp;
@@
-590,14
+606,17
@@
xstormy16_skip_trampoline_code (CORE_ADDR pc)
and vice versa. */
static CORE_ADDR
and vice versa. */
static CORE_ADDR
-xstormy16_pointer_to_address (struct type *type, const gdb_byte *buf)
+xstormy16_pointer_to_address (struct gdbarch *gdbarch,
+ struct type *type, const gdb_byte *buf)
{
{
+ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
enum type_code target = TYPE_CODE (TYPE_TARGET_TYPE (type));
enum type_code target = TYPE_CODE (TYPE_TARGET_TYPE (type));
- CORE_ADDR addr = extract_unsigned_integer (buf, TYPE_LENGTH (type));
+ CORE_ADDR addr
+ = extract_unsigned_integer (buf, TYPE_LENGTH (type), byte_order);
if (target == TYPE_CODE_FUNC || target == TYPE_CODE_METHOD)
{
if (target == TYPE_CODE_FUNC || target == TYPE_CODE_METHOD)
{
- CORE_ADDR addr2 = xstormy16_resolve_jmp_table_entry (addr);
+ CORE_ADDR addr2 = xstormy16_resolve_jmp_table_entry (
gdbarch,
addr);
if (addr2)
addr = addr2;
}
if (addr2)
addr = addr2;
}
@@
-606,17
+625,19
@@
xstormy16_pointer_to_address (struct type *type, const gdb_byte *buf)
}
static void
}
static void
-xstormy16_address_to_pointer (struct type *type, gdb_byte *buf, CORE_ADDR addr)
+xstormy16_address_to_pointer (struct gdbarch *gdbarch,
+ struct type *type, gdb_byte *buf, CORE_ADDR addr)
{
{
+ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
enum type_code target = TYPE_CODE (TYPE_TARGET_TYPE (type));
if (target == TYPE_CODE_FUNC || target == TYPE_CODE_METHOD)
{
enum type_code target = TYPE_CODE (TYPE_TARGET_TYPE (type));
if (target == TYPE_CODE_FUNC || target == TYPE_CODE_METHOD)
{
- CORE_ADDR addr2 = xstormy16_find_jmp_table_entry (addr);
+ CORE_ADDR addr2 = xstormy16_find_jmp_table_entry (
gdbarch,
addr);
if (addr2)
addr = addr2;
}
if (addr2)
addr = addr2;
}
- store_unsigned_integer (buf, TYPE_LENGTH (type), addr);
+ store_unsigned_integer (buf, TYPE_LENGTH (type),
byte_order,
addr);
}
static struct xstormy16_frame_cache *
}
static struct xstormy16_frame_cache *
@@
-639,29
+660,31
@@
xstormy16_alloc_frame_cache (void)
}
static struct xstormy16_frame_cache *
}
static struct xstormy16_frame_cache *
-xstormy16_frame_cache (struct frame_info *
next
_frame, void **this_cache)
+xstormy16_frame_cache (struct frame_info *
this
_frame, void **this_cache)
{
{
+ struct gdbarch *gdbarch = get_frame_arch (this_frame);
struct xstormy16_frame_cache *cache;
CORE_ADDR current_pc;
int i;
if (*this_cache)
struct xstormy16_frame_cache *cache;
CORE_ADDR current_pc;
int i;
if (*this_cache)
- return *this_cache;
+ return
(struct xstormy16_frame_cache *)
*this_cache;
cache = xstormy16_alloc_frame_cache ();
*this_cache = cache;
cache = xstormy16_alloc_frame_cache ();
*this_cache = cache;
- cache->base =
frame_unwind_register_unsigned (next
_frame, E_FP_REGNUM);
+ cache->base =
get_frame_register_unsigned (this
_frame, E_FP_REGNUM);
if (cache->base == 0)
return cache;
if (cache->base == 0)
return cache;
- cache->pc =
frame_func_unwind (next
_frame);
- current_pc =
frame_pc_unwind (next
_frame);
+ cache->pc =
get_frame_func (this
_frame);
+ current_pc =
get_frame_pc (this
_frame);
if (cache->pc)
if (cache->pc)
- xstormy16_analyze_prologue (cache->pc, current_pc, cache, next_frame);
+ xstormy16_analyze_prologue (gdbarch, cache->pc, current_pc,
+ cache, this_frame);
if (!cache->uses_fp)
if (!cache->uses_fp)
- cache->base =
frame_unwind_register_unsigned (next
_frame, E_SP_REGNUM);
+ cache->base =
get_frame_register_unsigned (this
_frame, E_SP_REGNUM);
cache->saved_sp = cache->base - cache->framesize;
cache->saved_sp = cache->base - cache->framesize;
@@
-672,59
+695,29
@@
xstormy16_frame_cache (struct frame_info *next_frame, void **this_cache)
return cache;
}
return cache;
}
-static void
-xstormy16_frame_prev_register (struct frame_info *next_frame,
- void **this_cache,
- int regnum, int *optimizedp,
- enum lval_type *lvalp, CORE_ADDR *addrp,
- int *realnump, gdb_byte *valuep)
+static struct value *
+xstormy16_frame_prev_register (struct frame_info *this_frame,
+ void **this_cache, int regnum)
{
{
- struct xstormy16_frame_cache *cache = xstormy16_frame_cache (
next
_frame,
+ struct xstormy16_frame_cache *cache = xstormy16_frame_cache (
this
_frame,
this_cache);
gdb_assert (regnum >= 0);
if (regnum == E_SP_REGNUM && cache->saved_sp)
this_cache);
gdb_assert (regnum >= 0);
if (regnum == E_SP_REGNUM && cache->saved_sp)
- {
- *optimizedp = 0;
- *lvalp = not_lval;
- *addrp = 0;
- *realnump = -1;
- if (valuep)
- {
- /* Store the value. */
- store_unsigned_integer (valuep, xstormy16_reg_size, cache->saved_sp);
- }
- return;
- }
+ return frame_unwind_got_constant (this_frame, regnum, cache->saved_sp);
if (regnum < E_NUM_REGS && cache->saved_regs[regnum] != REG_UNAVAIL)
if (regnum < E_NUM_REGS && cache->saved_regs[regnum] != REG_UNAVAIL)
- {
- *optimizedp = 0;
- *lvalp = lval_memory;
- *addrp = cache->saved_regs[regnum];
- *realnump = -1;
- if (valuep)
- {
- /* Read the value in from memory. */
- read_memory (*addrp, valuep,
- register_size (current_gdbarch, regnum));
- }
- return;
- }
+ return frame_unwind_got_memory (this_frame, regnum,
+ cache->saved_regs[regnum]);
- *optimizedp = 0;
- *lvalp = lval_register;
- *addrp = 0;
- *realnump = regnum;
- if (valuep)
- frame_unwind_register (next_frame, (*realnump), valuep);
+ return frame_unwind_got_register (this_frame, regnum, regnum);
}
static void
}
static void
-xstormy16_frame_this_id (struct frame_info *
next
_frame, void **this_cache,
+xstormy16_frame_this_id (struct frame_info *
this
_frame, void **this_cache,
struct frame_id *this_id)
{
struct frame_id *this_id)
{
- struct xstormy16_frame_cache *cache = xstormy16_frame_cache (
next
_frame,
+ struct xstormy16_frame_cache *cache = xstormy16_frame_cache (
this
_frame,
this_cache);
/* This marks the outermost frame. */
this_cache);
/* This marks the outermost frame. */
@@
-735,17
+728,20
@@
xstormy16_frame_this_id (struct frame_info *next_frame, void **this_cache,
}
static CORE_ADDR
}
static CORE_ADDR
-xstormy16_frame_base_address (struct frame_info *
next
_frame, void **this_cache)
+xstormy16_frame_base_address (struct frame_info *
this
_frame, void **this_cache)
{
{
- struct xstormy16_frame_cache *cache = xstormy16_frame_cache (
next
_frame,
+ struct xstormy16_frame_cache *cache = xstormy16_frame_cache (
this
_frame,
this_cache);
return cache->base;
}
static const struct frame_unwind xstormy16_frame_unwind = {
NORMAL_FRAME,
this_cache);
return cache->base;
}
static const struct frame_unwind xstormy16_frame_unwind = {
NORMAL_FRAME,
+ default_frame_unwind_stop_reason,
xstormy16_frame_this_id,
xstormy16_frame_this_id,
- xstormy16_frame_prev_register
+ xstormy16_frame_prev_register,
+ NULL,
+ default_frame_sniffer
};
static const struct frame_base xstormy16_frame_base = {
};
static const struct frame_base xstormy16_frame_base = {
@@
-755,12
+751,6
@@
static const struct frame_base xstormy16_frame_base = {
xstormy16_frame_base_address
};
xstormy16_frame_base_address
};
-static const struct frame_unwind *
-xstormy16_frame_sniffer (struct frame_info *next_frame)
-{
- return &xstormy16_frame_unwind;
-}
-
static CORE_ADDR
xstormy16_unwind_sp (struct gdbarch *gdbarch, struct frame_info *next_frame)
{
static CORE_ADDR
xstormy16_unwind_sp (struct gdbarch *gdbarch, struct frame_info *next_frame)
{
@@
-774,24
+764,23
@@
xstormy16_unwind_pc (struct gdbarch *gdbarch, struct frame_info *next_frame)
}
static struct frame_id
}
static struct frame_id
-xstormy16_unwind_dummy_id (struct gdbarch *gdbarch,
- struct frame_info *next_frame)
+xstormy16_dummy_id (struct gdbarch *gdbarch, struct frame_info *this_frame)
{
{
- return frame_id_build (xstormy16_unwind_sp (gdbarch, next_frame),
-
frame_pc_unwind (next
_frame));
+ CORE_ADDR sp = get_frame_register_unsigned (this_frame, E_SP_REGNUM);
+
return frame_id_build (sp, get_frame_pc (this
_frame));
}
/* Function: xstormy16_gdbarch_init
Initializer function for the xstormy16 gdbarch vector.
}
/* Function: xstormy16_gdbarch_init
Initializer function for the xstormy16 gdbarch vector.
- Called by gdbarch. Sets up the gdbarch vector(s) for this target. */
+ Called by gdbarch. Sets up the gdbarch vector(s) for this target.
*/
static struct gdbarch *
xstormy16_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
{
struct gdbarch *gdbarch;
static struct gdbarch *
xstormy16_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
{
struct gdbarch *gdbarch;
- /* find a candidate among the list of pre-declared architectures. */
+ /* find a candidate among the list of pre-declared architectures.
*/
arches = gdbarch_list_lookup_by_info (arches, &info);
if (arches != NULL)
return (arches->gdbarch);
arches = gdbarch_list_lookup_by_info (arches, &info);
if (arches != NULL)
return (arches->gdbarch);
@@
-815,19
+804,21
@@
xstormy16_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT);
set_gdbarch_long_long_bit (gdbarch, 8 * TARGET_CHAR_BIT);
set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT);
set_gdbarch_long_long_bit (gdbarch, 8 * TARGET_CHAR_BIT);
+ set_gdbarch_wchar_bit (gdbarch, 2 * TARGET_CHAR_BIT);
+ set_gdbarch_wchar_signed (gdbarch, 1);
+
set_gdbarch_float_bit (gdbarch, 4 * TARGET_CHAR_BIT);
set_gdbarch_double_bit (gdbarch, 8 * TARGET_CHAR_BIT);
set_gdbarch_long_double_bit (gdbarch, 8 * TARGET_CHAR_BIT);
set_gdbarch_ptr_bit (gdbarch, 2 * TARGET_CHAR_BIT);
set_gdbarch_addr_bit (gdbarch, 4 * TARGET_CHAR_BIT);
set_gdbarch_float_bit (gdbarch, 4 * TARGET_CHAR_BIT);
set_gdbarch_double_bit (gdbarch, 8 * TARGET_CHAR_BIT);
set_gdbarch_long_double_bit (gdbarch, 8 * TARGET_CHAR_BIT);
set_gdbarch_ptr_bit (gdbarch, 2 * TARGET_CHAR_BIT);
set_gdbarch_addr_bit (gdbarch, 4 * TARGET_CHAR_BIT);
+ set_gdbarch_dwarf2_addr_size (gdbarch, 4);
set_gdbarch_address_to_pointer (gdbarch, xstormy16_address_to_pointer);
set_gdbarch_pointer_to_address (gdbarch, xstormy16_pointer_to_address);
set_gdbarch_address_to_pointer (gdbarch, xstormy16_address_to_pointer);
set_gdbarch_pointer_to_address (gdbarch, xstormy16_pointer_to_address);
- set_gdbarch_write_pc (gdbarch, generic_target_write_pc);
-
- /* Stack grows up. */
+ /* Stack grows up. */
set_gdbarch_inner_than (gdbarch, core_addr_greaterthan);
/*
set_gdbarch_inner_than (gdbarch, core_addr_greaterthan);
/*
@@
-835,36
+826,35
@@
xstormy16_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
*/
set_gdbarch_unwind_sp (gdbarch, xstormy16_unwind_sp);
set_gdbarch_unwind_pc (gdbarch, xstormy16_unwind_pc);
*/
set_gdbarch_unwind_sp (gdbarch, xstormy16_unwind_sp);
set_gdbarch_unwind_pc (gdbarch, xstormy16_unwind_pc);
- set_gdbarch_
unwind_dummy_id (gdbarch, xstormy16_unwind
_dummy_id);
+ set_gdbarch_
dummy_id (gdbarch, xstormy16
_dummy_id);
set_gdbarch_frame_align (gdbarch, xstormy16_frame_align);
frame_base_set_default (gdbarch, &xstormy16_frame_base);
set_gdbarch_skip_prologue (gdbarch, xstormy16_skip_prologue);
set_gdbarch_frame_align (gdbarch, xstormy16_frame_align);
frame_base_set_default (gdbarch, &xstormy16_frame_base);
set_gdbarch_skip_prologue (gdbarch, xstormy16_skip_prologue);
- set_gdbarch_
in_function_epilogue
_p (gdbarch,
-
xstormy16_in_function_epilogue
_p);
+ set_gdbarch_
stack_frame_destroyed
_p (gdbarch,
+
xstormy16_stack_frame_destroyed
_p);
/* These values and methods are used when gdb calls a target function. */
set_gdbarch_push_dummy_call (gdbarch, xstormy16_push_dummy_call);
/* These values and methods are used when gdb calls a target function. */
set_gdbarch_push_dummy_call (gdbarch, xstormy16_push_dummy_call);
- set_gdbarch_breakpoint_from_pc (gdbarch, xstormy16_breakpoint_from_pc);
+ set_gdbarch_breakpoint_kind_from_pc (gdbarch,
+ xstormy16_breakpoint::kind_from_pc);
+ set_gdbarch_sw_breakpoint_from_kind (gdbarch,
+ xstormy16_breakpoint::bp_from_kind);
set_gdbarch_return_value (gdbarch, xstormy16_return_value);
set_gdbarch_skip_trampoline_code (gdbarch, xstormy16_skip_trampoline_code);
set_gdbarch_return_value (gdbarch, xstormy16_return_value);
set_gdbarch_skip_trampoline_code (gdbarch, xstormy16_skip_trampoline_code);
- set_gdbarch_print_insn (gdbarch, print_insn_xstormy16);
-
gdbarch_init_osabi (info, gdbarch);
gdbarch_init_osabi (info, gdbarch);
-
frame_unwind_append_sniffer (gdbarch, dwarf2_frame_sniffer
);
- frame_unwind_append_
sniffer (gdbarch, xstormy16_frame_sniffer
);
+
dwarf2_append_unwinders (gdbarch
);
+ frame_unwind_append_
unwinder (gdbarch, &xstormy16_frame_unwind
);
return gdbarch;
}
/* Function: _initialize_xstormy16_tdep
Initializer function for the Sanyo Xstormy16a module.
return gdbarch;
}
/* Function: _initialize_xstormy16_tdep
Initializer function for the Sanyo Xstormy16a module.
- Called by gdb at start-up. */
-
-extern initialize_file_ftype _initialize_xstormy16_tdep; /* -Wmissing-prototypes */
+ Called by gdb at start-up. */
void
_initialize_xstormy16_tdep (void)
void
_initialize_xstormy16_tdep (void)
This page took
0.068549 seconds
and
4
git commands to generate.