This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
[PATCH] Multiarched H8/300, addendum
- From: Corinna Vinschen <vinschen at redhat dot com>
- To: gdb-patches at sources dot redhat dot com
- Date: Tue, 17 Sep 2002 17:54:34 +0200
- Subject: [PATCH] Multiarched H8/300, addendum
- Reply-to: gdb-patches at sources dot redhat dot com
Hi,
this one slipped through. I forgot to rename NEXT_PROLOGUE_INSN and
the appropriate change to MAINTAINERS.
Corinna
ChangeLog:
* MAINTAINERS: Remove "non multi-arched" text from h8300.
* h8300-tdep.c (h8300_next_prologue_insn) Renamed from
NEXT_PROLOGUE_INSN.
(h8300_examine_prologue): Call h8300_next_prologue_insn instead of
NEXT_PROLOGUE_INSN.
Index: MAINTAINERS
===================================================================
RCS file: /cvs/src/src/gdb/MAINTAINERS,v
retrieving revision 1.201
diff -u -p -r1.201 MAINTAINERS
--- MAINTAINERS 12 Sep 2002 08:39:26 -0000 1.201
+++ MAINTAINERS 17 Sep 2002 15:53:35 -0000
@@ -82,7 +82,6 @@ maintainer works with the native maintai
h8300 --target=h8300hms -Werror
Maintenance only
- Not multi-arch, work in progress
h8500 --target=h8500hms -Werror
Maintenance only
Index: h8300-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/h8300-tdep.c,v
retrieving revision 1.16
diff -u -p -r1.16 h8300-tdep.c
--- h8300-tdep.c 16 Sep 2002 15:03:17 -0000 1.16
+++ h8300-tdep.c 17 Sep 2002 15:53:36 -0000
@@ -269,7 +269,7 @@ gdb_print_insn_h8300 (bfd_vma memaddr, d
of the instruction. */
static CORE_ADDR
-NEXT_PROLOGUE_INSN (CORE_ADDR addr, CORE_ADDR lim, unsigned short* pword1)
+h8300_next_prologue_insn (CORE_ADDR addr, CORE_ADDR lim, unsigned short* pword1)
{
char buf[2];
if (addr < lim + 8)
@@ -335,7 +335,7 @@ h8300_examine_prologue (register CORE_AD
if (ip == 0 || ip & (h8300hmode ? ~0xffffff : ~0xffff))
return 0;
- next_ip = NEXT_PROLOGUE_INSN (ip, limit, &insn_word);
+ next_ip = h8300_next_prologue_insn (ip, limit, &insn_word);
if (insn_word == 0x0100)
{
@@ -350,7 +350,7 @@ h8300_examine_prologue (register CORE_AD
ip = next_ip + adjust;
in_frame[insn_word & 0x7] = reg_save_depth;
- next_ip = NEXT_PROLOGUE_INSN (ip, limit, &insn_word);
+ next_ip = h8300_next_prologue_insn (ip, limit, &insn_word);
reg_save_depth += 2 + adjust;
}
@@ -358,7 +358,7 @@ h8300_examine_prologue (register CORE_AD
if (next_ip && IS_MOV_SP_FP (insn_word))
{
ip = next_ip;
- next_ip = NEXT_PROLOGUE_INSN (ip, limit, &insn_word);
+ next_ip = h8300_next_prologue_insn (ip, limit, &insn_word);
have_fp = 1;
}
@@ -371,7 +371,7 @@ h8300_examine_prologue (register CORE_AD
{
auto_depth += IS_SUB2_SP (insn_word) ? 2 : 4;
ip = next_ip;
- next_ip = NEXT_PROLOGUE_INSN (ip, limit, &insn_word);
+ next_ip = h8300_next_prologue_insn (ip, limit, &insn_word);
}
}
else
@@ -379,10 +379,10 @@ h8300_examine_prologue (register CORE_AD
if (next_ip && IS_MOVK_R5 (insn_word))
{
ip = next_ip;
- next_ip = NEXT_PROLOGUE_INSN (ip, limit, &insn_word);
+ next_ip = h8300_next_prologue_insn (ip, limit, &insn_word);
auto_depth += insn_word;
- next_ip = NEXT_PROLOGUE_INSN (next_ip, limit, &insn_word);
+ next_ip = h8300_next_prologue_insn (next_ip, limit, &insn_word);
auto_depth += insn_word;
}
if (next_ip && IS_SUBL_SP (insn_word))
@@ -391,7 +391,7 @@ h8300_examine_prologue (register CORE_AD
auto_depth += read_memory_unsigned_integer (ip, 4);
ip += 4;
- next_ip = NEXT_PROLOGUE_INSN (ip, limit, &insn_word);
+ next_ip = h8300_next_prologue_insn (ip, limit, &insn_word);
}
}
@@ -406,14 +406,14 @@ h8300_examine_prologue (register CORE_AD
if (insn_word == 0x0100)
{
ip = next_ip;
- next_ip = NEXT_PROLOGUE_INSN (ip, limit, &insn_word);
+ next_ip = h8300_next_prologue_insn (ip, limit, &insn_word);
adjust = 2;
}
if (IS_PUSH (insn_word))
{
ip = next_ip;
- next_ip = NEXT_PROLOGUE_INSN (ip, limit, &insn_word);
+ next_ip = h8300_next_prologue_insn (ip, limit, &insn_word);
fsr[r] = after_prolog_fp + auto_depth;
auto_depth += 2 + adjust;
continue;
@@ -426,7 +426,7 @@ h8300_examine_prologue (register CORE_AD
int start, i;
ip = next_ip;
- next_ip = NEXT_PROLOGUE_INSN (ip, limit, &insn_word);
+ next_ip = h8300_next_prologue_insn (ip, limit, &insn_word);
start = insn_word & 0x7;
for (i = start; i <= start + count; i++)
--
Corinna Vinschen
Cygwin Developer
Red Hat, Inc.
mailto:vinschen@redhat.com