From patchwork Tue Oct 25 14:50:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 686527 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 3t3GlJ3YLLz9ryQ for ; Wed, 26 Oct 2016 02:09:16 +1100 (AEDT) Received: from localhost ([::1]:55280 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bz3Ll-00077z-5h for incoming@patchwork.ozlabs.org; Tue, 25 Oct 2016 11:09:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60377) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bz33t-0008WR-Ls for qemu-devel@nongnu.org; Tue, 25 Oct 2016 10:50:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bz33p-00061E-8T for qemu-devel@nongnu.org; Tue, 25 Oct 2016 10:50:45 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:57738) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bz33o-0005zu-ML for qemu-devel@nongnu.org; Tue, 25 Oct 2016 10:50:41 -0400 Received: from Quad.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue003) with ESMTPSA (Nemesis) id 0MOVST-1c23j625P3-005ti8; Tue, 25 Oct 2016 16:50:37 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 25 Oct 2016 16:50:15 +0200 Message-Id: <1477407021-30755-18-git-send-email-laurent@vivier.eu> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477407021-30755-1-git-send-email-laurent@vivier.eu> References: <1477407021-30755-1-git-send-email-laurent@vivier.eu> X-Provags-ID: V03:K0:BSWwgUOqAlP+qcY/9FYJ9lwbzCAGHC6qqBtT2hE7xA/ETlY6Dgu NJfyF9Z/48UoeSpMkcsaO4uZ/tK5+xid8JA4BBbadTTm9mLlNKCUNK7b5N9O/9U+SIXhvSC yddAXoS3Liwk/XvXW+Oy9WPclXK1T2rn1SmpS/JXY1zqM6OjmEB615Q+IrQW6ZmxhYaCS3g kz7XlQAf25J4EqZZPizOg== X-UI-Out-Filterresults: notjunk:1; V01:K0:Db+TImY7y3o=:l7Osix01od77qycFlNHOSr dkXfF14aiYHyMmGDB4pUvkW8GEC+V8J/LZmyTITIP09j7Fs3gDcSXNLrIhGgqYU/q2V0iG+SN 5z1RZPoefCVNRF54HFuJEkI6rQ8PrQanLaIwR8yL073rTGXqBPGleRs08ss+m4jxuqP0MdNP3 Bs4XIFpQaiwU6/IjP33P8WvgshcK9eF095+lr9/R8XnAfgpgtNiQOLY8RWTJq1AkJ34wMBwME Ydq3zw/izOhR/xfAjKFqwkTT/SSFdesqKLG6iHCuDIyIBk47/VtwIEcDsYzr5P9AAir6S2/AY YDqUjprqqCNREnsgxmncIelgsl0qecQbtn192E6Lolwr01pfy8W0VmO0fw0FtxnHhIFEIwDfq GJeitzuCbaL0HUhF+vtIlDI86673XB0KJy0HCiWd8a6mwA/eORVeWQZyf/UNawZpEZLmCfQQX g6/zybM+SO8GwXLW/oh7K2qbjqWMLYsnj812b8so8S+GW/ixzwUAC/EDvLggoT7UE38Drh30m va4xd30YMoEe70PMVYyBpVfIvKDpeQjNRp3jR+T9+21x/FtKS1WGgb070Mhh9fSdWEx2E/lCw 3idXSZVSx/+m/BPAw5w4IOalN79UtU0XIgc2e5jdzwia2s0pCjcm9XtwowjunA3/d9Bp8L82z Q1ToAx1W7A3Q1EDYk3ykTkWOLGxd3ZGhMMoG2oP+PACv990Hhd465Q85HRQY1WdYZyr8= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.131 Subject: [Qemu-devel] [PATCH 17/23] target-m68k: Some fixes to SR and flags management 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: Laurent Vivier , gerg@uclinux.org, schwab@linux-m68k.org, agraf@suse.de, Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Signed-off-by: Richard Henderson Signed-off-by: Laurent Vivier --- target-m68k/cpu.h | 3 ++- target-m68k/helper.c | 17 +++++++++++++++-- target-m68k/op_helper.c | 5 +++-- target-m68k/translate.c | 2 +- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/target-m68k/cpu.h b/target-m68k/cpu.h index 2f08a2c..c0de978 100644 --- a/target-m68k/cpu.h +++ b/target-m68k/cpu.h @@ -158,7 +158,8 @@ M68kCPU *cpu_m68k_init(const char *cpu_model); is returned if the signal was handled by the virtual CPU. */ int cpu_m68k_signal_handler(int host_signum, void *pinfo, void *puc); -uint32_t cpu_m68k_flush_flags(CPUM68KState *env, int op); +uint32_t cpu_m68k_get_ccr(CPUM68KState *env); +void cpu_m68k_set_ccr(CPUM68KState *env, uint32_t); /* Instead of computing the condition codes after each m68k instruction, diff --git a/target-m68k/helper.c b/target-m68k/helper.c index d9ea830..1a54e66 100644 --- a/target-m68k/helper.c +++ b/target-m68k/helper.c @@ -132,7 +132,7 @@ void m68k_cpu_init_gdb(M68kCPU *cpu) /* TODO: Add [E]MAC registers. */ } -uint32_t cpu_m68k_flush_flags(CPUM68KState *env, int op) +static uint32_t cpu_m68k_flush_flags(CPUM68KState *env, int op) { int flags; uint32_t src; @@ -272,6 +272,18 @@ set_x: return flags; } +uint32_t cpu_m68k_get_ccr(CPUM68KState *env) +{ + return cpu_m68k_flush_flags(env, env->cc_op) | env->cc_x * CCF_X; +} + +void cpu_m68k_set_ccr(CPUM68KState *env, uint32_t val) +{ + env->cc_op = CC_OP_FLAGS; + env->cc_dest = val & 0xf; + env->cc_x = (val & CCF_X ? 1 : 0); +} + void HELPER(movec)(CPUM68KState *env, uint32_t reg, uint32_t val) { M68kCPU *cpu = m68k_env_get_cpu(env); @@ -466,7 +478,8 @@ uint32_t HELPER(addx_cc)(CPUM68KState *env, uint32_t op1, uint32_t op2) void HELPER(set_sr)(CPUM68KState *env, uint32_t val) { - env->sr = val & 0xffff; + env->sr = val & 0xffe0; + cpu_m68k_set_ccr(env, val); m68k_switch_sp(env); } diff --git a/target-m68k/op_helper.c b/target-m68k/op_helper.c index e41ae46..af36177 100644 --- a/target-m68k/op_helper.c +++ b/target-m68k/op_helper.c @@ -63,9 +63,9 @@ static void do_rte(CPUM68KState *env) fmt = cpu_ldl_kernel(env, sp); env->pc = cpu_ldl_kernel(env, sp + 4); sp |= (fmt >> 28) & 3; - env->sr = fmt & 0xffff; env->aregs[7] = sp + 8; - m68k_switch_sp(env); + + helper_set_sr(env, fmt); } static void do_interrupt_all(CPUM68KState *env, int is_hw) @@ -112,6 +112,7 @@ static void do_interrupt_all(CPUM68KState *env, int is_hw) fmt |= 0x40000000; fmt |= vector << 16; fmt |= env->sr; + fmt |= cpu_m68k_get_ccr(env); env->sr |= SR_S; if (is_hw) { diff --git a/target-m68k/translate.c b/target-m68k/translate.c index cecd12c..73f9e9f 100644 --- a/target-m68k/translate.c +++ b/target-m68k/translate.c @@ -3145,7 +3145,7 @@ void m68k_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf, i, u.l.upper, u.l.lower, *(double *)&u.d); } cpu_fprintf (f, "PC = %08x ", env->pc); - sr = env->sr | cpu_m68k_flush_flags(env, env->cc_op) | env->cc_x * CCF_X; + sr = env->sr | cpu_m68k_get_ccr(env); cpu_fprintf(f, "SR = %04x %c%c%c%c%c ", sr, (sr & CCF_X) ? 'X' : '-', (sr & CCF_N) ? 'N' : '-', (sr & CCF_Z) ? 'Z' : '-', (sr & CCF_V) ? 'V' : '-', (sr & CCF_C) ? 'C' : '-');