espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-10-16 20:32:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

* gdbcore.h (read_memory_nobpt): New function name instead of

Browse Source 
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.
This commit is contained in:
Joel Brobecker
2006-08-08 21:32:48 +00:00
parent 3841debee7
commit 359a926234
13 changed files with 47 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gdb/ChangeLog
View File

@ -1,3 +1,22 @@
2006-08-08 Joel Brobecker <brobecker@adacore.com>
* 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 <dan@codesourcery.com> 2006-08-08 Daniel Jacobowitz <dan@codesourcery.com>
* configure.ac: Check for expat. * configure.ac: Check for expat.

2
gdb/alpha-tdep.c
View File

@ -644,7 +644,7 @@ alpha_read_insn (CORE_ADDR pc)
char buf[4]; char buf[4];
int status; int status;
status = deprecated_read_memory_nobpt (pc, buf, 4); status = read_memory_nobpt (pc, buf, 4);
if (status) if (status)
memory_error (status, pc); memory_error (status, pc);
return extract_unsigned_integer (buf, 4); return extract_unsigned_integer (buf, 4);

4
gdb/alphanbsd-tdep.c
View File

@ -217,7 +217,7 @@ alphanbsd_sigtramp_offset (CORE_ADDR pc)
LONGEST off; LONGEST off;
int i; int i;
if (deprecated_read_memory_nobpt (pc, (char *) w, 4) != 0) if (read_memory_nobpt (pc, (char *) w, 4) != 0)
return -1; return -1;
for (i = 0; i < RETCODE_NWORDS; i++) for (i = 0; i < RETCODE_NWORDS; i++)
@ -231,7 +231,7 @@ alphanbsd_sigtramp_offset (CORE_ADDR pc)
off = i * 4; off = i * 4;
pc -= off; 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; return -1;
if (memcmp (ret, sigtramp_retcode, RETCODE_SIZE) == 0) if (memcmp (ret, sigtramp_retcode, RETCODE_SIZE) == 0)

7
gdb/breakpoint.c
View File

