From patchwork Thu Jul 14 04:11:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Rolnik X-Patchwork-Id: 648177 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 3rqj8z1P2xz9s9Z for ; Thu, 14 Jul 2016 14:17:39 +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=wqqXh31/; dkim-atps=neutral Received: from localhost ([::1]:51366 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNY5g-00014y-Rf for incoming@patchwork.ozlabs.org; Thu, 14 Jul 2016 00:17:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59370) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNY0L-0002rk-Lh for qemu-devel@nongnu.org; Thu, 14 Jul 2016 00:12:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bNY0H-000326-BV for qemu-devel@nongnu.org; Thu, 14 Jul 2016 00:12:04 -0400 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:36653) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNY0G-000320-Rn for qemu-devel@nongnu.org; Thu, 14 Jul 2016 00:12:01 -0400 Received: by mail-pf0-x243.google.com with SMTP id i123so4155339pfg.3 for ; Wed, 13 Jul 2016 21:12:00 -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=Vz3nKyOtI6HnXAo2tRWqSv8u7vUz9MDm0H/kPOuav3M=; b=wqqXh31/VKqiufltKzmAKw2wRs3MWbon9PHBVTHVzqxZOd5ruz/Xfvu+OWY3jpeAXB JvJUeOu9AhX1N72deg1RZrCMcYKIqJJb66bvZfYN2K/3t+API1p9+d5RbvuTfV3m6O91 onwlZaBVIOeJD7QoDAa/RSLE42e/XYfLyUOILx4pGpeWnrpc+J26GtEnXP0X85D1hgqs 8/7xCZdbKy49TaQdRyJplNohrkDpOGgX8xi1zpooWKotbhg9inoJjRIcjgRGCZbhx7j8 yiHP23AJ/x8MHGS/vvEOvXs/n14UuIq8q8K/okNn4/cL1X+jQgzdETJMfOqoZIEIgJXs PTAw== 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=Vz3nKyOtI6HnXAo2tRWqSv8u7vUz9MDm0H/kPOuav3M=; b=gzpyfAPfWUamVUIf/iwNx8SDIwt0XG6f/Xp2FCZNjt+oJ5O4RLjCkCaubdcd4CFrmH J5QehFCZ8eBKIscW7cE+vPKwvcJpQCEJeyEjdoz/nmYMjLz1HrOWiQcp1wGCJRnvkP3C jGOQ/+KQ2S3ljnulzkGEwaGD9FObFjD2Ql5cQS71aZGQWzXULt27CYbulP3AWglr6AGg 6Zi/9LzSTcqmD+KAzgmwI5+0qS0FGblcKUg5CmXfssAeybvfcNjWW+0u+Wc4nHjiTQrz Rbj+JUuJth58YNDFjXgYgTroIZwKXgyWCln6XB3bC8hhXHPzlGVM345DE7vbftq3Hgsc 9umg== X-Gm-Message-State: ALyK8tI0ymKGjVzsuOt2maGBgVOs4ZYYnnt+J5mgoUX4b9Kw06XvldPKI8znh1WxEpcSBg== X-Received: by 10.98.207.6 with SMTP id b6mr9139721pfg.25.1468469520089; Wed, 13 Jul 2016 21:12:00 -0700 (PDT) Received: from a0999b0126e1.ant.amazon.com (h194.236.133.40.static.ip.windstream.net. [40.133.236.194]) by smtp.gmail.com with ESMTPSA id e14sm6304557pfb.89.2016.07.13.21.11.57 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 13 Jul 2016 21:11:59 -0700 (PDT) From: Michael Rolnik To: qemu-devel@nongnu.org Date: Wed, 13 Jul 2016 21:11:01 -0700 Message-Id: <1468469461-18661-10-git-send-email-mrolnik@gmail.com> X-Mailer: git-send-email 2.4.9 (Apple Git-60) In-Reply-To: <1468469461-18661-1-git-send-email-mrolnik@gmail.com> References: <1468469461-18661-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: 2607:f8b0:400e:c00::243 Subject: [Qemu-devel] [PATCH v11 9/9] 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Michael Rolnik --- target-avr/Makefile.objs | 1 + target-avr/decode.c | 693 +++++++++++++++++++++++++++++++++++++++++++++++ target-avr/helper.c | 2 + target-avr/helper.h | 1 + target-avr/translate.c | 12 - 5 files changed, 697 insertions(+), 12 deletions(-) create mode 100644 target-avr/decode.c diff --git a/target-avr/Makefile.objs b/target-avr/Makefile.objs index fdafcd5..993a3a9 100644 --- a/target-avr/Makefile.objs +++ b/target-avr/Makefile.objs @@ -20,4 +20,5 @@ obj-y += translate.o cpu.o helper.o translate-inst.o obj-y += gdbstub.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..41e16e3 --- /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/helper.c b/target-avr/helper.c index d1f254d..f409be3 100644 --- a/target-avr/helper.c +++ b/target-avr/helper.c @@ -152,6 +152,7 @@ void tlb_fill(CPUState *cs, target_ulong vaddr, MMUAccessType access_type, tlb_set_page_with_attrs(cs, vaddr, paddr, attrs, prot, mmu_idx, page_size); } + void helper_sleep(CPUAVRState *env) { CPUState *cs = CPU(avr_env_get_cpu(env)); @@ -159,6 +160,7 @@ void helper_sleep(CPUAVRState *env) cs->exception_index = EXCP_HLT; cpu_loop_exit(cs); } + void helper_unsupported(CPUAVRState *env) { CPUState *cs = CPU(avr_env_get_cpu(env)); diff --git a/target-avr/helper.h b/target-avr/helper.h index 6036315..a533d2a 100644 --- a/target-avr/helper.h +++ b/target-avr/helper.h @@ -26,3 +26,4 @@ DEF_HELPER_3(outb, void, env, i32, i32) DEF_HELPER_2(inb, tl, env, i32) DEF_HELPER_3(fullwr, void, env, i32, i32) DEF_HELPER_2(fullrd, tl, env, i32) + diff --git a/target-avr/translate.c b/target-avr/translate.c index a7fbe3d..b753605 100644 --- a/target-avr/translate.c +++ b/target-avr/translate.c @@ -90,18 +90,6 @@ void avr_translate_init(void) done_init = 1; } -static int translate_nop(CPUAVRState *env, DisasContext *ctx, uint32_t opcode) -{ - return BS_NONE; -} - -void avr_decode(uint32_t pc, uint32_t *length, uint32_t opcode, - translate_function_t *translate) -{ - *length = 32; - *translate = &translate_nop; -} - static void decode_opc(AVRCPU *cpu, DisasContext *ctx, InstInfo *inst) { CPUAVRState *env = &cpu->env;