darlinghq/darling-gdb
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-gdb.git synced 2025-01-31 14:04:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* i386-tdep.c (i386_follow_jump): Use read_memory_nobpt to read

Browse Source 
instructions.
        (i386_analyze_struct_return): Likewise.
        (i386_skip_probe): Likewise.
        (i386_match_insn): Likewise.
        (i386_analyze_frame_setup): Likewise.
        (i386_analyze_register_saves): Likewise.
        (i386_skip_prologue): Likewise.
This commit is contained in:
Joel Brobecker 2006-08-08 21:36:46 +00:00
parent 359a926234
commit 24a2a65414
2 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gdb/ChangeLog
View File

@ -1,3 +1,14 @@
2006-08-08 Joel Brobecker <brobecker@adacore.com>
* i386-tdep.c (i386_follow_jump): Use read_memory_nobpt to read
instructions.
(i386_analyze_struct_return): Likewise.
(i386_skip_probe): Likewise.
(i386_match_insn): Likewise.
(i386_analyze_frame_setup): Likewise.
(i386_analyze_register_saves): Likewise.
(i386_skip_prologue): Likewise.
2006-08-08 Joel Brobecker <brobecker@adacore.com> 2006-08-08 Joel Brobecker <brobecker@adacore.com>
* gdbcore.h (read_memory_nobpt): New function name instead of * gdbcore.h (read_memory_nobpt): New function name instead of

26
gdb/i386-tdep.c
View File

@ -354,7 +354,7 @@ i386_follow_jump (CORE_ADDR pc)
long delta = 0; long delta = 0;
int data16 = 0; int data16 = 0;
op = read_memory_unsigned_integer (pc, 1); read_memory_nobpt (pc, &op, 1);
if (op == 0x66) if (op == 0x66)
{ {
data16 = 1; data16 = 1;
@ -420,12 +420,12 @@ i386_analyze_struct_return (CORE_ADDR pc, CORE_ADDR current_pc,
if (current_pc <= pc) if (current_pc <= pc)
return pc; return pc;
op = read_memory_unsigned_integer (pc, 1); read_memory_nobpt (pc, &op, 1);
if (op != 0x58) /* popl %eax */ if (op != 0x58) /* popl %eax */
return pc; return pc;
read_memory (pc + 1, buf, 4); read_memory_nobpt (pc + 1, buf, 4);
if (memcmp (buf, proto1, 3) != 0 && memcmp (buf, proto2, 4) != 0) if (memcmp (buf, proto1, 3) != 0 && memcmp (buf, proto2, 4) != 0)
return pc; return pc;
@ -464,7 +464,7 @@ i386_skip_probe (CORE_ADDR pc)
gdb_byte buf[8]; gdb_byte buf[8];
gdb_byte op; gdb_byte op;
op = read_memory_unsigned_integer (pc, 1); read_memory_nobpt (pc, &op, 1);
if (op == 0x68 || op == 0x6a) if (op == 0x68 || op == 0x6a)
{ {
@ -535,7 +535,7 @@ i386_match_insn (CORE_ADDR pc, struct i386_insn *skip_insns)
struct i386_insn *insn; struct i386_insn *insn;
gdb_byte op; gdb_byte op;
op = read_memory_unsigned_integer (pc, 1); read_memory_nobpt (pc, &op, 1);
for (insn = skip_insns; insn->len > 0; insn++) for (insn = skip_insns; insn->len > 0; insn++)
{ {
@ -548,7 +548,7 @@ i386_match_insn (CORE_ADDR pc, struct i386_insn *skip_insns)
gdb_assert (insn->len > 1); gdb_assert (insn->len > 1);
gdb_assert (insn->len <= I386_MAX_INSN_LEN); gdb_assert (insn->len <= I386_MAX_INSN_LEN);
read_memory (pc + 1, buf, insn->len - 1); read_memory_nobpt (pc + 1, buf, insn->len - 1);
for (i = 1; i < insn->len; i++) for (i = 1; i < insn->len; i++)
{ {
if ((buf[i - 1] & insn->mask[i]) != insn->insn[i]) if ((buf[i - 1] & insn->mask[i]) != insn->insn[i])
@ -634,7 +634,7 @@ i386_analyze_frame_setup (CORE_ADDR pc, CORE_ADDR limit,
if (limit <= pc) if (limit <= pc)
return limit; return limit;
op = read_memory_unsigned_integer (pc, 1); read_memory_nobpt (pc, &op, 1);
if (op == 0x55) /* pushl %ebp */ if (op == 0x55) /* pushl %ebp */
{ {
@ -669,7 +669,7 @@ i386_analyze_frame_setup (CORE_ADDR pc, CORE_ADDR limit,
if (limit <= pc + skip) if (limit <= pc + skip)
return limit; return limit;
op = read_memory_unsigned_integer (pc + skip, 1); read_memory_nobpt (pc + skip, &op, 1);
/* Check for `movl %esp, %ebp' -- can be written in two ways. */ /* Check for `movl %esp, %ebp' -- can be written in two ways. */
switch (op) switch (op)
@ -703,7 +703,7 @@ i386_analyze_frame_setup (CORE_ADDR pc, CORE_ADDR limit,
NOTE: You can't subtract a 16-bit immediate from a 32-bit NOTE: You can't subtract a 16-bit immediate from a 32-bit
reg, so we don't have to worry about a data16 prefix. */ reg, so we don't have to worry about a data16 prefix. */
op = read_memory_unsigned_integer (pc, 1); read_memory_nobpt (pc, &op, 1);
if (op == 0x83) if (op == 0x83)
{ {
/* `subl' with 8-bit immediate. */ /* `subl' with 8-bit immediate. */
@ -759,7 +759,7 @@ i386_analyze_register_saves (CORE_ADDR pc, CORE_ADDR current_pc,
offset -= cache->locals; offset -= cache->locals;
for (i = 0; i < 8 && pc < current_pc; i++) for (i = 0; i < 8 && pc < current_pc; i++)
{ {
op = read_memory_unsigned_integer (pc, 1); read_memory_nobpt (pc, &op, 1);
if (op < 0x50 || op > 0x57) if (op < 0x50 || op > 0x57)
break; break;
@ -848,7 +848,7 @@ i386_skip_prologue (CORE_ADDR start_pc)
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
{ {
op = read_memory_unsigned_integer (pc + i, 1); read_memory_nobpt (pc + i, &op, 1);
if (pic_pat[i] != op) if (pic_pat[i] != op)
break; break;
} }
@ -856,7 +856,7 @@ i386_skip_prologue (CORE_ADDR start_pc)
{ {
int delta = 6; int delta = 6;
op = read_memory_unsigned_integer (pc + delta, 1); read_memory_nobpt (pc + delta, &op, 1);
if (op == 0x89) /* movl %ebx, x(%ebp) */ if (op == 0x89) /* movl %ebx, x(%ebp) */
{ {
@ -869,7 +869,7 @@ i386_skip_prologue (CORE_ADDR start_pc)
else /* Unexpected instruction. */ else /* Unexpected instruction. */
delta = 0; delta = 0;
op = read_memory_unsigned_integer (pc + delta, 1); read_memory_nobpt (pc + delta, &op, 1);
} }
/* addl y,%ebx */ /* addl y,%ebx */