From 359a926234e5b72f99e7e60d46b4886b5c9af0b2 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Tue, 8 Aug 2006 21:32:48 +0000 Subject: [PATCH] * gdbcore.h (read_memory_nobpt): New function name instead of deprecated_read_memory_nobpt. * breakpoint.c (read_memory_nobpt): New function name instead of deprecated_read_memory_nobpt. Adjust calls to old deprecated_read_memory_nobpt accordingly. * alpha-tdep.c: Adjust calls to deprecated_read_memory_nobpt accordingly. * alphanbsd-tdep.c: Likewise. * frame.c: Likewise. * frv-tdep.c: Likewise. * hppa-linux-tdep.c: Likewise. * hppa-tdep.c: Likewise. * i386-linux-nat.c: Likewise. * m68klinux-tdep.c: Likewise. * mips-tdep.c: Likewise. * s390-tdep.c: Likewise. --- gdb/ChangeLog | 19 +++++++++++++++++++ gdb/alpha-tdep.c | 2 +- gdb/alphanbsd-tdep.c | 4 ++-- gdb/breakpoint.c | 7 +++---- gdb/frame.c | 4 ++-- gdb/frv-tdep.c | 2 +- gdb/gdbcore.h | 4 ++-- gdb/hppa-linux-tdep.c | 2 +- gdb/hppa-tdep.c | 14 +++++++------- gdb/i386-linux-nat.c | 2 +- gdb/m68klinux-tdep.c | 2 +- gdb/mips-tdep.c | 2 +- gdb/s390-tdep.c | 12 ++++++------ 13 files changed, 47 insertions(+), 29 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 74c8f36..ac95a7b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,22 @@ +2006-08-08 Joel Brobecker + + * gdbcore.h (read_memory_nobpt): New function name instead of + deprecated_read_memory_nobpt. + * breakpoint.c (read_memory_nobpt): New function name instead + of deprecated_read_memory_nobpt. + Adjust calls to old deprecated_read_memory_nobpt accordingly. + * alpha-tdep.c: Adjust calls to deprecated_read_memory_nobpt + accordingly. + * alphanbsd-tdep.c: Likewise. + * frame.c: Likewise. + * frv-tdep.c: Likewise. + * hppa-linux-tdep.c: Likewise. + * hppa-tdep.c: Likewise. + * i386-linux-nat.c: Likewise. + * m68klinux-tdep.c: Likewise. + * mips-tdep.c: Likewise. + * s390-tdep.c: Likewise. + 2006-08-08 Daniel Jacobowitz * configure.ac: Check for expat. diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c index afe1d2f..da803fb 100644 --- a/gdb/alpha-tdep.c +++ b/gdb/alpha-tdep.c @@ -644,7 +644,7 @@ alpha_read_insn (CORE_ADDR pc) char buf[4]; int status; - status = deprecated_read_memory_nobpt (pc, buf, 4); + status = read_memory_nobpt (pc, buf, 4); if (status) memory_error (status, pc); return extract_unsigned_integer (buf, 4); diff --git a/gdb/alphanbsd-tdep.c b/gdb/alphanbsd-tdep.c index d0dbae4..05c5906 100644 --- a/gdb/alphanbsd-tdep.c +++ b/gdb/alphanbsd-tdep.c @@ -217,7 +217,7 @@ alphanbsd_sigtramp_offset (CORE_ADDR pc) LONGEST off; int i; - if (deprecated_read_memory_nobpt (pc, (char *) w, 4) != 0) + if (read_memory_nobpt (pc, (char *) w, 4) != 0) return -1; for (i = 0; i < RETCODE_NWORDS; i++) @@ -231,7 +231,7 @@ alphanbsd_sigtramp_offset (CORE_ADDR pc) off = i * 4; pc -= off; - if (deprecated_read_memory_nobpt (pc, (char *) ret, sizeof (ret)) != 0) + if (read_memory_nobpt (pc, (char *) ret, sizeof (ret)) != 0) return -1; if (memcmp (ret, sigtramp_retcode, RETCODE_SIZE) == 0) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index dcf33e3..95ab4f9 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -639,8 +639,7 @@ commands_command (char *arg, int from_tty) shadow contents, not the breakpoints themselves. From breakpoint.c. */ int -deprecated_read_memory_nobpt (CORE_ADDR memaddr, gdb_byte *myaddr, - unsigned len) +read_memory_nobpt (CORE_ADDR memaddr, gdb_byte *myaddr, unsigned len) { int status; struct bp_location *b; @@ -702,7 +701,7 @@ deprecated_read_memory_nobpt (CORE_ADDR memaddr, gdb_byte *myaddr, if (bp_addr > memaddr) { /* Copy the section of memory before the breakpoint. */ - status = deprecated_read_memory_nobpt (memaddr, myaddr, bp_addr - memaddr); + status = read_memory_nobpt (memaddr, myaddr, bp_addr - memaddr); if (status != 0) return status; } @@ -710,7 +709,7 @@ deprecated_read_memory_nobpt (CORE_ADDR memaddr, gdb_byte *myaddr, if (bp_addr + bp_size < memaddr + len) { /* Copy the section of memory after the breakpoint. */ - status = deprecated_read_memory_nobpt (bp_addr + bp_size, + status = read_memory_nobpt (bp_addr + bp_size, myaddr + bp_addr + bp_size - memaddr, memaddr + len - (bp_addr + bp_size)); if (status != 0) diff --git a/gdb/frame.c b/gdb/frame.c index 19141ff..13b57ad 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -1514,8 +1514,8 @@ int safe_frame_unwind_memory (struct frame_info *this_frame, CORE_ADDR addr, gdb_byte *buf, int len) { - /* NOTE: deprecated_read_memory_nobpt returns zero on success! */ - return !deprecated_read_memory_nobpt (addr, buf, len); + /* NOTE: read_memory_nobpt returns zero on success! */ + return !read_memory_nobpt (addr, buf, len); } /* Architecture method. */ diff --git a/gdb/frv-tdep.c b/gdb/frv-tdep.c index 4f9aadc..26685c5 100644 --- a/gdb/frv-tdep.c +++ b/gdb/frv-tdep.c @@ -457,7 +457,7 @@ frv_gdbarch_adjust_breakpoint_address (struct gdbarch *gdbarch, CORE_ADDR bpaddr char instr[frv_instr_size]; int status; - status = deprecated_read_memory_nobpt (addr, instr, sizeof instr); + status = read_memory_nobpt (addr, instr, sizeof instr); if (status != 0) break; diff --git a/gdb/gdbcore.h b/gdb/gdbcore.h index d72a17b..b00ba9d 100644 --- a/gdb/gdbcore.h +++ b/gdb/gdbcore.h @@ -49,8 +49,8 @@ extern int have_core_file_p (void); the get_frame_memory methods, code reading from an exec can use the target methods. */ -extern int deprecated_read_memory_nobpt (CORE_ADDR memaddr, gdb_byte *myaddr, - unsigned len); +extern int read_memory_nobpt (CORE_ADDR memaddr, gdb_byte *myaddr, + unsigned len); /* Report a memory error with error(). */ diff --git a/gdb/hppa-linux-tdep.c b/gdb/hppa-linux-tdep.c index c5d23f9..eb5e858 100644 --- a/gdb/hppa-linux-tdep.c +++ b/gdb/hppa-linux-tdep.c @@ -102,7 +102,7 @@ insns_match_pattern (CORE_ADDR pc, { char buf[4]; - deprecated_read_memory_nobpt (npc, buf, 4); + read_memory_nobpt (npc, buf, 4); insn[i] = extract_unsigned_integer (buf, 4); if ((insn[i] & pattern[i].mask) == pattern[i].data) npc += 4; diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c index 50dac1b..8401bef 100644 --- a/gdb/hppa-tdep.c +++ b/gdb/hppa-tdep.c @@ -549,7 +549,7 @@ hppa_in_function_epilogue_p (struct gdbarch *gdbarch, CORE_ADDR pc) char buf[4]; int off; - status = deprecated_read_memory_nobpt (pc, buf, 4); + status = read_memory_nobpt (pc, buf, 4); if (status != 0) return 0; @@ -1555,7 +1555,7 @@ restart: old_save_sp = save_sp; old_stack_remaining = stack_remaining; - status = deprecated_read_memory_nobpt (pc, buf, 4); + status = read_memory_nobpt (pc, buf, 4); inst = extract_unsigned_integer (buf, 4); /* Yow! */ @@ -1604,7 +1604,7 @@ restart: while (reg_num >= (TARGET_PTR_BIT == 64 ? 19 : 23) && reg_num <= 26) { pc += 4; - status = deprecated_read_memory_nobpt (pc, buf, 4); + status = read_memory_nobpt (pc, buf, 4); inst = extract_unsigned_integer (buf, 4); if (status != 0) return pc; @@ -1617,7 +1617,7 @@ restart: reg_num = inst_saves_fr (inst); save_fr &= ~(1 << reg_num); - status = deprecated_read_memory_nobpt (pc + 4, buf, 4); + status = read_memory_nobpt (pc + 4, buf, 4); next_inst = extract_unsigned_integer (buf, 4); /* Yow! */ @@ -1644,13 +1644,13 @@ restart: while (reg_num >= 4 && reg_num <= (TARGET_PTR_BIT == 64 ? 11 : 7)) { pc += 8; - status = deprecated_read_memory_nobpt (pc, buf, 4); + status = read_memory_nobpt (pc, buf, 4); inst = extract_unsigned_integer (buf, 4); if (status != 0) return pc; if ((inst & 0xfc000000) != 0x34000000) break; - status = deprecated_read_memory_nobpt (pc + 4, buf, 4); + status = read_memory_nobpt (pc + 4, buf, 4); next_inst = extract_unsigned_integer (buf, 4); if (status != 0) return pc; @@ -2855,7 +2855,7 @@ hppa_match_insns (CORE_ADDR pc, struct insn_pattern *pattern, { gdb_byte buf[HPPA_INSN_SIZE]; - deprecated_read_memory_nobpt (npc, buf, HPPA_INSN_SIZE); + read_memory_nobpt (npc, buf, HPPA_INSN_SIZE); insn[i] = extract_unsigned_integer (buf, HPPA_INSN_SIZE); if ((insn[i] & pattern[i].mask) == pattern[i].data) npc += 4; diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c index 05501e2..5302282 100644 --- a/gdb/i386-linux-nat.c +++ b/gdb/i386-linux-nat.c @@ -785,7 +785,7 @@ i386_linux_resume (ptid_t ptid, int step, enum target_signal signal) that's about to be restored, and set the trace flag there. */ /* First check if PC is at a system call. */ - if (deprecated_read_memory_nobpt (pc, buf, LINUX_SYSCALL_LEN) == 0 + if (read_memory_nobpt (pc, buf, LINUX_SYSCALL_LEN) == 0 && memcmp (buf, linux_syscall, LINUX_SYSCALL_LEN) == 0) { int syscall = read_register_pid (LINUX_SYSCALL_REGNUM, diff --git a/gdb/m68klinux-tdep.c b/gdb/m68klinux-tdep.c index dad68c4..fb0fd20 100644 --- a/gdb/m68klinux-tdep.c +++ b/gdb/m68klinux-tdep.c @@ -68,7 +68,7 @@ m68k_linux_pc_in_sigtramp (CORE_ADDR pc, char *name) char buf[12]; unsigned long insn0, insn1, insn2; - if (deprecated_read_memory_nobpt (pc - 4, buf, sizeof (buf))) + if (read_memory_nobpt (pc - 4, buf, sizeof (buf))) return 0; insn1 = extract_unsigned_integer (buf + 4, 4); insn2 = extract_unsigned_integer (buf + 8, 4); diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index 0a63e4f..19f0e0d 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -858,7 +858,7 @@ mips_fetch_instruction (CORE_ADDR addr) } else instlen = MIPS_INSN32_SIZE; - status = deprecated_read_memory_nobpt (addr, buf, instlen); + status = read_memory_nobpt (addr, buf, instlen); if (status) memory_error (status, addr); return extract_unsigned_integer (buf, instlen); diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c index b7b372d..2fc939f 100644 --- a/gdb/s390-tdep.c +++ b/gdb/s390-tdep.c @@ -567,12 +567,12 @@ s390_readinstruction (bfd_byte instr[], CORE_ADDR at) static int s390_instrlen[] = { 2, 4, 4, 6 }; int instrlen; - if (deprecated_read_memory_nobpt (at, &instr[0], 2)) + if (read_memory_nobpt (at, &instr[0], 2)) return -1; instrlen = s390_instrlen[instr[0] >> 6]; if (instrlen > 2) { - if (deprecated_read_memory_nobpt (at + 2, &instr[2], instrlen - 2)) + if (read_memory_nobpt (at + 2, &instr[2], instrlen - 2)) return -1; } return instrlen; @@ -1196,19 +1196,19 @@ s390_in_function_epilogue_p (struct gdbarch *gdbarch, CORE_ADDR pc) int d2; if (word_size == 4 - && !deprecated_read_memory_nobpt (pc - 4, insn, 4) + && !read_memory_nobpt (pc - 4, insn, 4) && is_rs (insn, op_lm, &r1, &r3, &d2, &b2) && r3 == S390_SP_REGNUM - S390_R0_REGNUM) return 1; if (word_size == 4 - && !deprecated_read_memory_nobpt (pc - 6, insn, 6) + && !read_memory_nobpt (pc - 6, insn, 6) && is_rsy (insn, op1_lmy, op2_lmy, &r1, &r3, &d2, &b2) && r3 == S390_SP_REGNUM - S390_R0_REGNUM) return 1; if (word_size == 8 - && !deprecated_read_memory_nobpt (pc - 6, insn, 6) + && !read_memory_nobpt (pc - 6, insn, 6) && is_rsy (insn, op1_lmg, op2_lmg, &r1, &r3, &d2, &b2) && r3 == S390_SP_REGNUM - S390_R0_REGNUM) return 1; @@ -1721,7 +1721,7 @@ s390_sigtramp_frame_sniffer (struct frame_info *next_frame) CORE_ADDR pc = frame_pc_unwind (next_frame); bfd_byte sigreturn[2]; - if (deprecated_read_memory_nobpt (pc, sigreturn, 2)) + if (read_memory_nobpt (pc, sigreturn, 2)) return NULL; if (sigreturn[0] != 0x0a /* svc */) -- 2.7.4