From patchwork Wed Jul 31 16:07:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 170181 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp4235119ile; Wed, 31 Jul 2019 09:28:10 -0700 (PDT) X-Google-Smtp-Source: APXvYqyE+mPNSSfiC0ctu/QV4jOv/BCmXHzflWRtbOZInopr9TeJDZX6aUt1ftQxWiJeoCxKyXm0 X-Received: by 2002:a50:900d:: with SMTP id b13mr43487633eda.289.1564590490321; Wed, 31 Jul 2019 09:28:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564590490; cv=none; d=google.com; s=arc-20160816; b=sGZXcBffO/on7yE3X3sKAz3p/l6nFPZ7PrqGYZZA+FbQdTWdTP7fZ0sL5GmuyFy3Xc vaN6Ltoww4fRxnD6uXiX34QWVnmPIydi12sNwsdHqagiXvorLjucE3QTH39Nuwh1D497 roWWt3W+9sGl/O6xXchli6II0PXVfIYDlu9N/Ja/iREUnqonXUE/6gW0OAc0VOWiEN36 8dDmEz/FFgbNTUIMMCmf7XvkZMfsSyPesILbD+t9qCfPsD5fuf8qys9VBG93VsfhdAux A775CriD2/oHajSlMRiRUw9jaUKqo3z9tyFy3pmSpdWCtAnz8/HQ3KcmFRpSGYlQWwge JMEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=BnGODuR3Ycz5wS1Vq+gAFUjpRMhPGEguKfmXZgD+ipE=; b=ar10Vk4DwmnXTQbm6ieJaNwxwcVE2him8yCHX5LQ8sLuKi3X5qMhtt0YXlXp7YS6p8 4oyl4EpPKq0FRX68K3iPne9yyGrehfYK4SaAFXc0jYBPWnvQkV8ZtBYxvZrHxB7xc4fi gC3JP55S/dIdhzYJV/gFZr/+pttZF3iFriG8kE7+UXNmDSGDcvCp0qGiEupLTWWzUgGv dDdd4cutVza2DfOsqLECM1amJRRyXYCQCe3CZT9kvn2nT/9apnhd5U9d67mcZYWBy8Tq Qzsjk1a+0QC/ia6/iQi7yb3MRDNh0Orj2ScxShOUGTS/oQPeJs3esfjBRUvdNz46IQYK uJNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="xnEFkAm/"; 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=fail (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 x7si21344972edm.177.2019.07.31.09.28.10 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 31 Jul 2019 09:28:10 -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=fail header.i=@linaro.org header.s=google header.b="xnEFkAm/"; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42744 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsrST-0003sQ-9C for patch@linaro.org; Wed, 31 Jul 2019 12:28:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45060) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsrPh-0004l4-OM for qemu-devel@nongnu.org; Wed, 31 Jul 2019 12:25:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hsrPg-0000Gq-9I for qemu-devel@nongnu.org; Wed, 31 Jul 2019 12:25:17 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:44292) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hsrPg-0000G4-2v for qemu-devel@nongnu.org; Wed, 31 Jul 2019 12:25:16 -0400 Received: by mail-wr1-x443.google.com with SMTP id p17so70350835wrf.11 for ; Wed, 31 Jul 2019 09:25:16 -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=BnGODuR3Ycz5wS1Vq+gAFUjpRMhPGEguKfmXZgD+ipE=; b=xnEFkAm/zWatmrROcSkSEvr63uPFYqEEk3yDbnOK6SwJW68+amL9e+gaCXhGJ7nKh4 NLHzib3BT7uCP1EEqeLXgmyFER8zK2oJNK+YdF61icDx3hOjxwhkWu+xTFWmwKv8P+fR eYswyn+ru1s9xOowYI1p+DqcETTZ+PSJSGyuXp43oWoWsmKO2HeSUKuDf7sAivKQtzFj ucjrZN1ZNE/kc97sNfCY37euJ7fGHJD52Hy/SjpZZERS8i9+V4PJ9hvhu0e7Fuyxctgb KcNO3hO3Kv86zgvkSthjh/p6tmhJLggn15WI3vlmxyMiAjXxmOmpvu7mlLrHEYe0zx26 VFkw== 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=BnGODuR3Ycz5wS1Vq+gAFUjpRMhPGEguKfmXZgD+ipE=; b=WwrdBN3hz/EG5Y7CXitkonUsxKlaQmKWCX3fLgUMI004qG7q7v8ckv0mTjcq0FSyPf AHk5mrFvAftlHGawOD+1CfPsPI61V09wbOBfl9ZC7DF6CIwX0ayUu+V9B4umtbMJxiJl pEGodtlKyqgHC9EMJPbQrgYwX47KsCY4Yuhn6pU9gkrtcBWPqsibzH+CQcJ3BeM9B04D lvJO92yc0vhbFXz0Al0zI15eVhS7ogtOj2cSGGyk+QwVJc0ccbXJaoiEGNC7r41w6i5m OdG7Hob/VpaomHWjbxzKJ+wBN9j4NY+fo5CwqAT2ms8bl/2taUBF7d41QdOoU8+OPHox FOTg== X-Gm-Message-State: APjAAAUD5nJrOiox82UCAnyjMdmojIuK8ML8IVcEb3iw2b5I3S6aBGeC YHzRDglqST9IK08JeJef0A9r9w== X-Received: by 2002:adf:d08e:: with SMTP id y14mr106235925wrh.309.1564590315002; Wed, 31 Jul 2019 09:25:15 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x20sm157165737wrg.10.2019.07.31.09.25.12 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 09:25:13 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 09B251FFC7; Wed, 31 Jul 2019 17:07:24 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2019 17:07:14 +0100 Message-Id: <20190731160719.11396-50-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190731160719.11396-1-alex.bennee@linaro.org> References: <20190731160719.11396-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH v4 49/54] 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: Richard Henderson , bobby.prani@gmail.com, cota@braap.org, =?utf-8?q?Alex_Benn=C3=A9e?= , aaron@os.amperecomputing.com Errors-To: qemu-devel-bounces+patch=linaro.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 Reviewed-by: Richard Henderson --- 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(+) -- 2.20.1 diff --git a/disas.c b/disas.c index 3e2bfa572b1..4b127369c36 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 15da511f49c..119df9e9bdf 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 d9c1ca3b4cf..8b403dd6157 100644 --- a/include/qemu/qemu-plugin.h +++ b/include/qemu/qemu-plugin.h @@ -324,6 +324,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 4b3ac9e31fb..5a0bed1b1e0 100644 --- a/plugins/api.c +++ b/plugins/api.c @@ -40,6 +40,7 @@ #include "sysemu/sysemu.h" #include "tcg/tcg.h" #include "exec/exec-all.h" +#include "disas/disas.h" #include "plugin.h" #ifndef CONFIG_USER_ONLY #include "hw/boards.h" @@ -211,6 +212,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 40c0d1abd2f..267ec381b4a 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;