From patchwork Wed May 4 00:59:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 93943 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id ABB5FB6EFF for ; Wed, 4 May 2011 11:03:29 +1000 (EST) Received: from localhost ([::1]:59468 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QHQUw-0000lB-NY for incoming@patchwork.ozlabs.org; Tue, 03 May 2011 21:03:26 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=eV4VTlYavC8s5j1YOqt1Y/zj8y84WC1E6bqIdCWeQx0=; b=LHwQfSfk0QvzfiN3WHbMwzhSTwt/DAI8o3fGPPaMYmkgvvxssuF1wpMbUYCKIG322O 6hVn9EnG3w3ue9WVyHyyU/SuuielV669/L4Kml4qyBuhIWPMzRF3O2WJA6ZLV7JPQZNZ F3wDsf6kh+gYzUgq/ZdblC8vEcdQ2c6gzhBU8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=orzEM7L9gtsZ7vRGOp7t6+8om21sePa2yKJLB104Hjm0t3rHdNcll10IDXkCNgKPIa 9eVwmXzW0GnQJt8InMJbSM44BwwMqo+4omxkXTHfcQLwxOTt3zFKSWps/QdzkNiFnGHN StLDEKPx4l5Gp8vu+7PJgrELTDVuMtVMxfZ1E= Received: by 10.14.9.18 with SMTP id 18mr242165ees.236.1304470819402; Tue, 03 May 2011 18:00:19 -0700 (PDT) Received: from octofox.metropolis ([188.134.19.124]) by mx.google.com with ESMTPS id y18sm435344eeh.22.2011.05.03.18.00.17 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 03 May 2011 18:00:18 -0700 (PDT) Received: by octofox.metropolis (sSMTP sendmail emulation); Wed, 4 May 2011 05:00:15 +0400 From: Max Filippov To: qemu-devel@nongnu.org Date: Wed, 4 May 2011 04:59:09 +0400 Message-Id: <1304470768-16924-9-git-send-email-jcmvbkbc@gmail.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1304470768-16924-1-git-send-email-jcmvbkbc@gmail.com> References: <1304470768-16924-1-git-send-email-jcmvbkbc@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.215.45 Cc: Max Filippov Subject: [Qemu-devel] [RFC 09/28] target-xtensa: implement JX/RET0/CALLX 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 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*/