From patchwork Thu Sep 28 16:54:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 114455 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp965105qgf; Thu, 28 Sep 2017 09:56:16 -0700 (PDT) X-Received: by 10.200.1.30 with SMTP id e30mr1924144qtg.232.1506617776590; Thu, 28 Sep 2017 09:56:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506617776; cv=none; d=google.com; s=arc-20160816; b=GwEpcD778QJdliC9EZaHcB/Qi+tWDGOFCCEXNkd92PunjCT1Q0dp+LiHIrXdjG0JJ4 hpQqAr0ZdJxUlqYW8FKjGM23LEWxM4eBTyaYOGZ/Ow0sWaaJl48qoizW/aR6nV2jmlIf J0pvOAEWgj/QuVEnWPE6YdhhSQrgC99veBEvn265PEELx8MdBQZqaslkCA/8/UBb/60v GxOmODlcYlaSdJbAg6zXCf/X+ocZEddYquSCJGwbBhk8PosRWdl+6RioDhhmqjhsDp0T yroQ3ZbmUnEy1RypX37+qqylEkMegGaj0mZdgaSdrHVVpip4DuUDOT2hGzh9bQT1Gt91 EPvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=L4w7e6YVtwe6n3TScz7OlWevdXr+V6CRdMWP0MnC9cE=; b=WfyP6hu+I1FFx+6W+Pkp1epLkEon0hGZ86WCrgEYlw/+M/4O6u2YvMcwjK+kNGnar3 7F2ptVCgESgZF6fqe+V1KMst64EGrWZ+qo3mIKgNqRXLM1+1OB+0RloXuFgun2TP3cL7 JPRt8A9VnkjH1HVCuqjn1NL4ecB7vRsCXQqG+bip3+9pTYGFtRvvp21vRFkuUZFMDRzb wFp5Cta+4VEMG9jnYXHGJrS+Th1AzHnBdEa+lSJoADa5NAnwUn4luykfgksNPQnuRjRo hO6zC6Arc3RYa9HGlPIEtZQwDKLoSVrMnsOSuWGC5L3ykyEUnTQermdoaBXVlYCbNPsN iJ6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Xcqxm/LB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id j190si1881543qkd.110.2017.09.28.09.56.16 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 28 Sep 2017 09:56:16 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Xcqxm/LB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:60066 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dxc6g-0005nO-B8 for patch@linaro.org; Thu, 28 Sep 2017 12:56:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55275) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dxc4v-0004mJ-W9 for qemu-devel@nongnu.org; Thu, 28 Sep 2017 12:54:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dxc4r-0004Ir-1K for qemu-devel@nongnu.org; Thu, 28 Sep 2017 12:54:26 -0400 Received: from mail-pg0-x235.google.com ([2607:f8b0:400e:c05::235]:48226) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dxc4q-0004IK-R4 for qemu-devel@nongnu.org; Thu, 28 Sep 2017 12:54:20 -0400 Received: by mail-pg0-x235.google.com with SMTP id v23so1257109pgc.5 for ; Thu, 28 Sep 2017 09:54:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=L4w7e6YVtwe6n3TScz7OlWevdXr+V6CRdMWP0MnC9cE=; b=Xcqxm/LBcFY6FklHPug8YmWFiSW/iYMv+Ye5YCQrWXSYv8KxNwj/EhiHVkSI1crrDK d6ngViCcoJxfMjdXGTGanMgtHlN7Lym/chLBsY7tpo/E/x7LEiSA+r1S8pBITz4tJvfl ztw1ntZWVhL8NDUuonWY+ifL1X8vtKh3Uv00M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=L4w7e6YVtwe6n3TScz7OlWevdXr+V6CRdMWP0MnC9cE=; b=uKwXfJCoK4aCIdIX674FBCV9bKtdgD15mcpvn0ghcN7F0irvbDnhVnesOEpJeKVhO8 w9D9gUkSUyVzY8GpRYDzpLaUnukMJZVFVlKIcZBtTzfItGD4TWWVPj2fBBLlj3ukDaYB DLf2talUgpmXMs6zzm9foD/EZSVBiXwsNITdTtU8n3whoGe0N1oIq4UGW1Q+cMmuB3ov EA0YMNg2VDSu4RuJudOyg3NdZCassb/MoS2BK37sD6kxJDM1acm18sOCvUgtivhvISjU O1htSo+2aa/ndBw1IMeEhU76sse87s0EKUY4Oed2qUfs0OH2A8JYjB/+JgETTKIG8gTK WkuQ== X-Gm-Message-State: AHPjjUjVLeJ7pxE+YuXIY30ruUO3cZ4h12X2LsgCe3/yf+0YB13HY6mZ nB2suk1emE4R333RKnvwenFopW/615E= X-Google-Smtp-Source: AOwi7QAA9V6Kc/cyIJDLr8izdBV9JPudEeLrj4aZ9+DqRHRse+fvRjGD4Bm53zTJTA3jE3sccInjUQ== X-Received: by 10.84.244.135 with SMTP id h7mr4556426pll.110.1506617658570; Thu, 28 Sep 2017 09:54:18 -0700 (PDT) Received: from bigtime.twiddle.net ([70.35.39.2]) by smtp.gmail.com with ESMTPSA id e133sm3062332pfh.177.2017.09.28.09.54.17 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Sep 2017 09:54:17 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 28 Sep 2017 09:54:06 -0700 Message-Id: <20170928165414.7339-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170928165414.7339-1-richard.henderson@linaro.org> References: <20170928165414.7339-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::235 Subject: [Qemu-devel] [PATCH v4 1/9] target/i386: Convert to disas_set_info hook X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- disas.c | 22 ++-------------------- monitor.c | 21 --------------------- target/i386/cpu.c | 12 ++++++++++++ target/i386/translate.c | 8 +------- 4 files changed, 15 insertions(+), 48 deletions(-) -- 2.13.5 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/disas.c b/disas.c index d6a1eb9c8e..2be716fdb2 100644 --- a/disas.c +++ b/disas.c @@ -205,16 +205,7 @@ void target_disas(FILE *out, CPUState *cpu, target_ulong code, cc->disas_set_info(cpu, &s.info); } -#if defined(TARGET_I386) - if (flags == 2) { - s.info.mach = bfd_mach_x86_64; - } else if (flags == 1) { - s.info.mach = bfd_mach_i386_i8086; - } else { - s.info.mach = bfd_mach_i386_i386; - } - s.info.print_insn = print_insn_i386; -#elif defined(TARGET_PPC) +#if defined(TARGET_PPC) if ((flags >> 16) & 1) { s.info.endian = BFD_ENDIAN_LITTLE; } @@ -390,16 +381,7 @@ void monitor_disas(Monitor *mon, CPUState *cpu, cc->disas_set_info(cpu, &s.info); } -#if defined(TARGET_I386) - if (flags == 2) { - s.info.mach = bfd_mach_x86_64; - } else if (flags == 1) { - s.info.mach = bfd_mach_i386_i8086; - } else { - s.info.mach = bfd_mach_i386_i386; - } - s.info.print_insn = print_insn_i386; -#elif defined(TARGET_PPC) +#if defined(TARGET_PPC) if (flags & 0xFFFF) { /* If we have a precise definition of the instruction set, use it. */ s.info.mach = flags & 0xFFFF; diff --git a/monitor.c b/monitor.c index f4856b9268..1184bec678 100644 --- a/monitor.c +++ b/monitor.c @@ -1310,27 +1310,6 @@ static void memory_dump(Monitor *mon, int count, int format, int wsize, if (format == 'i') { int flags = 0; -#ifdef TARGET_I386 - CPUArchState *env = mon_get_cpu_env(); - if (wsize == 2) { - flags = 1; - } else if (wsize == 4) { - flags = 0; - } else { - /* as default we use the current CS size */ - flags = 0; - if (env) { -#ifdef TARGET_X86_64 - if ((env->efer & MSR_EFER_LMA) && - (env->segs[R_CS].flags & DESC_L_MASK)) - flags = 2; - else -#endif - if (!(env->segs[R_CS].flags & DESC_B_MASK)) - flags = 1; - } - } -#endif #ifdef TARGET_PPC CPUArchState *env = mon_get_cpu_env(); flags = msr_le << 16; diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 98732cd65f..13b2f8fbc5 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -4097,6 +4097,17 @@ static bool x86_cpu_has_work(CPUState *cs) !(env->hflags & HF_SMM_MASK)); } +static void x86_disas_set_info(CPUState *cs, disassemble_info *info) +{ + X86CPU *cpu = X86_CPU(cs); + CPUX86State *env = &cpu->env; + + info->mach = (env->hflags & HF_CS64_MASK ? bfd_mach_x86_64 + : env->hflags & HF_CS32_MASK ? bfd_mach_i386_i386 + : bfd_mach_i386_i8086); + info->print_insn = print_insn_i386; +} + static Property x86_cpu_properties[] = { #ifdef CONFIG_USER_ONLY /* apic_id = 0 by default for *-user, see commit 9886e834 */ @@ -4216,6 +4227,7 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) #endif cc->cpu_exec_enter = x86_cpu_exec_enter; cc->cpu_exec_exit = x86_cpu_exec_exit; + cc->disas_set_info = x86_disas_set_info; dc->user_creatable = true; } diff --git a/target/i386/translate.c b/target/i386/translate.c index a8986f4c1a..9932d64f2e 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -8527,15 +8527,9 @@ static void i386_tr_disas_log(const DisasContextBase *dcbase, CPUState *cpu) { DisasContext *dc = container_of(dcbase, DisasContext, base); - int disas_flags = !dc->code32; qemu_log("IN: %s\n", lookup_symbol(dc->base.pc_first)); -#ifdef TARGET_X86_64 - if (dc->code64) { - disas_flags = 2; - } -#endif - log_target_disas(cpu, dc->base.pc_first, dc->base.tb->size, disas_flags); + log_target_disas(cpu, dc->base.pc_first, dc->base.tb->size, 0); } static const TranslatorOps i386_tr_ops = {