summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOrjan Friberg <orjanf@axis.com>2005-05-27 13:47:59 +0000
committerOrjan Friberg <orjanf@axis.com>2005-05-27 13:47:59 +0000
commitecb28f5bff7651819d16712ec4d4d1753f79851a (patch)
tree8b58cebbf9298f93e60899f940e55a3336a5efe3
parent5973fecadd06660c7d9ab09b862895fe9ed7931a (diff)
downloadgdb-ecb28f5bff7651819d16712ec4d4d1753f79851a.tar.gz
2005-05-27 Orjan Friberg <orjanf@axis.com>
* cris-tdep.c (cris_sigtramp_start, cris_rt_sigtramp_start) (cris_frame_prev_register, cris_sigtramp_frame_prev_register) (cris_return_value): Use gdb_byte for byte buffers. (struct cris_frame_unwind, struct cris_frame_base): Fix formatting.
-rw-r--r--gdb/ChangeLog7
-rw-r--r--gdb/cris-tdep.c28
2 files changed, 22 insertions, 13 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7ce1f4632ce..cac94ee5f31 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-27 Orjan Friberg <orjanf@axis.com>
+
+ * cris-tdep.c (cris_sigtramp_start, cris_rt_sigtramp_start)
+ (cris_frame_prev_register, cris_sigtramp_frame_prev_register)
+ (cris_return_value): Use gdb_byte for byte buffers.
+ (struct cris_frame_unwind, struct cris_frame_base): Fix formatting.
+
2005-05-26 Chris Demetriou <cgd@netbsd.org>
* MAINTAINERS (Write After Approval): Remove myself.
diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c
index cd306a3ee7c..53258190e2c 100644
--- a/gdb/cris-tdep.c
+++ b/gdb/cris-tdep.c
@@ -219,14 +219,14 @@ static CORE_ADDR
cris_sigtramp_start (struct frame_info *next_frame)
{
CORE_ADDR pc = frame_pc_unwind (next_frame);
- unsigned short buf[SIGTRAMP_LEN];
+ gdb_byte buf[SIGTRAMP_LEN];
if (!safe_frame_unwind_memory (next_frame, pc, buf, SIGTRAMP_LEN))
return 0;
- if (buf[0] != SIGTRAMP_INSN0)
+ if (((buf[1] << 8) + buf[0]) != SIGTRAMP_INSN0)
{
- if (buf[0] != SIGTRAMP_INSN1)
+ if (((buf[1] << 8) + buf[0]) != SIGTRAMP_INSN1)
return 0;
pc -= SIGTRAMP_OFFSET1;
@@ -247,14 +247,14 @@ static CORE_ADDR
cris_rt_sigtramp_start (struct frame_info *next_frame)
{
CORE_ADDR pc = frame_pc_unwind (next_frame);
- unsigned short buf[SIGTRAMP_LEN];
+ gdb_byte buf[SIGTRAMP_LEN];
if (!safe_frame_unwind_memory (next_frame, pc, buf, SIGTRAMP_LEN))
return 0;
- if (buf[0] != SIGTRAMP_INSN0)
+ if (((buf[1] << 8) + buf[0]) != SIGTRAMP_INSN0)
{
- if (buf[0] != SIGTRAMP_INSN1)
+ if (((buf[1] << 8) + buf[0]) != SIGTRAMP_INSN1)
return 0;
pc -= SIGTRAMP_OFFSET1;
@@ -435,13 +435,13 @@ static void cris_frame_prev_register (struct frame_info *next_frame,
void **this_prologue_cache,
int regnum, int *optimizedp,
enum lval_type *lvalp, CORE_ADDR *addrp,
- int *realnump, void *bufferp);
+ int *realnump, gdb_byte *bufferp);
static void
cris_sigtramp_frame_prev_register (struct frame_info *next_frame,
void **this_cache,
int regnum, int *optimizedp,
enum lval_type *lvalp, CORE_ADDR *addrp,
- int *realnump, void *valuep)
+ int *realnump, gdb_byte *valuep)
{
/* Make sure we've initialized the cache. */
cris_sigtramp_frame_unwind_cache (next_frame, this_cache);
@@ -834,7 +834,7 @@ cris_frame_prev_register (struct frame_info *next_frame,
void **this_prologue_cache,
int regnum, int *optimizedp,
enum lval_type *lvalp, CORE_ADDR *addrp,
- int *realnump, void *bufferp)
+ int *realnump, gdb_byte *bufferp)
{
struct cris_unwind_cache *info
= cris_frame_unwind_cache (next_frame, this_prologue_cache);
@@ -989,7 +989,8 @@ cris_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
return sp;
}
-static const struct frame_unwind cris_frame_unwind = {
+static const struct frame_unwind cris_frame_unwind =
+{
NORMAL_FRAME,
cris_frame_this_id,
cris_frame_prev_register
@@ -1009,7 +1010,8 @@ cris_frame_base_address (struct frame_info *next_frame, void **this_cache)
return info->base;
}
-static const struct frame_base cris_frame_base = {
+static const struct frame_base cris_frame_base =
+{
&cris_frame_unwind,
cris_frame_base_address,
cris_frame_base_address,
@@ -1848,8 +1850,8 @@ cris_extract_return_value (struct type *type, struct regcache *regcache,
static enum return_value_convention
cris_return_value (struct gdbarch *gdbarch, struct type *type,
- struct regcache *regcache, void *readbuf,
- const void *writebuf)
+ struct regcache *regcache, gdb_byte *readbuf,
+ const gdb_byte *writebuf)
{
if (TYPE_CODE (type) == TYPE_CODE_STRUCT
|| TYPE_CODE (type) == TYPE_CODE_UNION