From patchwork Tue Sep 19 15:03:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 815625 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="R5DyBz7J"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xxRr12TYxz9sBZ for ; Wed, 20 Sep 2017 01:39:13 +1000 (AEST) Received: from localhost ([::1]:43620 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duKcB-00065E-Be for incoming@patchwork.ozlabs.org; Tue, 19 Sep 2017 11:39:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49198) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duK3j-00089i-BQ for qemu-devel@nongnu.org; Tue, 19 Sep 2017 11:03:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duK3i-0003mq-AN for qemu-devel@nongnu.org; Tue, 19 Sep 2017 11:03:35 -0400 Received: from mail-io0-x231.google.com ([2607:f8b0:4001:c06::231]:49512) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1duK3i-0003mT-6V for qemu-devel@nongnu.org; Tue, 19 Sep 2017 11:03:34 -0400 Received: by mail-io0-x231.google.com with SMTP id 21so726216iof.6 for ; Tue, 19 Sep 2017 08:03:34 -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; bh=3hkq2jrf4zLN0ohNd3zfc5ZyRYqIqhwKRQspcnViGNc=; b=R5DyBz7J6PEUyn6OYT4uVuSvCPISa8RkIGPoZYGIkmD8g0zymWqZIiXDdH2JXKDRL2 fFQ94tDa8VKO7bwmO9ipoh4mimwaSUN4Zz/8GuDoZYWuydCL0l17xxhLfRBRWcn/Pq9J 2KhYGAmcwtgAyFtPMTt/u+07qWiZ08paNg50s= 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; bh=3hkq2jrf4zLN0ohNd3zfc5ZyRYqIqhwKRQspcnViGNc=; b=gVk40/7AlB82UkY9J2ABKLW2/ZbN9+wmx6Q6WxZxrd8JcoNCvwnEH7TIwdC5lb79mE 1+/ymveRoFwNw307MhdelLmnfYswc/J1NnMizJL5Ulm+0FA+IvBYRZdvm8to5k3j0K4K g5EfAFlSEEhDP6VmkebPXPhDlpLDE3gVPWXzqrZXr72LvKzkg9VC2USkPP1ExJCzTrrz V6VAUNKYz+Jf4K9BS0KWz+NQmmNItDzm+PNVjajLyBNRPaBvLrRMpC8ZSOW906OlHZOM MNXYZcBZhygBBVk/TXEOJK+ZhfupQX90cjyIo0xwtIWSTdqNpo3AMTAkXwZTYatJRnuV 4pPA== X-Gm-Message-State: AHPjjUjX4SdqLjYg1f2qZiLsARhnW17f7NQLSf08nwu96JlNFG5Yqwsr UvyZhL3ugWAtsST7fuBoa1STkpVkzj0= X-Google-Smtp-Source: AOwi7QCMFvjmTBa/eqt1ZOOTupThjbksJa0WfdhL/jItr1QYHPEWYi/xe5DpxK3PTOuXkYYlJRMBvw== X-Received: by 10.202.4.6 with SMTP id 6mr1767974oie.240.1505833413126; Tue, 19 Sep 2017 08:03:33 -0700 (PDT) Received: from bigtime.twiddle.net (162.189-204-159.bestel.com.mx. [189.204.159.162]) by smtp.gmail.com with ESMTPSA id h63sm360621otb.59.2017.09.19.08.03.31 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Sep 2017 08:03:32 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 10:03:13 -0500 Message-Id: <20170919150313.10833-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170919150313.10833-1-richard.henderson@linaro.org> References: <20170919150313.10833-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4001:c06::231 Subject: [Qemu-devel] [PATCH v2 8/8] 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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. Signed-off-by: Richard Henderson Reviewed-by: Alex Bennée --- disas.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/disas.c b/disas.c index b4e4fc409e..c3606b3986 100644 --- a/disas.c +++ b/disas.c @@ -513,19 +513,11 @@ const char *lookup_symbol(target_ulong orig_addr) #include "monitor/monitor.h" -static int monitor_disas_is_physical; - static int -monitor_read_memory (bfd_vma memaddr, bfd_byte *myaddr, int length, - struct disassemble_info *info) +physical_read_memory (bfd_vma memaddr, bfd_byte *myaddr, int length, + struct disassemble_info *info) { - CPUDebug *s = 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; } @@ -540,8 +532,8 @@ void monitor_disas(Monitor *mon, CPUState *cpu, INIT_DISASSEMBLE_INFO(s.info, (FILE *)mon, monitor_fprintf); s.cpu = cpu; - monitor_disas_is_physical = is_physical; - s.info.read_memory_func = monitor_read_memory; + s.info.read_memory_func + = (is_physical ? physical_read_memory : target_read_memory); s.info.print_address_func = generic_print_address; s.info.buffer_vma = pc; s.info.cap_arch = -1;