From patchwork Tue Jun 7 15:49:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: peer.adelt@c-lab.de X-Patchwork-Id: 9161711 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F2C3060572 for ; Tue, 7 Jun 2016 15:50:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E4ED025E13 for ; Tue, 7 Jun 2016 15:50:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DA0C327248; Tue, 7 Jun 2016 15:50:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8985425E13 for ; Tue, 7 Jun 2016 15:50:09 +0000 (UTC) Received: from localhost ([::1]:51110 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAJGa-0000xi-O9 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 07 Jun 2016 11:50:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48689) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAJG1-0000u5-EC for qemu-devel@nongnu.org; Tue, 07 Jun 2016 11:49:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bAJFv-0004zm-03 for qemu-devel@nongnu.org; Tue, 07 Jun 2016 11:49:33 -0400 Received: from mail.uni-paderborn.de ([131.234.142.9]:50289) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAJFu-0004ym-MH for qemu-devel@nongnu.org; Tue, 07 Jun 2016 11:49:26 -0400 Received: from wormulon.uni-paderborn.de ([131.234.189.22] helo=localhost.localdomain) by mail.uni-paderborn.de with esmtp (Exim 4.84_2 amazonia) id 1bAJFs-0005gk-6h; Tue, 07 Jun 2016 17:49:24 +0200 Received: from mail.uni-paderborn.de by wormulon with queue id 1149631-5; Tue, 07 Jun 2016 15:49:23 GMT Received: from peer.adelt@c-lab.de (aftr-37-201-214-132.unity-media.net [37.201.214.132]) by mail.uni-paderborn.de with SMTP id 1bAJFr-0005dk-5Q; Tue, 07 Jun 2016 15:49:23 GMT (envelope-from peer.adelt@c-lab.de) X-Envelope-From: Received: from aftr-37-201-214-132.unity-media.net ([37.201.214.132] helo=arbeitstier.patch.net) by mail.uni-paderborn.de with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_CBC_SHA256:128) (Exim 4.84_2 telepax) id 1bAJFr-0005dk-5Q; Tue, 07 Jun 2016 17:49:23 +0200 From: peer.adelt@c-lab.de To: qemu-devel@nongnu.org Date: Tue, 7 Jun 2016 17:49:15 +0200 Message-Id: <1465314555-11501-5-git-send-email-peer.adelt@c-lab.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1465314555-11501-1-git-send-email-peer.adelt@c-lab.de> References: <1465314555-11501-1-git-send-email-peer.adelt@c-lab.de> X-PMX-Version: 6.3.0.2556906, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2016.6.7.153615 X-IMT-Spam-Score: 0.0 () X-IMT-Authenticated-Sender: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 131.234.142.9 Subject: [Qemu-devel] [PATCH v3 4/4] target-tricore: Added new JNE instruction variant 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: kbastian@mail.uni-paderborn.de, Peer Adelt , rth@twiddle.net Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Peer Adelt If D[15] is != sign_ext(const4) then PC will be set to (PC + zero_ext(disp4 + 16)). Signed-off-by: Peer Adelt Reviewed-by: Bastian Koppelmann --- target-tricore/translate.c | 16 ++++++++++++++++ target-tricore/tricore-opcodes.h | 2 ++ 2 files changed, 18 insertions(+) diff --git a/target-tricore/translate.c b/target-tricore/translate.c index 0e970c6..8fb8bf1 100644 --- a/target-tricore/translate.c +++ b/target-tricore/translate.c @@ -3362,9 +3362,15 @@ static void gen_compute_branch(DisasContext *ctx, uint32_t opc, int r1, case OPC1_16_SBC_JEQ: gen_branch_condi(ctx, TCG_COND_EQ, cpu_gpr_d[15], constant, offset); break; + case OPC1_16_SBC_JEQ2: + gen_branch_condi(ctx, TCG_COND_EQ, cpu_gpr_d[15], constant, offset + 16); + break; case OPC1_16_SBC_JNE: gen_branch_condi(ctx, TCG_COND_NE, cpu_gpr_d[15], constant, offset); break; + case OPC1_16_SBC_JNE2: + gen_branch_condi(ctx, TCG_COND_NE, cpu_gpr_d[15], constant, offset + 16); + break; /* SBRN-format jumps */ case OPC1_16_SBRN_JZ_T: temp = tcg_temp_new(); @@ -4097,6 +4103,16 @@ static void decode_16Bit_opc(CPUTriCoreState *env, DisasContext *ctx) const16 = MASK_OP_SBC_CONST4_SEXT(ctx->opcode); gen_compute_branch(ctx, op1, 0, 0, const16, address); break; + case OPC1_16_SBC_JEQ2: + case OPC1_16_SBC_JNE2: + if (tricore_feature(env, TRICORE_FEATURE_16)) { + address = MASK_OP_SBC_DISP4(ctx->opcode); + const16 = MASK_OP_SBC_CONST4_SEXT(ctx->opcode); + gen_compute_branch(ctx, op1, 0, 0, const16, address); + } else { + generate_trap(ctx, TRAPC_INSN_ERR, TIN2_IOPC); + } + break; /* SBRN-format */ case OPC1_16_SBRN_JNZ_T: case OPC1_16_SBRN_JZ_T: diff --git a/target-tricore/tricore-opcodes.h b/target-tricore/tricore-opcodes.h index 78ba338..08394b8 100644 --- a/target-tricore/tricore-opcodes.h +++ b/target-tricore/tricore-opcodes.h @@ -311,6 +311,7 @@ enum { OPC1_16_SRR_EQ = 0x3a, OPC1_16_SB_J = 0x3c, OPC1_16_SBC_JEQ = 0x1e, + OPC1_16_SBC_JEQ2 = 0x9e, OPC1_16_SBR_JEQ = 0x3e, OPC1_16_SBR_JGEZ = 0xce, OPC1_16_SBR_JGTZ = 0x4e, @@ -318,6 +319,7 @@ enum { OPC1_16_SBR_JLEZ = 0x8e, OPC1_16_SBR_JLTZ = 0x0e, OPC1_16_SBC_JNE = 0x5e, + OPC1_16_SBC_JNE2 = 0xde, OPC1_16_SBR_JNE = 0x7e, OPC1_16_SB_JNZ = 0xee, OPC1_16_SBR_JNZ = 0xf6,