From patchwork Fri Sep 18 04:55:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 519111 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id C4D00140291 for ; Fri, 18 Sep 2015 15:02:19 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=TRWG697l; dkim-atps=neutral Received: from localhost ([::1]:35227 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZcnoP-0004HZ-Mw for incoming@patchwork.ozlabs.org; Fri, 18 Sep 2015 01:02:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52355) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zcni3-0000yT-6F for qemu-devel@nongnu.org; Fri, 18 Sep 2015 00:55:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zcni2-0004S6-DD for qemu-devel@nongnu.org; Fri, 18 Sep 2015 00:55:43 -0400 Received: from mail-pa0-x234.google.com ([2607:f8b0:400e:c03::234]:35705) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zcni2-0004Rv-7z for qemu-devel@nongnu.org; Fri, 18 Sep 2015 00:55:42 -0400 Received: by pacfv12 with SMTP id fv12so40288414pac.2 for ; Thu, 17 Sep 2015 21:55:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=D8hW1LFaxKnuRayNXranaBGlX7czoL5h5z2vjZM9RIk=; b=TRWG697l1gLlyaUbRoCfVGOXqFWFBl5uoh5iGadA7NOyqfIAZHmXdCe5q/DTainBko SucQbuHJ7mngxhdvC/wl+ImZjbCbDXBCLvTpjgfIm31SmAhjIKevwD9phxTCMwwzm3j6 QRkqWiOb8jpNi6iignHjntJyO17BO4dw9ek3wsrKgdh8011OmPotNtDMWYDS4g3NJMfr gJHBLdwlS58371OqG/JKja+UHEfKCJpEevGMNMDN9KIxYoX1iUERPJl15U9Y4JPd50k0 jnff+q8pXqRyjQmsX6hC7El+sDnRhCDEHyD+p8w4iyWm4/jUM6LyFGceipsekgYKayph OUZQ== X-Received: by 10.66.136.102 with SMTP id pz6mr4980102pab.52.1442552141524; Thu, 17 Sep 2015 21:55:41 -0700 (PDT) Received: from pike.twiddle.home (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by smtp.gmail.com with ESMTPSA id uh10sm6323749pab.41.2015.09.17.21.55.40 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Sep 2015 21:55:41 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 17 Sep 2015 21:55:18 -0700 Message-Id: <1442552129-19242-12-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1442552129-19242-1-git-send-email-rth@twiddle.net> References: <1442552129-19242-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::234 Cc: peter.maydell@linaro.org, alex.bennee@linaro.org, aurelien@aurel32.net Subject: [Qemu-devel] [PATCH v2 11/22] target-cris: Mirror gen_opc_pc into insn_start 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This perhaps isn't ideal in terms of (ab)using the "pc" field to encode both pc and ppc + delay branch state, as one has to be aware of this when examining opcode dumps. But it preserves existing logic, which will be good for bisection, and it certainly does save storage space. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Reviewed-by: Aurelien Jarno --- target-cris/translate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target-cris/translate.c b/target-cris/translate.c index 477bddc..3d55a6a 100644 --- a/target-cris/translate.c +++ b/target-cris/translate.c @@ -3174,7 +3174,8 @@ gen_intermediate_code_internal(CRISCPU *cpu, TranslationBlock *tb, tcg_ctx.gen_opc_instr_start[lj] = 1; tcg_ctx.gen_opc_icount[lj] = num_insns; } - tcg_gen_insn_start(dc->pc); + tcg_gen_insn_start(dc->delayed_branch == 1 + ? dc->ppc | 1 : dc->pc); num_insns++; if (unlikely(cpu_breakpoint_test(cs, dc->pc, BP_ANY))) {