From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 665C8C31E4B for ; Fri, 14 Jun 2019 17:42:48 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E78F2217D6 for ; Fri, 14 Jun 2019 17:42:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="b4QxVGNm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E78F2217D6 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53840 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbqDu-0007iC-7E for qemu-devel@archiver.kernel.org; Fri, 14 Jun 2019 13:42:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58617) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbpqh-0005ay-JG for qemu-devel@nongnu.org; Fri, 14 Jun 2019 13:18:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hbpqe-00076y-82 for qemu-devel@nongnu.org; Fri, 14 Jun 2019 13:18:46 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:35169) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hbpqd-0006gy-Rv for qemu-devel@nongnu.org; Fri, 14 Jun 2019 13:18:44 -0400 Received: by mail-wm1-x341.google.com with SMTP id c6so3074856wml.0 for ; Fri, 14 Jun 2019 10:18:31 -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=z1GEGb1AT/jZhECwGmNfmmOk5GT9rSMPb0f35A3hv4U=; b=b4QxVGNm+6Fj7wKneuYl+McZEVsa+rbuAQzeqkJF2ZMJqsv++7W5AjPv4k6Gczt9rD 0uqDgDSNqVea7ndExQqYgTmbyXwCy9IemmBy7YayqB4cTnudMSItHo5yH8mwVz7tqcEu +XPjLmX6CjZaYIJCjTYQgshcaHR2TTwRiSIGNrzy6wkjRf3YHBGnAUirb6ZTM/jZlU2D U8vr+Xn63JuWl9s6/maMM6g0T5/aK4LLrnyrBfrEznxVRXOBOp4OeC5z4mQ+xi8qAf2k R0QoBLo6Ga3MxgCA6UhddHnjHv0cmCqGvRjJhlvQeBJe6pyt458a2GsxDyxRF5h0HwgH s8GA== 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=z1GEGb1AT/jZhECwGmNfmmOk5GT9rSMPb0f35A3hv4U=; b=B+IqBR2VByBUzcC4Co9lvTs4HHCx2r9p1TRFFEY/E45TdUX1LBoXjZfYSgMqoSqJha ceaLEIZZ0OtY3zvwpf++uo0/CD8djL+35HMdXXp3Srg8qVfadgYda9VwipOPMNvc8P+e VeTlMXUUeEsWPex+jpm0tKfvEOkJJweu4WQ2Lv1cEE3z5dpST2uSOX0KHeGccuiCEjKh T1p6kNcMvDY3hr+852wyDiZTk8iGCAColjSK5k6DCAKHQhERnjDsaz1UtJyxucUrLe1+ 8viknWmiBsxMa45yyCRt0LkLhuKFf51gSsRN1G142cS3NHDSs2kXF4cU1LUiT59pkguO x0/g== X-Gm-Message-State: APjAAAUHhEWhiT9WnrFjLkSH7q6lEu9muSt3Pz5MQPwqHmJy3gImicDd O6eYy0AqcaDU/Kz7dlpXHf0k80TZRFo= X-Google-Smtp-Source: APXvYqzgZQ5Z+g+Ud4extfvydZF0eChZKD9acTtshsuYsoYM7sGlUrb4SZbJMRck2kNClA/gh8pxzg== X-Received: by 2002:a1c:452:: with SMTP id 79mr9021561wme.149.1560532710963; Fri, 14 Jun 2019 10:18:30 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y133sm5786558wmg.5.2019.06.14.10.18.27 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 14 Jun 2019 10:18:29 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6C74A1FF91; Fri, 14 Jun 2019 18:12:04 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Fri, 14 Jun 2019 18:11:54 +0100 Message-Id: <20190614171200.21078-45-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190614171200.21078-1-alex.bennee@linaro.org> References: <20190614171200.21078-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PATCH v3 44/50] plugin: add qemu_plugin_insn_disas helper X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Give the plugins access to the QEMU dissasembler so they don't have to re-invent the wheel. Signed-off-by: Alex Bennée --- disas.c | 103 +++++++++++++++++++++++++++++++++++ include/disas/disas.h | 2 + include/qemu/qemu-plugin.h | 9 +++ plugins/api.c | 7 +++ plugins/qemu-plugins.symbols | 1 + 5 files changed, 122 insertions(+) diff --git a/disas.c b/disas.c index 3e2bfa572b..d8b75f0b73 100644 --- a/disas.c +++ b/disas.c @@ -475,6 +475,109 @@ void target_disas(FILE *out, CPUState *cpu, target_ulong code, } } +static GString plugin_disas_output; + +static int plugin_printf(FILE *stream, const char *fmt, ...) +{ + va_list va; + GString *s = &plugin_disas_output; + int initial_len = s->len; + + va_start(va, fmt); + g_string_append_printf(s, fmt, va); + va_end(va); + + return s->len - initial_len; +} + +static void plugin_print_address (bfd_vma addr, struct disassemble_info *info) +{ + /* does nothing */ +} + +/* Disassemble a single instruction directly into plugin output */ +static bool plugin_cap_disas_insn(disassemble_info *info, uint64_t pc, size_t size) +{ + uint8_t cap_buf[1024]; + csh handle; + cs_insn *insn; + size_t csize = 0; + int count; + GString *s = &plugin_disas_output; + + if (cap_disas_start(info, &handle) != CS_ERR_OK) { + return false; + } + insn = cap_insn; + + size_t tsize = MIN(sizeof(cap_buf) - csize, size); + const uint8_t *cbuf = cap_buf; + target_read_memory(pc, cap_buf, tsize, info); + + count = cs_disasm(handle, cbuf, size, 0, 1, &insn); + + if (count) { + g_string_printf(s, "%s %s", insn->mnemonic, insn->op_str); + } else { + g_string_printf(s, "cs_disasm failed"); + } + + cs_close(&handle); + return true; +} + +char * plugin_disas(CPUState *cpu, uint64_t addr, size_t size) +{ + CPUClass *cc = CPU_GET_CLASS(cpu); + target_ulong pc; + int count; + CPUDebug s; + GString *ds = g_string_set_size(&plugin_disas_output, 0); + + g_assert(ds == &plugin_disas_output); + + INIT_DISASSEMBLE_INFO(s.info, NULL, plugin_printf); + + s.cpu = cpu; + s.info.read_memory_func = target_read_memory; + s.info.buffer_vma = addr; + s.info.buffer_length = size; + s.info.print_address_func = plugin_print_address; + s.info.cap_arch = -1; + s.info.cap_mode = 0; + s.info.cap_insn_unit = 4; + s.info.cap_insn_split = 4; + +#ifdef TARGET_WORDS_BIGENDIAN + s.info.endian = BFD_ENDIAN_BIG; +#else + s.info.endian = BFD_ENDIAN_LITTLE; +#endif + + if (cc->disas_set_info) { + cc->disas_set_info(cpu, &s.info); + } + + if (s.info.cap_arch >= 0 && plugin_cap_disas_insn(&s.info, addr, size)) { + return g_strdup(ds->str); + } + + if (s.info.print_insn == NULL) { + s.info.print_insn = print_insn_od_target; + } + + for (pc = addr; size > 0; pc += count, size -= count) { + count = s.info.print_insn(pc, &s.info); + + if (count < 0) + break; + + g_assert(size >= count); + } + + return g_strdup(ds->str); +} + /* Disassemble this for me please... (debugging). */ void disas(FILE *out, void *code, unsigned long size) { diff --git a/include/disas/disas.h b/include/disas/disas.h index 15da511f49..119df9e9bd 100644 --- a/include/disas/disas.h +++ b/include/disas/disas.h @@ -13,6 +13,8 @@ void target_disas(FILE *out, CPUState *cpu, target_ulong code, void monitor_disas(Monitor *mon, CPUState *cpu, target_ulong pc, int nb_insn, int is_physical); +char * plugin_disas(CPUState *cpu, uint64_t addr, size_t size); + /* Look up symbol for debugging purpose. Returns "" if unknown. */ const char *lookup_symbol(target_ulong orig_addr); #endif diff --git a/include/qemu/qemu-plugin.h b/include/qemu/qemu-plugin.h index 0db1ef9714..21f056d4ab 100644 --- a/include/qemu/qemu-plugin.h +++ b/include/qemu/qemu-plugin.h @@ -312,6 +312,15 @@ qemu_plugin_register_vcpu_syscall_ret_cb(qemu_plugin_id_t id, qemu_plugin_vcpu_syscall_ret_cb_t cb); +/** + * qemu_plugin_insn_disas() - return disassembly string for instruction + * @insn: instruction reference + * + * Returns an allocated string containing the disassembly + */ + +char * qemu_plugin_insn_disas(const struct qemu_plugin_insn *insn); + /** * qemu_plugin_vcpu_for_each() - iterate over the existing vCPU * @id: plugin ID diff --git a/plugins/api.c b/plugins/api.c index 1c3aa64702..c0a1e98e68 100644 --- a/plugins/api.c +++ b/plugins/api.c @@ -40,6 +40,7 @@ #include "sysemu/sysemu.h" #include "tcg/tcg.h" #include "trace/mem-internal.h" /* mem_info macros */ +#include "disas/disas.h" #include "plugin.h" /* Uninstall and Reset handlers */ @@ -218,6 +219,12 @@ void *qemu_plugin_insn_haddr(const struct qemu_plugin_insn *insn) return insn->haddr; } +char *qemu_plugin_insn_disas(const struct qemu_plugin_insn *insn) +{ + CPUState *cpu = current_cpu; + return plugin_disas(cpu, insn->vaddr, insn->data->len); +} + /* * The memory queries allow the plugin to query information about a * memory access. diff --git a/plugins/qemu-plugins.symbols b/plugins/qemu-plugins.symbols index 38d47b7922..3fd51112b5 100644 --- a/plugins/qemu-plugins.symbols +++ b/plugins/qemu-plugins.symbols @@ -25,6 +25,7 @@ qemu_plugin_insn_size; qemu_plugin_insn_vaddr; qemu_plugin_insn_haddr; + qemu_plugin_insn_disas; qemu_plugin_mem_size_shift; qemu_plugin_mem_is_sign_extended; qemu_plugin_mem_is_big_endian; -- 2.20.1