From patchwork Fri Mar 29 22:20:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 784087 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:b0:33e:7753:30bd with SMTP id p1csp3426596wrt; Fri, 29 Mar 2024 15:22:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV9bomGgeEIeAmIgwo+0lYWT16L4WEaQupp8afaqmAJixDPRFcg/yeCbesI8LqKUSY2iNcVWtxOnr/LGCTHYZCF X-Google-Smtp-Source: AGHT+IGQFA9KmxwoLEARpixVrTL3EXOTOrnVChewpDgCSKHtHPu3CaeiGNSxa62QW4kGM31NgJyd X-Received: by 2002:ac8:5941:0:b0:431:5f73:bda8 with SMTP id 1-20020ac85941000000b004315f73bda8mr4039582qtz.65.1711750938263; Fri, 29 Mar 2024 15:22:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711750938; cv=none; d=google.com; s=arc-20160816; b=LyzAPImSF1ugHk/aa8peHwaFOuf0ONIDwA8VMOErg8WnKCakr/mDE8d37YXHYPN9SY uSkihCvtMh0+m/DlK+n244j6+fxEzWfEqS0io11NLxz1YF41z9C3wpeJk07lU6alIgg0 zK3pJuw/8rUEytmVOEupWZWsvWSDKX87CVf89XwbSA71Q+bNyVvtFj/EU9bSrGpJrZTf XWfVvRm8HRU3F/Nfww6nXmhZoOdqJyt58YNXC9a2lEz0oNJdbKAZIL9lIb9IIfcAR1Mb TOdTXNB2srTEMsz5CXTOxvSrywwOM4fKtefd3vr7hyOyWdZ72cTSkYEl3M7Hn68zBbHy H+kA== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=1pFViSSelBLDC7jQWPNWKQ58HUVyc3Kf8+NgXdrfBUc=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=PARiDlwHv7EdP8HYGlh/0YWsvX9+L69Ao4KOgvuasw7xw5JV6QVA2LjDFwC2BHh555 AYU/zthXXwaHEXQ8AWLvpVrVH/QcQh2kNsCdgSeRtp8BhM1cZcgTBmMQOwODgJh0CKJN y8y/pQn7m2ZzlcnZRB9zSoS6W6TtITqz08yGlkTlv0P8XHQzgZfcgxpqa6jr5OpOzqGZ lhe3qNNXcwu2YfBkVx7QLeADcqrYE9T0akgknB0+520UhNDE6ioi8tHtcWtnqWGWIUJs GmluIEoncu8SDL+LZA1xvqMPugaxyyo5jWJ+6daxCkY/klGrfXr8g1SR1VeRc4kdjuaP UAIA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Tva+OfnK; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g16-20020ac87d10000000b0043182dd0573si4606735qtb.503.2024.03.29.15.22.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Mar 2024 15:22:18 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Tva+OfnK; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqKam-00058o-J8; Fri, 29 Mar 2024 18:20:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rqKai-00057f-Kt for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:20:53 -0400 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqKah-0001q2-5R for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:20:52 -0400 Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-6e740fff1d8so2012850b3a.1 for ; Fri, 29 Mar 2024 15:20:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711750849; x=1712355649; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=1pFViSSelBLDC7jQWPNWKQ58HUVyc3Kf8+NgXdrfBUc=; b=Tva+OfnKh9KR7OktjPfOxSJAsP6pAvXCA2q9RtdmrT2s+KqhHQkmxCcLMLAI9hcM8k mZxmy02efutIBEecJ6Cr1EEmsLd1Ul6jdRZnfDrF0O8Dw+1Obuy173nGJMoNIPTugwxj uA3b3uxmpivHUSy1q8NsiM3UJBYRIUkNLsA/RxmyciOn3zU//qZWun0ABEDQdTkv9g3z Axx7fkJbEsmeG1ARCjsfihBjPdnFM0FvNPkq4ERP3xygoMLqaMx5jT0TL6P44y14tdQb d/OBoENRTIGytuyhfeExy8WdGkzwZZAWdh21ju5GT5Jk9US4SiRPYL8w2Yr/d8QI+LKm DKdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711750849; x=1712355649; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1pFViSSelBLDC7jQWPNWKQ58HUVyc3Kf8+NgXdrfBUc=; b=XVJzL2Th15il8bP5W8J32SoUpN51LaTB73r/t+vdr5PKekn9eUEjKAp3ADhnuoqVNE 8h2tX5GcZBoKG3bmAzBu99HxnGMpYfQZt+URWE+usPADggD7CEBvmRtCRUkrK0/RxtCw dRGfLAVwHRIaw6FyJ9o5aPsr2CgJiPZ5bD0YZFJqPnWrRNAWT2p5+e8HhUuxzr3lWvpk Y6njmOyyzt7D30ZnzHj87sazD3h6PSoXCv8LO99dng2c9lSlvJ73z/Le2siULzlKLicr 9mG88hphtLlp2br5f7KuRXXRH5ZVGO0+1G2RGlDUoB0cw7uupnR3q4Ff9Nx19Y2fQ9pI FGug== X-Gm-Message-State: AOJu0YwhZtcslby7Lb5Oc13Y96IUTahY0obaiYz6oijScYXBEl1I3hox 809ZVByMNttu1vxdbJv+SOxuSdMPTArm+x3lEKfeUS0wWfd0fhvnC1pj35HJjcPNI6us/GChVqL S X-Received: by 2002:a05:6a00:4b50:b0:6e7:6a7d:5a58 with SMTP id kr16-20020a056a004b5000b006e76a7d5a58mr3560406pfb.25.1711750849554; Fri, 29 Mar 2024 15:20:49 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id lc24-20020a056a004f5800b006eaacc63435sm3579811pfb.173.2024.03.29.15.20.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 15:20:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 6/7] disas: Show opcodes for target_disas and monitor_disas Date: Fri, 29 Mar 2024 12:20:36 -1000 Message-Id: <20240329222037.1735350-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240329222037.1735350-1-richard.henderson@linaro.org> References: <20240329222037.1735350-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::434; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_OTHER_BAD_TLD=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+patch=linaro.org@nongnu.org Fixes: 83b4613ba83 ("disas: introduce show_opcodes") Signed-off-by: Richard Henderson --- disas/disas-mon.c | 1 + disas/disas.c | 1 + 2 files changed, 2 insertions(+) diff --git a/disas/disas-mon.c b/disas/disas-mon.c index 48ac492c6c..5d6d9aa02d 100644 --- a/disas/disas-mon.c +++ b/disas/disas-mon.c @@ -34,6 +34,7 @@ void monitor_disas(Monitor *mon, CPUState *cpu, uint64_t pc, disas_initialize_debug_target(&s, cpu); s.info.fprintf_func = disas_gstring_printf; s.info.stream = (FILE *)ds; /* abuse this slot */ + s.info.show_opcodes = true; if (is_physical) { s.info.read_memory_func = physical_read_memory; diff --git a/disas/disas.c b/disas/disas.c index 17170d291e..7e3b0bb46c 100644 --- a/disas/disas.c +++ b/disas/disas.c @@ -211,6 +211,7 @@ void target_disas(FILE *out, CPUState *cpu, uint64_t code, size_t size) s.info.stream = out; s.info.buffer_vma = code; s.info.buffer_length = size; + s.info.show_opcodes = true; if (s.info.cap_arch >= 0 && cap_disas_target(&s.info, code, size)) { return;