From patchwork Tue Jun 14 18:09:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Rolnik X-Patchwork-Id: 9176389 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 AC0DF6075D for ; Tue, 14 Jun 2016 18:11:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9CAC02793D for ; Tue, 14 Jun 2016 18:11:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8FC6928236; Tue, 14 Jun 2016 18:11:43 +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 C83D32793D for ; Tue, 14 Jun 2016 18:11:42 +0000 (UTC) Received: from localhost ([::1]:37305 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCsoP-0003ng-K3 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 14 Jun 2016 14:11:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59738) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCsmr-0002s3-Al for qemu-devel@nongnu.org; Tue, 14 Jun 2016 14:10:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCsmp-0001Gq-IC for qemu-devel@nongnu.org; Tue, 14 Jun 2016 14:10:05 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:36361) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCsmp-0001GX-2e for qemu-devel@nongnu.org; Tue, 14 Jun 2016 14:10:03 -0400 Received: by mail-wm0-x244.google.com with SMTP id m124so381195wme.3 for ; Tue, 14 Jun 2016 11:10:03 -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=X892lGswwKjtD0dqir2C+Z2Tcaz6Hs+hj4d5ZVH82J0=; b=WBqUVUBBtJmH8uiT/rHMB1ZTgxRQOZUvxSFx154Ug/amk5jsx1ylvcbZndqjKeQXT1 8YV42W+37D4xpEZ4IBMUjEVrx8cD2HaWJ3t0/Jqjxdw2ACo3vw86bx+4BZrFoS+pccS0 HlSGZKYkvKSwIfHHEvmM3+ITs9r1iH5NKYLLS8r/RHp0fKieUuWZEM6yLabJgl0Ih6Ez f2I73iEL66PC3sKLCeWCkKDi8OcPaFul94TLnz4IO5/4DiEoPML0gYU0lPEL1dbkU4k+ FiGkqN36pZ3sTRVU94JnhOm1k8m7CywwF6ZSh58BSMfp4Di6r+E/8bJ8c0XqwrKdiyPp iu2A== 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=X892lGswwKjtD0dqir2C+Z2Tcaz6Hs+hj4d5ZVH82J0=; b=GLHAw510ia55CUm7Q0aN0O3LJH+iYJbhuzzHw2Fushs4gvuN/fExd4QhHLy3tpmRZv DA3THtIr3hobv4W82WoQhuEq3DH7d2zyF5Jtla4IThSxiy4ma1sZ5/LLlJkzkaSZb5sL 26qxQsL+vDQIvE7Ah+/aGWUj2e3DaSDPYd1sg7rOhpWjAAByvlEY/uOhjP1ZJMMs9pBi nWntLmwmaCVyIyWrUY6nO4G019PDqMEltAP5AjIKYINgori4YTCu54xTXNNgdrwfH4Bb 6U8zUHOYg27CkBkW1/x1tqXY4SjJnJXpQHcDAirtCsoHFbZgpcD9zw+XoVuXQA3TQmqI 1UpA== X-Gm-Message-State: ALyK8tITEBXbJeLI5PsFhkByUrskWfU3253cs1/MdNakXF5b7ByCoCFWvlvSpvfgq2p8JA== X-Received: by 10.194.162.168 with SMTP id yb8mr8395213wjb.32.1465927802299; Tue, 14 Jun 2016 11:10:02 -0700 (PDT) Received: from a0999b0126e1.ant.amazon.com ([5.102.195.79]) by smtp.gmail.com with ESMTPSA id el4sm1443037wjd.23.2016.06.14.11.10.00 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 14 Jun 2016 11:10:01 -0700 (PDT) From: Michael Rolnik To: qemu-devel@nongnu.org Date: Tue, 14 Jun 2016 21:09:36 +0300 Message-Id: <1465927779-83200-10-git-send-email-mrolnik@gmail.com> X-Mailer: git-send-email 2.4.9 (Apple Git-60) In-Reply-To: <1465927779-83200-1-git-send-email-mrolnik@gmail.com> References: <1465927779-83200-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::244 Subject: [Qemu-devel] [PATCH v7 09/12] target-avr: updating translate.c to use instructions translation 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 | 4 +- target-avr/translate.c | 148 +++++++++++++++++++++-------------------------- 2 files changed, 69 insertions(+), 83 deletions(-) diff --git a/target-avr/Makefile.objs b/target-avr/Makefile.objs index 2a10104..9757721 100644 --- a/target-avr/Makefile.objs +++ b/target-avr/Makefile.objs @@ -18,6 +18,8 @@ # # -obj-y += translate.o cpu.o helper.o +obj-y += translate.o helper.o cpu.o translate-inst.o obj-y += gdbstub.o obj-$(CONFIG_SOFTMMU) += machine.o + +obj-y += decode.o diff --git a/target-avr/translate.c b/target-avr/translate.c index 81ee44e..28babc9 100644 --- a/target-avr/translate.c +++ b/target-avr/translate.c @@ -18,60 +18,30 @@ * */ -#include "qemu/osdep.h" - -#include "cpu.h" -#include "exec/exec-all.h" -#include "disas/disas.h" -#include "tcg-op.h" -#include "exec/cpu_ldst.h" - -#include "exec/helper-proto.h" -#include "exec/helper-gen.h" -#include "exec/log.h" - -typedef struct DisasContext DisasContext; -typedef struct InstInfo InstInfo; - -/*This is the state at translation time. */ -struct DisasContext { - struct TranslationBlock *tb; - - /*Routine used to access memory */ - int memidx; - int bstate; - int singlestep; -}; - -enum { - BS_NONE = 0, /* Nothing special (none of the below */ - BS_STOP = 1, /* We want to stop translation for any reason */ - BS_BRANCH = 2, /* A branch condition is reached */ - BS_EXCP = 3, /* An exception condition is reached */ -}; - -static TCGv_env cpu_env; - -static TCGv cpu_pc; - -static TCGv cpu_Cf; -static TCGv cpu_Zf; -static TCGv cpu_Nf; -static TCGv cpu_Vf; -static TCGv cpu_Sf; -static TCGv cpu_Hf; -static TCGv cpu_Tf; -static TCGv cpu_If; - -static TCGv cpu_rampD; -static TCGv cpu_rampX; -static TCGv cpu_rampY; -static TCGv cpu_rampZ; - -static TCGv cpu_io[64]; -static TCGv cpu_r[32]; -static TCGv cpu_eind; -static TCGv cpu_sp; +#include "translate.h" + +TCGv_env cpu_env; + +TCGv cpu_pc; + +TCGv cpu_Cf; +TCGv cpu_Zf; +TCGv cpu_Nf; +TCGv cpu_Vf; +TCGv cpu_Sf; +TCGv cpu_Hf; +TCGv cpu_Tf; +TCGv cpu_If; + +TCGv cpu_rampD; +TCGv cpu_rampX; +TCGv cpu_rampY; +TCGv cpu_rampZ; + +TCGv cpu_io[64]; +TCGv cpu_r[32]; +TCGv cpu_eind; +TCGv cpu_sp; #include "exec/gen-icount.h" #define REG(x) (cpu_r[x]) @@ -120,25 +90,32 @@ void avr_translate_init(void) done_init = 1; } -static inline void gen_goto_tb(CPUAVRState *env, DisasContext *ctx, int n, - target_ulong dest) +static void decode_opc(AVRCPU *cpu, DisasContext *ctx, InstInfo *inst) { - TranslationBlock *tb; - - tb = ctx->tb; - - if ((tb->pc & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK) - && (ctx->singlestep == 0)) { - tcg_gen_goto_tb(n); - tcg_gen_movi_i32(cpu_pc, dest); - tcg_gen_exit_tb((uintptr_t)tb + n); - } else { - tcg_gen_movi_i32(cpu_pc, dest); - - if (ctx->singlestep) { - gen_helper_debug(cpu_env); - } - tcg_gen_exit_tb(0); + CPUAVRState *env = &cpu->env; + + inst->opcode = cpu_ldl_code(env, inst->cpc * 2);/* pc points to words */ + /* target is defined as bigendian for push_ret/pop_ret + optimization. but my decode assumes instruction to be in little + endian format, hence bswap + */ + inst->opcode = bswap32(inst->opcode); + inst->length = 16; + inst->translate = NULL; + + /* the following function looks onto the opcode as a string of bytes */ + avr_decode(inst->cpc, &inst->length, inst->opcode, &inst->translate); + + if (inst->length == 16) { + inst->npc = inst->cpc + 1; + /* get opcode as 16bit value */ + inst->opcode = inst->opcode & 0x0000ffff; + } + if (inst->length == 32) { + inst->npc = inst->cpc + 2; + /* get opcode as 32bit value */ + inst->opcode = (inst->opcode << 16) + | (inst->opcode >> 16); } } @@ -172,18 +149,21 @@ void gen_intermediate_code(CPUAVRState *env, struct TranslationBlock *tb) gen_tb_start(tb); /* decode first instruction */ - cpc = pc_start; - npc = cpc + 1; + ctx.inst[0].cpc = pc_start; + decode_opc(cpu, &ctx, &ctx.inst[0]); do { - /* translate current instruction */ + /* set curr/next PCs */ + cpc = ctx.inst[0].cpc; + npc = ctx.inst[0].npc; + + /* decode next instruction */ + ctx.inst[1].cpc = ctx.inst[0].npc; + decode_opc(cpu, &ctx, &ctx.inst[1]); + + /* translate current instruction */ tcg_gen_insn_start(cpc); num_insns++; - /* just skip to next instruction */ - cpc++; - npc++; - ctx.bstate = BS_NONE; - if (unlikely(cpu_breakpoint_test(cs, cpc * 2, BP_ANY))) { tcg_gen_movi_i32(cpu_pc, cpc); gen_helper_debug(cpu_env); @@ -195,6 +175,8 @@ void gen_intermediate_code(CPUAVRState *env, struct TranslationBlock *tb) goto done_generating; } + ctx.bstate = ctx.inst[0].translate(env, &ctx, ctx.inst[0].opcode); + if (num_insns >= max_insns) { break; /* max translated instructions limit reached */ } @@ -204,6 +186,8 @@ void gen_intermediate_code(CPUAVRState *env, struct TranslationBlock *tb) if ((cpc & (TARGET_PAGE_SIZE - 1)) == 0) { break; /* page boundary */ } + + ctx.inst[0] = ctx.inst[1]; /* make next inst curr */ } while (ctx.bstate == BS_NONE && !tcg_op_buf_full()); if (tb->cflags & CF_LAST_IO) { @@ -238,13 +222,13 @@ done_generating: } void restore_state_to_opc(CPUAVRState *env, TranslationBlock *tb, - target_ulong *data) + target_ulong *data) { env->pc_w = data[0]; } void avr_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf, - int flags) + int flags) { AVRCPU *cpu = AVR_CPU(cs); CPUAVRState *env = &cpu->env;