Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20190903' into staging

[mirror_qemu.git] / target / arm / translate.h

diff --git a/target/arm/translate.h b/target/arm/translate.h
index 92ef790be9ebbf4bfe278a149a40543bdb029c6c..dd24f91f265e72cb6e978ed310d48138ebdaf4f4 100644 (file)
--- a/target/arm/translate.h
+++ b/target/arm/translate.h
@@ -23,7 +23,7 @@ typedef struct DisasContext {
     int condexec_cond;
     int thumb;
     int sctlr_b;
-    TCGMemOp be_data;
+    MemOp be_data;
 #if !defined(CONFIG_USER_ONLY)
     int user;
 #endif
@@ -99,8 +99,6 @@ typedef struct DisasCompare {
     bool value_global;
 } DisasCompare;
 
-void unallocated_encoding(DisasContext *s);
-
 /* Share the TCG temporaries common between 32 and 64 bit modes.  */
 extern TCGv_i32 cpu_NF, cpu_ZF, cpu_CF, cpu_VF;
 extern TCGv_i64 cpu_exclusive_addr;