@ -639,8 +639,7 @@ commands_command (char *arg, int from_tty)
shadow contents, not the breakpoints themselves. From breakpoint.c. */ shadow contents, not the breakpoints themselves. From breakpoint.c. */
int int
deprecated_read_memory_nobpt (CORE_ADDR memaddr, gdb_byte *myaddr, read_memory_nobpt (CORE_ADDR memaddr, gdb_byte *myaddr, unsigned len)
unsigned len)
{ {
int status; int status;
struct bp_location *b; struct bp_location *b;
@ -702,7 +701,7 @@ deprecated_read_memory_nobpt (CORE_ADDR memaddr, gdb_byte *myaddr,
if (bp_addr > memaddr) if (bp_addr > memaddr)
{ {
/* Copy the section of memory before the breakpoint. */ /* 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) if (status != 0)
return status; return status;
} }
@ -710,7 +709,7 @@ deprecated_read_memory_nobpt (CORE_ADDR memaddr, gdb_byte *myaddr,
if (bp_addr + bp_size < memaddr + len) if (bp_addr + bp_size < memaddr + len)
{ {
/* Copy the section of memory after the breakpoint. */ /* 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, myaddr + bp_addr + bp_size - memaddr,
memaddr + len - (bp_addr + bp_size)); memaddr + len - (bp_addr + bp_size));
if (status != 0) if (status != 0)

4
gdb/frame.c
View File

@ -1514,8 +1514,8 @@ int
safe_frame_unwind_memory (struct frame_info *this_frame, safe_frame_unwind_memory (struct frame_info *this_frame,
CORE_ADDR addr, gdb_byte *buf, int len) CORE_ADDR addr, gdb_byte *buf, int len)
{ {
/* NOTE: deprecated_read_memory_nobpt returns zero on success! */ /* NOTE: read_memory_nobpt returns zero on success! */
return !deprecated_read_memory_nobpt (addr, buf, len); return !read_memory_nobpt (addr, buf, len);
} }
/* Architecture method. */ /* Architecture method. */

2
gdb/frv-tdep.c
View File

@ -457,7 +457,7 @@ frv_gdbarch_adjust_breakpoint_address (struct gdbarch *gdbarch, CORE_ADDR bpaddr
char instr[frv_instr_size]; char instr[frv_instr_size];
int status; int status;
status = deprecated_read_memory_nobpt (addr, instr, sizeof instr); status = read_memory_nobpt (addr, instr, sizeof instr);
if (status != 0) if (status != 0)
break; break;

4
gdb/gdbcore.h
View File

@ -49,8 +49,8 @@ extern int have_core_file_p (void);
the get_frame_memory methods, code reading from an exec can use the the get_frame_memory methods, code reading from an exec can use the
target methods. */ target methods. */
extern int deprecated_read_memory_nobpt (CORE_ADDR memaddr, gdb_byte *myaddr, extern int read_memory_nobpt (CORE_ADDR memaddr, gdb_byte *myaddr,
unsigned len); unsigned len);
/* Report a memory error with error(). */ /* Report a memory error with error(). */

2
gdb/hppa-linux-tdep.c
View File

@ -102,7 +102,7 @@ insns_match_pattern (CORE_ADDR pc,
{ {
char buf[4]; char buf[4];
deprecated_read_memory_nobpt (npc, buf, 4); read_memory_nobpt (npc, buf, 4);
insn[i] = extract_unsigned_integer (buf, 4); insn[i] = extract_unsigned_integer (buf, 4);
if ((insn[i] & pattern[i].mask) == pattern[i].data) if ((insn[i] & pattern[i].mask) == pattern[i].data)
npc += 4; npc += 4;

14
gdb/hppa-tdep.c
View File

@ -549,7 +549,7 @@ hppa_in_function_epilogue_p (struct gdbarch *gdbarch, CORE_ADDR pc)
char buf[4]; char buf[4];
int off; int off;
status = deprecated_read_memory_nobpt (pc, buf, 4); status = read_memory_nobpt (pc, buf, 4);
if (status != 0) if (status != 0)
return 0; return 0;
@ -1555,7 +1555,7 @@ restart:
old_save_sp = save_sp; old_save_sp = save_sp;
old_stack_remaining = stack_remaining; 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); inst = extract_unsigned_integer (buf, 4);
/* Yow! */ /* Yow! */
@ -1604,7 +1604,7 @@ restart:
while (reg_num >= (TARGET_PTR_BIT == 64 ? 19 : 23) && reg_num <= 26) while (reg_num >= (TARGET_PTR_BIT == 64 ? 19 : 23) && reg_num <= 26)
{ {
pc += 4; pc += 4;
status = deprecated_read_memory_nobpt (pc, buf, 4); status = read_memory_nobpt (pc, buf, 4);
inst = extract_unsigned_integer (buf, 4); inst = extract_unsigned_integer (buf, 4);
if (status != 0) if (status != 0)
return pc; return pc;
@ -1617,7 +1617,7 @@ restart:
reg_num = inst_saves_fr (inst); reg_num = inst_saves_fr (inst);
save_fr &= ~(1 << reg_num); 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); next_inst = extract_unsigned_integer (buf, 4);
/* Yow! */ /* Yow! */
@ -1644,13 +1644,13 @@ restart:
while (reg_num >= 4 && reg_num <= (TARGET_PTR_BIT == 64 ? 11 : 7)) while (reg_num >= 4 && reg_num <= (TARGET_PTR_BIT == 64 ? 11 : 7))
{ {
pc += 8; pc += 8;
status = deprecated_read_memory_nobpt (pc, buf, 4); status = read_memory_nobpt (pc, buf, 4);
inst = extract_unsigned_integer (buf, 4); inst = extract_unsigned_integer (buf, 4);
if (status != 0) if (status != 0)
return pc; return pc;
if ((inst & 0xfc000000) != 0x34000000) if ((inst & 0xfc000000) != 0x34000000)
break; 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); next_inst = extract_unsigned_integer (buf, 4);
if (status != 0) if (status != 0)
return pc; return pc;
@ -2855,7 +2855,7 @@ hppa_match_insns (CORE_ADDR pc, struct insn_pattern *pattern,
{ {
gdb_byte buf[HPPA_INSN_SIZE]; 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); insn[i] = extract_unsigned_integer (buf, HPPA_INSN_SIZE);
if ((insn[i] & pattern[i].mask) == pattern[i].data) if ((insn[i] & pattern[i].mask) == pattern[i].data)
npc += 4; npc += 4;

2
gdb/i386-linux-nat.c
View File

@ -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. */ that's about to be restored, and set the trace flag there. */
/* First check if PC is at a system call. */ /* 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) && memcmp (buf, linux_syscall, LINUX_SYSCALL_LEN) == 0)
{ {
int syscall = read_register_pid (LINUX_SYSCALL_REGNUM, int syscall = read_register_pid (LINUX_SYSCALL_REGNUM,

2
gdb/m68klinux-tdep.c
View File

@ -68,7 +68,7 @@ m68k_linux_pc_in_sigtramp (CORE_ADDR pc, char *name)
char buf[12]; char buf[12];
unsigned long insn0, insn1, insn2; 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; return 0;
insn1 = extract_unsigned_integer (buf + 4, 4); insn1 = extract_unsigned_integer (buf + 4, 4);
insn2 = extract_unsigned_integer (buf + 8, 4); insn2 = extract_unsigned_integer (buf + 8, 4);

2
gdb/mips-tdep.c
View File

@ -858,7 +858,7 @@ mips_fetch_instruction (CORE_ADDR addr)
} }
else else
instlen = MIPS_INSN32_SIZE; instlen = MIPS_INSN32_SIZE;
status = deprecated_read_memory_nobpt (addr, buf, instlen); status = read_memory_nobpt (addr, buf, instlen);
if (status) if (status)
memory_error (status, addr); memory_error (status, addr);
return extract_unsigned_integer (buf, instlen); return extract_unsigned_integer (buf, instlen);

12
gdb/s390-tdep.c
View File

@ -567,12 +567,12 @@ s390_readinstruction (bfd_byte instr[], CORE_ADDR at)
static int s390_instrlen[] = { 2, 4, 4, 6 }; static int s390_instrlen[] = { 2, 4, 4, 6 };
int instrlen; int instrlen;
if (deprecated_read_memory_nobpt (at, &instr[0], 2)) if (read_memory_nobpt (at, &instr[0], 2))
return -1; return -1;
instrlen = s390_instrlen[instr[0] >> 6]; instrlen = s390_instrlen[instr[0] >> 6];
if (instrlen > 2) 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 -1;
} }
return instrlen; return instrlen;
@ -1196,19 +1196,19 @@ s390_in_function_epilogue_p (struct gdbarch *gdbarch, CORE_ADDR pc)
int d2; int d2;
if (word_size == 4 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) && is_rs (insn, op_lm, &r1, &r3, &d2, &b2)
&& r3 == S390_SP_REGNUM - S390_R0_REGNUM) && r3 == S390_SP_REGNUM - S390_R0_REGNUM)
return 1; return 1;
if (word_size == 4 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) && is_rsy (insn, op1_lmy, op2_lmy, &r1, &r3, &d2, &b2)
&& r3 == S390_SP_REGNUM - S390_R0_REGNUM) && r3 == S390_SP_REGNUM - S390_R0_REGNUM)
return 1; return 1;
if (word_size == 8 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) && is_rsy (insn, op1_lmg, op2_lmg, &r1, &r3, &d2, &b2)
&& r3 == S390_SP_REGNUM - S390_R0_REGNUM) && r3 == S390_SP_REGNUM - S390_R0_REGNUM)
return 1; return 1;
@ -1721,7 +1721,7 @@ s390_sigtramp_frame_sniffer (struct frame_info *next_frame)
CORE_ADDR pc = frame_pc_unwind (next_frame); CORE_ADDR pc = frame_pc_unwind (next_frame);
bfd_byte sigreturn[2]; bfd_byte sigreturn[2];
if (deprecated_read_memory_nobpt (pc, sigreturn, 2)) if (read_memory_nobpt (pc, sigreturn, 2))
return NULL; return NULL;
if (sigreturn[0] != 0x0a /* svc */) if (sigreturn[0] != 0x0a /* svc */)