From patchwork Tue May 17 22:32:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 96074 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 256A8B6EE9 for ; Wed, 18 May 2011 08:41:41 +1000 (EST) Received: from localhost ([::1]:34787 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMSxO-0002Su-HT for incoming@patchwork.ozlabs.org; Tue, 17 May 2011 18:41:38 -0400 Received: from eggs.gnu.org ([140.186.70.92]:50626) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMSpr-0006Yf-LV for qemu-devel@nongnu.org; Tue, 17 May 2011 18:33:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QMSpq-0000Qb-O3 for qemu-devel@nongnu.org; Tue, 17 May 2011 18:33:51 -0400 Received: from mail-ey0-f173.google.com ([209.85.215.173]:53774) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMSpq-0000MT-Jf for qemu-devel@nongnu.org; Tue, 17 May 2011 18:33:50 -0400 Received: by mail-ey0-f173.google.com with SMTP id 6so338540eyb.4 for ; Tue, 17 May 2011 15:33:50 -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=BfZmsEgTJSxxVO7ewz4PW3CsCgRaFONEqRpvqlcGu0k=; b=mvZ291l4ssAGB795SwAjOfGYPN3/g/ifjIzsQ8VGN+hEDfKBrP4bibsp7xdzlUOFuG +Q8qPF7hBarOxTPiSmPC6JJGFrNR5S3huVYw8hJ/e3Sp3WPBrcEIfCgX6jFGH9sRnn7U ZT82YbuHoQqxwYFTM130z/zlJMSoqwahHYLy8= 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=aFzaEy0NxHtd1dhIY8onGToyzfqkvPMvS9SQoUe7wrgtPaxvKib1ZEpnSDtaeud6aB ghPljSaTukJO4LKcdmrcmcnAQIG429fSEt0PF9dBNpDXCc91Mfq20TS79jE/F2t7frL0 xqLR/QBYE2cpgS9HosjO0IA0gaYQ4qH4pfycA= Received: by 10.213.29.144 with SMTP id q16mr1377680ebc.38.1305671630235; Tue, 17 May 2011 15:33:50 -0700 (PDT) Received: from octofox.metropolis ([188.134.19.124]) by mx.google.com with ESMTPS id y9sm695598eeh.8.2011.05.17.15.33.47 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 May 2011 15:33:49 -0700 (PDT) Received: by octofox.metropolis (sSMTP sendmail emulation); Wed, 18 May 2011 02:33:46 +0400 From: Max Filippov To: qemu-devel@nongnu.org Date: Wed, 18 May 2011 02:32:38 +0400 Message-Id: <1305671572-5899-13-git-send-email-jcmvbkbc@gmail.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1305671572-5899-1-git-send-email-jcmvbkbc@gmail.com> References: <1305671572-5899-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.173 Cc: Max Filippov Subject: [Qemu-devel] [PATCH 12/26] target-xtensa: implement LSAI group 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 - base + offset load/store operations for 1/2/4 byte values; - cache operations (not implemented); - multiprocessor synchronization operations. Signed-off-by: Max Filippov --- target-xtensa/cpu.h | 1 + target-xtensa/translate.c | 88 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 0 deletions(-) diff --git a/target-xtensa/cpu.h b/target-xtensa/cpu.h index 5383a9a..d518cab 100644 --- a/target-xtensa/cpu.h +++ b/target-xtensa/cpu.h @@ -107,6 +107,7 @@ enum { enum { SAR = 3, + SCOMPARE1 = 12, }; typedef struct XtensaConfig { diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c index 0b84895..a2a1e78 100644 --- a/target-xtensa/translate.c +++ b/target-xtensa/translate.c @@ -64,6 +64,7 @@ static TCGv_i32 cpu_UR[256]; static const char * const sregnames[256] = { [SAR] = "SAR", + [SCOMPARE1] = "SCOMPARE1", }; static const char * const uregnames[256] = { @@ -851,7 +852,94 @@ static void disas_xtensa_insn(DisasContext *dc) break; case 2: /*LSAI*/ +#define gen_load_store(type, shift) do { \ + TCGv_i32 addr = tcg_temp_new_i32(); \ + tcg_gen_addi_i32(addr, cpu_R[RRI8_S], RRI8_IMM8 << shift); \ + tcg_gen_qemu_##type(cpu_R[RRI8_T], addr, 0); \ + tcg_temp_free(addr); \ + } while (0) + + switch (RRI8_R) { + case 0: /*L8UI*/ + gen_load_store(ld8u, 0); + break; + + case 1: /*L16UI*/ + gen_load_store(ld16u, 1); + break; + + case 2: /*L32I*/ + gen_load_store(ld32u, 2); + break; + + case 4: /*S8I*/ + gen_load_store(st8, 0); + break; + + case 5: /*S16I*/ + gen_load_store(st16, 1); + break; + + case 6: /*S32I*/ + gen_load_store(st32, 2); + break; + + case 7: /*CACHEc*/ + break; + + case 9: /*L16SI*/ + gen_load_store(ld16s, 1); + break; + + case 10: /*MOVI*/ + tcg_gen_movi_i32(cpu_R[RRI8_T], + RRI8_IMM8 | (RRI8_S << 8) | + ((RRI8_S & 0x8) ? 0xfffff000 : 0)); + break; + + case 11: /*L32AIy*/ + HAS_OPTION(XTENSA_OPTION_MP_SYNCHRO); + gen_load_store(ld32u, 2); /*TODO acquire?*/ + break; + + case 12: /*ADDI*/ + tcg_gen_addi_i32(cpu_R[RRI8_T], cpu_R[RRI8_S], RRI8_IMM8_SE); + break; + + case 13: /*ADDMI*/ + tcg_gen_addi_i32(cpu_R[RRI8_T], cpu_R[RRI8_S], RRI8_IMM8_SE << 8); + break; + + case 14: /*S32C1Iy*/ + HAS_OPTION(XTENSA_OPTION_MP_SYNCHRO); + { + int label = gen_new_label(); + TCGv_i32 tmp = tcg_temp_local_new_i32(); + TCGv_i32 addr = tcg_temp_local_new_i32(); + + tcg_gen_mov_i32(tmp, cpu_R[RRI8_T]); + tcg_gen_addi_i32(addr, cpu_R[RRI8_S], RRI8_IMM8 << 2); + tcg_gen_qemu_ld32u(cpu_R[RRI8_T], addr, 0); + tcg_gen_brcond_i32(TCG_COND_NE, tmp, cpu_SR[SCOMPARE1], label); + + tcg_gen_qemu_st32(tmp, addr, 0); + + gen_set_label(label); + tcg_temp_free(addr); + tcg_temp_free(tmp); + } + break; + + case 15: /*S32RIy*/ + HAS_OPTION(XTENSA_OPTION_MP_SYNCHRO); + gen_load_store(st32, 2); /*TODO release?*/ + break; + + default: /*reserved*/ + break; + } break; +#undef gen_load_store case 3: /*LSCIp*/ HAS_OPTION(XTENSA_OPTION_COPROCESSOR);