From nobody Mon May 20 14:56:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1689644224466359.4772988111994; Mon, 17 Jul 2023 18:37:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLZd6-0008Nq-Qm; Mon, 17 Jul 2023 21:35: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 1qLZd4-0008Lj-QP for qemu-devel@nongnu.org; Mon, 17 Jul 2023 21:35:54 -0400 Received: from mail-qk1-f180.google.com ([209.85.222.180]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qLZd3-0007ir-3Z for qemu-devel@nongnu.org; Mon, 17 Jul 2023 21:35:54 -0400 Received: by mail-qk1-f180.google.com with SMTP id af79cd13be357-7659cb9c42aso421838585a.3 for ; Mon, 17 Jul 2023 18:35:52 -0700 (PDT) Received: from neon.. (ip68-106-29-136.ph.ph.cox.net. [68.106.29.136]) by smtp.gmail.com with ESMTPSA id s5-20020a17090aad8500b00263b9e75aecsm359956pjq.41.2023.07.17.18.35.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jul 2023 18:35:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689644151; x=1692236151; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=XSC7TRhF4x/D+7CSA6CQbeJFzO7VmEZkfATTpaM1HK8=; b=j2YlCk5mUrIDZPVTL7MimXm2UOIGpELn2rubu+hLFrNbcmzyVDOD0mxkAfjOodUDla +PwRxgc9Z3GZ9YDN5MoCN0mITcp76Bo5dYPDZVEw2oeKPO5bg4Jd7TazkvEhdOAwwH5W GaXHCGP4v6EG20a1oe3oQHQhi1MNiUnPyYZ6uCcegvqkLmkWxHJY3P8gAc9i6m7PsEWI zpmHQ4Qs2JgKlIbHPyZH+aqYkANEism2IJHfq6T9M2liyM3bH1bKBO+P7QXs8/n3ogWN fkHqig1e6FZt1f3w+h48PXdAoii0ylBiBwYpkxa9TQ1lZKuUZEUfFt1Q/rKRJenrjUVq plQg== X-Gm-Message-State: ABy/qLbz3nvDC3Gl1DFYFS8Vhju8Fj9uSwUBFFLF0IFsM1dyUhlXh+J9 6b2WZR3crwv8F45mQXl0XAD/i0mvFEXIBUHV X-Google-Smtp-Source: APBJJlGPp5fmq4O7tAXt6P9o/dF9AM5EmzUBt2JoRpMTW5pTdKpBnOqKFIimYdEy4Tw8bajML7fNig== X-Received: by 2002:a05:620a:430c:b0:765:7a1e:a456 with SMTP id u12-20020a05620a430c00b007657a1ea456mr16703462qko.54.1689644151359; Mon, 17 Jul 2023 18:35:51 -0700 (PDT) From: Matt Borgerson To: qemu-devel@nongnu.org Cc: Richard Henderson , Paolo Bonzini , Matt Borgerson Subject: [PATCH] accel/tcg: Fix guest instruction address in output assembly log Date: Mon, 17 Jul 2023 18:35:31 -0700 Message-Id: <20230718013531.1669100-1-contact@mborgerson.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=209.85.222.180; envelope-from=mborgerson@gmail.com; helo=mail-qk1-f180.google.com X-Spam_score_int: -13 X-Spam_score: -1.4 X-Spam_bar: - X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1689644226522100001 Content-Type: text/plain; charset="utf-8" If CF_PCREL is enabled, generated host assembly logging (command line option `-d out_asm`) may incorrectly report guest instruction virtual addresses as page offsets instead of absolute addresses. This patch corrects the reported guest address. Signed-off-by: Matt Borgerson --- accel/tcg/translate-all.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index a1782db5dd..859db95cf7 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -283,6 +283,24 @@ static int setjmp_gen_code(CPUArchState *env, Translat= ionBlock *tb, return tcg_gen_code(tcg_ctx, tb, pc); } =20 +static vaddr get_guest_insn_vaddr(TranslationBlock *tb, vaddr pc, size_t i= nsn) +{ + g_assert(insn < tb->icount); + + /* FIXME: This replicates the restore_state_to_opc() logic. */ + vaddr addr =3D tcg_ctx->gen_insn_data[insn * TARGET_INSN_START_WORDS]; + + if (tb_cflags(tb) & CF_PCREL) { + addr |=3D (pc & TARGET_PAGE_MASK); + } else { +#if defined(TARGET_I386) + addr -=3D tb->cs_base; +#endif + } + + return addr; +} + /* Called with mmap_lock held for user mode emulation. */ TranslationBlock *tb_gen_code(CPUState *cpu, vaddr pc, uint64_t cs_base, @@ -458,7 +476,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu, fprintf(logfile, "OUT: [size=3D%d]\n", gen_code_size); fprintf(logfile, " -- guest addr 0x%016" PRIx64 " + tb prologue\n", - tcg_ctx->gen_insn_data[insn * TARGET_INSN_START_WORDS]= ); + get_guest_insn_vaddr(tb, pc, insn)); chunk_start =3D tcg_ctx->gen_insn_end_off[insn]; disas(logfile, tb->tc.ptr, chunk_start); =20 @@ -471,7 +489,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu, size_t chunk_end =3D tcg_ctx->gen_insn_end_off[insn]; if (chunk_end > chunk_start) { fprintf(logfile, " -- guest addr 0x%016" PRIx64 "\n", - tcg_ctx->gen_insn_data[insn * TARGET_INSN_STAR= T_WORDS]); + get_guest_insn_vaddr(tb, pc, insn)); disas(logfile, tb->tc.ptr + chunk_start, chunk_end - chunk_start); chunk_start =3D chunk_end; --=20 2.34.1