From d1a8e808facd1ad8101d65425c20621f5df2a780 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 17 Sep 2002 15:54:26 +0000 Subject: [PATCH] * 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. --- gdb/ChangeLog | 8 ++++++++ gdb/MAINTAINERS | 1 - gdb/h8300-tdep.c | 22 +++++++++++----------- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 92bb3ff..40cae6c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2002-09-17 Corinna Vinschen + + * 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. + 2002-09-16 Joel Brobecker * osfsolib.c: Remove file, replaced by solib-osf.c. diff --git a/gdb/MAINTAINERS b/gdb/MAINTAINERS index 0eb3f24..87f871f 100644 --- a/gdb/MAINTAINERS +++ b/gdb/MAINTAINERS @@ -82,7 +82,6 @@ maintainer works with the native maintainer when resolving API issues. h8300 --target=h8300hms -Werror Maintenance only - Not multi-arch, work in progress h8500 --target=h8500hms -Werror Maintenance only diff --git a/gdb/h8300-tdep.c b/gdb/h8300-tdep.c index cd62799..be55327 100644 --- a/gdb/h8300-tdep.c +++ b/gdb/h8300-tdep.c @@ -269,7 +269,7 @@ gdb_print_insn_h8300 (bfd_vma memaddr, disassemble_info * info) 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_ADDR ip, register CORE_ADDR limit, 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_ADDR ip, register CORE_ADDR limit, 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_ADDR ip, register CORE_ADDR limit, 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_ADDR ip, register CORE_ADDR limit, { 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_ADDR ip, register CORE_ADDR limit, 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_ADDR ip, register CORE_ADDR limit, 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_ADDR ip, register CORE_ADDR limit, 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_ADDR ip, register CORE_ADDR limit, 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++) -- 2.7.4