From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52233) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1abLrI-0007P9-4d for qemu-devel@nongnu.org; Thu, 03 Mar 2016 00:31:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1abLrH-00032l-6F for qemu-devel@nongnu.org; Thu, 03 Mar 2016 00:31:32 -0500 Received: from mail-qg0-x241.google.com ([2607:f8b0:400d:c04::241]:34295) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1abLrH-00032a-2o for qemu-devel@nongnu.org; Thu, 03 Mar 2016 00:31:31 -0500 Received: by mail-qg0-x241.google.com with SMTP id t4so757704qge.1 for ; Wed, 02 Mar 2016 21:31:30 -0800 (PST) Sender: Richard Henderson From: Richard Henderson Date: Wed, 2 Mar 2016 21:30:48 -0800 Message-Id: <1456983051-14707-5-git-send-email-rth@twiddle.net> In-Reply-To: <1456983051-14707-1-git-send-email-rth@twiddle.net> References: <1456983051-14707-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH 4/7] target-i386: Dump illegal opcodes with -d unimp List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, hpoussin@reactos.org Signed-off-by: Richard Henderson --- target-i386/translate.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/target-i386/translate.c b/target-i386/translate.c index b73c237..aa423cb 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -99,6 +99,7 @@ typedef struct DisasContext { int prefix; TCGMemOp aflag; TCGMemOp dflag; + target_ulong pc_start; target_ulong pc; /* pc = eip + cs_base */ int is_jmp; /* 1 = means jump (stop translation), 2 means CPU static state change (stop translation) */ @@ -2368,6 +2369,21 @@ static void gen_exception(DisasContext *s, int trapno, target_ulong cur_eip) s->is_jmp = DISAS_TB_JUMP; } +static void gen_illop(CPUX86State *env, DisasContext *s) +{ + target_ulong pc = s->pc_start; + gen_exception(s, EXCP06_ILLOP, pc - s->cs_base); + + if (qemu_loglevel_mask(LOG_UNIMP)) { + target_ulong end = s->pc; + qemu_log("ILLOPC: " TARGET_FMT_lx ":", pc); + for (; pc < end; ++pc) { + qemu_log(" %02x", cpu_ldub_code(env, pc)); + } + qemu_log("\n"); + } +} + /* an interrupt is different from an exception because of the privilege checks */ static void gen_interrupt(DisasContext *s, int intno, @@ -2893,7 +2909,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, } if (s->flags & HF_EM_MASK) { illegal_op: - gen_exception(s, EXCP06_ILLOP, pc_start - s->cs_base); + gen_illop(env, s); return; } if (is_xmm && !(s->flags & HF_OSFXSR_MASK)) @@ -4293,7 +4309,7 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, target_ulong next_eip, tval; int rex_w, rex_r; - s->pc = pc_start; + s->pc_start = s->pc = pc_start; prefixes = 0; s->override = -1; rex_w = -1; @@ -8031,7 +8047,7 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, if (s->prefix & PREFIX_LOCK) gen_helper_unlock(); /* XXX: ensure that no lock was generated */ - gen_exception(s, EXCP06_ILLOP, pc_start - s->cs_base); + gen_illop(env, s); return s->pc; } -- 2.5.0