From nobody Tue Feb 10 22:18:36 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1506457550033853.0863881870164; Tue, 26 Sep 2017 13:25:50 -0700 (PDT) Received: from localhost ([::1]:51039 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwwQJ-000349-BI for importer@patchew.org; Tue, 26 Sep 2017 16:25:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44062) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwwFg-0002yp-AN for qemu-devel@nongnu.org; Tue, 26 Sep 2017 16:14:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dwwFf-0003Gm-Dq for qemu-devel@nongnu.org; Tue, 26 Sep 2017 16:14:44 -0400 Received: from mail-pg0-x22f.google.com ([2607:f8b0:400e:c05::22f]:48917) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dwwFf-0003Fw-7T for qemu-devel@nongnu.org; Tue, 26 Sep 2017 16:14:43 -0400 Received: by mail-pg0-x22f.google.com with SMTP id v23so6516393pgc.5 for ; Tue, 26 Sep 2017 13:14:43 -0700 (PDT) Received: from bigtime.twiddle.net ([70.35.39.2]) by smtp.gmail.com with ESMTPSA id r138sm15582470pgr.12.2017.09.26.13.14.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Sep 2017 13:14:41 -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=iHGWhZ7FMiF/1t3mBnHk2VoW4xUvwNwin4py5V11uoo=; b=V2foSD8upKy8zHkZTTcI/X/T3o4ZgD3BR5f3N6SLpdGSGiyot553RG38IioqV2UFfm XzNz/vCnz4TWhn2qQwt/u3C/uWH97z+do9sPyyQJR93eigSMZhKnxu/tvVkrCqG+NEFw 1AL14DeUKyeIZzS2nrTKAdbhCcjNZO7uyYT1s= 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=iHGWhZ7FMiF/1t3mBnHk2VoW4xUvwNwin4py5V11uoo=; b=RzLeBGLnwbv7ADx9HvVh47bzKWTrnyOjzG2h+PcdyKWNcBN5kmWEEiCMHw9Qj80vT6 CqdaNSpzc+4WGE+N0T2rC/K2NfTvLtdzrTY2s0l17GzAuYt319Gu9CFxQ8E1+Dkme1Lm ySpV+OBFNzdsqol7pNYel3cncynZV5VicK6UzFJjBGZofiEu4wnX2SG/MvtyNFDStnID tMrkOJXjovQL1zR1W/nPqTeSd3qNhCG6Wvt2GkcpCcJM+Gon90mNNVnsOZNpEc7K4IeO LbU9xKXSIGautBwIXMoxQpgdP3W2KJUjdK5bKHZ5Y+arqJy9CUZMAI+fkdTFQL8Ymbp6 TZCA== X-Gm-Message-State: AHPjjUipbNmk1ls1rfRAxvtN6fcOt24kXMyKVVAJRyfYMdQSyCPomw7R XsZMBKjATlFmiFCsfgzqz/vSuHES2kk= X-Google-Smtp-Source: AOwi7QCPO/T7YdbaUmE3sajSJEvwvC/Ikb62vMALuT7RXQ4Er70sNYMZad4vFiaAuWzbFyJ4/Zz2sQ== X-Received: by 10.101.74.129 with SMTP id b1mr11968029pgu.272.1506456882139; Tue, 26 Sep 2017 13:14:42 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 26 Sep 2017 13:14:26 -0700 Message-Id: <20170926201427.2833-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170926201427.2833-1-richard.henderson@linaro.org> References: <20170926201427.2833-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: 2607:f8b0:400e:c05::22f Subject: [Qemu-devel] [PATCH v3 8/9] disas: Remove monitor_disas_is_physical 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, qemu-ppc@nongnu.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 Even though there is only one monitor, and thus no race on this global data object, there is also no point in having it. We can just as well record the decision in the read_memory_function that we select. Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- disas.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/disas.c b/disas.c index 0d212f2ac5..194c523885 100644 --- a/disas.c +++ b/disas.c @@ -513,19 +513,11 @@ const char *lookup_symbol(target_ulong orig_addr) =20 #include "monitor/monitor.h" =20 -static int monitor_disas_is_physical; - static int -monitor_read_memory (bfd_vma memaddr, bfd_byte *myaddr, int length, +physical_read_memory(bfd_vma memaddr, bfd_byte *myaddr, int length, struct disassemble_info *info) { - CPUDebug *s =3D container_of(info, CPUDebug, info); - - if (monitor_disas_is_physical) { - cpu_physical_memory_read(memaddr, myaddr, length); - } else { - cpu_memory_rw_debug(s->cpu, memaddr, myaddr, length, 0); - } + cpu_physical_memory_read(memaddr, myaddr, length); return 0; } =20 @@ -540,8 +532,8 @@ void monitor_disas(Monitor *mon, CPUState *cpu, INIT_DISASSEMBLE_INFO(s.info, (FILE *)mon, monitor_fprintf); =20 s.cpu =3D cpu; - monitor_disas_is_physical =3D is_physical; - s.info.read_memory_func =3D monitor_read_memory; + s.info.read_memory_func + =3D (is_physical ? physical_read_memory : target_read_memory); s.info.print_address_func =3D generic_print_address; s.info.buffer_vma =3D pc; s.info.cap_arch =3D -1; --=20 2.13.5