From patchwork Mon Jun 11 10:49:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 927610 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu 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 41492q2p6qz9rxs for ; Mon, 11 Jun 2018 20:57:39 +1000 (AEST) Received: from localhost ([::1]:47692 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSKVy-0008Ia-5o for incoming@patchwork.ozlabs.org; Mon, 11 Jun 2018 06:57:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56392) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSKOn-0002cj-TD for qemu-devel@nongnu.org; Mon, 11 Jun 2018 06:50:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fSKOj-0000pI-NB for qemu-devel@nongnu.org; Mon, 11 Jun 2018 06:50:09 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:51061) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fSKOj-0000oT-9Z for qemu-devel@nongnu.org; Mon, 11 Jun 2018 06:50:05 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LkUkZ-1fzC2d2uJX-00cOLO; Mon, 11 Jun 2018 12:49:52 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 11 Jun 2018 12:49:35 +0200 Message-Id: <20180611104935.20499-10-laurent@vivier.eu> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180611104935.20499-1-laurent@vivier.eu> References: <20180611104935.20499-1-laurent@vivier.eu> X-Provags-ID: V03:K1:PYDJ7nCSX6R/z4Us2yconzbMVfCxldQ8nnqygtoc48Qw1htb3Px gSFw/1gbcE0AS3jzXuTsSWkXvGSHUlRAC9lm15FYeZqd0mLyaSIL2IU5TxGZTCvVuiRhUpw m3m3x6Dn/aHuJ1YzOh6lY5i67h/VLAaIewVVaXU2JpLP/8wa+q9bQoWRwPFSoy71S5EkR7g s6ybiXK9cy37es5ZCjXoQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:7BL5OGmEb9o=:a1PElOz0IglWH2YZgxxCfM 1jcjDFrfoLuAqaNuvYUoliGz0UGUqhU5ONuU5DU3MoCF7GtiukSGf3LSO61ZaIExYqb9xIKpJ PSQ0u+S1sxyz9WcMaMcJJ4x/rmmpqbh9dfXpDZJciTVRVnPFOrsG4h9x26Nb+gHGFDYjgyL0B SrZASh6/fVm/CZcymsNQFpBrlTSx54M19vyjnNInd8KL6yYRIirMN+X5GNqK5VVz5NaNolIUs 1ay1hB3ps14lgrbKa/Lvp/ZPeW/+nO0s38xmTAFftKiXRxdm1K9nWIfZFJz9Km1+jU8L2pKJk Xf/hBbtk/9jfDBVAkqpngqldIxNGIJcjFRaFLyUeTWKbmCkEU6w8fAfONgSY+GKt1qzB5z9AT cZLraYEi4L/LZaqCWwhhNITh2+cwzzGFgvptl26WU/AlSK1jXyj+9h/VgX9RSwpldC6LYhYT+ Y5OrMqo1gP1kHTfm92801bHITxwcK2EuAGX3u+oqbdXH9vdl8PxitS3Bk7cS6ztUzPtmDrvvi prsmc0HczYOvoEBgNcrCKzGeDXwYbtel/4CzRmvY5rSGXblNnGdpxJcHe8VBAAKCqcWhdP6M4 iXPTR+kRQgBpwWkivXYl6t0kWKE8EB3pRVnqpdl3fI3E6SCWz3rNlEvis4Jj7WVxbL4GxVUF4 6O2dCBynuSOOeK6aN486yCYm5OOuWbPrwtgh8rJsz8SkkhQKD9B7lKOPdIEKtGNkVrOI= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.187 Subject: [Qemu-devel] [PULL 9/9] target/m68k: Merge disas_m68k_insn into m68k_tr_translate_insn 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: Riku Voipio , Richard Henderson , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Signed-off-by: Richard Henderson Message-Id: <20180512050250.12774-10-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- target/m68k/translate.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index ff3493d8ab..ae3651b867 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -6049,16 +6049,6 @@ void register_m68k_insns (CPUM68KState *env) #undef INSN } -/* ??? Some of this implementation is not exception safe. We should always - write back the result to memory before setting the condition codes. */ -static void disas_m68k_insn(CPUM68KState * env, DisasContext *s) -{ - uint16_t insn = read_im16(env, s); - opcode_table[insn](env, s, insn); - do_writebacks(s); - do_release(s); -} - static void m68k_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cpu) { DisasContext *dc = container_of(dcbase, DisasContext, base); @@ -6101,8 +6091,13 @@ static bool m68k_tr_breakpoint_check(DisasContextBase *dcbase, CPUState *cpu, static void m68k_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu) { DisasContext *dc = container_of(dcbase, DisasContext, base); + CPUM68KState *env = cpu->env_ptr; + uint16_t insn = read_im16(env, dc); + + opcode_table[insn](env, dc, insn); + do_writebacks(dc); + do_release(dc); - disas_m68k_insn(cpu->env_ptr, dc); dc->base.pc_next = dc->pc; if (dc->base.is_jmp == DISAS_NEXT) {