From patchwork Wed Apr 24 23:31:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 791590 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:346:15ad:a2a with SMTP id g4csp1106513wrq; Wed, 24 Apr 2024 16:33:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVWFY7Kt2kiek0DzvxrdXqkmMg6Ep7huRDdSgfDRwkShNx0ymtDq58OVvvJL/s5JhsdJUAEygKLUJPwYq9jt/XX X-Google-Smtp-Source: AGHT+IHbhNjuwtmDrstOaGZu6cMgsYzkMWn9bLUfpL5j+vGOc02yLWAkISPLJZPk0rIPvc5dFi/a X-Received: by 2002:ac8:7f45:0:b0:439:6113:4dd0 with SMTP id g5-20020ac87f45000000b0043961134dd0mr3970246qtk.65.1714001618689; Wed, 24 Apr 2024 16:33:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714001618; cv=none; d=google.com; s=arc-20160816; b=ppPfElJmUnrZV57/5K7TdLuP0lH7rIq9g1gNQB7kaxIq+/kLflNRdFZ0ojIsWpYOb8 Qw+2bH3A/r4AASKqjDgrNgh7/my3GmyJJpZoSO3PpmEUmT96odJoF62eB8vJuDTVfMrh g5KJMq1pg3jDyVlvCFOs3HyReKknJh1fGZU+F5AI2WKmbGW6lyDG/QLVEh51lDyboZm3 uICPL7dbUNVXnxhXmD92deMQokw694G8XHTSixILzThQ0w4hD+38V5vKFvs6k07tsS1x XzbAuVHorq4X+9Hg3IRh2CTGU5pTY18V+SQhmf1Gn0wRACrvrS6K6MTj0hVkkvwWVOTo wq6A== 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=EfgEgduM5tnEf0qPxFIi5z72enVcbh8+15waZvRvIfY=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=NASsXZz575PbJDzQiZtN3meK1jBf9HsbN9zdjFlKvGPDZfAtx4BSbqUFzK8wunn4ho 37Ujo0tywEfC6V+d/PglANKELsP+ucRhLsLNcWbU1zyQbz7/sVNcPXHoFBhtLwNcJLKd qF5SdiMdeQuVwPAti2rd7fqUzZk2dZkSQRwZvlrWWso0Qhs69FaSj3Lktp6Flb58Q9uz tuN3olAAJMhkxeByvKE4JlQmKqID2/PoRxBXbnR7JASWlOZz2FJpJc5xRR/g0Mqnqxag zMfqEF2Un2fe5SvvT4Hs3w7zhNNNFE12nAevtfI7KqSq8mADhXutBjKJNUB97HZbVy+N oiUw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Zd3ktxbz; 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 cc7-20020a05622a410700b0043a2e535023si2091625qtb.428.2024.04.24.16.33.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Apr 2024 16:33:38 -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=Zd3ktxbz; 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 1rzm5k-0005wk-Ke; Wed, 24 Apr 2024 19:31: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 1rzm5h-0005u5-CZ for qemu-devel@nongnu.org; Wed, 24 Apr 2024 19:31:53 -0400 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rzm5f-0003UO-CK for qemu-devel@nongnu.org; Wed, 24 Apr 2024 19:31:53 -0400 Received: by mail-pg1-x534.google.com with SMTP id 41be03b00d2f7-5dca1efad59so269495a12.2 for ; Wed, 24 Apr 2024 16:31:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714001510; x=1714606310; 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=EfgEgduM5tnEf0qPxFIi5z72enVcbh8+15waZvRvIfY=; b=Zd3ktxbzXHPidWFp56NZIHupcuRyQWPpyhTPDuRnsyg+ulZFoG6HEG/Cv8bjE7+hKP 3BwPXw15hN6HZbTcJi3Jj68kwUrzKcc/tjcE49fYN/uHwlbL6gSiN4M5hml341rreHpE iHrTaLcxqAu4DAedgPBbRJmS7M7Pm9bAvv+6nk1SCkz7TFrxeFjgzGjmai5hwRu5ulJ9 0teoW6KYuMlFN58bAvNskzqP3ZKhZovbYAekfwUrRNNzpy/anEeeN8wCl/jyHBdtfnGY x0hCfBhhKGmRlQnB6i/iwhot/rPQOT1i3MLYEnhZGDj+Rorc9G9EuPdjwlr+M0o01d1v nfLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714001510; x=1714606310; 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=EfgEgduM5tnEf0qPxFIi5z72enVcbh8+15waZvRvIfY=; b=Vq84Z2iqz9cF47fa+p7Ykk3mk2+QaGJ5cU2682N83F6ZC29LiE0zh2a2owMLHxnw6n nA8SiVP653PY3wBdUtaL55Fv/1KHLuOk/lGF69vLIb5bxJDVxPaz5boS7k6FV3n4kQU+ 7J6VBm1eWI+cT0hvM5fzLVNsqMbzbMWyfIVvob45DBzjb1ubOacQQsgWM28DS7Bowf2F bfA+XMaclMZU4rsGIBEqE8A2QmVMNFFeQ5ph6PbhzJjzDvgYHdL+x4sllqp2kZIWOu3l lElEkBbK5lEOpJ8/zMIImrc5aRgKCQHj9m6omMumrqnvJzKEVTgLTLI+Sex0bAIPKxb0 eThQ== X-Gm-Message-State: AOJu0Yydzbw1bA2kM68QQ7N6a25FTxmeArWGdz4d4gQdcz97zG2yKNig +U7tC1BOGU6EUYbArfD9rsECJjj82hz+jnGCI/lFdJT55NK5rl3iihtEBxumvCm4mamwx76A+3X L X-Received: by 2002:a17:90a:289:b0:2a5:f19:978d with SMTP id w9-20020a17090a028900b002a50f19978dmr3996176pja.37.1714001509777; Wed, 24 Apr 2024 16:31:49 -0700 (PDT) Received: from stoup.. ([156.19.246.23]) by smtp.gmail.com with ESMTPSA id z24-20020a17090abd9800b002a56b3931dfsm11737859pjr.49.2024.04.24.16.31.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Apr 2024 16:31:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 19/33] disas: Use translator_st to get disassembly data Date: Wed, 24 Apr 2024 16:31:17 -0700 Message-Id: <20240424233131.988727-20-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240424233131.988727-1-richard.henderson@linaro.org> References: <20240424233131.988727-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::534; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x534.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.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=1.999, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 Read from already translated pages, or saved mmio data. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- include/disas/disas.h | 5 +++-- include/exec/translator.h | 4 ++-- include/qemu/typedefs.h | 1 + accel/tcg/translator.c | 2 +- disas/disas-common.c | 14 -------------- disas/disas-mon.c | 15 +++++++++++++++ disas/disas-target.c | 19 +++++++++++++++++-- plugins/api.c | 4 ++-- 8 files changed, 41 insertions(+), 23 deletions(-) diff --git a/include/disas/disas.h b/include/disas/disas.h index 54a5e68443..c702b1effc 100644 --- a/include/disas/disas.h +++ b/include/disas/disas.h @@ -4,14 +4,15 @@ /* Disassemble this for me please... (debugging). */ #ifdef CONFIG_TCG void disas(FILE *out, const void *code, size_t size); -void target_disas(FILE *out, CPUState *cpu, uint64_t code, size_t size); +void target_disas(FILE *out, CPUState *cpu, const DisasContextBase *db); #endif void monitor_disas(Monitor *mon, CPUState *cpu, uint64_t pc, int nb_insn, bool is_physical); #ifdef CONFIG_PLUGIN -char *plugin_disas(CPUState *cpu, uint64_t addr, size_t size); +char *plugin_disas(CPUState *cpu, const DisasContextBase *db, + uint64_t addr, size_t size); #endif /* Look up symbol for debugging purpose. Returns "" if unknown. */ diff --git a/include/exec/translator.h b/include/exec/translator.h index bd76d6446b..8c3a8aa3d1 100644 --- a/include/exec/translator.h +++ b/include/exec/translator.h @@ -79,7 +79,7 @@ typedef enum DisasJumpType { * * Architecture-agnostic disassembly context. */ -typedef struct DisasContextBase { +struct DisasContextBase { TranslationBlock *tb; vaddr pc_first; vaddr pc_next; @@ -103,7 +103,7 @@ typedef struct DisasContextBase { int record_start; int record_len; uint8_t record[32]; -} DisasContextBase; +}; /** * TranslatorOps: diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 50c277cf0b..0b3cf3f3ec 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -50,6 +50,7 @@ typedef struct CPUTLBEntryFull CPUTLBEntryFull; typedef struct DeviceListener DeviceListener; typedef struct DeviceState DeviceState; typedef struct DirtyBitmapSnapshot DirtyBitmapSnapshot; +typedef struct DisasContextBase DisasContextBase; typedef struct DisplayChangeListener DisplayChangeListener; typedef struct DriveInfo DriveInfo; typedef struct DumpState DumpState; diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c index 8e8c4e1bf8..e968d530d8 100644 --- a/accel/tcg/translator.c +++ b/accel/tcg/translator.c @@ -230,7 +230,7 @@ void translator_loop(CPUState *cpu, TranslationBlock *tb, int *max_insns, if (!ops->disas_log || !ops->disas_log(db, cpu, logfile)) { fprintf(logfile, "IN: %s\n", lookup_symbol(db->pc_first)); - target_disas(logfile, cpu, db->pc_first, db->tb->size); + target_disas(logfile, cpu, db); } fprintf(logfile, "\n"); qemu_log_unlock(logfile); diff --git a/disas/disas-common.c b/disas/disas-common.c index e4118a381f..e4118e996b 100644 --- a/disas/disas-common.c +++ b/disas/disas-common.c @@ -7,25 +7,12 @@ #include "disas/disas.h" #include "disas/capstone.h" #include "hw/core/cpu.h" -#include "exec/memory.h" #include "disas-internal.h" /* Filled in by elfload.c. Simplistic, but will do for now. */ struct syminfo *syminfos = NULL; -/* - * Get LENGTH bytes from info's buffer, at target address memaddr. - * Transfer them to myaddr. - */ -static int target_read_memory(bfd_vma memaddr, bfd_byte *myaddr, int length, - struct disassemble_info *info) -{ - CPUDebug *s = container_of(info, CPUDebug, info); - int r = cpu_memory_rw_debug(s->cpu, memaddr, myaddr, length, 0); - return r ? EIO : 0; -} - /* * Print an error message. We can assume that this is in response to * an error return from {host,target}_read_memory. @@ -72,7 +59,6 @@ void disas_initialize_debug_target(CPUDebug *s, CPUState *cpu) disas_initialize_debug(s); s->cpu = cpu; - s->info.read_memory_func = target_read_memory; s->info.print_address_func = print_address; if (target_words_bigendian()) { s->info.endian = BFD_ENDIAN_BIG; diff --git a/disas/disas-mon.c b/disas/disas-mon.c index 5d6d9aa02d..37bf16ac79 100644 --- a/disas/disas-mon.c +++ b/disas/disas-mon.c @@ -11,6 +11,19 @@ #include "hw/core/cpu.h" #include "monitor/monitor.h" +/* + * Get LENGTH bytes from info's buffer, at target address memaddr. + * Transfer them to myaddr. + */ +static int +virtual_read_memory(bfd_vma memaddr, bfd_byte *myaddr, int length, + struct disassemble_info *info) +{ + CPUDebug *s = container_of(info, CPUDebug, info); + int r = cpu_memory_rw_debug(s->cpu, memaddr, myaddr, length, 0); + return r ? EIO : 0; +} + static int physical_read_memory(bfd_vma memaddr, bfd_byte *myaddr, int length, struct disassemble_info *info) @@ -38,6 +51,8 @@ void monitor_disas(Monitor *mon, CPUState *cpu, uint64_t pc, if (is_physical) { s.info.read_memory_func = physical_read_memory; + } else { + s.info.read_memory_func = virtual_read_memory; } s.info.buffer_vma = pc; diff --git a/disas/disas-target.c b/disas/disas-target.c index 82313b2a67..48f3a365dc 100644 --- a/disas/disas-target.c +++ b/disas/disas-target.c @@ -6,16 +6,28 @@ #include "qemu/osdep.h" #include "disas/disas.h" #include "disas/capstone.h" +#include "exec/translator.h" #include "disas-internal.h" -void target_disas(FILE *out, CPUState *cpu, uint64_t code, size_t size) +static int translator_read_memory(bfd_vma memaddr, bfd_byte *myaddr, + int length, struct disassemble_info *info) { + const DisasContextBase *db = info->application_data; + return translator_st(db, myaddr, memaddr, length) ? 0 : EIO; +} + +void target_disas(FILE *out, CPUState *cpu, const struct DisasContextBase *db) +{ + uint64_t code = db->pc_first; + size_t size = translator_st_len(db); uint64_t pc; int count; CPUDebug s; disas_initialize_debug_target(&s, cpu); + s.info.read_memory_func = translator_read_memory; + s.info.application_data = (void *)db; s.info.fprintf_func = fprintf; s.info.stream = out; s.info.buffer_vma = code; @@ -58,12 +70,15 @@ static void plugin_print_address(bfd_vma addr, struct disassemble_info *info) * there is left over it usually indicates the front end has read more * bytes than it needed. */ -char *plugin_disas(CPUState *cpu, uint64_t addr, size_t size) +char *plugin_disas(CPUState *cpu, const DisasContextBase *db, + uint64_t addr, size_t size) { CPUDebug s; GString *ds = g_string_new(NULL); disas_initialize_debug_target(&s, cpu); + s.info.read_memory_func = translator_read_memory; + s.info.application_data = (void *)db; s.info.fprintf_func = disas_gstring_printf; s.info.stream = (FILE *)ds; /* abuse this slot */ s.info.buffer_vma = addr; diff --git a/plugins/api.c b/plugins/api.c index 36ab47cdae..c084f335dd 100644 --- a/plugins/api.c +++ b/plugins/api.c @@ -271,8 +271,8 @@ void *qemu_plugin_insn_haddr(const struct qemu_plugin_insn *insn) char *qemu_plugin_insn_disas(const struct qemu_plugin_insn *insn) { - CPUState *cpu = current_cpu; - return plugin_disas(cpu, insn->vaddr, insn->len); + return plugin_disas(tcg_ctx->cpu, tcg_ctx->plugin_db, + insn->vaddr, insn->len); } const char *qemu_plugin_insn_symbol(const struct qemu_plugin_insn *insn)