From patchwork Fri Dec 29 19:31:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 122952 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5055323qgn; Fri, 29 Dec 2017 11:34:11 -0800 (PST) X-Google-Smtp-Source: ACJfBot0ZN0o7Vl0dHccLLi+Y8QOjPW6FOVa2y+U2SjSfU/uH5V06m5wYlgCVdWvsIB1QzQYMEY8 X-Received: by 10.37.1.9 with SMTP id 9mr15277557ybb.186.1514576051176; Fri, 29 Dec 2017 11:34:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514576051; cv=none; d=google.com; s=arc-20160816; b=M0mZd4zPzPqgNJh9xb2hqXZn+0Mbzz6yQHcKJpyPkok1/IRhqh79rgvoFuld4deX6D sskn/DT8lHU3X0S/FvUZBKd0b3cY2HiDuEatuMJCZ1Ryzawy3TY2jhLKO5pSvqqeXIdS otWeY8+9OXfE+tvypg7lV5iy/dRHOJNeFAXxJ/ndogR7R6TrG+Rjpl/vPUSs+fgLQhQy gauC1QSsUSL1kYbzOj6cFzLAGW+KjeURtDRiZshzXveGYLXiubTxHW6mvvZlkJItOBzJ MYq9/Jm3JK8GBvjo8PhB3kJkfh2k7aY4PVCjfESpHsZOa2SlZ8GDSCj2OM/B0eoIQQGb 5lKQ== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=Sr3fqqRj0plITnuq3H3brw4JCLSqy7sgphraf+htRhc=; b=fePD+St4SS1Hd0ZQhU9ieBdbpSzTx+bDn1wOm8TyC+mOpwTQFdzmkgCOJss40G1VGQ Jsx3D1X0Bk0uFSHb0EXhtndtg+G3qL4L95W75NCO7ZsjcKPSbzJi8BLpo9ovuJhiHDej uANc7NDr/VKMUy4Fmlhc9h0XoABhfmOuW1OehQfh+bDyDrwfRthgQDjVZSUIAPooJP6G qqUPTTrBBeQWZ6YGic9F6xNE/Zm6eKE2NOX5MCCezerC3/61RXfkvWgzbYvn5HXUZ8Dj wfgPe9DtDYaUNANkiVTY9mK/Qylem+GdLZnKY0OkTTudAsIIZggj8doJiwSJD0GfJhI9 rbmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=JipQ/dH6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id o18si2274974ybm.432.2017.12.29.11.34.11 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 29 Dec 2017 11:34:11 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=JipQ/dH6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:51980 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eV0Py-00022V-MG for patch@linaro.org; Fri, 29 Dec 2017 14:34:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42862) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eV0NN-0000mx-Je for qemu-devel@nongnu.org; Fri, 29 Dec 2017 14:31:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eV0NM-0000Qu-JZ for qemu-devel@nongnu.org; Fri, 29 Dec 2017 14:31:29 -0500 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:38016) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eV0NM-0000PB-DU for qemu-devel@nongnu.org; Fri, 29 Dec 2017 14:31:28 -0500 Received: by mail-pf0-x242.google.com with SMTP id u25so22418458pfg.5 for ; Fri, 29 Dec 2017 11:31:28 -0800 (PST) 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; bh=Sr3fqqRj0plITnuq3H3brw4JCLSqy7sgphraf+htRhc=; b=JipQ/dH6B/P8GwIfzlubNoi08LseJHf339y+uroxhXih2Et5Fb6DERywTH6cJk7bFF rbWwyyxSITKHLsj1xYfxgu3yovGOTqH4uPti15uhy3f34USRDKGkA/i+6OKREwSu2CTx cfD8ejSYhqAycuRP3H4/A/APqrKmjzlhk7IDw= 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; bh=Sr3fqqRj0plITnuq3H3brw4JCLSqy7sgphraf+htRhc=; b=iCsAYBQiQMUoZGQoZSwN3TQQRsFtAtaOd2b4Esqqyjayy43Hdf+pgGIY8R70uTyVTy S94e23vG2x+OhEeuv6UbQO6E0E7aH3X8h7QKAijwrgYteCmkiTGav4foFUF2zusoZ7EL L+J9e/90r0Y7xX2I7Ckl2eSxUSC6cjfrV42C0gypQti//gzOfCvrOyzUy6IjfxfmwXYz iIo3I1uy39vrhLJTPYWHqGTtJcc69ersMFzZ83sO24h8DNp1U1ecaDqiDyyoOcWDCVBQ xXTnmAiXmzS4AbQ+uYR6tljuAs7xdSq+mijCgGbTPYiHlLZHFcNoDOE1qJKNXhlTPBV9 MKAw== X-Gm-Message-State: AKGB3mKijR+2QW8BdhAD7JIr82iavQ3YlCcCIzvJjmukP4aQuaNo81i3 yeoqd7URitqapLhknZ4P8JdpeZHF+g0= X-Received: by 10.101.92.74 with SMTP id v10mr31077952pgr.193.1514575887200; Fri, 29 Dec 2017 11:31:27 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-183-164.tukw.qwest.net. [97.113.183.164]) by smtp.gmail.com with ESMTPSA id q68sm71240492pfb.1.2017.12.29.11.31.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Dec 2017 11:31:26 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 29 Dec 2017 11:31:13 -0800 Message-Id: <20171229193113.11753-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171229193113.11753-1-richard.henderson@linaro.org> References: <20171229193113.11753-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::242 Subject: [Qemu-devel] [PULL 8/8] tcg: add cs_base and flags to -d exec output X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Paolo Bonzini Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Signed-off-by: Paolo Bonzini Message-Id: <20171217055023.29225-1-pbonzini@redhat.com> [rth: Also change the Chain logging in helper_lookup_tb_ptr.] Signed-off-by: Richard Henderson --- accel/tcg/cpu-exec.c | 6 ++++-- accel/tcg/tcg-runtime.c | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) -- 2.14.3 diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 4452cd9856..280200f737 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -146,8 +146,10 @@ static inline tcg_target_ulong cpu_tb_exec(CPUState *cpu, TranslationBlock *itb) uint8_t *tb_ptr = itb->tc.ptr; qemu_log_mask_and_addr(CPU_LOG_EXEC, itb->pc, - "Trace %p [%d: " TARGET_FMT_lx "] %s\n", - itb->tc.ptr, cpu->cpu_index, itb->pc, + "Trace %d: %p [" + TARGET_FMT_lx "/" TARGET_FMT_lx "/%#x] %s\n", + cpu->cpu_index, itb->tc.ptr, + itb->cs_base, itb->pc, itb->flags, lookup_symbol(itb->pc)); #if defined(DEBUG_DISAS) diff --git a/accel/tcg/tcg-runtime.c b/accel/tcg/tcg-runtime.c index 4172ffda82..d0d4484406 100644 --- a/accel/tcg/tcg-runtime.c +++ b/accel/tcg/tcg-runtime.c @@ -156,8 +156,9 @@ void *HELPER(lookup_tb_ptr)(CPUArchState *env) return tcg_ctx->code_gen_epilogue; } qemu_log_mask_and_addr(CPU_LOG_EXEC, pc, - "Chain %p [%d: " TARGET_FMT_lx "] %s\n", - tb->tc.ptr, cpu->cpu_index, pc, + "Chain %d: %p [" + TARGET_FMT_lx "/" TARGET_FMT_lx "/%#x] %s\n", + cpu->cpu_index, tb->tc.ptr, cs_base, pc, flags, lookup_symbol(pc)); return tb->tc.ptr; }