From nobody Tue Feb 10 11:12:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508935091986162.8275917826204; Wed, 25 Oct 2017 05:38:11 -0700 (PDT) Received: from localhost ([::1]:48107 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7Kwa-0004AK-JH for importer@patchew.org; Wed, 25 Oct 2017 08:38:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42880) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7Kq1-0007Vt-4t for qemu-devel@nongnu.org; Wed, 25 Oct 2017 08:31:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e7Kpr-0007yV-8V for qemu-devel@nongnu.org; Wed, 25 Oct 2017 08:31:13 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:56906) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e7Kpq-0007yD-W2 for qemu-devel@nongnu.org; Wed, 25 Oct 2017 08:31:03 -0400 Received: by mail-wm0-x241.google.com with SMTP id z3so1590291wme.5 for ; Wed, 25 Oct 2017 05:31:02 -0700 (PDT) Received: from cloudburst.twiddle.net ([62.168.35.105]) by smtp.gmail.com with ESMTPSA id 61sm2263446wrg.58.2017.10.25.05.31.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Oct 2017 05:31:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NYOFWOWemQRN4J6eKraXGc5rW1vmFeGZ2VDO7BWbC4w=; b=MY9eBz7rY1DF+khKlF55UzCqFFEshEzuVrpgT56C7GeStLc/qf5XV2YKtiLXQumV2P yApt8l+NZCDzob4mFp9QVCFOO1qfpX16+QJVJNxCae7y7X0zpxmRkkzNFRNlg9gWHxsM AtAdEXBrMx97bCKryNqB+tdI4+eHZoqNKGdDY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NYOFWOWemQRN4J6eKraXGc5rW1vmFeGZ2VDO7BWbC4w=; b=NCQqaSuujHXAHbW6iTkdNuxT4v+f+ruGo026v/ORP3bU4zq/C9oCMvdRL+Ix8gU6qP aZQ/7G+ZMwSbGXmNAOyrRR35tMqSuq2K81ElR/nnwRyyz/NHExPGATb4RPC+iGGBAe9x tjzMYfbrMakBBFvTpUvgMCDBQSyR9U3Y4ZbX5vFN6erT7muKF05vBcYJo/j1LgUbB5SI jqyOEhMGyHVAmG+KPNP0On0FytyZoeI9acD5+pEDNiFyH8C6wogKBIK1T8JUbvSyvIMi 5XVFXObf9HjXk3E0pQ3n/V5rYsOa1zorKRGZ2IYEtStO7lmkqAVgq2xwP04u7/BNj3jA pLKw== X-Gm-Message-State: AMCzsaVCjOYhXJxBnYrXeipYaFGIzmfZqpbBwPWFuaS9tIoM7ZVdmqm0 NegAtSVvwD+xGrsvUgAyVs0Ba6clVMQ= X-Google-Smtp-Source: ABhQp+RzPMdxbag30vp80ugnV+OnhQUEOO6OmiCVgDsXmvG6J8CrOlwIajfj1EnhdPispsHFY/Cn6Q== X-Received: by 10.28.22.2 with SMTP id 2mr1651464wmw.47.1508934661618; Wed, 25 Oct 2017 05:31:01 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 25 Oct 2017 14:30:46 +0200 Message-Id: <20171025123056.3165-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171025123056.3165-1-richard.henderson@linaro.org> References: <20171025123056.3165-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PULL 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: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e 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(-) 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_ulo= ng code, cc->disas_set_info(cpu, &s.info); } =20 -#if defined(TARGET_I386) - if (flags =3D=3D 2) { - s.info.mach =3D bfd_mach_x86_64; - } else if (flags =3D=3D 1) { - s.info.mach =3D bfd_mach_i386_i8086; - } else { - s.info.mach =3D bfd_mach_i386_i386; - } - s.info.print_insn =3D print_insn_i386; -#elif defined(TARGET_PPC) +#if defined(TARGET_PPC) if ((flags >> 16) & 1) { s.info.endian =3D BFD_ENDIAN_LITTLE; } @@ -389,16 +380,7 @@ void monitor_disas(Monitor *mon, CPUState *cpu, cc->disas_set_info(cpu, &s.info); } =20 -#if defined(TARGET_I386) - if (flags =3D=3D 2) { - s.info.mach =3D bfd_mach_x86_64; - } else if (flags =3D=3D 1) { - s.info.mach =3D bfd_mach_i386_i8086; - } else { - s.info.mach =3D bfd_mach_i386_i386; - } - s.info.print_insn =3D 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 =3D 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, =20 if (format =3D=3D 'i') { int flags =3D 0; -#ifdef TARGET_I386 - CPUArchState *env =3D mon_get_cpu_env(); - if (wsize =3D=3D 2) { - flags =3D 1; - } else if (wsize =3D=3D 4) { - flags =3D 0; - } else { - /* as default we use the current CS size */ - flags =3D 0; - if (env) { -#ifdef TARGET_X86_64 - if ((env->efer & MSR_EFER_LMA) && - (env->segs[R_CS].flags & DESC_L_MASK)) - flags =3D 2; - else -#endif - if (!(env->segs[R_CS].flags & DESC_B_MASK)) - flags =3D 1; - } - } -#endif #ifdef TARGET_PPC CPUArchState *env =3D mon_get_cpu_env(); flags =3D 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)); } =20 +static void x86_disas_set_info(CPUState *cs, disassemble_info *info) +{ + X86CPU *cpu =3D X86_CPU(cs); + CPUX86State *env =3D &cpu->env; + + info->mach =3D (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 =3D print_insn_i386; +} + static Property x86_cpu_properties[] =3D { #ifdef CONFIG_USER_ONLY /* apic_id =3D 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 =3D x86_cpu_exec_enter; cc->cpu_exec_exit =3D x86_cpu_exec_exit; + cc->disas_set_info =3D x86_disas_set_info; =20 dc->user_creatable =3D 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 =3D container_of(dcbase, DisasContext, base); - int disas_flags =3D !dc->code32; =20 qemu_log("IN: %s\n", lookup_symbol(dc->base.pc_first)); -#ifdef TARGET_X86_64 - if (dc->code64) { - disas_flags =3D 2; - } -#endif - log_target_disas(cpu, dc->base.pc_first, dc->base.tb->size, disas_flag= s); + log_target_disas(cpu, dc->base.pc_first, dc->base.tb->size, 0); } =20 static const TranslatorOps i386_tr_ops =3D { --=20 2.13.6