From patchwork Wed Aug 17 22:38:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Rolnik X-Patchwork-Id: 9286661 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 C18C560839 for ; Wed, 17 Aug 2016 22:46:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A24B1290EC for ; Wed, 17 Aug 2016 22:46:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 901F2290D3; Wed, 17 Aug 2016 22:46:57 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 859B2290D3 for ; Wed, 17 Aug 2016 22:46:56 +0000 (UTC) Received: from localhost ([::1]:49769 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ba9br-00051q-3S for patchwork-qemu-devel@patchwork.kernel.org; Wed, 17 Aug 2016 18:46:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57512) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ba9WP-0000P6-EW for qemu-devel@nongnu.org; Wed, 17 Aug 2016 18:41:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ba9WM-0000Pv-Hp for qemu-devel@nongnu.org; Wed, 17 Aug 2016 18:41:16 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:34569) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ba9WM-0000Pl-1x for qemu-devel@nongnu.org; Wed, 17 Aug 2016 18:41:14 -0400 Received: by mail-wm0-x241.google.com with SMTP id q128so1538066wma.1 for ; Wed, 17 Aug 2016 15:41:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XfzXepT/Z7umLII1XmGMxDRILVpKVqnDSWvocsBRAp4=; b=Iuf+WNzGVjB9EGbd90B3HEsohpIqN+Bi870VaUr/LgpJZUYelTq6NS4I7/LREm17A2 11fPaOMzUT36DpFfFudEYosBpLq2ju7iHyOosXEcMFEdxXaekxL5y4ag8xFjcRamyrGv xvNJTnjm0Tw8kolHW4MrWI63qdnzLoNMaBoEvHc/faBjCzzQcPiygYkni3PvJjAn5ViB cI/sLZqKGeptFs44z90YtXcy1VI+DpdD7iySqqklGdInWC7gi6bnMyB2NpuiUP3/ZBcg JjOydUs9fuB2fqabea2c8pOARHgm6n+qvBTgZMtB6ulC8UJIT38TW+0V+ZhmdQ2XknHh bt+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XfzXepT/Z7umLII1XmGMxDRILVpKVqnDSWvocsBRAp4=; b=b24xqFkjybPHEgpw2ZE/Gjs/oFZ1uTHkawT78Zjw+Q87Rp+l/lU058W0MHrNAKtcgS S/MjRnuCjhpvrYpU0Sc1kuFmS05LjfBVRn9rSlaOAC0EfV0SadTWaV58aQkbykbKq627 QZEFYTAr6aXa0u6MBIdiosVlb7HSH/XFim5TLClMSTVJdWHgyKzmntx2tCD+FKZydX3n QTAyvejtgSoL6NCdpSVD16zyI5tPhzpZiZYJGWrd8+It2FzZdmrkj15hZ+sJKAeq3mZE /34Q9GoGvbWdx1DzX66/60ZjCrdKcynICymNOGJ1MwJ5dITkR2AixSiHJPSL1CvQ+9FA ZQtw== X-Gm-Message-State: AEkoout009gTtB4culdMF2Wd74i1CLFmrm9/pVwkcIWt2pWirw2vKm1/bFn3dhZgoonR0Q== X-Received: by 10.194.27.133 with SMTP id t5mr43537892wjg.15.1471473673026; Wed, 17 Aug 2016 15:41:13 -0700 (PDT) Received: from a0999b0126e1.ant.amazon.com ([37.46.39.170]) by smtp.gmail.com with ESMTPSA id f4sm28626504wmf.8.2016.08.17.15.41.01 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 17 Aug 2016 15:41:03 -0700 (PDT) From: Michael Rolnik To: qemu-devel@nongnu.org Date: Thu, 18 Aug 2016 01:38:43 +0300 Message-Id: <1471473523-30624-10-git-send-email-mrolnik@gmail.com> X-Mailer: git-send-email 2.4.9 (Apple Git-60) In-Reply-To: <1471473523-30624-1-git-send-email-mrolnik@gmail.com> References: <1471473523-30624-1-git-send-email-mrolnik@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PATCH v16 09/10] target-avr: adding instruction decoder 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: peter.maydell@linaro.org, Michael Rolnik , 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 Signed-off-by: Michael Rolnik --- target-avr/Makefile.objs | 1 + target-avr/decode.c | 693 +++++++++++++++++++++++++++++++++++++++++++++++ target-avr/translate.c | 2 + 3 files changed, 696 insertions(+) create mode 100644 target-avr/decode.c diff --git a/target-avr/Makefile.objs b/target-avr/Makefile.objs index f4a82c4..b500989 100644 --- a/target-avr/Makefile.objs +++ b/target-avr/Makefile.objs @@ -21,5 +21,6 @@ obj-y += translate.o cpu.o helper.o obj-y += gdbstub.o obj-y += translate-inst.o +obj-y += decode.o obj-$(CONFIG_SOFTMMU) += machine.o diff --git a/target-avr/decode.c b/target-avr/decode.c new file mode 100644 index 0000000..243bab3 --- /dev/null +++ b/target-avr/decode.c @@ -0,0 +1,693 @@ +/* + * QEMU AVR CPU + * + * Copyright (c) 2016 Michael Rolnik + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see + * + */ + +#include +#include "translate.h" + +void avr_decode(uint32_t pc, uint32_t *l, uint32_t c, translate_function_t *t) +{ + uint32_t opc = extract32(c, 0, 16); + switch (opc & 0x0000d000) { + case 0x00000000: { + switch (opc & 0x00002c00) { + case 0x00000000: { + switch (opc & 0x00000300) { + case 0x00000000: { + *l = 16; + *t = &avr_translate_NOP; + break; + } + case 0x00000100: { + *l = 16; + *t = &avr_translate_MOVW; + break; + } + case 0x00000200: { + *l = 16; + *t = &avr_translate_MULS; + break; + } + case 0x00000300: { + switch (opc & 0x00000088) { + case 0x00000000: { + *l = 16; + *t = &avr_translate_MULSU; + break; + } + case 0x00000008: { + *l = 16; + *t = &avr_translate_FMUL; + break; + } + case 0x00000080: { + *l = 16; + *t = &avr_translate_FMULS; + break; + } + case 0x00000088: { + *l = 16; + *t = &avr_translate_FMULSU; + break; + } + } + break; + } + } + break; + } + case 0x00000400: { + *l = 16; + *t = &avr_translate_CPC; + break; + } + case 0x00000800: { + *l = 16; + *t = &avr_translate_SBC; + break; + } + case 0x00000c00: { + *l = 16; + *t = &avr_translate_ADD; + break; + } + case 0x00002000: { + *l = 16; + *t = &avr_translate_AND; + break; + } + case 0x00002400: { + *l = 16; + *t = &avr_translate_EOR; + break; + } + case 0x00002800: { + *l = 16; + *t = &avr_translate_OR; + break; + } + case 0x00002c00: { + *l = 16; + *t = &avr_translate_MOV; + break; + } + } + break; + } + case 0x00001000: { + switch (opc & 0x00002000) { + case 0x00000000: { + switch (opc & 0x00000c00) { + case 0x00000000: { + *l = 16; + *t = &avr_translate_CPSE; + break; + } + case 0x00000400: { + *l = 16; + *t = &avr_translate_CP; + break; + } + case 0x00000800: { + *l = 16; + *t = &avr_translate_SUB; + break; + } + case 0x00000c00: { + *l = 16; + *t = &avr_translate_ADC; + break; + } + } + break; + } + case 0x00002000: { + *l = 16; + *t = &avr_translate_CPI; + break; + } + } + break; + } + case 0x00004000: { + switch (opc & 0x00002000) { + case 0x00000000: { + *l = 16; + *t = &avr_translate_SBCI; + break; + } + case 0x00002000: { + *l = 16; + *t = &avr_translate_ORI; + break; + } + } + break; + } + case 0x00005000: { + switch (opc & 0x00002000) { + case 0x00000000: { + *l = 16; + *t = &avr_translate_SUBI; + break; + } + case 0x00002000: { + *l = 16; + *t = &avr_translate_ANDI; + break; + } + } + break; + } + case 0x00008000: { + switch (opc & 0x00000208) { + case 0x00000000: { + *l = 16; + *t = &avr_translate_LDDZ; + break; + } + case 0x00000008: { + *l = 16; + *t = &avr_translate_LDDY; + break; + } + case 0x00000200: { + *l = 16; + *t = &avr_translate_STDZ; + break; + } + case 0x00000208: { + *l = 16; + *t = &avr_translate_STDY; + break; + } + } + break; + } + case 0x00009000: { + switch (opc & 0x00002800) { + case 0x00000000: { + switch (opc & 0x00000600) { + case 0x00000000: { + switch (opc & 0x0000000f) { + case 0x00000000: { + *l = 32; + *t = &avr_translate_LDS; + break; + } + case 0x00000001: { + *l = 16; + *t = &avr_translate_LDZ2; + break; + } + case 0x00000002: { + *l = 16; + *t = &avr_translate_LDZ3; + break; + } + case 0x00000003: { + break; + } + case 0x00000004: { + *l = 16; + *t = &avr_translate_LPM2; + break; + } + case 0x00000005: { + *l = 16; + *t = &avr_translate_LPMX; + break; + } + case 0x00000006: { + *l = 16; + *t = &avr_translate_ELPM2; + break; + } + case 0x00000007: { + *l = 16; + *t = &avr_translate_ELPMX; + break; + } + case 0x00000008: { + break; + } + case 0x00000009: { + *l = 16; + *t = &avr_translate_LDY2; + break; + } + case 0x0000000a: { + *l = 16; + *t = &avr_translate_LDY3; + break; + } + case 0x0000000b: { + break; + } + case 0x0000000c: { + *l = 16; + *t = &avr_translate_LDX1; + break; + } + case 0x0000000d: { + *l = 16; + *t = &avr_translate_LDX2; + break; + } + case 0x0000000e: { + *l = 16; + *t = &avr_translate_LDX3; + break; + } + case 0x0000000f: { + *l = 16; + *t = &avr_translate_POP; + break; + } + } + break; + } + case 0x00000200: { + switch (opc & 0x0000000f) { + case 0x00000000: { + *l = 32; + *t = &avr_translate_STS; + break; + } + case 0x00000001: { + *l = 16; + *t = &avr_translate_STZ2; + break; + } + case 0x00000002: { + *l = 16; + *t = &avr_translate_STZ3; + break; + } + case 0x00000003: { + break; + } + case 0x00000004: { + *l = 16; + *t = &avr_translate_XCH; + break; + } + case 0x00000005: { + *l = 16; + *t = &avr_translate_LAS; + break; + } + case 0x00000006: { + *l = 16; + *t = &avr_translate_LAC; + break; + } + case 0x00000007: { + *l = 16; + *t = &avr_translate_LAT; + break; + } + case 0x00000008: { + break; + } + case 0x00000009: { + *l = 16; + *t = &avr_translate_STY2; + break; + } + case 0x0000000a: { + *l = 16; + *t = &avr_translate_STY3; + break; + } + case 0x0000000b: { + break; + } + case 0x0000000c: { + *l = 16; + *t = &avr_translate_STX1; + break; + } + case 0x0000000d: { + *l = 16; + *t = &avr_translate_STX2; + break; + } + case 0x0000000e: { + *l = 16; + *t = &avr_translate_STX3; + break; + } + case 0x0000000f: { + *l = 16; + *t = &avr_translate_PUSH; + break; + } + } + break; + } + case 0x00000400: { + switch (opc & 0x0000000e) { + case 0x00000000: { + switch (opc & 0x00000001) { + case 0x00000000: { + *l = 16; + *t = &avr_translate_COM; + break; + } + case 0x00000001: { + *l = 16; + *t = &avr_translate_NEG; + break; + } + } + break; + } + case 0x00000002: { + switch (opc & 0x00000001) { + case 0x00000000: { + *l = 16; + *t = &avr_translate_SWAP; + break; + } + case 0x00000001: { + *l = 16; + *t = &avr_translate_INC; + break; + } + } + break; + } + case 0x00000004: { + *l = 16; + *t = &avr_translate_ASR; + break; + } + case 0x00000006: { + switch (opc & 0x00000001) { + case 0x00000000: { + *l = 16; + *t = &avr_translate_LSR; + break; + } + case 0x00000001: { + *l = 16; + *t = &avr_translate_ROR; + break; + } + } + break; + } + case 0x00000008: { + switch (opc & 0x00000181) { + case 0x00000000: { + *l = 16; + *t = &avr_translate_BSET; + break; + } + case 0x00000001: { + switch (opc & 0x00000010) { + case 0x00000000: { + *l = 16; + *t = &avr_translate_IJMP; + break; + } + case 0x00000010: { + *l = 16; + *t = &avr_translate_EIJMP; + break; + } + } + break; + } + case 0x00000080: { + *l = 16; + *t = &avr_translate_BCLR; + break; + } + case 0x00000081: { + break; + } + case 0x00000100: { + switch (opc & 0x00000010) { + case 0x00000000: { + *l = 16; + *t = &avr_translate_RET; + break; + } + case 0x00000010: { + *l = 16; + *t = &avr_translate_RETI; + break; + } + } + break; + } + case 0x00000101: { + switch (opc & 0x00000010) { + case 0x00000000: { + *l = 16; + *t = &avr_translate_ICALL; + break; + } + case 0x00000010: { + *l = 16; + *t = &avr_translate_EICALL; + break; + } + } + break; + } + case 0x00000180: { + switch (opc & 0x00000070) { + case 0x00000000: { + *l = 16; + *t = &avr_translate_SLEEP; + break; + } + case 0x00000010: { + *l = 16; + *t = &avr_translate_BREAK; + break; + } + case 0x00000020: { + *l = 16; + *t = &avr_translate_WDR; + break; + } + case 0x00000030: { + break; + } + case 0x00000040: { + *l = 16; + *t = &avr_translate_LPM1; + break; + } + case 0x00000050: { + *l = 16; + *t = &avr_translate_ELPM1; + break; + } + case 0x00000060: { + *l = 16; + *t = &avr_translate_SPM; + break; + } + case 0x00000070: { + *l = 16; + *t = &avr_translate_SPMX; + break; + } + } + break; + } + case 0x00000181: { + break; + } + } + break; + } + case 0x0000000a: { + switch (opc & 0x00000001) { + case 0x00000000: { + *l = 16; + *t = &avr_translate_DEC; + break; + } + case 0x00000001: { + *l = 16; + *t = &avr_translate_DES; + break; + } + } + break; + } + case 0x0000000c: { + *l = 32; + *t = &avr_translate_JMP; + break; + } + case 0x0000000e: { + *l = 32; + *t = &avr_translate_CALL; + break; + } + } + break; + } + case 0x00000600: { + switch (opc & 0x00000100) { + case 0x00000000: { + *l = 16; + *t = &avr_translate_ADIW; + break; + } + case 0x00000100: { + *l = 16; + *t = &avr_translate_SBIW; + break; + } + } + break; + } + } + break; + } + case 0x00000800: { + switch (opc & 0x00000400) { + case 0x00000000: { + switch (opc & 0x00000300) { + case 0x00000000: { + *l = 16; + *t = &avr_translate_CBI; + break; + } + case 0x00000100: { + *l = 16; + *t = &avr_translate_SBIC; + break; + } + case 0x00000200: { + *l = 16; + *t = &avr_translate_SBI; + break; + } + case 0x00000300: { + *l = 16; + *t = &avr_translate_SBIS; + break; + } + } + break; + } + case 0x00000400: { + *l = 16; + *t = &avr_translate_MUL; + break; + } + } + break; + } + case 0x00002000: { + *l = 16; + *t = &avr_translate_IN; + break; + } + case 0x00002800: { + *l = 16; + *t = &avr_translate_OUT; + break; + } + } + break; + } + case 0x0000c000: { + switch (opc & 0x00002000) { + case 0x00000000: { + *l = 16; + *t = &avr_translate_RJMP; + break; + } + case 0x00002000: { + *l = 16; + *t = &avr_translate_LDI; + break; + } + } + break; + } + case 0x0000d000: { + switch (opc & 0x00002000) { + case 0x00000000: { + *l = 16; + *t = &avr_translate_RCALL; + break; + } + case 0x00002000: { + switch (opc & 0x00000c00) { + case 0x00000000: { + *l = 16; + *t = &avr_translate_BRBS; + break; + } + case 0x00000400: { + *l = 16; + *t = &avr_translate_BRBC; + break; + } + case 0x00000800: { + switch (opc & 0x00000200) { + case 0x00000000: { + *l = 16; + *t = &avr_translate_BLD; + break; + } + case 0x00000200: { + *l = 16; + *t = &avr_translate_BST; + break; + } + } + break; + } + case 0x00000c00: { + switch (opc & 0x00000200) { + case 0x00000000: { + *l = 16; + *t = &avr_translate_SBRC; + break; + } + case 0x00000200: { + *l = 16; + *t = &avr_translate_SBRS; + break; + } + } + break; + } + } + break; + } + } + break; + } + } + +} + diff --git a/target-avr/translate.c b/target-avr/translate.c index 0fa8292..74b8383 100644 --- a/target-avr/translate.c +++ b/target-avr/translate.c @@ -90,6 +90,8 @@ static void decode_opc(AVRCPU *cpu, DisasContext *ctx, InstInfo *inst) inst->length = 16; inst->translate = NULL; + avr_decode(inst->cpc, &inst->length, inst->opcode, &inst->translate); + if (inst->length == 16) { inst->npc = inst->cpc + 1; /* get opcode as 16bit value */