From patchwork Mon Aug 24 16:17:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 510152 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 4B08A140280 for ; Tue, 25 Aug 2015 02:22:44 +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=XgBeIzUK; dkim-atps=neutral Received: from localhost ([::1]:54993 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZTuWA-0000RF-Dt for incoming@patchwork.ozlabs.org; Mon, 24 Aug 2015 12:22:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37652) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZTuSl-000340-MG for qemu-devel@nongnu.org; Mon, 24 Aug 2015 12:19:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZTuSh-0002zo-Cf for qemu-devel@nongnu.org; Mon, 24 Aug 2015 12:19:11 -0400 Received: from mail-qg0-x232.google.com ([2607:f8b0:400d:c04::232]:34195) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZTuSh-0002zg-1y for qemu-devel@nongnu.org; Mon, 24 Aug 2015 12:19:07 -0400 Received: by qgeg42 with SMTP id g42so90045977qge.1 for ; Mon, 24 Aug 2015 09:19:06 -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=C69tJShWWfY8PZ8USwcP1a+7peRJDNbilFYvpi5jvjo=; b=XgBeIzUK3czCivswvIvjvSyTQwpKomFeTjxXACUWRQFjON9VqHbI1BaoVJz/xAzi+T 2g1FYpRtEjY9ogpFrNc5KS63goARV0baTyDsfgTvLcBwLV7/Djm4Ybtp8DIrKPg1U/Va cDzuXptzW1yNnUcGSiRpQlgpRu0/Tg+ekfqAFSCi2ahXiOpHGQ2dupnuGYgU4foCPvC/ hrvAfEAhTU4pN3XFwSn0VUd1idcOf9TIubF50CfuKKwiW3zxanGp2/cjxDZYe5QMCtzy 93woyfruEZaNOKcqALZvTC94qWfExa4KKLfVVvhQvJEvYa63JujU5vuf0cpVhMjLw+iU DKNw== X-Received: by 10.140.237.72 with SMTP id i69mr58070853qhc.59.1440433146763; Mon, 24 Aug 2015 09:19:06 -0700 (PDT) Received: from bigtime.com ([75.147.178.105]) by smtp.gmail.com with ESMTPSA id g76sm11445818qhc.33.2015.08.24.09.19.05 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Aug 2015 09:19:06 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 24 Aug 2015 09:17:45 -0700 Message-Id: <1440433079-14458-20-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1440433079-14458-1-git-send-email-rth@twiddle.net> References: <1440433079-14458-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:400d:c04::232 Cc: walt@tilera.com, cmetcalf@ezchip.com, xili_gchen_5257@hotmail.com, peter.maydell@linaro.org Subject: [Qemu-devel] [PATCH v14 19/33] target-tilegx: Handle unconditional jump instructions 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 Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- target-tilegx/translate.c | 58 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 41 insertions(+), 17 deletions(-) diff --git a/target-tilegx/translate.c b/target-tilegx/translate.c index 37c6ec5..11dcd45 100644 --- a/target-tilegx/translate.c +++ b/target-tilegx/translate.c @@ -242,7 +242,7 @@ static TileExcp gen_rr_opcode(DisasContext *dc, unsigned opext, const char *mnemonic; TCGMemOp memop; - /* Eliminate nops before doing anything else. */ + /* Eliminate nops and jumps before doing anything else. */ switch (opext) { case OE_RR_Y0(NOP): case OE_RR_Y1(NOP): @@ -261,6 +261,31 @@ static TileExcp gen_rr_opcode(DisasContext *dc, unsigned opext, } qemu_log_mask(CPU_LOG_TB_IN_ASM, "%s", mnemonic); return TILEGX_EXCP_NONE; + + case OE_RR_X1(JRP): + case OE_RR_Y1(JRP): + mnemonic = "jrp"; + goto do_jr; + case OE_RR_X1(JR): + case OE_RR_Y1(JR): + mnemonic = "jr"; + goto do_jr; + case OE_RR_X1(JALRP): + case OE_RR_Y1(JALRP): + mnemonic = "jalrp"; + goto do_jalr; + case OE_RR_X1(JALR): + case OE_RR_Y1(JALR): + mnemonic = "jalr"; + do_jalr: + tcg_gen_movi_tl(dest_gr(dc, TILEGX_R_LR), + dc->pc + TILEGX_BUNDLE_SIZE_IN_BYTES); + do_jr: + dc->jmp.cond = TCG_COND_ALWAYS; + dc->jmp.dest = tcg_temp_new(); + tcg_gen_andi_tl(dc->jmp.dest, load_gr(dc, srca), ~7); + qemu_log_mask(CPU_LOG_TB_IN_ASM, "%s %s", mnemonic, reg_names[srca]); + return TILEGX_EXCP_NONE; } tdest = dest_gr(dc, dest); @@ -289,14 +314,6 @@ static TileExcp gen_rr_opcode(DisasContext *dc, unsigned opext, case OE_RR_Y1(ILL): case OE_RR_X1(INV): case OE_RR_X1(IRET): - case OE_RR_X1(JALRP): - case OE_RR_Y1(JALRP): - case OE_RR_X1(JALR): - case OE_RR_Y1(JALR): - case OE_RR_X1(JRP): - case OE_RR_Y1(JRP): - case OE_RR_X1(JR): - case OE_RR_Y1(JR): return TILEGX_EXCP_OPCODE_UNIMPLEMENTED; case OE_RR_X1(LD1S): memop = MO_SB; @@ -363,6 +380,12 @@ static TileExcp gen_rr_opcode(DisasContext *dc, unsigned opext, break; case OE_RR_X1(LNK): case OE_RR_Y1(LNK): + if (srca) { + return TILEGX_EXCP_OPCODE_UNIMPLEMENTED; + } + tcg_gen_movi_tl(tdest, dc->pc + TILEGX_BUNDLE_SIZE_IN_BYTES); + mnemonic = "lnk"; + break; case OE_RR_X1(MF): case OE_RR_X1(NAP): return TILEGX_EXCP_OPCODE_UNIMPLEMENTED; @@ -1086,18 +1109,19 @@ static TileExcp gen_branch_opcode_x1(DisasContext *dc, unsigned ext, return TILEGX_EXCP_NONE; } -static TileExcp gen_jump_opcode_x1(DisasContext *dc, unsigned ext, - int off) +static TileExcp gen_jump_opcode_x1(DisasContext *dc, unsigned ext, int off) { target_ulong tgt = dc->pc + off * TILEGX_BUNDLE_SIZE_IN_BYTES; - const char *mnemonic; + const char *mnemonic = "j"; - switch (ext) { - case JAL_JUMP_OPCODE_X1: - case J_JUMP_OPCODE_X1: - default: - return TILEGX_EXCP_OPCODE_UNIMPLEMENTED; + /* The extension field is 1 bit, therefore we only have JAL and J. */ + if (ext == JAL_JUMP_OPCODE_X1) { + tcg_gen_movi_tl(dest_gr(dc, TILEGX_R_LR), + dc->pc + TILEGX_BUNDLE_SIZE_IN_BYTES); + mnemonic = "jal"; } + dc->jmp.cond = TCG_COND_ALWAYS; + dc->jmp.dest = tcg_const_tl(tgt); if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) { qemu_log("%s " TARGET_FMT_lx " <%s>",