diff options
| -rw-r--r-- | gdb/ChangeLog | 15 | ||||
| -rw-r--r-- | gdb/amd64-linux-tdep.c | 50 | ||||
| -rw-r--r-- | gdb/arm-tdep.c | 12 | ||||
| -rw-r--r-- | gdb/i386-linux-tdep.c | 28 | ||||
| -rw-r--r-- | gdb/i386-tdep.c | 488 | ||||
| -rw-r--r-- | gdb/infrun.c | 2 | ||||
| -rw-r--r-- | gdb/linux-record.c | 543 | ||||
| -rw-r--r-- | gdb/moxie-tdep.c | 84 | ||||
| -rw-r--r-- | gdb/record-full.c | 32 | ||||
| -rw-r--r-- | gdb/record-full.h | 10 |
10 files changed, 656 insertions, 608 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 40e2847541c..6701fbea041 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,20 @@ 2013-03-11 Markus Metzger <markus.t.metzger@intel.com> + * record-full.h, record-full.c (record_memory_query): Rename + to ... + (record_full_memory_query): ...this. Update all users. + (record_arch_list_add_reg): Rename to ... + (record_full_arch_list_add_reg): ...this. Update all users. + (record_arch_list_add_mem): Rename to ... + (record_full_arch_list_add_mem): ...this. Update all users. + (record_arch_list_add_end): Rename to ... + (record_full_arch_list_add_end): ...this. Update all users. + (record_gdb_operation_disable_set): Rename to ... + (record_full_gdb_operation_disable_set): ...this. + Update all users. + +2013-03-11 Markus Metzger <markus.t.metzger@intel.com> + * record-full.c (DEFAULT_RECORD_INSN_MAX_NUM): Renamed to ... (DEFAULT_RECORD_FULL_INSN_MAX_NUM): ... this. Updated all users. (RECORD_IS_REPLAY): Renamed to ... diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c index 4f383db88ae..88c291d848a 100644 --- a/gdb/amd64-linux-tdep.c +++ b/gdb/amd64-linux-tdep.c @@ -313,39 +313,39 @@ amd64_linux_write_pc (struct regcache *regcache, CORE_ADDR pc) static int amd64_all_but_ip_registers_record (struct regcache *regcache) { - if (record_arch_list_add_reg (regcache, AMD64_RAX_REGNUM)) + if (record_full_arch_list_add_reg (regcache, AMD64_RAX_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, AMD64_RCX_REGNUM)) + if (record_full_arch_list_add_reg (regcache, AMD64_RCX_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, AMD64_RDX_REGNUM)) + if (record_full_arch_list_add_reg (regcache, AMD64_RDX_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, AMD64_RBX_REGNUM)) + if (record_full_arch_list_add_reg (regcache, AMD64_RBX_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, AMD64_RSP_REGNUM)) + if (record_full_arch_list_add_reg (regcache, AMD64_RSP_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, AMD64_RBP_REGNUM)) + if (record_full_arch_list_add_reg (regcache, AMD64_RBP_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, AMD64_RSI_REGNUM)) + if (record_full_arch_list_add_reg (regcache, AMD64_RSI_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, AMD64_RDI_REGNUM)) + if (record_full_arch_list_add_reg (regcache, AMD64_RDI_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, AMD64_R8_REGNUM)) + if (record_full_arch_list_add_reg (regcache, AMD64_R8_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, AMD64_R9_REGNUM)) + if (record_full_arch_list_add_reg (regcache, AMD64_R9_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, AMD64_R10_REGNUM)) + if (record_full_arch_list_add_reg (regcache, AMD64_R10_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, AMD64_R11_REGNUM)) + if (record_full_arch_list_add_reg (regcache, AMD64_R11_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, AMD64_R12_REGNUM)) + if (record_full_arch_list_add_reg (regcache, AMD64_R12_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, AMD64_R13_REGNUM)) + if (record_full_arch_list_add_reg (regcache, AMD64_R13_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, AMD64_R14_REGNUM)) + if (record_full_arch_list_add_reg (regcache, AMD64_R14_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, AMD64_R15_REGNUM)) + if (record_full_arch_list_add_reg (regcache, AMD64_R15_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, AMD64_EFLAGS_REGNUM)) + if (record_full_arch_list_add_reg (regcache, AMD64_EFLAGS_REGNUM)) return -1; return 0; @@ -1164,7 +1164,7 @@ amd64_canonicalize_syscall (enum amd64_syscall syscall_number) /* Parse the arguments of current system call instruction and record the values of the registers and memory that will be changed into - "record_arch_list". This instruction is "syscall". + "record_full_arch_list". This instruction is "syscall". Return -1 if something wrong. */ @@ -1203,8 +1203,8 @@ amd64_linux_syscall_record (struct regcache *regcache) regcache_raw_read_unsigned (regcache, amd64_linux_record_tdep.arg2, &addr); - if (record_arch_list_add_mem (addr, - amd64_linux_record_tdep.size_ulong)) + if (record_full_arch_list_add_mem + (addr, amd64_linux_record_tdep.size_ulong)) return -1; } goto record_regs; @@ -1231,9 +1231,9 @@ amd64_linux_syscall_record (struct regcache *regcache) record_regs: /* Record the return value of the system call. */ - if (record_arch_list_add_reg (regcache, AMD64_RCX_REGNUM)) + if (record_full_arch_list_add_reg (regcache, AMD64_RCX_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, AMD64_R11_REGNUM)) + if (record_full_arch_list_add_reg (regcache, AMD64_R11_REGNUM)) return -1; return 0; @@ -1253,7 +1253,7 @@ amd64_linux_record_signal (struct gdbarch *gdbarch, if (amd64_all_but_ip_registers_record (regcache)) return -1; - if (record_arch_list_add_reg (regcache, AMD64_RIP_REGNUM)) + if (record_full_arch_list_add_reg (regcache, AMD64_RIP_REGNUM)) return -1; /* Record the change in the stack. */ @@ -1267,12 +1267,12 @@ amd64_linux_record_signal (struct gdbarch *gdbarch, /* This is for frame_size. sp -= sizeof (struct rt_sigframe); */ rsp -= AMD64_LINUX_frame_size; - if (record_arch_list_add_mem (rsp, AMD64_LINUX_redzone + if (record_full_arch_list_add_mem (rsp, AMD64_LINUX_redzone + AMD64_LINUX_xstate + AMD64_LINUX_frame_size)) return -1; - if (record_arch_list_add_end ()) + if (record_full_arch_list_add_end ()) return -1; return 0; diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index 33b8d5d513b..17246860a5a 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -12601,13 +12601,13 @@ arm_process_record (struct gdbarch *gdbarch, struct regcache *regcache, if (0 == ret) { /* Record registers. */ - record_arch_list_add_reg (arm_record.regcache, ARM_PC_REGNUM); + record_full_arch_list_add_reg (arm_record.regcache, ARM_PC_REGNUM); if (arm_record.arm_regs) { for (no_of_rec = 0; no_of_rec < arm_record.reg_rec_count; no_of_rec++) { - if (record_arch_list_add_reg (arm_record.regcache , - arm_record.arm_regs[no_of_rec])) + if (record_full_arch_list_add_reg + (arm_record.regcache , arm_record.arm_regs[no_of_rec])) ret = -1; } } @@ -12616,14 +12616,14 @@ arm_process_record (struct gdbarch *gdbarch, struct regcache *regcache, { for (no_of_rec = 0; no_of_rec < arm_record.mem_rec_count; no_of_rec++) { - if (record_arch_list_add_mem + if (record_full_arch_list_add_mem ((CORE_ADDR)arm_record.arm_mems[no_of_rec].addr, - arm_record.arm_mems[no_of_rec].len)) + arm_record.arm_mems[no_of_rec].len)) ret = -1; } } - if (record_arch_list_add_end ()) + if (record_full_arch_list_add_end ()) ret = -1; } diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c index f96fc816b6b..fc9de622bab 100644 --- a/gdb/i386-linux-tdep.c +++ b/gdb/i386-linux-tdep.c @@ -370,23 +370,23 @@ i386_linux_write_pc (struct regcache *regcache, CORE_ADDR pc) static int i386_all_but_ip_registers_record (struct regcache *regcache) { - if (record_arch_list_add_reg (regcache, I386_EAX_REGNUM)) + if (record_full_arch_list_add_reg (regcache, I386_EAX_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, I386_ECX_REGNUM)) + if (record_full_arch_list_add_reg (regcache, I386_ECX_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, I386_EDX_REGNUM)) + if (record_full_arch_list_add_reg (regcache, I386_EDX_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, I386_EBX_REGNUM)) + if (record_full_arch_list_add_reg (regcache, I386_EBX_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, I386_ESP_REGNUM)) + if (record_full_arch_list_add_reg (regcache, I386_ESP_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, I386_EBP_REGNUM)) + if (record_full_arch_list_add_reg (regcache, I386_EBP_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, I386_ESI_REGNUM)) + if (record_full_arch_list_add_reg (regcache, I386_ESI_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, I386_EDI_REGNUM)) + if (record_full_arch_list_add_reg (regcache, I386_EDI_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, I386_EFLAGS_REGNUM)) + if (record_full_arch_list_add_reg (regcache, I386_EFLAGS_REGNUM)) return -1; return 0; @@ -450,7 +450,7 @@ i386_linux_intx80_sysenter_syscall_record (struct regcache *regcache) return ret; /* Record the return value of the system call. */ - if (record_arch_list_add_reg (regcache, I386_EAX_REGNUM)) + if (record_full_arch_list_add_reg (regcache, I386_EAX_REGNUM)) return -1; return 0; @@ -469,7 +469,7 @@ i386_linux_record_signal (struct gdbarch *gdbarch, if (i386_all_but_ip_registers_record (regcache)) return -1; - if (record_arch_list_add_reg (regcache, I386_EIP_REGNUM)) + if (record_full_arch_list_add_reg (regcache, I386_EIP_REGNUM)) return -1; /* Record the change in the stack. */ @@ -480,11 +480,11 @@ i386_linux_record_signal (struct gdbarch *gdbarch, /* This is for frame_size. sp -= sizeof (struct rt_sigframe); */ esp -= I386_LINUX_frame_size; - if (record_arch_list_add_mem (esp, - I386_LINUX_xstate + I386_LINUX_frame_size)) + if (record_full_arch_list_add_mem (esp, + I386_LINUX_xstate + I386_LINUX_frame_size)) return -1; - if (record_arch_list_add_end ()) + if (record_full_arch_list_add_end ()) return -1; return 0; diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c index a36a83d1beb..61ccc3e13b2 100644 --- a/gdb/i386-tdep.c +++ b/gdb/i386-tdep.c @@ -4205,7 +4205,7 @@ i386_record_lea_modrm (struct i386_record_s *irp) if (irp->override >= 0) { - if (record_memory_query) + if (record_full_memory_query) { int q; @@ -4226,7 +4226,7 @@ Do you want to stop the program?"), if (i386_record_lea_modrm_addr (irp, &addr)) return -1; - if (record_arch_list_add_mem (addr, 1 << irp->ot)) + if (record_full_arch_list_add_mem (addr, 1 << irp->ot)) return -1; return 0; @@ -4240,13 +4240,13 @@ i386_record_push (struct i386_record_s *irp, int size) { ULONGEST addr; - if (record_arch_list_add_reg (irp->regcache, - irp->regmap[X86_RECORD_RESP_REGNUM])) + if (record_full_arch_list_add_reg (irp->regcache, + irp->regmap[X86_RECORD_RESP_REGNUM])) return -1; regcache_raw_read_unsigned (irp->regcache, irp->regmap[X86_RECORD_RESP_REGNUM], &addr); - if (record_arch_list_add_mem ((CORE_ADDR) addr - size, size)) + if (record_full_arch_list_add_mem ((CORE_ADDR) addr - size, size)) return -1; return 0; @@ -4278,7 +4278,7 @@ static int i386_record_floats (struct gdbarch *gdbarch, { for (i = I387_ST0_REGNUM (tdep); i <= I387_ST0_REGNUM (tdep) + 7; i++) { - if (record_arch_list_add_reg (ir->regcache, i)) + if (record_full_arch_list_add_reg (ir->regcache, i)) return -1; } } @@ -4286,7 +4286,7 @@ static int i386_record_floats (struct gdbarch *gdbarch, { for (i = I387_FCTRL_REGNUM (tdep); i <= I387_FOP_REGNUM (tdep); i++) { - if (record_arch_list_add_reg (ir->regcache, i)) + if (record_full_arch_list_add_reg (ir->regcache, i)) return -1; } } @@ -4294,14 +4294,14 @@ static int i386_record_floats (struct gdbarch *gdbarch, { for (i = I387_ST0_REGNUM (tdep); i <= I387_FOP_REGNUM (tdep); i++) { - if (record_arch_list_add_reg (ir->regcache, i)) + if (record_full_arch_list_add_reg (ir->regcache, i)) return -1; } } else if ((iregnum >= I387_ST0_REGNUM (tdep)) && (iregnum <= I387_FOP_REGNUM (tdep))) { - if (record_arch_list_add_reg (ir->regcache,iregnum)) + if (record_full_arch_list_add_reg (ir->regcache,iregnum)) return -1; } else @@ -4313,7 +4313,7 @@ static int i386_record_floats (struct gdbarch *gdbarch, { for (i = I387_FCTRL_REGNUM (tdep); i <= I387_FOP_REGNUM (tdep); i++) { - if (record_arch_list_add_reg (ir->regcache, i)) + if (record_full_arch_list_add_reg (ir->regcache, i)) return -1; } } @@ -4324,8 +4324,8 @@ static int i386_record_floats (struct gdbarch *gdbarch, registers and memory that will be changed by the current instruction. Returns -1 if something goes wrong, 0 otherwise. */ -#define I386_RECORD_ARCH_LIST_ADD_REG(regnum) \ - record_arch_list_add_reg (ir.regcache, ir.regmap[(regnum)]) +#define I386_RECORD_FULL_ARCH_LIST_ADD_REG(regnum) \ + record_full_arch_list_add_reg (ir.regcache, ir.regmap[(regnum)]) int i386_process_record (struct gdbarch *gdbarch, struct regcache *regcache, @@ -4530,7 +4530,7 @@ i386_process_record (struct gdbarch *gdbarch, struct regcache *regcache, ir.rm |= ir.rex_b; if (ir.ot == OT_BYTE && !ir.regmap[X86_RECORD_R8_REGNUM]) ir.rm &= 0x3; - I386_RECORD_ARCH_LIST_ADD_REG (ir.rm); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.rm); } break; case 1: /* OP Gv, Ev */ @@ -4539,14 +4539,14 @@ i386_process_record (struct gdbarch *gdbarch, struct regcache *regcache, ir.reg |= rex_r; if (ir.ot == OT_BYTE && !ir.regmap[X86_RECORD_R8_REGNUM]) ir.reg &= 0x3; - I386_RECORD_ARCH_LIST_ADD_REG (ir.reg); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.reg); break; case 2: /* OP A, Iv */ - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); break; } } - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0x80: /* GRP1 */ @@ -4573,9 +4573,9 @@ i386_process_record (struct gdbarch *gdbarch, struct regcache *regcache, return -1; } else - I386_RECORD_ARCH_LIST_ADD_REG (ir.rm | ir.rex_b); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.rm | ir.rex_b); } - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0x40: /* inc */ @@ -4596,8 +4596,8 @@ i386_process_record (struct gdbarch *gdbarch, struct regcache *regcache, case 0x4e: case 0x4f: - I386_RECORD_ARCH_LIST_ADD_REG (opcode & 7); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (opcode & 7); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0xf6: /* GRP3 */ @@ -4615,7 +4615,7 @@ i386_process_record (struct gdbarch *gdbarch, struct regcache *regcache, switch (ir.reg) { case 0: /* test */ - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 2: /* not */ case 3: /* neg */ @@ -4629,19 +4629,19 @@ i386_process_record (struct gdbarch *gdbarch, struct regcache *regcache, ir.rm |= ir.rex_b; if (ir.ot == OT_BYTE && !ir.regmap[X86_RECORD_R8_REGNUM]) ir.rm &= 0x3; - I386_RECORD_ARCH_LIST_ADD_REG (ir.rm); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.rm); } if (ir.reg == 3) /* neg */ - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 4: /* mul */ case 5: /* imul */ case 6: /* div */ case 7: /* idiv */ - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); if (ir.ot != OT_BYTE) - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REDX_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REDX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; default: ir.addr -= 2; @@ -4679,26 +4679,26 @@ i386_process_record (struct gdbarch *gdbarch, struct regcache *regcache, ir.rm |= ir.rex_b; if (ir.ot == OT_BYTE && !ir.regmap[X86_RECORD_R8_REGNUM]) ir.rm &= 0x3; - I386_RECORD_ARCH_LIST_ADD_REG (ir.rm); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.rm); } - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 2: /* call */ if (ir.regmap[X86_RECORD_R8_REGNUM] && ir.dflag) ir.dflag = 2; if (i386_record_push (&ir, 1 << (ir.dflag + 1))) return -1; - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 3: /* lcall */ - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_CS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_CS_REGNUM); if (i386_record_push (&ir, 1 << (ir.dflag + 1))) return -1; - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 4: /* jmp */ case 5: /* ljmp */ - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 6: /* push */ if (ir.regmap[X86_RECORD_R8_REGNUM] && ir.dflag) @@ -4718,16 +4718,16 @@ i386_process_record (struct gdbarch *gdbarch, struct regcache *regcache, case 0x85: case 0xa8: case 0xa9: - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0x98: /* CWDE/CBW */ - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); break; case 0x99: /* CDQ/CWD */ - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REDX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REDX_REGNUM); break; case 0x0faf: /* imul */ @@ -4743,8 +4743,8 @@ i386_process_record (struct gdbarch *gdbarch, struct regcache *regcache, ir.reg |= rex_r; if (ir.ot == OT_BYTE && !ir.regmap[X86_RECORD_R8_REGNUM]) ir.reg &= 0x3; - I386_RECORD_ARCH_LIST_ADD_REG (ir.reg); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.reg); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0x0fc0: /* xadd */ @@ -4760,10 +4760,10 @@ i386_process_record (struct gdbarch *gdbarch, struct regcache *regcache, { if (ir.ot == OT_BYTE && !ir.regmap[X86_RECORD_R8_REGNUM]) ir.reg &= 0x3; - I386_RECORD_ARCH_LIST_ADD_REG (ir.reg); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.reg); if (ir.ot == OT_BYTE && !ir.regmap[X86_RECORD_R8_REGNUM]) ir.rm &= 0x3; - I386_RECORD_ARCH_LIST_ADD_REG (ir.rm); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.rm); } else { @@ -4771,9 +4771,9 @@ i386_process_record (struct gdbarch *gdbarch, struct regcache *regcache, return -1; if (ir.ot == OT_BYTE && !ir.regmap[X86_RECORD_R8_REGNUM]) ir.reg &= 0x3; - I386_RECORD_ARCH_LIST_ADD_REG (ir.reg); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.reg); } - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0x0fb0: /* cmpxchg */ @@ -4787,18 +4787,18 @@ i386_process_record (struct gdbarch *gdbarch, struct regcache *regcache, if (ir.mod == 3) { ir.reg |= rex_r; - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); if (ir.ot == OT_BYTE && !ir.regmap[X86_RECORD_R8_REGNUM]) ir.reg &= 0x3; - I386_RECORD_ARCH_LIST_ADD_REG (ir.reg); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.reg); } else { - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); if (i386_record_lea_modrm (&ir)) return -1; } - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0x0fc7: /* cmpxchg8b */ @@ -4810,11 +4810,11 @@ i386_process_record (struct gdbarch *gdbarch, struct regcache *regcache, opcode = opcode << 8 | ir.modrm; goto no_support; } - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REDX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REDX_REGNUM); if (i386_record_lea_modrm (&ir)) return -1; - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0x50: /* push */ @@ -4875,8 +4875,8 @@ i386_process_record (struct gdbarch *gdbarch, struct regcache *regcache, case 0x5d: case 0x5e: case 0x5f: - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_RESP_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG ((opcode & 0x7) | ir.rex_b); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_RESP_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG ((opcode & 0x7) | ir.rex_b); break; case 0x61: /* popa */ @@ -4888,7 +4888,7 @@ i386_process_record (struct gdbarch *gdbarch, struct regcache *regcache, for (regnum = X86_RECORD_REAX_REGNUM; regnum <= X86_RECORD_REDI_REGNUM; regnum++) - I386_RECORD_ARCH_LIST_ADD_REG (regnum); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (regnum); break; case 0x8f: /* pop */ @@ -4899,18 +4899,18 @@ i386_process_record (struct gdbarch *gdbarch, struct regcache *regcache, if (i386_record_modrm (&ir)) return -1; if (ir.mod == 3) - I386_RECORD_ARCH_LIST_ADD_REG (ir.rm | ir.rex_b); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.rm | ir.rex_b); else { ir.popl_esp_hack = 1 << ir.ot; if (i386_record_lea_modrm (&ir)) return -1; } - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_RESP_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_RESP_REGNUM); break; case 0xc8: /* enter */ - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REBP_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REBP_REGNUM); if (ir.regmap[X86_RECORD_R8_REGNUM] && ir.dflag) ir.dflag = 2; if (i386_record_push (&ir, 1 << (ir.dflag + 1))) @@ -4918,8 +4918,8 @@ i386_process_record (struct gdbarch *gdbarch, struct regcache *regcache, break; case 0xc9: /* leave */ - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_RESP_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REBP_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_RESP_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REBP_REGNUM); break; case 0x07: /* pop es */ @@ -4928,9 +4928,9 @@ i386_process_record (struct gdbarch *gdbarch, struct regcache *regcache, ir.addr -= 1; goto no_support; } - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_RESP_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_ES_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_RESP_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_ES_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0x17: /* pop ss */ @@ -4939,9 +4939,9 @@ i386_process_record (struct gdbarch *gdbarch, struct regcache *regcache, ir.addr -= 1; goto no_support; } - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_RESP_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_SS_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_RESP_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_SS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0x1f: /* pop ds */ @@ -4950,21 +4950,21 @@ i386_process_record (struct gdbarch *gdbarch, struct regcache *regcache, ir.addr -= 1; goto no_support; } - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_RESP_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_DS_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_RESP_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_DS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0x0fa1: /* pop fs */ - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_RESP_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_FS_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_RESP_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_FS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0x0fa9: /* pop gs */ - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_RESP_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_GS_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_RESP_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_GS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0x88: /* mov */ @@ -4992,7 +4992,7 @@ i386_process_record (struct gdbarch *gdbarch, struct regcache *regcache, ir.rm |= ir.rex_b; if (ir.ot == OT_BYTE && !ir.regmap[X86_RECORD_R8_REGNUM]) ir.rm &= 0x3; - I386_RECORD_ARCH_LIST_ADD_REG (ir.rm); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.rm); } break; @@ -5007,7 +5007,7 @@ i386_process_record (struct gdbarch *gdbarch, struct regcache *regcache, ir.reg |= rex_r; if (ir.ot == OT_BYTE && !ir.regmap[X86_RECORD_R8_REGNUM]) ir.reg &= 0x3; - I386_RECORD_ARCH_LIST_ADD_REG (ir.reg); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.reg); break; case 0x8c: /* mov seg */ @@ -5021,7 +5021,7 @@ i386_process_record (struct gdbarch *gdbarch, struct regcache *regcache, } if (ir.mod == 3) - I386_RECORD_ARCH_LIST_ADD_REG (ir.rm); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.rm); else { ir.ot = OT_WORD; @@ -5056,8 +5056,8 @@ i386_process_record (struct gdbarch *gdbarch, struct regcache *regcache, goto no_support; break; } - I386_RECORD_ARCH_LIST_ADD_REG (regnum); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (regnum); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0x0fb6: /* movzbS */ @@ -5066,7 +5066,7 @@ i386_process_record (struct gdbarch *gdbarch, struct regcache *regcache, case 0x0fbf: /* movswS */ if (i386_record_modrm (&ir)) return -1; - I386_RECORD_ARCH_LIST_ADD_REG (ir.reg | rex_r); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.reg | rex_r); break; case 0x8d: /* lea */ @@ -5082,21 +5082,21 @@ i386_process_record (struct gdbarch *gdbarch, struct regcache *regcache, ir.reg |= rex_r; if (ir.ot == OT_BYTE && !ir.regmap[X86_RECORD_R8_REGNUM]) ir.reg &= 0x3; - I386_RECORD_ARCH_LIST_ADD_REG (ir.reg); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.reg); break; case 0xa0: /* mov EAX */ case 0xa1: case 0xd7: /* xlat */ - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); break; case 0xa2: /* mov EAX */ case 0xa3: if (ir.override >= 0) { - if (record_memory_query) + if (record_full_memory_query) { int q; @@ -5138,7 +5138,7 @@ Do you want to stop the program?"), ir.addr += 2; addr = extract_unsigned_integer (buf, 2, byte_order); } - if (record_arch_list_add_mem (addr, 1 << ir.ot)) + if (record_full_arch_list_add_mem (addr, 1 << ir.ot)) return -1; } break; @@ -5151,9 +5151,9 @@ Do you want to stop the program?"), case 0xb5: case 0xb6: case 0xb7: - I386_RECORD_ARCH_LIST_ADD_REG ((ir.regmap[X86_RECORD_R8_REGNUM]) - ? ((opcode & 0x7) | ir.rex_b) - : ((opcode & 0x7) & 0x3)); + I386_RECORD_FULL_ARCH_LIST_ADD_REG ((ir.regmap[X86_RECORD_R8_REGNUM]) + ? ((opcode & 0x7) | ir.rex_b) + : ((opcode & 0x7) & 0x3)); break; case 0xb8: /* mov R, Iv */ @@ -5164,7 +5164,7 @@ Do you want to stop the program?"), case 0xbd: case 0xbe: case 0xbf: - I386_RECORD_ARCH_LIST_ADD_REG ((opcode & 0x7) | ir.rex_b); + I386_RECORD_FULL_ARCH_LIST_ADD_REG ((opcode & 0x7) | ir.rex_b); break; case 0x91: /* xchg R, EAX */ @@ -5174,8 +5174,8 @@ Do you want to stop the program?"), case 0x95: case 0x96: case 0x97: - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (opcode & 0x7); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (opcode & 0x7); break; case 0x86: /* xchg Ev, Gv */ @@ -5191,7 +5191,7 @@ Do you want to stop the program?"), ir.rm |= ir.rex_b; if (ir.ot == OT_BYTE && !ir.regmap[X86_RECORD_R8_REGNUM]) ir.rm &= 0x3; - I386_RECORD_ARCH_LIST_ADD_REG (ir.rm); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.rm); } else { @@ -5201,7 +5201,7 @@ Do you want to stop the program?"), ir.reg |= rex_r; if (ir.ot == OT_BYTE && !ir.regmap[X86_RECORD_R8_REGNUM]) ir.reg &= 0x3; - I386_RECORD_ARCH_LIST_ADD_REG (ir.reg); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.reg); break; case 0xc4: /* les Gv */ @@ -5244,9 +5244,9 @@ Do you want to stop the program?"), regnum = X86_RECORD_GS_REGNUM; break; } - I386_RECORD_ARCH_LIST_ADD_REG (regnum); - I386_RECORD_ARCH_LIST_ADD_REG (ir.reg | rex_r); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (regnum); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.reg | rex_r); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0xc0: /* shifts */ @@ -5271,9 +5271,9 @@ Do you want to stop the program?"), ir.rm |= ir.rex_b; if (ir.ot == OT_BYTE && !ir.regmap[X86_RECORD_R8_REGNUM]) ir.rm &= 0x3; - I386_RECORD_ARCH_LIST_ADD_REG (ir.rm); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.rm); } - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0x0fa4: @@ -5284,7 +5284,7 @@ Do you want to stop the program?"), return -1; if (ir.mod == 3) { - if (record_arch_list_add_reg (ir.regcache, ir.rm)) + if (record_full_arch_list_add_reg (ir.regcache, ir.rm)) return -1; } else @@ -5387,17 +5387,17 @@ Do you want to stop the program?"), switch (ir.reg >> 4) { case 0: - if (record_arch_list_add_mem (addr64, 4)) + if (record_full_arch_list_add_mem (addr64, 4)) return -1; break; case 2: - if (record_arch_list_add_mem (addr64, 8)) + if (record_full_arch_list_add_mem (addr64, 8)) return -1; break; case 3: break; default: - if (record_arch_list_add_mem (addr64, 2)) + if (record_full_arch_list_add_mem (addr64, 2)) return -1; break; } @@ -5406,7 +5406,7 @@ Do you want to stop the program?"), switch (ir.reg >> 4) { case 0: - if (record_arch_list_add_mem (addr64, 4)) + if (record_full_arch_list_add_mem (addr64, 4)) return -1; if (3 == (ir.reg & 7)) { @@ -5417,7 +5417,7 @@ Do you want to stop the program?"), } break; case 1: - if (record_arch_list_add_mem (addr64, 4)) + if (record_full_arch_list_add_mem (addr64, 4)) return -1; if ((3 == (ir.reg & 7)) || (5 == (ir.reg & 7)) @@ -5430,7 +5430,7 @@ Do you want to stop the program?"), } break; case 2: - if (record_arch_list_add_mem (addr64, 8)) + if (record_full_arch_list_add_mem (addr64, 8)) return -1; if (3 == (ir.reg & 7)) { @@ -5450,7 +5450,7 @@ Do you want to stop the program?"), } /* Fall through */ default: - if (record_arch_list_add_mem (addr64, 2)) + if (record_full_arch_list_add_mem (addr64, 2)) return -1; break; } @@ -5477,18 +5477,18 @@ Do you want to stop the program?"), case 0x0e: if (ir.dflag) { - if (record_arch_list_add_mem (addr64, 28)) + if (record_full_arch_list_add_mem (addr64, 28)) return -1; } else { - if (record_arch_list_add_mem (addr64, 14)) + if (record_full_arch_list_add_mem (addr64, 14)) return -1; } break; case 0x0f: case 0x2f: - if (record_arch_list_add_mem (addr64, 2)) + if (record_full_arch_list_add_mem (addr64, 2)) return -1; /* Insn fstp, fbstp. */ if (i386_record_floats (gdbarch, &ir, I386_SAVE_FPU_REGS)) @@ -5496,23 +5496,23 @@ Do you want to stop the program?"), break; case 0x1f: case 0x3e: - if (record_arch_list_add_mem (addr64, 10)) + if (record_full_arch_list_add_mem (addr64, 10)) return -1; break; case 0x2e: if (ir.dflag) { - if (record_arch_list_add_mem (addr64, 28)) + if (record_full_arch_list_add_mem (addr64, 28)) return -1; addr64 += 28; } else { - if (record_arch_list_add_mem (addr64, 14)) + if (record_full_arch_list_add_mem (addr64, 14)) return -1; addr64 += 14; } - if (record_arch_list_add_mem (addr64, 80)) + if (record_full_arch_list_add_mem (addr64, 80)) return -1; /* Insn fsave. */ if (i386_record_floats (gdbarch, &ir, @@ -5520,7 +5520,7 @@ Do you want to stop the program?"), return -1; break; case 0x3f: - if (record_arch_list_add_mem (addr64, 8)) + if (record_full_arch_list_add_mem (addr64, 8)) return -1; /* Insn fistp. */ if (i386_record_floats (gdbarch, &ir, I386_SAVE_FPU_REGS)) @@ -5726,7 +5726,8 @@ Do you want to stop the program?"), case 0xdf: if (0xe0 == ir.modrm) { - if (record_arch_list_add_reg (ir.regcache, I386_EAX_REGNUM)) + if (record_full_arch_list_add_reg (ir.regcache, + I386_EAX_REGNUM)) return -1; } else if ((0x0f == ir.modrm >> 4) || (0x0e == ir.modrm >> 4)) @@ -5769,7 +5770,7 @@ Do you want to stop the program?"), if (ir.aflag && (es != ds)) { /* addr += ((uint32_t) read_register (I386_ES_REGNUM)) << 4; */ - if (record_memory_query) + if (record_full_memory_query) { int q; @@ -5786,59 +5787,59 @@ Do you want to stop the program?"), } else { - if (record_arch_list_add_mem (addr, 1 << ir.ot)) + if (record_full_arch_list_add_mem (addr, 1 << ir.ot)) return -1; } if (prefixes & (PREFIX_REPZ | PREFIX_REPNZ)) - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_RECX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_RECX_REGNUM); if (opcode == 0xa4 || opcode == 0xa5) - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_RESI_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REDI_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_RESI_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REDI_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); } break; case 0xa6: /* cmpsS */ case 0xa7: - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REDI_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_RESI_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REDI_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_RESI_REGNUM); if (prefixes & (PREFIX_REPZ | PREFIX_REPNZ)) - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_RECX_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_RECX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0xac: /* lodsS */ case 0xad: - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_RESI_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_RESI_REGNUM); if (prefixes & (PREFIX_REPZ | PREFIX_REPNZ)) - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_RECX_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_RECX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0xae: /* scasS */ case 0xaf: - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REDI_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REDI_REGNUM); if (prefixes & (PREFIX_REPZ | PREFIX_REPNZ)) - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_RECX_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_RECX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0x6e: /* outsS */ case 0x6f: - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_RESI_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_RESI_REGNUM); if (prefixes & (PREFIX_REPZ | PREFIX_REPNZ)) - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_RECX_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_RECX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0xe4: /* port I/O */ case 0xe5: case 0xec: case 0xed: - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); break; case 0xe6: @@ -5850,16 +5851,16 @@ Do you want to stop the program?"), /* control */ case 0xc2: /* ret im */ case 0xc3: /* ret */ - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_RESP_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_RESP_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0xca: /* lret im */ case 0xcb: /* lret */ case 0xcf: /* iret */ - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_CS_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_RESP_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_CS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_RESP_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0xe8: /* call im */ @@ -5875,7 +5876,7 @@ Do you want to stop the program?"), ir.addr -= 1; goto no_support; } - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_CS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_CS_REGNUM); if (i386_record_push (&ir, 1 << (ir.dflag + 1))) return -1; break; @@ -5933,13 +5934,13 @@ Do you want to stop the program?"), case 0x0f9d: case 0x0f9e: case 0x0f9f: - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); ir.ot = OT_BYTE; if (i386_record_modrm (&ir)) return -1; if (ir.mod == 3) - I386_RECORD_ARCH_LIST_ADD_REG (ir.rex_b ? (ir.rm | ir.rex_b) - : (ir.rm & 0x3)); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.rex_b ? (ir.rm | ir.rex_b) + : (ir.rm & 0x3)); else { if (i386_record_lea_modrm (&ir)) @@ -5968,12 +5969,12 @@ Do you want to stop the program?"), ir.reg |= rex_r; if (ir.dflag == OT_BYTE) ir.reg &= 0x3; - I386_RECORD_ARCH_LIST_ADD_REG (ir.reg); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.reg); break; /* flags */ case 0x9c: /* pushf */ - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); if (ir.regmap[X86_RECORD_R8_REGNUM] && ir.dflag) ir.dflag = 2; if (i386_record_push (&ir, 1 << (ir.dflag + 1))) @@ -5981,8 +5982,8 @@ Do you want to stop the program?"), break; case 0x9d: /* popf */ - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_RESP_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_RESP_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0x9e: /* sahf */ @@ -5997,7 +5998,7 @@ Do you want to stop the program?"), case 0xf9: /* stc */ case 0xfc: /* cld */ case 0xfd: /* std */ - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0x9f: /* lahf */ @@ -6006,8 +6007,8 @@ Do you want to stop the program?"), ir.addr -= 1; goto no_support; } - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); break; /* bit operations */ @@ -6024,18 +6025,18 @@ Do you want to stop the program?"), if (ir.reg != 4) { if (ir.mod == 3) - I386_RECORD_ARCH_LIST_ADD_REG (ir.rm | ir.rex_b); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.rm | ir.rex_b); else { if (i386_record_lea_modrm (&ir)) return -1; } } - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0x0fa3: /* bt Gv, Ev */ - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0x0fab: /* bts */ @@ -6045,7 +6046,7 @@ Do you want to stop the program?"), if (i386_record_modrm (&ir)) return -1; if (ir.mod == 3) - I386_RECORD_ARCH_LIST_ADD_REG (ir.rm | ir.rex_b); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.rm | ir.rex_b); else { uint64_t addr64; @@ -6066,18 +6067,18 @@ Do you want to stop the program?"), addr64 += ((int64_t) addr >> 6) << 6; break; } - if (record_arch_list_add_mem (addr64, 1 << ir.ot)) + if (record_full_arch_list_add_mem (addr64, 1 << ir.ot)) return -1; if (i386_record_lea_modrm (&ir)) return -1; } - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0x0fbc: /* bsf */ case 0x0fbd: /* bsr */ - I386_RECORD_ARCH_LIST_ADD_REG (ir.reg | rex_r); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.reg | rex_r); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; /* bcd */ @@ -6092,8 +6093,8 @@ Do you want to stop the program?"), ir.addr -= 1; goto no_support; } - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; /* misc */ @@ -6171,7 +6172,7 @@ Do you want to stop the program?"), case 0x0fcd: case 0x0fce: case 0x0fcf: - I386_RECORD_ARCH_LIST_ADD_REG ((opcode & 7) | ir.rex_b); + I386_RECORD_FULL_ARCH_LIST_ADD_REG ((opcode & 7) | ir.rex_b); break; case 0xd6: /* salc */ @@ -6180,16 +6181,16 @@ Do you want to stop the program?"), ir.addr -= 1; goto no_support; } - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0xe0: /* loopnz */ case 0xe1: /* loopz */ case 0xe2: /* loop */ case 0xe3: /* jecxz */ - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_RECX_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_RECX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0x0f30: /* wrmsr */ @@ -6207,8 +6208,8 @@ Do you want to stop the program?"), break; case 0x0f31: /* rdtsc */ - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REDX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REDX_REGNUM); break; case 0x0f34: /* sysenter */ @@ -6263,10 +6264,10 @@ Do you want to stop the program?"), break; case 0x0fa2: /* cpuid */ - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_RECX_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REDX_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REBX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_RECX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REDX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REBX_REGNUM); break; case 0xf4: /* hlt */ @@ -6284,7 +6285,7 @@ Do you want to stop the program?"), case 0: /* sldt */ case 1: /* str */ if (ir.mod == 3) - I386_RECORD_ARCH_LIST_ADD_REG (ir.rm | ir.rex_b); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.rm | ir.rex_b); else { ir.ot = OT_WORD; @@ -6297,7 +6298,7 @@ Do you want to stop the program?"), break; case 4: /* verr */ case 5: /* verw */ - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; default: ir.addr -= 3; @@ -6324,7 +6325,7 @@ Do you want to stop the program?"), } if (ir.override >= 0) { - if (record_memory_query) + if (record_full_memory_query) { int q; @@ -6343,17 +6344,17 @@ Do you want to stop the program?"), { if (i386_record_lea_modrm_addr (&ir, &addr64)) return -1; - if (record_arch_list_add_mem (addr64, 2)) + if (record_full_arch_list_add_mem (addr64, 2)) return -1; addr64 += 2; if (ir.regmap[X86_RECORD_R8_REGNUM]) { - if (record_arch_list_add_mem (addr64, 8)) + if (record_full_arch_list_add_mem (addr64, 8)) return -1; } else { - if (record_arch_list_add_mem (addr64, 4)) + if (record_full_arch_list_add_mem (addr64, 4)) return -1; } } @@ -6367,7 +6368,7 @@ Do you want to stop the program?"), case 0: /* monitor */ break; case 1: /* mwait */ - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; default: ir.addr -= 3; @@ -6381,7 +6382,7 @@ Do you want to stop the program?"), /* sidt */ if (ir.override >= 0) { - if (record_memory_query) + if (record_full_memory_query) { int q; @@ -6402,17 +6403,17 @@ Do you want to stop the program?"), if (i386_record_lea_modrm_addr (&ir, &addr64)) return -1; - if (record_arch_list_add_mem (addr64, 2)) + if (record_full_arch_list_add_mem (addr64, 2)) return -1; addr64 += 2; if (ir.regmap[X86_RECORD_R8_REGNUM]) { - if (record_arch_list_add_mem (addr64, 8)) + if (record_full_arch_list_add_mem (addr64, 8)) return -1; } else { - if (record_arch_list_add_mem (addr64, 4)) + if (record_full_arch_list_add_mem (addr64, 4)) return -1; } } @@ -6424,8 +6425,8 @@ Do you want to stop the program?"), /* xgetbv */ if (ir.rm == 0) { - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REDX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REDX_REGNUM); break; } /* xsetbv */ @@ -6443,7 +6444,7 @@ Do you want to stop the program?"), case 4: /* smsw */ if (ir.mod == 3) { - if (record_arch_list_add_reg (ir.regcache, ir.rm | ir.rex_b)) + if (record_full_arch_list_add_reg (ir.regcache, ir.rm | ir.rex_b)) return -1; } else @@ -6452,16 +6453,16 @@ Do you want to stop the program?"), if (i386_record_lea_modrm (&ir)) return -1; } - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 6: /* lmsw */ - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 7: /* invlpg */ if (ir.mod == 3) { if (ir.rm == 0 && ir.regmap[X86_RECORD_R8_REGNUM]) - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_GS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_GS_REGNUM); else { ir.addr -= 3; @@ -6470,7 +6471,7 @@ Do you want to stop the program?"), } } else - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; default: ir.addr -= 3; @@ -6489,8 +6490,8 @@ Do you want to stop the program?"), return -1; if (ir.mod == 3 || ir.regmap[X86_RECORD_R8_REGNUM]) { - I386_RECORD_ARCH_LIST_ADD_REG (ir.regmap[X86_RECORD_R8_REGNUM] - ? (ir.reg | rex_r) : ir.rm); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.regmap[X86_RECORD_R8_REGNUM] + ? (ir.reg | rex_r) : ir.rm); } else { @@ -6499,15 +6500,15 @@ Do you want to stop the program?"), return -1; } if (!ir.regmap[X86_RECORD_R8_REGNUM]) - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0x0f02: /* lar */ case 0x0f03: /* lsl */ if (i386_record_modrm (&ir)) return -1; - I386_RECORD_ARCH_LIST_ADD_REG (ir.reg | rex_r); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.reg | rex_r); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0x0f18: @@ -6549,9 +6550,9 @@ Do you want to stop the program?"), case 4: case 8: if (opcode & 2) - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); else - I386_RECORD_ARCH_LIST_ADD_REG (ir.rm | ir.rex_b); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.rm | ir.rex_b); break; default: ir.addr -= 3; @@ -6573,13 +6574,13 @@ Do you want to stop the program?"), goto no_support; } if (opcode & 2) - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); else - I386_RECORD_ARCH_LIST_ADD_REG (ir.rm | ir.rex_b); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.rm | ir.rex_b); break; case 0x0f06: /* clts */ - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; /* MMX 3DNow! SSE SSE2 SSE3 SSSE3 SSE4 */ @@ -6591,7 +6592,7 @@ Do you want to stop the program?"), case 0x0f77: /* emms */ if (i386_fpc_regnum_p (gdbarch, I387_FTAG_REGNUM(tdep))) goto no_support; - record_arch_list_add_reg (ir.regcache, I387_FTAG_REGNUM(tdep)); + record_full_arch_list_add_reg (ir.regcache, I387_FTAG_REGNUM(tdep)); break; case 0x0f0f: /* 3DNow! data */ @@ -6628,7 +6629,7 @@ Do you want to stop the program?"), case 0xbf: /* 3DNow! pavgusb */ if (!i386_mmx_regnum_p (gdbarch, I387_MM0_REGNUM (tdep) + ir.reg)) goto no_support_3dnow_data; - record_arch_list_add_reg (ir.regcache, ir.reg); + record_full_arch_list_add_reg (ir.regcache, ir.reg); break; default: @@ -6640,15 +6641,15 @@ no_support_3dnow_data: break; case 0x0faa: /* rsm */ - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_RECX_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REDX_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REBX_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_RESP_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REBP_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_RESI_REGNUM); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REDI_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_RECX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REDX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REBX_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_RESP_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REBP_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_RESI_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REDI_REGNUM); break; case 0x0fae: @@ -6660,10 +6661,10 @@ no_support_3dnow_data: { uint64_t tmpu64; - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); if (i386_record_lea_modrm_addr (&ir, &tmpu64)) return -1; - if (record_arch_list_add_mem (tmpu64, 512)) + if (record_full_arch_list_add_mem (tmpu64, 512)) return -1; } break; @@ -6672,33 +6673,34 @@ no_support_3dnow_data: { int i; - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); for (i = I387_MM0_REGNUM (tdep); i386_mmx_regnum_p (gdbarch, i); i++) - record_arch_list_add_reg (ir.regcache, i); + record_full_arch_list_add_reg (ir.regcache, i); for (i = I387_XMM0_REGNUM (tdep); i386_xmm_regnum_p (gdbarch, i); i++) - record_arch_list_add_reg (ir.regcache, i); + record_full_arch_list_add_reg (ir.regcache, i); if (i386_mxcsr_regnum_p (gdbarch, I387_MXCSR_REGNUM(tdep))) - record_arch_list_add_reg (ir.regcache, I387_MXCSR_REGNUM(tdep)); + record_full_arch_list_add_reg (ir.regcache, + I387_MXCSR_REGNUM(tdep)); for (i = I387_ST0_REGNUM (tdep); i386_fp_regnum_p (gdbarch, i); i++) - record_arch_list_add_reg (ir.regcache, i); + record_full_arch_list_add_reg (ir.regcache, i); for (i = I387_FCTRL_REGNUM (tdep); i386_fpc_regnum_p (gdbarch, i); i++) - record_arch_list_add_reg (ir.regcache, i); + record_full_arch_list_add_reg (ir.regcache, i); } break; case 2: /* ldmxcsr */ if (!i386_mxcsr_regnum_p (gdbarch, I387_MXCSR_REGNUM(tdep))) goto no_support; - record_arch_list_add_reg (ir.regcache, I387_MXCSR_REGNUM(tdep)); + record_full_arch_list_add_reg (ir.regcache, I387_MXCSR_REGNUM(tdep)); break; case 3: /* stmxcsr */ @@ -7076,10 +7078,10 @@ reswitch_prefix_add: ir.reg |= rex_r; if (!i386_xmm_regnum_p (gdbarch, I387_XMM0_REGNUM (tdep) + ir.reg)) goto no_support; - record_arch_list_add_reg (ir.regcache, - I387_XMM0_REGNUM (tdep) + ir.reg); + record_full_arch_list_add_reg (ir.regcache, + I387_XMM0_REGNUM (tdep) + ir.reg); if ((opcode & 0xfffffffc) == 0x660f3a60) - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0x0f11: /* movups */ @@ -7109,8 +7111,8 @@ reswitch_prefix_add: if (!i386_xmm_regnum_p (gdbarch, I387_XMM0_REGNUM (tdep) + ir.rm)) goto no_support; - record_arch_list_add_reg (ir.regcache, - I387_XMM0_REGNUM (tdep) + ir.rm); + record_full_arch_list_add_reg (ir.regcache, + I387_XMM0_REGNUM (tdep) + ir.rm); } else { @@ -7163,7 +7165,7 @@ reswitch_prefix_add: case 0x660fc5: /* pextrw */ case 0x0fd7: /* pmovmskb */ case 0x660fd7: /* pmovmskb */ - I386_RECORD_ARCH_LIST_ADD_REG (ir.reg | rex_r); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.reg | rex_r); break; case 0x0f3800: /* pshufb */ @@ -7264,8 +7266,8 @@ reswitch_prefix_add: return -1; if (!i386_mmx_regnum_p (gdbarch, I387_MM0_REGNUM (tdep) + ir.reg)) goto no_support; - record_arch_list_add_reg (ir.regcache, - I387_MM0_REGNUM (tdep) + ir.reg); + record_full_arch_list_add_reg (ir.regcache, + I387_MM0_REGNUM (tdep) + ir.reg); break; case 0x0f71: /* psllw */ @@ -7275,8 +7277,8 @@ reswitch_prefix_add: return -1; if (!i386_mmx_regnum_p (gdbarch, I387_MM0_REGNUM (tdep) + ir.rm)) goto no_support; - record_arch_list_add_reg (ir.regcache, - I387_MM0_REGNUM (tdep) + ir.rm); + record_full_arch_list_add_reg (ir.regcache, + I387_MM0_REGNUM (tdep) + ir.rm); break; case 0x660f71: /* psllw */ @@ -7287,8 +7289,8 @@ reswitch_prefix_add: ir.rm |= ir.rex_b; if (!i386_xmm_regnum_p (gdbarch, I387_XMM0_REGNUM (tdep) + ir.rm)) goto no_support; - record_arch_list_add_reg (ir.regcache, - I387_XMM0_REGNUM (tdep) + ir.rm); + record_full_arch_list_add_reg (ir.regcache, + I387_XMM0_REGNUM (tdep) + ir.rm); break; case 0x0f7e: /* movd */ @@ -7296,7 +7298,7 @@ reswitch_prefix_add: if (i386_record_modrm (&ir)) return -1; if (ir.mod == 3) - I386_RECORD_ARCH_LIST_ADD_REG (ir.rm | ir.rex_b); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.rm | ir.rex_b); else { if (ir.dflag == 2) @@ -7315,8 +7317,8 @@ reswitch_prefix_add: { if (!i386_mmx_regnum_p (gdbarch, I387_MM0_REGNUM (tdep) + ir.rm)) goto no_support; - record_arch_list_add_reg (ir.regcache, - I387_MM0_REGNUM (tdep) + ir.rm); + record_full_arch_list_add_reg (ir.regcache, + I387_MM0_REGNUM (tdep) + ir.rm); } else { @@ -7329,8 +7331,8 @@ reswitch_prefix_add: case 0xf30fb8: /* popcnt */ if (i386_record_modrm (&ir)) return -1; - I386_RECORD_ARCH_LIST_ADD_REG (ir.reg); - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (ir.reg); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0x660fd6: /* movq */ @@ -7342,8 +7344,8 @@ reswitch_prefix_add: if (!i386_xmm_regnum_p (gdbarch, I387_XMM0_REGNUM (tdep) + ir.rm)) goto no_support; - record_arch_list_add_reg (ir.regcache, - I387_XMM0_REGNUM (tdep) + ir.rm); + record_full_arch_list_add_reg (ir.regcache, + I387_XMM0_REGNUM (tdep) + ir.rm); } else { @@ -7358,14 +7360,14 @@ reswitch_prefix_add: case 0x660f2e: /* ucomisd */ case 0x0f2f: /* comiss */ case 0x660f2f: /* comisd */ - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM); break; case 0x0ff7: /* maskmovq */ regcache_raw_read_unsigned (ir.regcache, ir.regmap[X86_RECORD_REDI_REGNUM], &addr); - if (record_arch_list_add_mem (addr, 64)) + if (record_full_arch_list_add_mem (addr, 64)) return -1; break; @@ -7373,7 +7375,7 @@ reswitch_prefix_add: regcache_raw_read_unsigned (ir.regcache, ir.regmap[X86_RECORD_REDI_REGNUM], &addr); - if (record_arch_list_add_mem (addr, 128)) + if (record_full_arch_list_add_mem (addr, 128)) return -1; break; @@ -7389,8 +7391,8 @@ reswitch_prefix_add: } /* In the future, maybe still need to deal with need_dasm. */ - I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_REIP_REGNUM); - if (record_arch_list_add_end ()) + I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REIP_REGNUM); + if (record_full_arch_list_add_end ()) return -1; return 0; diff --git a/gdb/infrun.c b/gdb/infrun.c index 1e2addc609d..92874e22b88 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -3011,7 +3011,7 @@ adjust_pc_after_break (struct execution_control_state *ecs) struct cleanup *old_cleanups = NULL; if (RECORD_IS_USED) - old_cleanups = record_gdb_operation_disable_set (); + old_cleanups = record_full_gdb_operation_disable_set (); /* When using hardware single-step, a SIGTRAP is reported for both a completed single-step and a software breakpoint. Need to diff --git a/gdb/linux-record.c b/gdb/linux-record.c index 2b62219f3df..616f08f9b3e 100644 --- a/gdb/linux-record.c +++ b/gdb/linux-record.c @@ -100,7 +100,7 @@ record_linux_sockaddr (struct regcache *regcache, a = alloca (tdep->size_int); - if (record_arch_list_add_mem ((CORE_ADDR) len, tdep->size_int)) + if (record_full_arch_list_add_mem ((CORE_ADDR) len, tdep->size_int)) return -1; /* Get the addrlen. */ @@ -118,7 +118,7 @@ record_linux_sockaddr (struct regcache *regcache, if (addrlen <= 0 || addrlen > tdep->size_sockaddr) addrlen = tdep->size_sockaddr; - if (record_arch_list_add_mem ((CORE_ADDR) addr, addrlen)) + if (record_full_arch_list_add_mem ((CORE_ADDR) addr, addrlen)) return -1; return 0; @@ -137,7 +137,7 @@ record_linux_msghdr (struct regcache *regcache, if (!addr) return 0; - if (record_arch_list_add_mem ((CORE_ADDR) addr, tdep->size_msghdr)) + if (record_full_arch_list_add_mem ((CORE_ADDR) addr, tdep->size_msghdr)) return -1; a = alloca (tdep->size_msghdr); @@ -156,10 +156,11 @@ record_linux_msghdr (struct regcache *regcache, /* msg_name msg_namelen */ addr = extract_unsigned_integer (a, tdep->size_pointer, byte_order); a += tdep->size_pointer; - if (record_arch_list_add_mem ((CORE_ADDR) addr, - (int) extract_unsigned_integer (a, - tdep->size_int, - byte_order))) + if (record_full_arch_list_add_mem + ((CORE_ADDR) addr, + (int) extract_unsigned_integer (a, + tdep->size_int, + byte_order))) return -1; a += tdep->size_int; @@ -193,7 +194,7 @@ record_linux_msghdr (struct regcache *regcache, tmpint = (int) extract_unsigned_integer (iov + tdep->size_pointer, tdep->size_size_t, byte_order); - if (record_arch_list_add_mem (tmpaddr, tmpint)) + if (record_full_arch_list_add_mem (tmpaddr, tmpint)) return -1; addr += tdep->size_iovec; } @@ -204,7 +205,7 @@ record_linux_msghdr (struct regcache *regcache, addr = extract_unsigned_integer (a, tdep->size_pointer, byte_order); a += tdep->size_pointer; tmpint = (int) extract_unsigned_integer (a, tdep->size_size_t, byte_order); - if (record_arch_list_add_mem ((CORE_ADDR) addr, tmpint)) + if (record_full_arch_list_add_mem ((CORE_ADDR) addr, tmpint)) return -1; return 0; @@ -261,7 +262,7 @@ record_linux_system_call (enum gdb_syscall syscall, regcache_raw_read_unsigned (regcache, tdep->arg2, &addr); regcache_raw_read_unsigned (regcache, tdep->arg3, &count); - if (record_arch_list_add_mem ((CORE_ADDR) addr, (int) count)) + if (record_full_arch_list_add_mem ((CORE_ADDR) addr, (int) count)) return -1; } break; @@ -286,8 +287,8 @@ record_linux_system_call (enum gdb_syscall syscall, case gdb_sys_fstat: case gdb_sys_lstat: regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size__old_kernel_stat)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size__old_kernel_stat)) return -1; break; @@ -308,7 +309,7 @@ record_linux_system_call (enum gdb_syscall syscall, { regcache_raw_read_unsigned (regcache, tdep->arg4, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, 4)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, 4)) return -1; } break; @@ -332,7 +333,8 @@ record_linux_system_call (enum gdb_syscall syscall, case gdb_sys_times: regcache_raw_read_unsigned (regcache, tdep->arg1, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, tdep->size_tms)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_tms)) return -1; break; @@ -404,8 +406,8 @@ record_linux_system_call (enum gdb_syscall syscall, { regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_termios)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_termios)) return -1; } else if (tmpulongest == tdep->ioctl_TIOCGPGRP @@ -413,8 +415,8 @@ record_linux_system_call (enum gdb_syscall syscall, { regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_pid_t)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_pid_t)) return -1; } else if (tmpulongest == tdep->ioctl_TIOCOUTQ @@ -428,16 +430,16 @@ record_linux_system_call (enum gdb_syscall syscall, { regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_int)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_int)) return -1; } else if (tmpulongest == tdep->ioctl_TIOCGWINSZ) { regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_winsize)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_winsize)) return -1; } else if (tmpulongest == tdep->ioctl_TIOCLINUX) @@ -445,47 +447,47 @@ record_linux_system_call (enum gdb_syscall syscall, regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); /* This syscall affects a char-size memory. */ - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, 1)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, 1)) return -1; } else if (tmpulongest == tdep->ioctl_TIOCGSERIAL) { regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_serial_struct)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_serial_struct)) return -1; } else if (tmpulongest == tdep->ioctl_TCGETS2) { regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_termios2)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_termios2)) return -1; } else if (tmpulongest == tdep->ioctl_FIOQSIZE) { regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_loff_t)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_loff_t)) return -1; } else if (tmpulongest == tdep->ioctl_TIOCGICOUNT) { regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_serial_icounter_struct)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_serial_icounter_struct)) return -1; } else if (tmpulongest == tdep->ioctl_TIOCGHAYESESP) { regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_hayes_esp_config)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_hayes_esp_config)) return -1; } else if (tmpulongest == tdep->ioctl_TIOCSERGSTRUCT) @@ -511,8 +513,8 @@ record_linux_system_call (enum gdb_syscall syscall, { regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_flock)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_flock)) return -1; } break; @@ -524,8 +526,8 @@ record_linux_system_call (enum gdb_syscall syscall, case gdb_sys_olduname: regcache_raw_read_unsigned (regcache, tdep->arg1, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_oldold_utsname)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_oldold_utsname)) return -1; break; @@ -535,8 +537,8 @@ record_linux_system_call (enum gdb_syscall syscall, case gdb_sys_ustat: regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_ustat)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_ustat)) return -1; break; @@ -548,8 +550,8 @@ record_linux_system_call (enum gdb_syscall syscall, case gdb_sys_sigaction: regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_old_sigaction)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_old_sigaction)) return -1; break; @@ -562,8 +564,8 @@ record_linux_system_call (enum gdb_syscall syscall, case gdb_sys_sigpending: regcache_raw_read_unsigned (regcache, tdep->arg1, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_old_sigset_t)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_old_sigset_t)) return -1; break; @@ -573,26 +575,26 @@ record_linux_system_call (enum gdb_syscall syscall, case gdb_sys_old_getrlimit: regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_rlimit)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_rlimit)) return -1; break; case gdb_sys_getrusage: regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_rusage)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_rusage)) return -1; break; case gdb_sys_gettimeofday: regcache_raw_read_unsigned (regcache, tdep->arg1, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_timeval)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_timeval)) return -1; regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_timezone)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_timezone)) return -1; break; @@ -601,15 +603,15 @@ record_linux_system_call (enum gdb_syscall syscall, case gdb_sys_getgroups16: regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_old_gid_t)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_old_gid_t)) return -1; break; case gdb_sys_setgroups16: regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_old_gid_t)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_old_gid_t)) return -1; break; @@ -639,13 +641,13 @@ record_linux_system_call (enum gdb_syscall syscall, (unsigned long) sizeof (sel)); return -1; } - if (record_arch_list_add_mem (sel.inp, tdep->size_fd_set)) + if (record_full_arch_list_add_mem (sel.inp, tdep->size_fd_set)) return -1; - if (record_arch_list_add_mem (sel.outp, tdep->size_fd_set)) + if (record_full_arch_list_add_mem (sel.outp, tdep->size_fd_set)) return -1; - if (record_arch_list_add_mem (sel.exp, tdep->size_fd_set)) + if (record_full_arch_list_add_mem (sel.exp, tdep->size_fd_set)) return -1; - if (record_arch_list_add_mem (sel.tvp, tdep->size_timeval)) + if (record_full_arch_list_add_mem (sel.tvp, tdep->size_timeval)) return -1; } } @@ -661,7 +663,7 @@ record_linux_system_call (enum gdb_syscall syscall, regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); regcache_raw_read_unsigned (regcache, tdep->arg3, &len); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, (int) len)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, (int) len)) return -1; } break; @@ -686,8 +688,8 @@ record_linux_system_call (enum gdb_syscall syscall, case gdb_old_readdir: regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_dirent)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_dirent)) return -1; break; @@ -701,7 +703,7 @@ record_linux_system_call (enum gdb_syscall syscall, regcache_raw_read_unsigned (regcache, tdep->arg1, &tmpulongest); regcache_raw_read_unsigned (regcache, tdep->arg2, &len); - if (record_memory_query) + if (record_full_memory_query) { int q; @@ -731,8 +733,8 @@ Do you want to stop the program?"), case gdb_sys_statfs: case gdb_sys_fstatfs: regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_statfs)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_statfs)) return -1; break; @@ -779,7 +781,8 @@ Do you want to stop the program?"), regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); regcache_raw_read_unsigned (regcache, tdep->arg3, &size); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, (int) size)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + (int) size)) return -1; } break; @@ -792,7 +795,8 @@ Do you want to stop the program?"), case gdb_sys_socketpair: regcache_raw_read_unsigned (regcache, tdep->arg4, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, tdep->size_int)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_int)) return -1; break; @@ -818,10 +822,10 @@ Do you want to stop the program?"), regcache_raw_read_unsigned (regcache, tdep->arg4, &optvalp); tmpint = (int) extract_signed_integer (optlenp, tdep->size_int, byte_order); - if (record_arch_list_add_mem ((CORE_ADDR) optvalp, tmpint)) + if (record_full_arch_list_add_mem ((CORE_ADDR) optvalp, tmpint)) return -1; - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_int)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_int)) return -1; } break; @@ -892,7 +896,7 @@ Do you want to stop the program?"), tmpaddr = (CORE_ADDR) extract_unsigned_integer (a, tdep->size_ulong, byte_order); - if (record_arch_list_add_mem (tmpaddr, tdep->size_int)) + if (record_full_arch_list_add_mem (tmpaddr, tdep->size_int)) return -1; } } @@ -953,8 +957,8 @@ Do you want to stop the program?"), a += tdep->size_ulong; tmpint = (int) extract_unsigned_integer (a, tdep->size_ulong, byte_order); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tmpint)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tmpint)) return -1; } } @@ -1008,14 +1012,15 @@ Do you want to stop the program?"), tmpint = (int) extract_unsigned_integer (av, tdep->size_int, byte_order); - if (record_arch_list_add_mem (tmpaddr, tmpint)) + if (record_full_arch_list_add_mem (tmpaddr, tmpint)) return -1; a += tdep->size_ulong; tmpaddr = (CORE_ADDR) extract_unsigned_integer (a, tdep->size_ulong, byte_order); - if (record_arch_list_add_mem (tmpaddr, tdep->size_int)) + if (record_full_arch_list_add_mem (tmpaddr, + tdep->size_int)) return -1; } } @@ -1064,15 +1069,15 @@ Do you want to stop the program?"), case gdb_sys_setitimer: regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_itimerval)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_itimerval)) return -1; break; case gdb_sys_getitimer: regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_itimerval)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_itimerval)) return -1; break; @@ -1081,14 +1086,15 @@ Do you want to stop the program?"), case gdb_sys_newfstat: case gdb_sys_newfstatat: regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, tdep->size_stat)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_stat)) return -1; break; case gdb_sys_uname: regcache_raw_read_unsigned (regcache, tdep->arg1, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_old_utsname)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_old_utsname)) return -1; break; @@ -1100,12 +1106,12 @@ Do you want to stop the program?"), case gdb_sys_wait4: regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_int)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_int)) return -1; regcache_raw_read_unsigned (regcache, tdep->arg4, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_rusage)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_rusage)) return -1; break; @@ -1114,8 +1120,8 @@ Do you want to stop the program?"), case gdb_sys_sysinfo: regcache_raw_read_unsigned (regcache, tdep->arg1, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_sysinfo)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_sysinfo)) return -1; break; @@ -1131,15 +1137,15 @@ Do you want to stop the program?"), case gdb_sys_shmat: regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_ulong)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_ulong)) return -1; break; case gdb_sys_shmctl: regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_shmid_ds)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_shmid_ds)) return -1; break; @@ -1154,15 +1160,15 @@ Do you want to stop the program?"), regcache_raw_read_signed (regcache, tdep->arg3, &l); regcache_raw_read_unsigned (regcache, tdep->arg2, &msgp); tmpint = l + tdep->size_long; - if (record_arch_list_add_mem ((CORE_ADDR) msgp, tmpint)) + if (record_full_arch_list_add_mem ((CORE_ADDR) msgp, tmpint)) return -1; } break; case gdb_sys_msgctl: regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_msqid_ds)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_msqid_ds)) return -1; break; @@ -1188,29 +1194,29 @@ Do you want to stop the program?"), regcache_raw_read_signed (regcache, tdep->arg3, &second); regcache_raw_read_unsigned (regcache, tdep->arg5, &ptr); tmpint = (int) second + tdep->size_long; - if (record_arch_list_add_mem ((CORE_ADDR) ptr, tmpint)) + if (record_full_arch_list_add_mem ((CORE_ADDR) ptr, tmpint)) return -1; } break; case RECORD_MSGCTL: regcache_raw_read_unsigned (regcache, tdep->arg5, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_msqid_ds)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_msqid_ds)) return -1; break; case RECORD_SHMAT: regcache_raw_read_unsigned (regcache, tdep->arg4, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_ulong)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_ulong)) return -1; break; case RECORD_SHMCTL: regcache_raw_read_unsigned (regcache, tdep->arg5, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_shmid_ds)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_shmid_ds)) return -1; break; default: @@ -1230,8 +1236,8 @@ Do you want to stop the program?"), case gdb_sys_newuname: regcache_raw_read_unsigned (regcache, tdep->arg1, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_new_utsname)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_new_utsname)) return -1; break; @@ -1243,14 +1249,15 @@ Do you want to stop the program?"), regcache_raw_read_unsigned (regcache, tdep->arg2, &ptr); regcache_raw_read_unsigned (regcache, tdep->arg3, &bytecount); - if (record_arch_list_add_mem ((CORE_ADDR) ptr, (int) bytecount)) + if (record_full_arch_list_add_mem ((CORE_ADDR) ptr, (int) bytecount)) return -1; } break; case gdb_sys_adjtimex: regcache_raw_read_unsigned (regcache, tdep->arg1, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, tdep->size_timex)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_timex)) return -1; break; @@ -1259,8 +1266,8 @@ Do you want to stop the program?"), case gdb_sys_sigprocmask: regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_old_sigset_t)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_old_sigset_t)) return -1; break; @@ -1278,29 +1285,29 @@ Do you want to stop the program?"), regcache_raw_read_unsigned (regcache, tdep->arg4, &tmpulongest); /* __u32 */ - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, 4)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, 4)) return -1; break; case RECORD_Q_GETINFO: regcache_raw_read_unsigned (regcache, tdep->arg4, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_mem_dqinfo)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_mem_dqinfo)) return -1; break; case RECORD_Q_GETQUOTA: regcache_raw_read_unsigned (regcache, tdep->arg4, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_if_dqblk)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_if_dqblk)) return -1; break; case RECORD_Q_XGETQSTAT: case RECORD_Q_XGETQUOTA: regcache_raw_read_unsigned (regcache, tdep->arg4, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_fs_quota_stat)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_fs_quota_stat)) return -1; break; } @@ -1318,7 +1325,7 @@ Do you want to stop the program?"), regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); /*XXX the size of memory is not very clear. */ - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, 10)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, 10)) return -1; } break; @@ -1331,8 +1338,8 @@ Do you want to stop the program?"), case gdb_sys_llseek: regcache_raw_read_unsigned (regcache, tdep->arg4, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_loff_t)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_loff_t)) return -1; break; @@ -1343,28 +1350,28 @@ Do you want to stop the program?"), regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); regcache_raw_read_unsigned (regcache, tdep->arg3, &count); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_dirent * count)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_dirent * count)) return -1; } break; case gdb_sys_select: regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_fd_set)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_fd_set)) return -1; regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_fd_set)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_fd_set)) return -1; regcache_raw_read_unsigned (regcache, tdep->arg4, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_fd_set)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_fd_set)) return -1; regcache_raw_read_unsigned (regcache, tdep->arg5, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_timeval)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_timeval)) return -1; break; @@ -1403,7 +1410,7 @@ Do you want to stop the program?"), = (int) extract_unsigned_integer (iov + tdep->size_pointer, tdep->size_size_t, byte_order); - if (record_arch_list_add_mem (tmpaddr, tmpint)) + if (record_full_arch_list_add_mem (tmpaddr, tmpint)) return -1; vec += tdep->size_iovec; } @@ -1424,7 +1431,8 @@ Do you want to stop the program?"), case gdb_sys_sched_getparam: regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, tdep->size_int)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_int)) return -1; break; @@ -1438,8 +1446,8 @@ Do you want to stop the program?"), case gdb_sys_sched_rr_get_interval: case gdb_sys_nanosleep: regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_timespec)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_timespec)) return -1; break; @@ -1449,16 +1457,16 @@ Do you want to stop the program?"), case gdb_sys_getresuid16: regcache_raw_read_unsigned (regcache, tdep->arg1, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_old_uid_t)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_old_uid_t)) return -1; regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_old_uid_t)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_old_uid_t)) return -1; regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_old_uid_t)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_old_uid_t)) return -1; break; @@ -1473,8 +1481,8 @@ Do you want to stop the program?"), ULONGEST nfds; regcache_raw_read_unsigned (regcache, tdep->arg2, &nfds); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_pollfd * nfds)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_pollfd * nfds)) return -1; } break; @@ -1491,7 +1499,7 @@ Do you want to stop the program?"), rsize = tdep->size_knfsd_fh; regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, rsize)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, rsize)) return -1; } break; @@ -1501,16 +1509,16 @@ Do you want to stop the program?"), case gdb_sys_getresgid16: regcache_raw_read_unsigned (regcache, tdep->arg1, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_old_gid_t)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_old_gid_t)) return -1; regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_old_gid_t)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_old_gid_t)) return -1; regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_old_gid_t)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_old_gid_t)) return -1; break; @@ -1521,15 +1529,15 @@ Do you want to stop the program?"), case 2: regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_int)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_int)) return -1; break; case 16: regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_TASK_COMM_LEN)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_TASK_COMM_LEN)) return -1; break; } @@ -1540,15 +1548,15 @@ Do you want to stop the program?"), case gdb_sys_rt_sigaction: regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_sigaction)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_sigaction)) return -1; break; case gdb_sys_rt_sigprocmask: regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_sigset_t)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_sigset_t)) return -1; break; @@ -1559,16 +1567,16 @@ Do you want to stop the program?"), ULONGEST sigsetsize; regcache_raw_read_unsigned (regcache, tdep->arg2,&sigsetsize); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - (int) sigsetsize)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + (int) sigsetsize)) return -1; } break; case gdb_sys_rt_sigtimedwait: regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_siginfo_t)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_siginfo_t)) return -1; break; @@ -1583,7 +1591,8 @@ Do you want to stop the program?"), ULONGEST count; regcache_raw_read_unsigned (regcache, tdep->arg3,&count); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, (int) count)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + (int) count)) return -1; } break; @@ -1599,15 +1608,16 @@ Do you want to stop the program?"), ULONGEST size; regcache_raw_read_unsigned (regcache, tdep->arg2, &size); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, (int) size)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + (int) size)) return -1; } break; case gdb_sys_capget: regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_cap_user_data_t)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_cap_user_data_t)) return -1; break; @@ -1616,15 +1626,15 @@ Do you want to stop the program?"), case gdb_sys_sigaltstack: regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_stack_t)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_stack_t)) return -1; break; case gdb_sys_sendfile: regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_off_t)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_off_t)) return -1; break; @@ -1635,8 +1645,8 @@ Do you want to stop the program?"), case gdb_sys_getrlimit: regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_rlimit)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_rlimit)) return -1; break; @@ -1651,8 +1661,8 @@ Do you want to stop the program?"), case gdb_sys_lstat64: case gdb_sys_fstat64: regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_stat64)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_stat64)) return -1; break; @@ -1674,7 +1684,7 @@ Do you want to stop the program?"), regcache_raw_read_unsigned (regcache, tdep->arg1, &gidsetsize); tmpint = tdep->size_gid_t * (int) gidsetsize; - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, tmpint)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, tmpint)) return -1; } break; @@ -1686,13 +1696,16 @@ Do you want to stop the program?"), case gdb_sys_getresuid: regcache_raw_read_unsigned (regcache, tdep->arg1, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, tdep->size_uid_t)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_uid_t)) return -1; regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, tdep->size_uid_t)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_uid_t)) return -1; regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, tdep->size_uid_t)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_uid_t)) return -1; break; @@ -1701,13 +1714,16 @@ Do you want to stop the program?"), case gdb_sys_getresgid: regcache_raw_read_unsigned (regcache, tdep->arg1, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, tdep->size_gid_t)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_gid_t)) return -1; regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, tdep->size_gid_t)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_gid_t)) return -1; regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, tdep->size_gid_t)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_gid_t)) return -1; break; @@ -1721,8 +1737,8 @@ Do you want to stop the program?"), case gdb_sys_mincore: regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_PAGE_SIZE)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_PAGE_SIZE)) return -1; break; @@ -1736,8 +1752,8 @@ Do you want to stop the program?"), regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); regcache_raw_read_unsigned (regcache, tdep->arg3, &count); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_dirent64 * count)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_dirent64 * count)) return -1; } break; @@ -1748,8 +1764,8 @@ Do you want to stop the program?"), { regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_flock64)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_flock64)) return -1; } else if (tmpulongest != tdep->fcntl_F_SETLK64 @@ -1777,7 +1793,8 @@ Do you want to stop the program?"), ULONGEST size; regcache_raw_read_unsigned (regcache, tdep->arg4, &size); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, (int) size)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + (int) size)) return -1; } break; @@ -1791,7 +1808,8 @@ Do you want to stop the program?"), ULONGEST size; regcache_raw_read_unsigned (regcache, tdep->arg3, &size); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, (int) size)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + (int) size)) return -1; } break; @@ -1804,8 +1822,8 @@ Do you want to stop the program?"), case gdb_sys_sendfile64: regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_loff_t)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_loff_t)) return -1; break; @@ -1820,27 +1838,30 @@ Do you want to stop the program?"), ULONGEST len; regcache_raw_read_unsigned (regcache, tdep->arg2, &len); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, (int) len)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + (int) len)) return -1; } break; case gdb_sys_set_thread_area: regcache_raw_read_unsigned (regcache, tdep->arg1, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, tdep->size_int)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_int)) return -1; break; case gdb_sys_get_thread_area: regcache_raw_read_unsigned (regcache, tdep->arg1, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_user_desc)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_user_desc)) return -1; break; case gdb_sys_io_setup: regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, tdep->size_long)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_long)) return -1; break; @@ -1854,8 +1875,8 @@ Do you want to stop the program?"), ULONGEST nr; regcache_raw_read_unsigned (regcache, tdep->arg3, &nr); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - nr * tdep->size_io_event)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + nr * tdep->size_io_event)) return -1; } break; @@ -1886,7 +1907,7 @@ Do you want to stop the program?"), = (CORE_ADDR) extract_unsigned_integer (iocbp, tdep->size_pointer, byte_order); - if (record_arch_list_add_mem (tmpaddr, tdep->size_iocb)) + if (record_full_arch_list_add_mem (tmpaddr, tdep->size_iocb)) return -1; iocbp += tdep->size_pointer; } @@ -1895,8 +1916,8 @@ Do you want to stop the program?"), case gdb_sys_io_cancel: regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_io_event)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_io_event)) return -1; break; @@ -1925,7 +1946,8 @@ Do you want to stop the program?"), ULONGEST len; regcache_raw_read_unsigned (regcache, tdep->arg3, &len); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, (int) len)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + (int) len)) return -1; } break; @@ -1941,8 +1963,9 @@ Do you want to stop the program?"), ULONGEST maxevents; regcache_raw_read_unsigned (regcache, tdep->arg3, &maxevents); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - maxevents * tdep->size_epoll_event)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + (maxevents + * tdep->size_epoll_event))) return -1; } break; @@ -1953,21 +1976,22 @@ Do you want to stop the program?"), case gdb_sys_timer_create: regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, tdep->size_int)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_int)) return -1; break; case gdb_sys_timer_settime: regcache_raw_read_unsigned (regcache, tdep->arg4, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_itimerspec)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_itimerspec)) return -1; break; case gdb_sys_timer_gettime: regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_itimerspec)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_itimerspec)) return -1; break; @@ -1978,30 +2002,30 @@ Do you want to stop the program?"), case gdb_sys_clock_gettime: regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_timespec)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_timespec)) return -1; break; case gdb_sys_clock_getres: regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_timespec)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_timespec)) return -1; break; case gdb_sys_clock_nanosleep: regcache_raw_read_unsigned (regcache, tdep->arg4, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_timespec)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_timespec)) return -1; break; case gdb_sys_statfs64: case gdb_sys_fstatfs64: regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_statfs64)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_statfs64)) return -1; break; @@ -2014,7 +2038,8 @@ Do you want to stop the program?"), case gdb_sys_get_mempolicy: regcache_raw_read_unsigned (regcache, tdep->arg1, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, tdep->size_int)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_int)) return -1; regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); if (tmpulongest) @@ -2022,8 +2047,8 @@ Do you want to stop the program?"), ULONGEST maxnode; regcache_raw_read_unsigned (regcache, tdep->arg3, &maxnode); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - maxnode * tdep->size_long)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + maxnode * tdep->size_long)) return -1; } break; @@ -2041,12 +2066,13 @@ Do you want to stop the program?"), ULONGEST msg_len; regcache_raw_read_unsigned (regcache, tdep->arg3, &msg_len); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - (int) msg_len)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + (int) msg_len)) return -1; } regcache_raw_read_unsigned (regcache, tdep->arg4, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, tdep->size_int)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_int)) return -1; break; @@ -2055,8 +2081,8 @@ Do you want to stop the program?"), case gdb_sys_mq_getsetattr: regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_mq_attr)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_mq_attr)) return -1; break; @@ -2065,12 +2091,12 @@ Do you want to stop the program?"), case gdb_sys_waitid: regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_siginfo)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_siginfo)) return -1; regcache_raw_read_unsigned (regcache, tdep->arg5, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_rusage)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_rusage)) return -1; break; @@ -2090,8 +2116,8 @@ Do you want to stop the program?"), ULONGEST buflen; regcache_raw_read_unsigned (regcache, tdep->arg4, &buflen); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - (int) buflen)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + (int) buflen)) return -1; } } @@ -2112,8 +2138,8 @@ Do you want to stop the program?"), case gdb_sys_fstatat64: regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_stat64)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_stat64)) return -1; break; @@ -2130,7 +2156,8 @@ Do you want to stop the program?"), ULONGEST bufsiz; regcache_raw_read_unsigned (regcache, tdep->arg4, &bufsiz); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, (int) bufsiz)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + (int) bufsiz)) return -1; } break; @@ -2141,20 +2168,20 @@ Do you want to stop the program?"), case gdb_sys_pselect6: regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_fd_set)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_fd_set)) return -1; regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_fd_set)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_fd_set)) return -1; regcache_raw_read_unsigned (regcache, tdep->arg4, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_fd_set)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_fd_set)) return -1; regcache_raw_read_unsigned (regcache, tdep->arg5, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_timespec)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_timespec)) return -1; break; @@ -2165,13 +2192,13 @@ Do you want to stop the program?"), ULONGEST nfds; regcache_raw_read_unsigned (regcache, tdep->arg2, &nfds); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_pollfd * nfds)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_pollfd * nfds)) return -1; } regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_timespec)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_timespec)) return -1; break; @@ -2181,21 +2208,23 @@ Do you want to stop the program?"), case gdb_sys_get_robust_list: regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, tdep->size_int)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_int)) return -1; regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, tdep->size_int)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_int)) return -1; break; case gdb_sys_splice: regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_loff_t)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_loff_t)) return -1; regcache_raw_read_unsigned (regcache, tdep->arg4, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_loff_t)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_loff_t)) return -1; break; @@ -2211,22 +2240,24 @@ Do you want to stop the program?"), ULONGEST nr_pages; regcache_raw_read_unsigned (regcache, tdep->arg2, &nr_pages); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - nr_pages * tdep->size_int)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + nr_pages * tdep->size_int)) return -1; } break; case gdb_sys_getcpu: regcache_raw_read_unsigned (regcache, tdep->arg1, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, tdep->size_int)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_int)) return -1; regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, tdep->size_int)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_int)) return -1; regcache_raw_read_unsigned (regcache, tdep->arg3, &tmpulongest); - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, - tdep->size_ulong * 2)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, + tdep->size_ulong * 2)) return -1; break; @@ -2238,7 +2269,7 @@ Do you want to stop the program?"), regcache_raw_read_unsigned (regcache, tdep->arg3, &maxevents); tmpint = (int) maxevents * tdep->size_epoll_event; - if (record_arch_list_add_mem ((CORE_ADDR) tmpulongest, tmpint)) + if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, tmpint)) return -1; } break; diff --git a/gdb/moxie-tdep.c b/gdb/moxie-tdep.c index fc0f85cfb67..1676a9bb71d 100644 --- a/gdb/moxie-tdep.c +++ b/gdb/moxie-tdep.c @@ -573,7 +573,7 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache, case 0x02: /* gsr */ { int reg = (inst >> 8) & 0xf; - if (record_arch_list_add_reg (regcache, reg)) + if (record_full_arch_list_add_reg (regcache, reg)) return -1; } break; @@ -603,7 +603,7 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache, case 0x02: /* mov (register-to-register) */ { int reg = (inst >> 4) & 0xf; - if (record_arch_list_add_reg (regcache, reg)) + if (record_full_arch_list_add_reg (regcache, reg)) return -1; } break; @@ -613,25 +613,25 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache, MOXIE_SP_REGNUM, (gdb_byte *) & tmpu32); tmpu32 = extract_unsigned_integer ((gdb_byte *) & tmpu32, 4, byte_order); - if (record_arch_list_add_reg (regcache, MOXIE_FP_REGNUM) - || (record_arch_list_add_reg (regcache, - MOXIE_SP_REGNUM)) - || record_arch_list_add_mem (tmpu32 - 12, 12)) + if (record_full_arch_list_add_reg (regcache, MOXIE_FP_REGNUM) + || (record_full_arch_list_add_reg (regcache, + MOXIE_SP_REGNUM)) + || record_full_arch_list_add_mem (tmpu32 - 12, 12)) return -1; } break; case 0x04: /* ret */ { - if (record_arch_list_add_reg (regcache, MOXIE_FP_REGNUM) - || (record_arch_list_add_reg (regcache, - MOXIE_SP_REGNUM))) + if (record_full_arch_list_add_reg (regcache, MOXIE_FP_REGNUM) + || (record_full_arch_list_add_reg (regcache, + MOXIE_SP_REGNUM))) return -1; } break; case 0x05: /* add.l */ { int reg = (inst >> 4) & 0xf; - if (record_arch_list_add_reg (regcache, reg)) + if (record_full_arch_list_add_reg (regcache, reg)) return -1; } break; @@ -641,8 +641,8 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache, regcache_raw_read (regcache, reg, (gdb_byte *) & tmpu32); tmpu32 = extract_unsigned_integer ((gdb_byte *) & tmpu32, 4, byte_order); - if (record_arch_list_add_reg (regcache, reg) - || record_arch_list_add_mem (tmpu32 - 4, 4)) + if (record_full_arch_list_add_reg (regcache, reg) + || record_full_arch_list_add_mem (tmpu32 - 4, 4)) return -1; } break; @@ -650,15 +650,15 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache, { int a = (inst >> 4) & 0xf; int b = inst & 0xf; - if (record_arch_list_add_reg (regcache, a) - || record_arch_list_add_reg (regcache, b)) + if (record_full_arch_list_add_reg (regcache, a) + || record_full_arch_list_add_reg (regcache, b)) return -1; } break; case 0x08: /* lda.l */ { int reg = (inst >> 4) & 0xf; - if (record_arch_list_add_reg (regcache, reg)) + if (record_full_arch_list_add_reg (regcache, reg)) return -1; } break; @@ -666,14 +666,14 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache, { tmpu32 = (uint32_t) moxie_process_readu (addr+2, buf, 4, byte_order); - if (record_arch_list_add_mem (tmpu32, 4)) + if (record_full_arch_list_add_mem (tmpu32, 4)) return -1; } break; case 0x0a: /* ld.l (register indirect) */ { int reg = (inst >> 4) & 0xf; - if (record_arch_list_add_reg (regcache, reg)) + if (record_full_arch_list_add_reg (regcache, reg)) return -1; } break; @@ -683,14 +683,14 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache, regcache_raw_read (regcache, reg, (gdb_byte *) & tmpu32); tmpu32 = extract_unsigned_integer ((gdb_byte *) & tmpu32, 4, byte_order); - if (record_arch_list_add_mem (tmpu32, 4)) + if (record_full_arch_list_add_mem (tmpu32, 4)) return -1; } break; case 0x0c: /* ldo.l */ { int reg = (inst >> 4) & 0xf; - if (record_arch_list_add_reg (regcache, reg)) + if (record_full_arch_list_add_reg (regcache, reg)) return -1; } break; @@ -703,13 +703,13 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache, tmpu32 = extract_unsigned_integer ((gdb_byte *) & tmpu32, 4, byte_order); tmpu32 += offset; - if (record_arch_list_add_mem (tmpu32, 4)) + if (record_full_arch_list_add_mem (tmpu32, 4)) return -1; } break; case 0x0e: /* cmp */ { - if (record_arch_list_add_reg (regcache, MOXIE_CC_REGNUM)) + if (record_full_arch_list_add_reg (regcache, MOXIE_CC_REGNUM)) return -1; } break; @@ -733,10 +733,10 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache, MOXIE_SP_REGNUM, (gdb_byte *) & tmpu32); tmpu32 = extract_unsigned_integer ((gdb_byte *) & tmpu32, 4, byte_order); - if (record_arch_list_add_reg (regcache, MOXIE_FP_REGNUM) - || (record_arch_list_add_reg (regcache, - MOXIE_SP_REGNUM)) - || record_arch_list_add_mem (tmpu32 - 12, 12)) + if (record_full_arch_list_add_reg (regcache, MOXIE_FP_REGNUM) + || (record_full_arch_list_add_reg (regcache, + MOXIE_SP_REGNUM)) + || record_full_arch_list_add_mem (tmpu32 - 12, 12)) return -1; } break; @@ -750,7 +750,7 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache, case 0x1d: /* lda.b */ { int reg = (inst >> 4) & 0xf; - if (record_arch_list_add_reg (regcache, reg)) + if (record_full_arch_list_add_reg (regcache, reg)) return -1; } break; @@ -760,7 +760,7 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache, regcache_raw_read (regcache, reg, (gdb_byte *) & tmpu32); tmpu32 = extract_unsigned_integer ((gdb_byte *) & tmpu32, 4, byte_order); - if (record_arch_list_add_mem (tmpu32, 1)) + if (record_full_arch_list_add_mem (tmpu32, 1)) return -1; } break; @@ -768,7 +768,7 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache, { tmpu32 = moxie_process_readu (addr+2, (char *) buf, 4, byte_order); - if (record_arch_list_add_mem (tmpu32, 1)) + if (record_full_arch_list_add_mem (tmpu32, 1)) return -1; } break; @@ -777,7 +777,7 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache, case 0x22: /* lda.s */ { int reg = (inst >> 4) & 0xf; - if (record_arch_list_add_reg (regcache, reg)) + if (record_full_arch_list_add_reg (regcache, reg)) return -1; } break; @@ -787,7 +787,7 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache, regcache_raw_read (regcache, reg, (gdb_byte *) & tmpu32); tmpu32 = extract_unsigned_integer ((gdb_byte *) & tmpu32, 4, byte_order); - if (record_arch_list_add_mem (tmpu32, 2)) + if (record_full_arch_list_add_mem (tmpu32, 2)) return -1; } break; @@ -795,7 +795,7 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache, { tmpu32 = moxie_process_readu (addr+2, (char *) buf, 4, byte_order); - if (record_arch_list_add_mem (tmpu32, 2)) + if (record_full_arch_list_add_mem (tmpu32, 2)) return -1; } break; @@ -816,7 +816,7 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache, case 0x2f: /* mul.l */ { int reg = (inst >> 4) & 0xf; - if (record_arch_list_add_reg (regcache, reg)) + if (record_full_arch_list_add_reg (regcache, reg)) return -1; } break; @@ -837,7 +837,7 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache, break; case 0x2: /* SYS_open */ { - if (record_arch_list_add_reg (regcache, RET1_REGNUM)) + if (record_full_arch_list_add_reg (regcache, RET1_REGNUM)) return -1; } break; @@ -858,13 +858,13 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache, length = moxie_process_readu (tmpu32+20, (char *) buf, 4, byte_order); - if (record_arch_list_add_mem (ptr, length)) + if (record_full_arch_list_add_mem (ptr, length)) return -1; } break; case 0x5: /* SYS_write */ { - if (record_arch_list_add_reg (regcache, RET1_REGNUM)) + if (record_full_arch_list_add_reg (regcache, RET1_REGNUM)) return -1; } break; @@ -879,7 +879,7 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache, case 0x34: /* umod.l */ { int reg = (inst >> 4) & 0xf; - if (record_arch_list_add_reg (regcache, reg)) + if (record_full_arch_list_add_reg (regcache, reg)) return -1; } break; @@ -889,7 +889,7 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache, case 0x36: /* ldo.b */ { int reg = (inst >> 4) & 0xf; - if (record_arch_list_add_reg (regcache, reg)) + if (record_full_arch_list_add_reg (regcache, reg)) return -1; } break; @@ -902,14 +902,14 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache, tmpu32 = extract_unsigned_integer ((gdb_byte *) & tmpu32, 4, byte_order); tmpu32 += offset; - if (record_arch_list_add_mem (tmpu32, 1)) + if (record_full_arch_list_add_mem (tmpu32, 1)) return -1; } break; case 0x38: /* ldo.s */ { int reg = (inst >> 4) & 0xf; - if (record_arch_list_add_reg (regcache, reg)) + if (record_full_arch_list_add_reg (regcache, reg)) return -1; } break; @@ -922,7 +922,7 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache, tmpu32 = extract_unsigned_integer ((gdb_byte *) & tmpu32, 4, byte_order); tmpu32 += offset; - if (record_arch_list_add_mem (tmpu32, 2)) + if (record_full_arch_list_add_mem (tmpu32, 2)) return -1; } break; @@ -932,9 +932,9 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache, } } - if (record_arch_list_add_reg (regcache, MOXIE_PC_REGNUM)) + if (record_full_arch_list_add_reg (regcache, MOXIE_PC_REGNUM)) return -1; - if (record_arch_list_add_end ()) + if (record_full_arch_list_add_end ()) return -1; return 0; } diff --git a/gdb/record-full.c b/gdb/record-full.c index 14f44009304..5ffa6b73e70 100644 --- a/gdb/record-full.c +++ b/gdb/record-full.c @@ -156,7 +156,7 @@ struct record_full_entry /* If true, query if PREC cannot record memory change of next instruction. */ -int record_memory_query = 0; +int record_full_memory_query = 0; struct record_full_core_buf_entry { @@ -483,7 +483,7 @@ record_full_get_loc (struct record_full_entry *rec) /* Record the value of a register NUM to record_full_arch_list. */ int -record_arch_list_add_reg (struct regcache *regcache, int regnum) +record_full_arch_list_add_reg (struct regcache *regcache, int regnum) { struct record_full_entry *rec; @@ -506,7 +506,7 @@ record_arch_list_add_reg (struct regcache *regcache, int regnum) length is LEN to record_full_arch_list. */ int -record_arch_list_add_mem (CORE_ADDR addr, int len) +record_full_arch_list_add_mem (CORE_ADDR addr, int len) { struct record_full_entry *rec; @@ -537,7 +537,7 @@ record_arch_list_add_mem (CORE_ADDR addr, int len) record_full_arch_list. */ int -record_arch_list_add_end (void) +record_full_arch_list_add_end (void) { struct record_full_entry *rec; @@ -701,7 +701,7 @@ record_full_message_wrapper_safe (struct regcache *regcache, static int record_full_gdb_operation_disable = 0; struct cleanup * -record_gdb_operation_disable_set (void) +record_full_gdb_operation_disable_set (void) { struct cleanup *old_cleanups = NULL; @@ -1189,7 +1189,7 @@ record_full_wait_1 (struct target_ops *ops, ptid_t ptid, struct target_waitstatus *status, int options) { - struct cleanup *set_cleanups = record_gdb_operation_disable_set (); + struct cleanup *set_cleanups = record_full_gdb_operation_disable_set (); if (record_debug) fprintf_unfiltered (gdb_stdlog, @@ -1599,7 +1599,7 @@ record_full_registers_change (struct regcache *regcache, int regnum) for (i = 0; i < gdbarch_num_regs (get_regcache_arch (regcache)); i++) { - if (record_arch_list_add_reg (regcache, i)) + if (record_full_arch_list_add_reg (regcache, i)) { record_full_list_release (record_full_arch_list_tail); error (_("Process record: failed to record execution log.")); @@ -1608,13 +1608,13 @@ record_full_registers_change (struct regcache *regcache, int regnum) } else { - if (record_arch_list_add_reg (regcache, regnum)) + if (record_full_arch_list_add_reg (regcache, regnum)) { record_full_list_release (record_full_arch_list_tail); error (_("Process record: failed to record execution log.")); } } - if (record_arch_list_add_end ()) + if (record_full_arch_list_add_end ()) { record_full_list_release (record_full_arch_list_tail); error (_("Process record: failed to record execution log.")); @@ -1721,7 +1721,7 @@ record_full_xfer_partial (struct target_ops *ops, enum target_object object, /* Record registers change to list as an instruction. */ record_full_arch_list_head = NULL; record_full_arch_list_tail = NULL; - if (record_arch_list_add_mem (offset, len)) + if (record_full_arch_list_add_mem (offset, len)) { record_full_list_release (record_full_arch_list_tail); if (record_debug) @@ -1730,7 +1730,7 @@ record_full_xfer_partial (struct target_ops *ops, enum target_object object, "execution log."); return -1; } - if (record_arch_list_add_end ()) + if (record_full_arch_list_add_end ()) { record_full_list_release (record_full_arch_list_tail); if (record_debug) @@ -1831,7 +1831,7 @@ record_full_insert_breakpoint (struct gdbarch *gdbarch, struct cleanup *old_cleanups; int ret; - old_cleanups = record_gdb_operation_disable_set (); + old_cleanups = record_full_gdb_operation_disable_set (); ret = record_full_beneath_to_insert_breakpoint (gdbarch, bp_tgt); do_cleanups (old_cleanups); @@ -1871,7 +1871,7 @@ record_full_remove_breakpoint (struct gdbarch *gdbarch, struct cleanup *old_cleanups; int ret; - old_cleanups = record_gdb_operation_disable_set (); + old_cleanups = record_full_gdb_operation_disable_set (); ret = record_full_beneath_to_remove_breakpoint (gdbarch, bp_tgt); do_cleanups (old_cleanups); @@ -2717,7 +2717,7 @@ record_full_save (char *recfilename) gdbarch = get_regcache_arch (regcache); /* Disable the GDB operation record. */ - set_cleanups = record_gdb_operation_disable_set (); + set_cleanups = record_full_gdb_operation_disable_set (); /* Reverse execute to the begin of record list. */ while (1) @@ -2897,7 +2897,7 @@ static void record_full_goto_insn (struct record_full_entry *entry, enum exec_direction_kind dir) { - struct cleanup *set_cleanups = record_gdb_operation_disable_set (); + struct cleanup *set_cleanups = record_full_gdb_operation_disable_set (); struct regcache *regcache = get_current_regcache (); struct gdbarch *gdbarch = get_regcache_arch (regcache); @@ -3043,7 +3043,7 @@ record/replay buffer. Zero means unlimited. Default is 200000."), deprecate_cmd (c, "show record full insn-number-max"); add_setshow_boolean_cmd ("memory-query", no_class, - &record_memory_query, _("\ + &record_full_memory_query, _("\ Set whether query if PREC cannot record memory change of next instruction."), _("\ Show whether query if PREC cannot record memory change of next instruction."), diff --git a/gdb/record-full.h b/gdb/record-full.h index 46da3a238b5..b5d5b314e9e 100644 --- a/gdb/record-full.h +++ b/gdb/record-full.h @@ -20,11 +20,11 @@ #ifndef RECORD_FULL_H #define RECORD_FULL_H -extern int record_memory_query; +extern int record_full_memory_query; -extern int record_arch_list_add_reg (struct regcache *regcache, int num); -extern int record_arch_list_add_mem (CORE_ADDR addr, int len); -extern int record_arch_list_add_end (void); -extern struct cleanup *record_gdb_operation_disable_set (void); +extern int record_full_arch_list_add_reg (struct regcache *regcache, int num); +extern int record_full_arch_list_add_mem (CORE_ADDR addr, int len); +extern int record_full_arch_list_add_end (void); +extern struct cleanup *record_full_gdb_operation_disable_set (void); #endif /* RECORD_FULL_H */ |