From patchwork Sun Oct 22 00:46:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 116614 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp3186404qgn; Sat, 21 Oct 2017 17:48:42 -0700 (PDT) X-Received: by 10.55.75.75 with SMTP id y72mr12572233qka.118.1508633322326; Sat, 21 Oct 2017 17:48:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508633322; cv=none; d=google.com; s=arc-20160816; b=LkausG3RrkL72R2d7I47Lr5ZgKO3thVTvwEU46ezRDv5H7gawGJmOVyCP5jUevaT1c xprJfWfewvjcvAkL8hfMaZwKL7zmZZHYbxhemoocD4SFXf/NxdKvkv5rmrVZ1aeokHQH whUVexctP6R8dnL849S0VI1BH4K/7aVaFxA7iQi4V8bxBEa+J3CkF2+/YbEQAKKHG4jJ fMB/XPq9CcbUwBjr2DDev8Fb7Cf8yU0QYYzooX2biJxS/3XEWMgwNy2AeJTT8LXhX8o8 pryr+m3d1XmiMFKlnZIlsTuYE6qqsuQ1UuA4x2bZk1l8wSXJwmI0371AvliTKlvV/iJ3 ELGA== 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=NYOFWOWemQRN4J6eKraXGc5rW1vmFeGZ2VDO7BWbC4w=; b=w7Kv3Mjj9TYN9jK4kGmJ5g448sR6XB+ndT9VGyn5yL99LQtVdpuTMlrVjLSg+D0O6m XwZFYuyrpQVXJLq3kbotXq4eWv8un6vqItaL/TBsMubX9G1h1G/c20mll0DRAt0EQYQs u1nFLo9m7nEf+PVcLG/gWq8Wkcf2Cl7xBsPQlhptzQVcTLuOa+iQhllGaeUpdpN5pMHW WcPaUbfYjGh6HWVzOt7+XqrrmL0HIfWJ9idUc29GFkuKIBB7du9IkukcToy1G9BdYIcY Hp9nFfUZrTsAqByGbQugBDwTu8iBz6r3WA7upzRJKwjQ3AFO0hLqUD5gCb90KUd+vF75 U4WQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NgBdClXf; 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 k7si1432196qtk.393.2017.10.21.17.48.41 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 21 Oct 2017 17:48:42 -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=NgBdClXf; 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]:59627 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e64RU-0003K8-6U for patch@linaro.org; Sat, 21 Oct 2017 20:48:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37257) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e64PP-0002CP-I6 for qemu-devel@nongnu.org; Sat, 21 Oct 2017 20:46:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e64PM-0008BO-1T for qemu-devel@nongnu.org; Sat, 21 Oct 2017 20:46:31 -0400 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]:52923) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e64PL-0008AV-Pe for qemu-devel@nongnu.org; Sat, 21 Oct 2017 20:46:27 -0400 Received: by mail-pg0-x241.google.com with SMTP id a192so9196645pge.9 for ; Sat, 21 Oct 2017 17:46:27 -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=NYOFWOWemQRN4J6eKraXGc5rW1vmFeGZ2VDO7BWbC4w=; b=NgBdClXfMiZhUhLG3252Mzr3xBfd+zOTm0YhR9qe/WrnNaE3yXTA3DRxutX4NF+UwD 5+gy9njZ4PUWx9xjfY5PYVNptkjsXM+eE3Xcg2l2EwKlXUDlJC0skQhJT4I6bbY+J/cG UMRQFISW8rQe667Or6XE/lDqiV4O1t4yqrgE8= 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=NYOFWOWemQRN4J6eKraXGc5rW1vmFeGZ2VDO7BWbC4w=; b=E2ReZSexD6pTtrzT2a1nBgWjjNnFF3tzqQmprPKjq6ezzIxaUn7Ox+XSaP3FZZeGgn TMB0/lYfb7mhXE12Oh6yvvuC465cayv9LDBaue0cvPAD0629CmmOfKm7+mJk5CNn7Svs rfbaj2LfnQk8lc08aT8Yo2xYEMLv8p1O/BDvCE//5dO9pNSibz5iCosLmrC4CZxk00DF RZb6h/CrHBoLDn5fEFKew8XtXJEO5xaF4TKcdOpjE42Ck7tcJx0IDQA4F1Lepuppd3ya AkcAB944MDqfOxsPxOIal4zoYbPUXiYWyN39X9CF1pMa8aiMW8BGzrxD3+fjxQ0wgdXR t8Kg== X-Gm-Message-State: AMCzsaWJVMsoWdECMdxu/OBi3Nm6eQq66GWk2co2e+yZidMnLGYeT5vW VYWqlq1RvBrALCqIA6f9/BYKjtOso48= X-Google-Smtp-Source: ABhQp+T43ffrPSHcOCqffESU4u5fVZzkCfizhnnL4o1TkKAQxTdnp3pxyfAyDFTxlrBYVbJQk4IgHg== X-Received: by 10.98.189.23 with SMTP id a23mr1570220pff.124.1508633186415; Sat, 21 Oct 2017 17:46:26 -0700 (PDT) Received: from cloudburst.twiddle.net (174-21-9-158.tukw.qwest.net. [174.21.9.158]) by smtp.gmail.com with ESMTPSA id j12sm5766728pgs.35.2017.10.21.17.46.24 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 21 Oct 2017 17:46:25 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 21 Oct 2017 17:46:11 -0700 Message-Id: <20171022004621.28372-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171022004621.28372-1-richard.henderson@linaro.org> References: <20171022004621.28372-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::241 Subject: [Qemu-devel] [PATCH v7 01/11] 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" Tested-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé 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.6 diff --git a/disas.c b/disas.c index 54eea3f9c9..7e22a80da6 100644 --- a/disas.c +++ b/disas.c @@ -204,16 +204,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; } @@ -389,16 +380,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 fe0d1bdbb4..a736ae9a81 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 5f24a2de3c..69a87de83b 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -8557,15 +8557,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 = {