From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7865 invoked by alias); 29 Aug 2009 15:53:36 -0000 Received: (qmail 7855 invoked by uid 22791); 29 Aug 2009 15:53:35 -0000 X-SWARE-Spam-Status: No, hits=-1.4 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_28,SARE_MSGID_LONG40,SPF_PASS X-Spam-Check-By: sourceware.org Received: from mail-iw0-f183.google.com (HELO mail-iw0-f183.google.com) (209.85.223.183) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 29 Aug 2009 15:53:28 +0000 Received: by iwn13 with SMTP id 13so1188581iwn.12 for ; Sat, 29 Aug 2009 08:53:26 -0700 (PDT) MIME-Version: 1.0 Received: by 10.231.6.87 with SMTP id 23mr2517215iby.19.1251561206147; Sat, 29 Aug 2009 08:53:26 -0700 (PDT) From: Hui Zhu Date: Sat, 29 Aug 2009 16:12:00 -0000 Message-ID: Subject: [RFA/prec] Make i386 handle segment register better To: gdb-patches ml Cc: Michael Snyder Content-Type: multipart/mixed; boundary=0015176f1cf81b6c02047249cd32 X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2009-08/txt/msg00538.txt.bz2 --0015176f1cf81b6c02047249cd32 Content-Type: text/plain; charset=ISO-8859-1 Content-length: 3167 Hi guys, In prec-fix-x86-strinsn.txt patch, I add code the compare the ES and DS to make sure if es if same with ds or not. I think it works not bad, so I make a patch to check other segment regiser like it. Please help me with it. Thanks, Hui 2009-08-29 Hui Zhu * i386-tdep.c (i386_record_check_override): New function. (i386_record_lea_modrm): Call i386_record_check_override. (i386_process_record): Ditto. --- i386-tdep.c | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) --- a/i386-tdep.c +++ b/i386-tdep.c @@ -3147,6 +3147,26 @@ no_rm: return 0; } +static int +i386_record_check_override (struct i386_record_s *irp) +{ + if (irp->override >= 0 && irp->override != X86_RECORD_DS_REGNUM) + { + ULONGEST tmp, ds; + + regcache_raw_read_unsigned (irp->regcache, + irp->regmap[irp->override], + &tmp); + regcache_raw_read_unsigned (irp->regcache, + irp->regmap[X86_RECORD_DS_REGNUM], + &ds); + if (tmp != ds) + return 1; + } + + return 0; +} + /* Record the value of the memory that willbe changed in current instruction to "record_arch_list". Return -1 if something wrong. */ @@ -3157,7 +3177,7 @@ i386_record_lea_modrm (struct i386_recor struct gdbarch *gdbarch = irp->gdbarch; uint64_t addr; - if (irp->override >= 0) + if (i386_record_check_override (irp)) { if (record_debug) printf_unfiltered (_("Process record ignores the memory change " @@ -4039,7 +4059,7 @@ reswitch: /* mov EAX */ case 0xa2: case 0xa3: - if (ir.override >= 0) + if (i386_record_check_override (&ir)) { if (record_debug) printf_unfiltered (_("Process record ignores the memory change " @@ -4458,13 +4478,8 @@ reswitch: ir.regmap[X86_RECORD_REDI_REGNUM], &tmpulongest); - regcache_raw_read_unsigned (ir.regcache, - 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)) + ir.override = X86_RECORD_ES_REGNUM; + if (ir.aflag && i386_record_check_override (&ir)) { /* addr += ((uint32_t) read_register (I386_ES_REGNUM)) << 4; */ if (record_debug) @@ -5086,7 +5101,7 @@ reswitch: opcode = opcode << 8 | ir.modrm; goto no_support; } - if (ir.override >= 0) + if (i386_record_check_override (&ir)) { if (record_debug) printf_unfiltered (_("Process record ignores the memory " @@ -5138,7 +5153,7 @@ reswitch: else { /* sidt */ - if (ir.override >= 0) + if (i386_record_check_override (&ir)) { if (record_debug) printf_unfiltered (_("Process record ignores the memory " --0015176f1cf81b6c02047249cd32 Content-Type: text/plain; charset=US-ASCII; name="prec-i386-override.txt" Content-Disposition: attachment; filename="prec-i386-override.txt" Content-Transfer-Encoding: base64 X-Attachment-Id: f_fyyj793z0 Content-length: 3701 LS0tCiBpMzg2LXRkZXAuYyB8ICAgMzcgKysrKysrKysrKysrKysrKysrKysr KysrKystLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDI2IGluc2VydGlv bnMoKyksIDExIGRlbGV0aW9ucygtKQoKLS0tIGEvaTM4Ni10ZGVwLmMKKysr IGIvaTM4Ni10ZGVwLmMKQEAgLTMxNDcsNiArMzE0NywyNiBAQCBub19ybToK ICAgcmV0dXJuIDA7CiB9CiAKK3N0YXRpYyBpbnQKK2kzODZfcmVjb3JkX2No ZWNrX292ZXJyaWRlIChzdHJ1Y3QgaTM4Nl9yZWNvcmRfcyAqaXJwKQorewor ICBpZiAoaXJwLT5vdmVycmlkZSA+PSAwICYmIGlycC0+b3ZlcnJpZGUgIT0g WDg2X1JFQ09SRF9EU19SRUdOVU0pCisgICAgeworICAgICAgVUxPTkdFU1Qg dG1wLCBkczsKKworICAgICAgcmVnY2FjaGVfcmF3X3JlYWRfdW5zaWduZWQg KGlycC0+cmVnY2FjaGUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgaXJwLT5yZWdtYXBbaXJwLT5vdmVycmlkZV0sCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgJnRtcCk7CisgICAgICByZWdjYWNo ZV9yYXdfcmVhZF91bnNpZ25lZCAoaXJwLT5yZWdjYWNoZSwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBpcnAtPnJlZ21hcFtYODZfUkVD T1JEX0RTX1JFR05VTV0sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgJmRzKTsKKyAgICAgIGlmICh0bXAgIT0gZHMpCisgICAgICAgIHJl dHVybiAxOworICAgIH0KKworICByZXR1cm4gMDsKK30KKwogLyogUmVjb3Jk IHRoZSB2YWx1ZSBvZiB0aGUgbWVtb3J5IHRoYXQgd2lsbGJlIGNoYW5nZWQg aW4gY3VycmVudCBpbnN0cnVjdGlvbgogICAgdG8gInJlY29yZF9hcmNoX2xp c3QiLgogICAgUmV0dXJuIC0xIGlmIHNvbWV0aGluZyB3cm9uZy4gKi8KQEAg LTMxNTcsNyArMzE3Nyw3IEBAIGkzODZfcmVjb3JkX2xlYV9tb2RybSAoc3Ry dWN0IGkzODZfcmVjb3IKICAgc3RydWN0IGdkYmFyY2ggKmdkYmFyY2ggPSBp cnAtPmdkYmFyY2g7CiAgIHVpbnQ2NF90IGFkZHI7CiAKLSAgaWYgKGlycC0+ b3ZlcnJpZGUgPj0gMCkKKyAgaWYgKGkzODZfcmVjb3JkX2NoZWNrX292ZXJy aWRlIChpcnApKQogICAgIHsKICAgICAgIGlmIChyZWNvcmRfZGVidWcpCiAJ cHJpbnRmX3VuZmlsdGVyZWQgKF8oIlByb2Nlc3MgcmVjb3JkIGlnbm9yZXMg dGhlIG1lbW9yeSBjaGFuZ2UgIgpAQCAtNDAzOSw3ICs0MDU5LDcgQEAgcmVz d2l0Y2g6CiAgICAgICAvKiBtb3YgRUFYICovCiAgICAgY2FzZSAweGEyOgog ICAgIGNhc2UgMHhhMzoKLSAgICAgIGlmIChpci5vdmVycmlkZSA+PSAwKQor ICAgICAgaWYgKGkzODZfcmVjb3JkX2NoZWNrX292ZXJyaWRlICgmaXIpKQog ICAgICAgICB7CiAJICBpZiAocmVjb3JkX2RlYnVnKQogCSAgICBwcmludGZf dW5maWx0ZXJlZCAoXygiUHJvY2VzcyByZWNvcmQgaWdub3JlcyB0aGUgbWVt b3J5IGNoYW5nZSAiCkBAIC00NDU4LDEzICs0NDc4LDggQEAgcmVzd2l0Y2g6 CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlyLnJl Z21hcFtYODZfUkVDT1JEX1JFRElfUkVHTlVNXSwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgJnRtcHVsb25nZXN0KTsKIAotICAg ICAgICAgIHJlZ2NhY2hlX3Jhd19yZWFkX3Vuc2lnbmVkIChpci5yZWdjYWNo ZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaXIu cmVnbWFwW1g4Nl9SRUNPUkRfRVNfUkVHTlVNXSwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgJmVzKTsKLSAgICAgICAgICByZWdj YWNoZV9yYXdfcmVhZF91bnNpZ25lZCAoaXIucmVnY2FjaGUsCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlyLnJlZ21hcFtYODZf UkVDT1JEX0RTX1JFR05VTV0sCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICZkcyk7Ci0gICAgICAgICAgaWYgKGlyLmFmbGFnICYm IChlcyAhPSBkcykpCisgICAgICAgICAgaXIub3ZlcnJpZGUgPSBYODZfUkVD T1JEX0VTX1JFR05VTTsKKyAgICAgICAgICBpZiAoaXIuYWZsYWcgJiYgaTM4 Nl9yZWNvcmRfY2hlY2tfb3ZlcnJpZGUgKCZpcikpCiAgICAgICAgICAgICB7 CiAgICAgICAgICAgICAgIC8qIGFkZHIgKz0gKCh1aW50MzJfdCkgcmVhZF9y ZWdpc3RlciAoSTM4Nl9FU19SRUdOVU0pKSA8PCA0OyAqLwogICAgICAgICAg ICAgICBpZiAocmVjb3JkX2RlYnVnKQpAQCAtNTA4Niw3ICs1MTAxLDcgQEAg cmVzd2l0Y2g6CiAJCW9wY29kZSA9IG9wY29kZSA8PCA4IHwgaXIubW9kcm07 CiAJCWdvdG8gbm9fc3VwcG9ydDsKIAkgICAgICB9Ci0JICAgIGlmIChpci5v dmVycmlkZSA+PSAwKQorCSAgICBpZiAoaTM4Nl9yZWNvcmRfY2hlY2tfb3Zl cnJpZGUgKCZpcikpCiAJICAgICAgewogCQlpZiAocmVjb3JkX2RlYnVnKQog CQkgIHByaW50Zl91bmZpbHRlcmVkIChfKCJQcm9jZXNzIHJlY29yZCBpZ25v cmVzIHRoZSBtZW1vcnkgIgpAQCAtNTEzOCw3ICs1MTUzLDcgQEAgcmVzd2l0 Y2g6CiAJICBlbHNlCiAJICAgIHsKIAkgICAgICAvKiBzaWR0ICovCi0JICAg ICAgaWYgKGlyLm92ZXJyaWRlID49IDApCisJICAgICAgaWYgKGkzODZfcmVj b3JkX2NoZWNrX292ZXJyaWRlICgmaXIpKQogCQl7CiAJCSAgaWYgKHJlY29y ZF9kZWJ1ZykKIAkJICAgIHByaW50Zl91bmZpbHRlcmVkIChfKCJQcm9jZXNz IHJlY29yZCBpZ25vcmVzIHRoZSBtZW1vcnkgIgo= --0015176f1cf81b6c02047249cd32--