r2d: Use cpu_sh4_init() to obtain SuperHCPU

[qemu.git] / dyngen-exec.h

diff --git a/dyngen-exec.h b/dyngen-exec.h
index 3544372a65a408e117ccd55a4fcf42c57a8a36b1..083e20bed789fd45831cbb9aef8ef306609231f0 100644 (file)
--- a/dyngen-exec.h
+++ b/dyngen-exec.h
@@ -31,7 +31,7 @@
 #elif defined(_ARCH_PPC)
 #define AREG0 "r27"
 #elif defined(__arm__)
-#define AREG0 "r7"
+#define AREG0 "r6"
 #elif defined(__hppa__)
 #define AREG0 "r17"
 #elif defined(__mips__)
@@ -61,10 +61,10 @@
 #endif
 
 #if defined(AREG0)
-register CPUState *env asm(AREG0);
+register CPUArchState *env asm(AREG0);
 #else
 /* TODO: Try env = cpu_single_env. */
-extern CPUState *env;
+extern CPUArchState *env;
 #endif
 
 #endif /* !defined(__DYNGEN_EXEC_H__) */