softmmu: move ALIGNED_ONLY to cpu.h

Prepare for moving softmmu_header.h inclusion out of .c files

Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/target-alpha/cpu.h b/target-alpha/cpu.h
index 07d9f63d1fd0583ec773ca7d80ceb09530224262..d9b861f40462f2c37a52a07720b0c124db0d9a91 100644 (file)
--- a/target-alpha/cpu.h
+++ b/target-alpha/cpu.h
@@ -24,6 +24,7 @@
 #include "qemu-common.h"
 
 #define TARGET_LONG_BITS 64
+#define ALIGNED_ONLY
 
 #define CPUArchState struct CPUAlphaState
 

diff --git a/target-alpha/mem_helper.c b/target-alpha/mem_helper.c
index c560bd9717d448f5e553c1e437f0a4eb0a9ee9e2..c5c1165190a283246068148835b50ad8ec038e39 100644 (file)
--- a/target-alpha/mem_helper.c
+++ b/target-alpha/mem_helper.c
@@ -134,7 +134,6 @@ void alpha_cpu_unassigned_access(CPUState *cs, hwaddr addr,
 #include "exec/softmmu_exec.h"
 
 #define MMUSUFFIX _mmu
-#define ALIGNED_ONLY
 
 #define SHIFT 0
 #include "exec/softmmu_template.h"

diff --git a/target-mips/cpu.h b/target-mips/cpu.h
index 6c2014eddde09502b0e2429df3b5cb927b4be97e..a9b2c7ae3873f7c063603a602aa13b6bb0f3351e 100644 (file)
--- a/target-mips/cpu.h
+++ b/target-mips/cpu.h
@@ -3,6 +3,7 @@
 
 //#define DEBUG_OP
 
+#define ALIGNED_ONLY
 #define TARGET_HAS_ICE 1
 
 #define ELF_MACHINE    EM_MIPS

diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
index 2b665a19f10d3566abe84067e4edc8b2b4a58375..1c79b686882ba13c92343b910e6fec3e357abb66 100644 (file)
--- a/target-mips/op_helper.c
+++ b/target-mips/op_helper.c
@@ -2129,7 +2129,6 @@ void helper_wait(CPUMIPSState *env)
 #if !defined(CONFIG_USER_ONLY)
 
 #define MMUSUFFIX _mmu
-#define ALIGNED_ONLY
 
 #define SHIFT 0
 #include "exec/softmmu_template.h"

diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h
index f72451d53e676f2621142d439143030222505026..836f87f42f9883507e51c71927d4558deb1c68ac 100644 (file)
--- a/target-sparc/cpu.h
+++ b/target-sparc/cpu.h
@@ -5,6 +5,8 @@
 #include "qemu-common.h"
 #include "qemu/bswap.h"
 
+#define ALIGNED_ONLY
+
 #if !defined(TARGET_SPARC64)
 #define TARGET_LONG_BITS 32
 #define TARGET_DPREGS 16

diff --git a/target-sparc/ldst_helper.c b/target-sparc/ldst_helper.c
index 6e04c0938e690a59fe66b1622b794e71ab362914..5dec92496884c64997aed955af8e784af2805e95 100644 (file)
--- a/target-sparc/ldst_helper.c
+++ b/target-sparc/ldst_helper.c
@@ -67,7 +67,6 @@
 #if !defined(CONFIG_USER_ONLY)
 #include "exec/softmmu_exec.h"
 #define MMUSUFFIX _mmu
-#define ALIGNED_ONLY
 
 #define SHIFT 0
 #include "exec/softmmu_template.h"

diff --git a/target-xtensa/cpu.h b/target-xtensa/cpu.h
index e210bacdffa59860d3b19507fdcff9a6b3bb7261..d797d2649a63c80e1e4bb699d35ba258be07b7f2 100644 (file)
--- a/target-xtensa/cpu.h
+++ b/target-xtensa/cpu.h
@@ -28,6 +28,7 @@
 #ifndef CPU_XTENSA_H
 #define CPU_XTENSA_H
 
+#define ALIGNED_ONLY
 #define TARGET_LONG_BITS 32
 #define ELF_MACHINE EM_XTENSA
 

diff --git a/target-xtensa/op_helper.c b/target-xtensa/op_helper.c
index fd514fc81331552a0b5cdc022f3f20e6814762ab..9ce81e2084871fabb5ea714db74d7b083b00c5d2 100644 (file)
--- a/target-xtensa/op_helper.c
+++ b/target-xtensa/op_helper.c
@@ -31,7 +31,6 @@
 #include "exec/softmmu_exec.h"
 #include "exec/address-spaces.h"
 
-#define ALIGNED_ONLY
 #define MMUSUFFIX _mmu
 
 #define SHIFT 0