From d94f0a8ecb256fcfcd9eb12bd4700711eca3e937 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 28 Mar 2014 17:48:12 +0100 Subject: softmmu: move ALIGNED_ONLY to cpu.h Prepare for moving softmmu_header.h inclusion out of .c files Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- target-alpha/cpu.h | 1 + target-alpha/mem_helper.c | 1 - target-mips/cpu.h | 1 + target-mips/op_helper.c | 1 - target-sparc/cpu.h | 2 ++ target-sparc/ldst_helper.c | 1 - target-xtensa/cpu.h | 1 + target-xtensa/op_helper.c | 1 - 8 files changed, 5 insertions(+), 4 deletions(-) diff --git a/target-alpha/cpu.h b/target-alpha/cpu.h index 07d9f63d1f..d9b861f404 100644 --- 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 c560bd9717..c5c1165190 100644 --- 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 6c2014eddd..a9b2c7ae38 100644 --- 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 2b665a19f1..1c79b68688 100644 --- 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 f72451d53e..836f87f42f 100644 --- 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 6e04c0938e..5dec924968 100644 --- 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 e210bacdff..d797d2649a 100644 --- 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 fd514fc813..9ce81e2084 100644 --- 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 -- cgit v1.2.1