From 77d7dc9283af8e77f27314c9e2e79fbdea9ce7ff Mon Sep 17 00:00:00 2001
From: Hui Zhu <teawater@gmail.com>
Date: Sat, 29 Aug 2009 05:32:16 +0000
Subject: [PATCH] 2009-08-29 Hui Zhu <teawater@gmail.com>
* i386-tdep.c (i386_process_record): Fix the error of string
ops instructions's handler.
---
gdb/ChangeLog | 5 ++++
gdb/i386-tdep.c | 69 +++++++++++++++++++++++--------------------------
2 files changed, 38 insertions(+), 36 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e035de2499c..32fcf5dcaed 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-29 Hui Zhu <teawater@gmail.com>
+
+ * i386-tdep.c (i386_process_record): Fix the error of string
+ ops instructions's handler.
+
2009-08-28 Doug Evans <dje@google.com>
* top.c (execute_command): Remove redundant comment.
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index def86cf56d6..0381bc9b5d8 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -4443,50 +4443,47 @@ i386_process_record (struct gdbarch *gdbarch, struct regcache *regcache,
/* insS */
case 0x6c:
case 0x6d:
- if ((opcode & 1) == 0)
- ir.ot = OT_BYTE;
- else
- ir.ot = ir.dflag + OT_WORD;
regcache_raw_read_unsigned (ir.regcache,
- ir.regmap[X86_RECORD_REDI_REGNUM],
+ ir.regmap[X86_RECORD_RECX_REGNUM],
&tmpulongest);
- if (!ir.aflag)
- {
- tmpulongest &= 0xffff;
- /* addr += ((uint32_t) read_register (I386_ES_REGNUM)) << 4; */
- if (record_debug)
- printf_unfiltered (_("Process record ignores the memory change "
- "of instruction at address 0x%s because "
- "it can't get the value of the segment "
- "register.\n"),
- paddress (gdbarch, ir.addr));
- }
- if (prefixes & (PREFIX_REPZ | PREFIX_REPNZ))
+ if (tmpulongest)
{
- ULONGEST count, eflags;
+ ULONGEST es, ds;
+
+ if ((opcode & 1) == 0)
+ ir.ot = OT_BYTE;
+ else
+ ir.ot = ir.dflag + OT_WORD;
regcache_raw_read_unsigned (ir.regcache,
ir.regmap[X86_RECORD_REDI_REGNUM],
- &count);
- if (!ir.aflag)
- count &= 0xffff;
+ &tmpulongest);
+
regcache_raw_read_unsigned (ir.regcache,
- ir.regmap[X86_RECORD_EFLAGS_REGNUM],
- &eflags);
- if ((eflags >> 10) & 0x1)
- tmpulongest -= (count - 1) * (1 << ir.ot);
- if (record_arch_list_add_mem (tmpulongest, count * (1 << ir.ot)))
- return -1;
- I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_RECX_REGNUM);
- }
- else
- {
+ ir.regmap[X86_RECORD_ES_REGNUM],
+ &es);
+ regcache_raw_read_unsigned (ir.regcache,
+ ir.regmap[X86_RECORD_DS_REGNUM],
+ &ds);
+ if (ir.aflag && (es != ds))
+ {
+ /* addr += ((uint32_t) read_register (I386_ES_REGNUM)) << 4; */
+ if (record_debug)
+ printf_unfiltered (_("Process record ignores the memory "
+ "change of instruction at address 0x%s "
+ "because it can't get the value of the "
+ "ES segment register.\n"),
+ paddress (gdbarch, ir.addr));
+ }
+
+ if (prefixes & (PREFIX_REPZ | PREFIX_REPNZ))
+ I386_RECORD_ARCH_LIST_ADD_REG (X86_RECORD_RECX_REGNUM);
if (record_arch_list_add_mem (tmpulongest, 1 << ir.ot))
return -1;
- }
- 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);
+ 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);
+ }
break;
/* cmpsS */
--
GitLab