--- qemu/tcg/arm/tcg-target.h	2018/04/24 19:18:23	1.1.1.5
+++ qemu/tcg/arm/tcg-target.h	2018/04/24 19:35:49	1.1.1.6
@@ -78,10 +78,11 @@ typedef enum {
 
 enum {
     /* Note: must be synced with dyngen-exec.h */
-    TCG_AREG0 = TCG_REG_R7,
+    TCG_AREG0 = TCG_REG_R6,
 };
 
-static inline void flush_icache_range(unsigned long start, unsigned long stop)
+static inline void flush_icache_range(tcg_target_ulong start,
+                                      tcg_target_ulong stop)
 {
 #if QEMU_GNUC_PREREQ(4, 1)
     __builtin___clear_cache((char *) start, (char *) stop);