Received: from eggs.gnu.org ([2001:4830:134:3::10]:38984) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VPMF8-0001Nk-1Z for qemu-devel@nongnu.org; Thu, 26 Sep 2013 20:49:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VPMEv-0004km-3w for qemu-devel@nongnu.org; Thu, 26 Sep 2013 20:49:13 -0400 Received: from cantor2.suse.de ([195.135.220.15]:52677 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VPMEu-0004iy-UF for qemu-devel@nongnu.org; Thu, 26 Sep 2013 20:49:01 -0400 From: Alexander Graf Date: Fri, 27 Sep 2013 02:48:26 +0200 Message-Id: <1380242934-20953-33-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 32/60] AArch64: Add svc 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 syscall (svc) instruction. Signed-off-by: Alexander Graf --- target-arm/translate-a64.c | 13 +++++++++++++ target-arm/translate.c | 5 ----- target-arm/translate.h | 5 +++++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c index 583a68f..fdcf876 100644 --- a/target-arm/translate-a64.c +++ b/target-arm/translate-a64.c @@ -1583,6 +1583,12 @@ static void handle_simdshl(DisasContext *s, uint32_t insn) tcg_temp_free_i64(tcg_tmp); } +static void handle_svc(DisasContext *s, uint32_t insn) +{ + gen_a64_set_pc_im(s->pc); + s->is_jmp = DISAS_SWI; +} + void disas_a64_insn(CPUARMState *env, DisasContext *s) { uint32_t insn; @@ -1697,6 +1703,13 @@ void disas_a64_insn(CPUARMState *env, DisasContext *s) handle_bfm(s, insn); } break; + case 0x14: + if (get_bits(insn, 29, 3) == 0x6 && !get_bits(insn, 2, 3)) { + handle_svc(s, insn); + } else { + unallocated_encoding(s); + } + break; default: unallocated_encoding(s); break; diff --git a/target-arm/translate.c b/target-arm/translate.c index ef284da..8d75f33 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -55,11 +55,6 @@ static uint32_t gen_opc_condexec_bits[OPC_BUF_SIZE]; #define IS_USER(s) (s->user) #endif -/* These instructions trap after executing, so defer them until after the - conditional execution state has been updated. */ -#define DISAS_WFI 4 -#define DISAS_SWI 5 - TCGv_ptr cpu_env; /* We reuse the same 64-bit temporaries for efficiency. */ static TCGv_i64 cpu_V0, cpu_V1, cpu_M0; diff --git a/target-arm/translate.h b/target-arm/translate.h index 67c7760..bc21741 100644 --- a/target-arm/translate.h +++ b/target-arm/translate.h @@ -1,6 +1,11 @@ #ifndef TARGET_ARM_TRANSLATE_H #define TARGET_ARM_TRANSLATE_H +/* These instructions trap after executing, so defer them until after the + conditional execution state has been updated. */ +#define DISAS_WFI 4 +#define DISAS_SWI 5 + /* internal defines */ typedef struct DisasContext { target_ulong pc; -- 1.7.12.4