Received: from eggs.gnu.org ([2001:4830:134:3::10]:39040) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VPMF9-0001Ns-No for qemu-devel@nongnu.org; Thu, 26 Sep 2013 20:49:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VPMEv-0004lg-Ix for qemu-devel@nongnu.org; Thu, 26 Sep 2013 20:49:15 -0400 Received: from cantor2.suse.de ([195.135.220.15]:52686 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VPMEv-0004kh-Al for qemu-devel@nongnu.org; Thu, 26 Sep 2013 20:49:01 -0400 From: Alexander Graf Date: Fri, 27 Sep 2013 02:48:30 +0200 Message-Id: <1380242934-20953-37-git-send-email-agraf@suse.de> In-Reply-To: <1380242934-20953-1-git-send-email-agraf@suse.de> References: <1380242934-20953-1-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH 36/60] AArch64: Add msr instruction emulation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Michael Matz , C Fontana , Dirk Mueller , Laurent Desnogues , Christoffer Dall , Richard Henderson This patch adds emulation for the msr instruction. It suffers from the same shortcomings as mrs emulation and should be combined with it. Signed-off-by: Alexander Graf --- target-arm/translate-a64.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c index 4879073..a2d5942 100644 --- a/target-arm/translate-a64.c +++ b/target-arm/translate-a64.c @@ -1681,6 +1681,31 @@ static void handle_mrs(DisasContext *s, uint32_t insn) } } +static void handle_msr(DisasContext *s, uint32_t insn) +{ + int dest = get_reg(insn); + int op2 = get_bits(insn, 5, 3); + int crm = get_bits(insn, 8, 4); + int crn = get_bits(insn, 12, 4); + int op1 = get_bits(insn, 16, 3); + int op0 = get_bits(insn, 19, 2); + + /* XXX handle properly */ + if (op0 == 3 && op1 == 3 && op2 == 2 && !crm && crn == 13) { + tcg_gen_st_i64(cpu_reg(dest), cpu_env, + offsetof(CPUARMState, sr.tpidr_el0)); + } else if (op0 == 3 && op1 == 3 && (op2 == 0 || op2 == 1) && + crm == 4 && crn == 4) { + /* XXX this is probably wrong! */ + tcg_gen_st32_i64(cpu_reg(dest), cpu_env, + offsetof(CPUARMState, vfp.xregs[ARM_VFP_FPSCR])); + } else { + qemu_log_mask(LOG_UNIMP, "MSR: %d %d %d %d %d\n", op0, op1, op2, crm, + crn); + unallocated_encoding(s); + } +} + void disas_a64_insn(CPUARMState *env, DisasContext *s) { uint32_t insn; @@ -1811,6 +1836,8 @@ void disas_a64_insn(CPUARMState *env, DisasContext *s) handle_cb(s, insn); } else if (get_bits(insn, 20, 12) == 0xd53) { handle_mrs(s, insn); + } else if (get_bits(insn, 20, 12) == 0xd51) { + handle_msr(s, insn); } else { unallocated_encoding(s); } -- 1.7.12.4