Patchwork [v4,04/12] ARM: Add AArch64 translation stub

login
register
mail settings
Submitter John Rigby
Date May 14, 2013, 4:32 a.m.
Message ID <1368505980-17151-5-git-send-email-john.rigby@linaro.org>
Download mbox | patch
Permalink /patch/243606/
State New
Headers show

Comments

John Rigby - May 14, 2013, 4:32 a.m.
From: Alexander Graf <agraf@suse.de>

We should translate AArch64 mode separately from AArch32 mode. In AArch64 mode,
registers look vastly different, instruction encoding is completely different,
basically the system turns into a different machine.

So let's do a simple if() in translate.c to decide whether we can handle the
current code in the legacy AArch32 code or in the new AArch64 code.

So far, the translation always complains about unallocated instructions. There
is no emulator functionality in this patch!

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: John Rigby <john.rigby@linaro.org>
---

Changes in v2:
- Remove uses of is_a64 that are not needed because arch choice happens at
  a higher level.
- aarch64 register arrays now only have 31 entries with sp and xzr treated as
  special cases.

Changes in v3:
- Register arrays back to 32 entries with sp as register 31.
- Fix some checkpatch.pl issues

 target-arm/Makefile.objs   |   1 +
 target-arm/translate-a64.c | 137 +++++++++++++++++++++++++++++++++++++++++++++
 target-arm/translate.c     |   9 +++
 target-arm/translate.h     |   6 ++
 4 files changed, 153 insertions(+)
 create mode 100644 target-arm/translate-a64.c
