From patchwork Thu Jun 2 20:04:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Rolnik X-Patchwork-Id: 9151135 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 BEBD160467 for ; Thu, 2 Jun 2016 20:09:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B077428326 for ; Thu, 2 Jun 2016 20:09:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A580828328; Thu, 2 Jun 2016 20:09:22 +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 0B56A28326 for ; Thu, 2 Jun 2016 20:09:22 +0000 (UTC) Received: from localhost ([::1]:50094 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8Yvh-0007le-3z for patchwork-qemu-devel@patchwork.kernel.org; Thu, 02 Jun 2016 16:09:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54481) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8Yr2-0003Qn-OH for qemu-devel@nongnu.org; Thu, 02 Jun 2016 16:04:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b8Yr0-0003CC-6v for qemu-devel@nongnu.org; Thu, 02 Jun 2016 16:04:31 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:34272) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8Yqz-0003C2-T7 for qemu-devel@nongnu.org; Thu, 02 Jun 2016 16:04:30 -0400 Received: by mail-wm0-x242.google.com with SMTP id n184so18043222wmn.1 for ; Thu, 02 Jun 2016 13:04:29 -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=qBvIy92daQIKGuKPMA6CvFxGDX1RmpWcdwh6+4PQHK8=; b=d/wdxVkRpRu58L/993MefnRRze3jV6R/3PCnKc8YhIPEG85af/4Pr3ghOZKoUUOAkl Y4oS1RK1/kB1yFRzgCTtM5MCYqpiO4gIZ90xyIaMSIDHXLit7Z0JEJuXPejp/ard/W4T gcufMb0OCJXGV05cVVP78pjdm2WiwBm5IHimxBpBVhkylWBjS800RrnSCRVEgC9l4Wb/ Jf9d4N7Y+dnoHfrH56q+DEwak/aUNJP83CcmaxBjQF5sL8G7RybpSzw0wz0to5KWdiS/ DvNV+ZSnkVPAUf42dmKIiIPwYehoEMAJBFGMLiyWTTKODseebRlNaC0geRdzqSTOAwQ3 aIqQ== 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=qBvIy92daQIKGuKPMA6CvFxGDX1RmpWcdwh6+4PQHK8=; b=dk1IWOVbLdnQkGIFsbVqD66BPNj8PANWRT/N1rhaHBzliC3leq4zf0MkZ+A7FHtyqL MDK4hx7rGXPW2SisE+HiKk2KiZ9ERwGIqLlcQFjtgPtfTo7rAza36k01OL092erMgCyk TtliyeRogLbXTDnvyOCbncOGPmF+YN4eNZQfTqwXMk9Vz1+qb6dhQnPzmzDpvrBIINJr OwU8l80zTYdP92zSXHO1Un0fxw2Oy8+I9p38AtOetXkIzSnGiRpmkfnDI/YEJaXhNdJm /iCcZrniQeHnjrjTxiiPMufEylszQDkkfEFxma/OmN0dUQGKChioiEdHqz0YnXpSgFR1 ET1g== X-Gm-Message-State: ALyK8tJe/7tBPZGbwQZNcF+P9nUq+IlTOBbbtJYZ1WgJGRbXeIPZEMRpSZG+COiAagL7kQ== X-Received: by 10.28.157.23 with SMTP id g23mr29265846wme.34.1464897869253; Thu, 02 Jun 2016 13:04:29 -0700 (PDT) Received: from a0999b0126e1.ant.amazon.com ([94.230.86.227]) by smtp.gmail.com with ESMTPSA id lf9sm2114488wjc.44.2016.06.02.13.04.28 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 02 Jun 2016 13:04:28 -0700 (PDT) From: Michael Rolnik X-Google-Original-From: Michael Rolnik To: qemu-devel@nongnu.org Date: Thu, 2 Jun 2016 23:04:05 +0300 Message-Id: <1464897846-97364-9-git-send-email-rolnik@amazon.com> X-Mailer: git-send-email 2.4.9 (Apple Git-60) In-Reply-To: <1464897846-97364-1-git-send-email-rolnik@amazon.com> References: <1464897846-97364-1-git-send-email-rolnik@amazon.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PATCH 09/10] 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: Michael Rolnik , Michael Rolnik 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, 72 insertions(+), 80 deletions(-) diff --git a/target-avr/Makefile.objs b/target-avr/Makefile.objs index c503546..8d06d54 100644 --- a/target-avr/Makefile.objs +++ b/target-avr/Makefile.objs @@ -1,3 +1,5 @@ -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 e98aaef..0df0184 100644 --- a/target-avr/translate.c +++ b/target-avr/translate.c @@ -18,60 +18,31 @@ * */ -#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,30 +91,42 @@ 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; + CPUAVRState *env = &cpu->env; - tb = ctx->tb; + inst->opcode = cpu_ldl_code(env, inst->cpc * 2); /* pc points to words */ + inst->length = 16; + inst->translate = NULL; - 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); + /* the following function looks onto the opcode as a string of bytes */ + avr_decode(inst->cpc, &inst->length, inst->opcode, &inst->translate); - if (ctx->singlestep) { - gen_helper_debug(cpu_env); - } - tcg_gen_exit_tb(0); + 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); } } +uint32_t get_opcode( + uint8_t const *code, + unsigned bitBase, + unsigned bitSize) +{ + return *(uint16_t *)code; +} + + /*generate intermediate code for basic block 'tb'. */ void gen_intermediate_code( CPUAVRState *env, @@ -176,18 +159,21 @@ void gen_intermediate_code( 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); @@ -199,6 +185,8 @@ void gen_intermediate_code( 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 */ } @@ -208,6 +196,8 @@ void gen_intermediate_code( 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) {