From patchwork Thu Jul 31 13:06:32 2014 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: 34645 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f69.google.com (mail-pa0-f69.google.com [209.85.220.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D12F920792 for ; Thu, 31 Jul 2014 13:26:04 +0000 (UTC) Received: by mail-pa0-f69.google.com with SMTP id kx10sf17546345pab.4 for ; Thu, 31 Jul 2014 06:26:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=IiMS65I0bLFXlx1RdWTu+VpKk27aOyKFrdVNfPdB4bM=; b=O7w26XuDqTcYrEDETikGWL1ayOTX844uT6G9Z60xNW+HQx2KHY8F5ZJtyMSULcNDhA aXHHMSJbpzfeKU8vXYq0Po9KQ0TuWVyDd9XxP+iBn8PjDnUCiKfZkyg9+mupq9nmSp79 7F6LwJfCLMkNzXBUv7HcFna78vJWKev0n7DJODywijza6DzxgJzzFrPNF0PD29P87KCU g4QTpoND7DS//QOY98HK7C54ejk9Y0qayiHW/A/o5ousuZd83qbt/C5WvwrscYnzNWsn NO4NdZ/cBXdlEhjnaeb/VdH5Lq1CWU+gqaBcT4NQVrRWrTj4cuqMKl3EgKT7yqQOLPkI uLQg== X-Gm-Message-State: ALoCoQnK24DA8E2NZLmo7IAMxOQoRfmyW2zF2kobfFv9zzP4nHRxfkOgNfwpBcTswzfQdP54FcpW X-Received: by 10.66.218.162 with SMTP id ph2mr1610414pac.3.1406813164176; Thu, 31 Jul 2014 06:26:04 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.80.36 with SMTP id b33ls981346qgd.68.gmail; Thu, 31 Jul 2014 06:26:04 -0700 (PDT) X-Received: by 10.221.64.80 with SMTP id xh16mr12574501vcb.35.1406813164012; Thu, 31 Jul 2014 06:26:04 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id q6si4336083veh.50.2014.07.31.06.26.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 31 Jul 2014 06:26:03 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.169 as permitted sender) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id le20so4182669vcb.28 for ; Thu, 31 Jul 2014 06:26:03 -0700 (PDT) X-Received: by 10.52.120.38 with SMTP id kz6mr1810516vdb.86.1406813163696; Thu, 31 Jul 2014 06:26:03 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp18156vcb; Thu, 31 Jul 2014 06:26:03 -0700 (PDT) X-Received: by 10.140.50.50 with SMTP id r47mr17429497qga.96.1406813163299; Thu, 31 Jul 2014 06:26:03 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id t5si9659647qap.132.2014.07.31.06.26.03 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 31 Jul 2014 06:26:03 -0700 (PDT) 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; Received: from localhost ([::1]:56669 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCqMs-0007Ky-Rg for patch@linaro.org; Thu, 31 Jul 2014 09:26:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51597) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCq4H-00007N-QB for qemu-devel@nongnu.org; Thu, 31 Jul 2014 09:06:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XCq49-0001FJ-Pj for qemu-devel@nongnu.org; Thu, 31 Jul 2014 09:06:49 -0400 Received: from static.88-198-71-155.clients.your-server.de ([88.198.71.155]:50110 helo=socrates.bennee.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCq49-0001FA-Je for qemu-devel@nongnu.org; Thu, 31 Jul 2014 09:06:41 -0400 Received: from localhost ([127.0.0.1] helo=zen.linaro.local) by socrates.bennee.com with esmtp (Exim 4.80) (envelope-from ) id 1XCqE0-0002HE-Dn; Thu, 31 Jul 2014 15:16:52 +0200 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 31 Jul 2014 14:06:32 +0100 Message-Id: <1406811992-6766-10-git-send-email-alex.bennee@linaro.org> X-Mailer: git-send-email 2.0.3 In-Reply-To: <1406811992-6766-1-git-send-email-alex.bennee@linaro.org> References: <1406811992-6766-1-git-send-email-alex.bennee@linaro.org> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: alex.bennee@linaro.org X-SA-Exim-Scanned: No (on socrates.bennee.com); SAEximRunCond expanded to false X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 88.198.71.155 Cc: Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= , l@dorileo.org Subject: [Qemu-devel] [PATCH v3 9/9] target-arm: dfilter support for in_asm, op, opt_op X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: alex.bennee@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.169 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Each individual architecture needs to use the qemu_log_in_addr_range() feature for enabling in_asm and marking blocks for op/opt_op output. Signed-off-by: Alex Bennée diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c index 33b5025..56b8534 100644 --- a/target-arm/translate-a64.c +++ b/target-arm/translate-a64.c @@ -10910,7 +10910,8 @@ void gen_intermediate_code_internal_a64(ARMCPU *cpu, gen_io_start(); } - if (unlikely(qemu_loglevel_mask(CPU_LOG_TB_OP | CPU_LOG_TB_OP_OPT))) { + if (unlikely(qemu_loglevel_mask(CPU_LOG_TB_OP | CPU_LOG_TB_OP_OPT) && + qemu_log_in_addr_range(dc->pc))) { tcg_gen_debug_insn_start(dc->pc); } @@ -10984,7 +10985,8 @@ done_generating: *tcg_ctx.gen_opc_ptr = INDEX_op_end; #ifdef DEBUG_DISAS - if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) { + if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM) && + qemu_log_in_addr_range(pc_start)) { qemu_log("----------------\n"); qemu_log("IN: %s\n", lookup_symbol(pc_start)); log_target_disas(env, pc_start, dc->pc - pc_start, diff --git a/target-arm/translate.c b/target-arm/translate.c index cf4e767..d74a8a9 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -11018,7 +11018,8 @@ static inline void gen_intermediate_code_internal(ARMCPU *cpu, if (num_insns + 1 == max_insns && (tb->cflags & CF_LAST_IO)) gen_io_start(); - if (unlikely(qemu_loglevel_mask(CPU_LOG_TB_OP | CPU_LOG_TB_OP_OPT))) { + if (unlikely(qemu_loglevel_mask(CPU_LOG_TB_OP | CPU_LOG_TB_OP_OPT)) && + qemu_log_in_addr_range(dc->pc)) { tcg_gen_debug_insn_start(dc->pc); } @@ -11138,7 +11139,8 @@ done_generating: *tcg_ctx.gen_opc_ptr = INDEX_op_end; #ifdef DEBUG_DISAS - if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) { + if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM) && + qemu_log_in_addr_range(pc_start)) { qemu_log("----------------\n"); qemu_log("IN: %s\n", lookup_symbol(pc_start)); log_target_disas(env, pc_start, dc->pc - pc_start,