Peter Maydell - May 20, 2013, 12:57 p.m.
On 14 May 2013 05:32, John Rigby <john.rigby@linaro.org> wrote:
> @@ -10038,6 +10042,11 @@ void cpu_dump_state(CPUARMState *env, FILE *f, fprintf_function cpu_fprintf,
>      int i;
>      uint32_t psr;
>
> +    if (is_a64(env)) {
> +        cpu_dump_state_a64(env, f, cpu_fprintf, flags);
> +        return;
> +    }
> +

This breaks building of the 32 bit ARM target:

  LINK  arm-softmmu/qemu-system-arm
target-arm/translate.o: In function `cpu_dump_state':
/home/petmay01/linaro/qemu-from-laptop/qemu/target-arm/translate.c:10046:
undefined reference to `cpu_dump_state_a64'

because cpu_dump_state_a64() is in a file which is
only built for 64 bit.

thanks
-- PMM
Andreas Färber - June 16, 2013, 8:06 p.m.
Am 20.05.2013 14:57, schrieb Peter Maydell:
> On 14 May 2013 05:32, John Rigby <john.rigby@linaro.org> wrote:
>> @@ -10038,6 +10042,11 @@ void cpu_dump_state(CPUARMState *env, FILE *f, fprintf_function cpu_fprintf,
>>      int i;
>>      uint32_t psr;
>>
>> +    if (is_a64(env)) {
>> +        cpu_dump_state_a64(env, f, cpu_fprintf, flags);
>> +        return;
>> +    }
>> +
> 
> This breaks building of the 32 bit ARM target:
> 
>   LINK  arm-softmmu/qemu-system-arm
> target-arm/translate.o: In function `cpu_dump_state':
> /home/petmay01/linaro/qemu-from-laptop/qemu/target-arm/translate.c:10046:
> undefined reference to `cpu_dump_state_a64'
> 
> because cpu_dump_state_a64() is in a file which is
> only built for 64 bit.

My qom-cpu-10 series may help here, it turns cpu_dump_state() into a
simple helper function calling CPUClass::dump_state(). So a Cortex-A5x
class_init or TARGET_AARCH64 for the base class_init would simply assign
the 64-bit version of the callback, leaving 32-bit target unaffected
(note: I didn't read the whole patch).

Andreas
Peter Maydell - June 16, 2013, 8:24 p.m.
On 16 June 2013 21:06, Andreas Färber <afaerber@suse.de> wrote:
> My qom-cpu-10 series may help here, it turns cpu_dump_state() into a
> simple helper function calling CPUClass::dump_state(). So a Cortex-A5x
> class_init or TARGET_AARCH64 for the base class_init would simply assign
> the 64-bit version of the callback, leaving 32-bit target unaffected
> (note: I didn't read the whole patch).

Yeah, that would work and be neater than ifdeffery. (the 64 bit
callback would then have to call the 32 bit callback if we're
really in 32 bit mode, but that's not a problem). In the meantime if
this lands before your series it's easy enough to just have an ifdef
that makes cpu_dump_state_a64() a no-op if building the 32 bit binary.
(in fact that's what my current working tree has.)

thanks
-- PMM

Patch

diff --git a/target-arm/Makefile.objs b/target-arm/Makefile.objs
index d89b57c..e488edb 100644
--- a/target-arm/Makefile.objs
+++ b/target-arm/Makefile.objs
@@ -3,3 +3,4 @@  obj-$(CONFIG_SOFTMMU) += machine.o
 obj-$(CONFIG_KVM) += kvm.o
 obj-y += translate.o op_helper.o helper.o cpu.o
 obj-y += neon_helper.o iwmmxt_helper.o
+obj-$(TARGET_AARCH64) += translate-a64.o
diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c
new file mode 100644
index 0000000..29e8937
--- /dev/null
+++ b/target-arm/translate-a64.c
@@ -0,0 +1,137 @@ 
+/*
+ *  AArch64 translation
+ *
+ *  Copyright (c) 2013 Alexander Graf <agraf@suse.de>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+#include <stdarg.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <inttypes.h>
+
+#include "cpu.h"
+#include "tcg-op.h"
+#include "qemu/log.h"
+#include "translate.h"
+#include "qemu/host-utils.h"
+
+#include "helper.h"
+#define GEN_HELPER 1
+#include "helper.h"
+
+static TCGv_i64 cpu_X[32];
+static TCGv_i64 cpu_pc;
+static TCGv_i32 pstate;
+
+static const char *regnames[] = {
+    "x0", "x1", "x2", "x3", "x4", "x5", "x6", "x7",
+    "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15",
+    "x16", "x17", "x18", "x19", "x20", "x21", "x22", "x23",
+    "x24", "x25", "x26", "x27", "x28", "x29", "lr", "sp"
+};
+
+/* initialize TCG globals.  */
+void a64_translate_init(void)
+{
+    int i;
+
+    cpu_pc = tcg_global_mem_new_i64(TCG_AREG0,
+                                    offsetof(CPUARMState, pc),
+                                    "pc");
+    for (i = 0; i < 32; i++) {
+        cpu_X[i] = tcg_global_mem_new_i64(TCG_AREG0,
+                                          offsetof(CPUARMState, xregs[i]),
+                                          regnames[i]);
+    }
+
+    pstate = tcg_global_mem_new_i32(TCG_AREG0,
+                                    offsetof(CPUARMState, pstate),
+                                    "pstate");
+}
+
+void cpu_dump_state_a64(CPUARMState *env, FILE *f, fprintf_function cpu_fprintf,
+                        int flags)
+{
+    int i;
+
+    cpu_fprintf(f, "PC=%016"PRIx64"  SP=%016"PRIx64"\n",
+            env->pc, env->xregs[31]);
+    for (i = 0; i < 31; i++) {
+        cpu_fprintf(f, "X%02d=%016"PRIx64, i, env->xregs[i]);
+        if ((i % 4) == 3) {
+            cpu_fprintf(f, "\n");
+        } else {
+            cpu_fprintf(f, " ");
+        }
+    }
+    cpu_fprintf(f, "PSTATE=%c%c%c%c\n",
+        env->pstate & PSTATE_N ? 'n' : '.',
+        env->pstate & PSTATE_Z ? 'z' : '.',
+        env->pstate & PSTATE_C ? 'c' : '.',
+        env->pstate & PSTATE_V ? 'v' : '.');
+    cpu_fprintf(f, "\n");
+}
+
+void gen_a64_set_pc_im(uint64_t val)
+{
+    tcg_gen_movi_i64(cpu_pc, val);
+}
+
+static void gen_exception(int excp)
+{
+    TCGv_i32 tmp = tcg_temp_new_i32();
+    tcg_gen_movi_i32(tmp, excp);
+    gen_helper_exception(cpu_env, tmp);
+    tcg_temp_free_i32(tmp);
+}
+
+static void gen_exception_insn(DisasContext *s, int offset, int excp)
+{
+    gen_a64_set_pc_im(s->pc - offset);
+    gen_exception(excp);
+    s->is_jmp = DISAS_JUMP;
+}
+
+static void real_unallocated_encoding(DisasContext *s)
+{
+    fprintf(stderr, "Unknown instruction: %#x\n",
+            arm_ldl_code(cpu_single_env, s->pc - 4, s->bswap_code));
+    gen_exception_insn(s, 4, EXCP_UDEF);
+}
+
+#define unallocated_encoding(s) do { \
+    fprintf(stderr, "unallocated encoding at line: %d\n", __LINE__); \
+    real_unallocated_encoding(s); \
+    } while (0)
+
+void disas_a64_insn(CPUARMState *env, DisasContext *s)
+{
+    uint32_t insn;
+
+    insn = arm_ldl_code(env, s->pc, s->bswap_code);
+    s->pc += 4;
+
+    switch ((insn >> 24) & 0x1f) {
+    default:
+        unallocated_encoding(s);
+        break;
+    }
+
+    if (unlikely(s->singlestep_enabled) && (s->is_jmp == DISAS_TB_JUMP)) {
+        /* go through the main loop for single step */
+        s->is_jmp = DISAS_JUMP;
+    }
+}
diff --git a/target-arm/translate.c b/target-arm/translate.c
index 66d4892..02d5a3d 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -112,6 +112,10 @@  void arm_translate_init(void)
         offsetof(CPUARMState, exclusive_info), "exclusive_info");
 #endif
 
+#ifdef TARGET_AARCH64
+    a64_translate_init();
+#endif
+
 #define GEN_HELPER 2
 #include "helper.h"
 }
@@ -10038,6 +10042,11 @@  void cpu_dump_state(CPUARMState *env, FILE *f, fprintf_function cpu_fprintf,
     int i;
     uint32_t psr;
 
+    if (is_a64(env)) {
+        cpu_dump_state_a64(env, f, cpu_fprintf, flags);
+        return;
+    }
+
     for(i=0;i<16;i++) {
         cpu_fprintf(f, "R%02d=%08x", i, env->regs[i]);
         if ((i % 4) == 3)
diff --git a/target-arm/translate.h b/target-arm/translate.h
index 8ba1433..9086e43 100644
--- a/target-arm/translate.h
+++ b/target-arm/translate.h
@@ -26,4 +26,10 @@  typedef struct DisasContext {
 
 extern TCGv_ptr cpu_env;
 
+void a64_translate_init(void);
+void cpu_dump_state_a64(CPUARMState *env, FILE *f,
+        fprintf_function cpu_fprintf, int flags);
+void disas_a64_insn(CPUARMState *env, DisasContext *s);
+void gen_a64_set_pc_im(uint64_t val);
+
 #endif /* TARGET_ARM_TRANSLATE_H */