From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:53015) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QHQRw-0004Tp-Rn for qemu-devel@nongnu.org; Tue, 03 May 2011 21:00:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QHQRw-0000kH-1B for qemu-devel@nongnu.org; Tue, 03 May 2011 21:00:20 -0400 Received: from mail-ew0-f45.google.com ([209.85.215.45]:56465) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QHQRv-0000ZL-Sq for qemu-devel@nongnu.org; Tue, 03 May 2011 21:00:19 -0400 Received: by mail-ew0-f45.google.com with SMTP id 24so221435ewy.4 for ; Tue, 03 May 2011 18:00:19 -0700 (PDT) From: Max Filippov Date: Wed, 4 May 2011 04:59:09 +0400 Message-Id: <1304470768-16924-9-git-send-email-jcmvbkbc@gmail.com> In-Reply-To: <1304470768-16924-1-git-send-email-jcmvbkbc@gmail.com> References: <1304470768-16924-1-git-send-email-jcmvbkbc@gmail.com> Subject: [Qemu-devel] [RFC 09/28] target-xtensa: implement JX/RET0/CALLX List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Max Filippov Group SNM0 (indirect jumps and calls). Signed-off-by: Max Filippov --- target-xtensa/translate.c | 49 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 48 insertions(+), 1 deletions(-) diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c index 2bfa801..f4d74e0 100644 --- a/target-xtensa/translate.c +++ b/target-xtensa/translate.c @@ -130,7 +130,11 @@ static void disas_xtensa_insn(DisasContext *dc) #define CALL_OFFSET ((((_b0) & 0x3) << 16) | ((_b1) << 8) | (_b2)) #define CALL_OFFSET_SE (((_b0 & 0x2) ? 0xfffc0000 : 0) | CALL_OFFSET) -#define BRI12_M ((_b0) & 0x3) +#define CALLX_N CALL_N +#define CALLX_M ((_b0) & 0x3) +#define CALLX_S RRR_S + +#define BRI12_M CALLX_M #define BRI12_S RRR_S #define BRI12_IMM12 ((((_b1) & 0xf) << 8) | (_b2)) #define BRI12_IMM12_SE ((((_b1) & 0x8) ? 0xfffff000 : 0) | BRI12_IMM12) @@ -165,6 +169,49 @@ static void disas_xtensa_insn(DisasContext *dc) switch (RRR_R) { case 0: /*SNM0*/ + switch (CALLX_M) { + case 0: /*ILL*/ + break; + + case 1: /*reserved*/ + break; + + case 2: /*JR*/ + switch (CALLX_N) { + case 0: /*RET*/ + case 2: /*JX*/ + gen_jump(dc, cpu_R[CALLX_S]); + break; + + case 1: /*RETWw*/ + HAS_OPTION(XTENSA_OPTION_WINDOWED_REGISTER); + break; + + case 3: /*reserved*/ + break; + } + break; + + case 3: /*CALLX*/ + switch (CALLX_N) { + case 0: /*CALLX0*/ + { + TCGv_i32 tmp = tcg_temp_new_i32(); + tcg_gen_mov_i32(tmp, cpu_R[CALLX_S]); + tcg_gen_movi_i32(cpu_R[0], dc->pc + 3); + gen_jump(dc, tmp); + tcg_temp_free(tmp); + } + break; + + case 1: /*CALLX4w*/ + case 2: /*CALLX8w*/ + case 3: /*CALLX12w*/ + HAS_OPTION(XTENSA_OPTION_WINDOWED_REGISTER); + break; + } + break; + } break; case 1: /*MOVSPw*/ -- 1.7.3.4