From patchwork Fri Apr 24 17:39:14 2020 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: 185759 Delivered-To: patch@linaro.org Received: by 2002:a92:3d9a:0:0:0:0:0 with SMTP id k26csp927623ilf; Fri, 24 Apr 2020 10:39:40 -0700 (PDT) X-Google-Smtp-Source: APiQypJajG6/oe8s1y43v3CHE/Z7Ot/EkB7kcReroZOQMoWo9cEmsHvzDiA465PEM1hTY4Lz0h0Q X-Received: by 2002:ac8:346f:: with SMTP id v44mr10414714qtb.27.1587749980135; Fri, 24 Apr 2020 10:39:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587749980; cv=none; d=google.com; s=arc-20160816; b=ujpqZII1/aXZ6DuZIGrQ7oO7rBIbfctSM0DNP+UkH2m0/DTPuR32cPtdCSY2aTSUch bo2lv0Qr8hsmLPXoS/xr/wY3EY1sqQdjIvYAzlLbUUDu/yqGqSBZ8YRJwWUnKMvMgA+V yYGhhcNGrcoVJ7agvwYlL/Bggg3ZykGJ1WldRrZ/d4RSU0GkjBme7Z59wYXeciqamop2 vXd/vX9zpfbcZb71KvCF6UuW/Gr80W6ZgAjqJOpvsoCQAqxIX6n/lwEVaDNHuAU4KStr bPy/JM+f8x/1zorAfnguIawvT7Q3FcMTE/SI9K7DQNprMLqQtuSBqxYS08XwRmHc8fWL hhiw== 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:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature; bh=UYYv1cklqi3lKfo2WFxkU8h/TgF0pb3Dq/qwxKtV6C4=; b=qZez7G2rISVonS0T3tbBERMK2pfcPhYJXWRAQGzZhCJYtvyMXst8tZ8y20pHLn4UaR BKgpw++lPSsGpfMiiMOWEbmIeYlNoR7cAjjikkXjyB+Y4W4brtJ3Ql863PeEKd5nqCOa Htu3LMmnaQYz3PoV2QVqWKvTE2pRNfpjm5GHGExtiDiIfuKwjkhXkkOOz/kLMmlUrYpw jYDrtGL69Dywl+IFGkT7Gci/0LcYWt7qjS0fUj/q2YoRSAsIA8CpIfilWYL2EL5t8BSW r7vlIiNHJrI3ktdu+1zXkFYIJfOPrkf9G+vPP5oL5ak52wprYXCa3XI9tFL+cdKdOEXB QVFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=j3ivlIzM; 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 l95si3635878qte.222.2020.04.24.10.39.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 24 Apr 2020 10:39:40 -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=j3ivlIzM; 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]:45900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jS2Id-0006Q2-Ii for patch@linaro.org; Fri, 24 Apr 2020 13:39:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48216) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jS2IT-0006Ox-RU for qemu-devel@nongnu.org; Fri, 24 Apr 2020 13:39:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jS2IS-00063w-Jj for qemu-devel@nongnu.org; Fri, 24 Apr 2020 13:39:29 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:42351) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jS2IS-0005xl-5z for qemu-devel@nongnu.org; Fri, 24 Apr 2020 13:39:28 -0400 Received: by mail-wr1-x444.google.com with SMTP id j2so11899857wrs.9 for ; Fri, 24 Apr 2020 10:39:27 -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:mime-version :content-transfer-encoding; bh=UYYv1cklqi3lKfo2WFxkU8h/TgF0pb3Dq/qwxKtV6C4=; b=j3ivlIzMwDtxULJmUnH0RYPeUPbLlVvrW7SUUzhUxUB+1yWUYdgiz5zkXHO+/YExqM urXhfuk3khuh5p3hIeXiUmHOPUcOL1mqGJQnn4jOMs9eEmC1zqjI4SwBagpKPzJjTl/w HfSsLFQ6ihkkExHNYPu6vj69FNp9yBE/d0CUJ7E/MI+eblRSWbOiypZpEsbVoymRADxK 7H2E+InYUlDILXxgRUF5XhOkzzDUMkYrNju0OXKIpcCMU+wS8gNzxOhmnJcNczLzpUYw cVYb+t5m0h2ViqUHOSsc1Osqx8BIqgI4fgKBVaj2vFsJJ8O0JkfleTSBAGhNmNONNxSb pSTA== 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:mime-version :content-transfer-encoding; bh=UYYv1cklqi3lKfo2WFxkU8h/TgF0pb3Dq/qwxKtV6C4=; b=Z9iR1rmYTbvm0UZHQqpA22eG/lj2G56Cb+qr/a+Kv3Yh4//F8o7TSmc62gJMqDbF5I XarNO15tSxI7J7SF969zvrsHa8sNMbu1Bw67myAx6zXOt2J+QnU4DFGzI6/JiNukLk5Z mTQ4LcHbGSoDk0lYfBRMCa0baagBsoBjDqezOS+xU5ucAmPXdYV1HtVmGfSp4DprUta0 DOGR38qp35Muwka+1U/cr9zN5OmbvdgqIKIu24r8bt8Es3ydOs+B04Sx6fZ4zd+V0EAY nvXDVevnMiOihYKc5P59NPNplxXElapzaXUrPXpWfVcX2LodJDZmrILGQBIHMnIbEOP7 iZTg== X-Gm-Message-State: AGi0Puaqayw/7/y9A3e8BmVz5zCQ3M8XOG20SVNRHYq0NYKPiWGcKs32 yJ1LIjo2LvghEPcsYgg2+/ONow== X-Received: by 2002:adf:e5c8:: with SMTP id a8mr13402753wrn.56.1587749965861; Fri, 24 Apr 2020 10:39:25 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y5sm9713493wru.15.2020.04.24.10.39.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Apr 2020 10:39:24 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C74841FF7E; Fri, 24 Apr 2020 18:39:23 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [RFC PATCH] translate-all: include guest address in out_asm output Date: Fri, 24 Apr 2020 18:39:14 +0100 Message-Id: <20200424173914.2957-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::444; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x444.google.com X-detected-operating-system: by eggs.gnu.org: Error: [-] PROGRAM ABORT : Malformed IPv6 address (bad octet value). Location : parse_addr6(), p0f-client.c:67 X-Received-From: 2a00:1450:4864:20::444 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_Benn=C3=A9e?= , Paolo Bonzini , richard.henderson@linaro.org, Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is a slightly hackish Friday afternoon attempt to include the guest address in our out_asm output in an effort to make it a little easier to see what is generating what final assembly. Signed-off-by: Alex Bennée --- accel/tcg/translate-all.c | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) -- 2.20.1 diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 9924e66d1f..31711de938 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -1789,14 +1789,42 @@ TranslationBlock *tb_gen_code(CPUState *cpu, if (qemu_loglevel_mask(CPU_LOG_TB_OUT_ASM) && qemu_log_in_addr_range(tb->pc)) { FILE *logfile = qemu_log_lock(); + size_t code_size, data_size = 0; + size_t insn_start; + int insn = 0; qemu_log("OUT: [size=%d]\n", gen_code_size); if (tcg_ctx->data_gen_ptr) { - size_t code_size = tcg_ctx->data_gen_ptr - tb->tc.ptr; - size_t data_size = gen_code_size - code_size; - size_t i; + code_size = tcg_ctx->data_gen_ptr - tb->tc.ptr; + data_size = gen_code_size - code_size; + } else { + code_size = gen_code_size; + } + + /* first dump prologue */ + insn_start = tcg_ctx->gen_insn_end_off[0]; + if (insn_start > 0) { + qemu_log(" prologue: [size=%ld]\n", insn_start); + log_disas(tb->tc.ptr, insn_start); + } + + do { + size_t insn_end; + if (insn < (tb->icount - 1)) { + insn_end = tcg_ctx->gen_insn_end_off[insn + 1]; + } else { + insn_end = code_size; + } + qemu_log(" for guest addr: " TARGET_FMT_lx ":\n", + tcg_ctx->gen_insn_data[insn][0]); + + log_disas(tb->tc.ptr + insn_start, insn_end - insn_start); - log_disas(tb->tc.ptr, code_size); + insn_start = insn_end; + } while (++insn < tb->icount && insn_start < code_size); + if (data_size) { + int i; + qemu_log(" data: [size=%ld]\n", data_size); for (i = 0; i < data_size; i += sizeof(tcg_target_ulong)) { if (sizeof(tcg_target_ulong) == 8) { qemu_log("0x%08" PRIxPTR ": .quad 0x%016" PRIx64 "\n", @@ -1808,8 +1836,6 @@ TranslationBlock *tb_gen_code(CPUState *cpu, *(uint32_t *)(tcg_ctx->data_gen_ptr + i)); } } - } else { - log_disas(tb->tc.ptr, gen_code_size); } qemu_log("\n"); qemu_log_flush();