From patchwork Wed Sep 30 05:09:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 524726 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 144AE140787 for ; Thu, 1 Oct 2015 14:45:12 +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=gea5uhZv; dkim-atps=neutral Received: from localhost ([::1]:37633 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZhVjy-0004lL-1Y for incoming@patchwork.ozlabs.org; Thu, 01 Oct 2015 00:45:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56446) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zh9fl-00025T-7k for qemu-devel@nongnu.org; Wed, 30 Sep 2015 01:11:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zh9fk-0004zV-5n for qemu-devel@nongnu.org; Wed, 30 Sep 2015 01:11:21 -0400 Received: from mail-pa0-x22b.google.com ([2607:f8b0:400e:c03::22b]:33591) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zh9fk-0004zL-04 for qemu-devel@nongnu.org; Wed, 30 Sep 2015 01:11:20 -0400 Received: by pacex6 with SMTP id ex6so28407256pac.0 for ; Tue, 29 Sep 2015 22:11:19 -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=ugowMFn0omURzB0eS0pY9dYrlDiltbLkcEfq+R2+bL0=; b=gea5uhZvMzrFkn9giTVPP6FtThOZ/d0c9dzoTlPd5Aw1oy2eqSKoj30YoDqRJy6XC6 XpnJ2fxtXWU1PVXJIhlCVXaoZmcmBsNTYdRnbNk7kiqAP+mUG1nmEG9/syJY/L8QgTGi rQIrguVWQq3a5H1tknmk8Z6PQellFPahNOuJIRF3pkgP8c15t8GmXSGHnMheLzMumDI0 /tVb8CZ5wcFeErfmV1VBlYyES0wxK/oJvhMYmukMJqZBNieVT9KJTExAI3u/Y4DzTUfK F2JVFpWMYLZrruz1PaIhco/vDuWMc6drbAq4NrcxNG+5EqgOIstqiJvf8rMAmBMRS0fd mdMw== X-Received: by 10.68.197.196 with SMTP id iw4mr2372454pbc.153.1443589879440; Tue, 29 Sep 2015 22:11:19 -0700 (PDT) Received: from bigtime.com ([1.144.36.49]) by smtp.gmail.com with ESMTPSA id w9sm28763437pbt.29.2015.09.29.22.11.16 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2015 22:11:18 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 30 Sep 2015 15:09:31 +1000 Message-Id: <1443589786-26929-12-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1443589786-26929-1-git-send-email-rth@twiddle.net> References: <1443589786-26929-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::22b Cc: peter.maydell@linaro.org, aurelien@aurel32.net Subject: [Qemu-devel] [PATCH v4 11/26] 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: Aurelien Jarno Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- 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))) {