mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-27 05:43:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

exec: Rename NEED_CPU_H -> COMPILING_PER_TARGET

Browse Source 
'NEED_CPU_H' guard target-specific code; it is defined by meson
altogether with the 'CONFIG_TARGET' definition. Rename NEED_CPU_H
as COMPILING_PER_TARGET to clarify its meaning.

Mechanical change running:

 $ sed -i s/NEED_CPU_H/COMPILING_PER_TARGET/g $(git grep -l NEED_CPU_H)

then manually add a /* COMPILING_PER_TARGET */ comment
after the '#endif' when the block is large.

Inspired-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20240322161439.6448-4-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-06-13 16:29:11 +02:00
parent a118c4aff4
commit 7d7a21ba69
16 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/exec/cpu-defs.h
View File

@ -19,7 +19,7 @@
#ifndef CPU_DEFS_H #ifndef CPU_DEFS_H
#define CPU_DEFS_H #define CPU_DEFS_H
#ifndef NEED_CPU_H #ifndef COMPILING_PER_TARGET
#error cpu.h included from common code #error cpu.h included from common code
#endif #endif

4
include/exec/helper-head.h
View File

@ -43,7 +43,7 @@
#define dh_ctype_noreturn G_NORETURN void #define dh_ctype_noreturn G_NORETURN void
#define dh_ctype(t) dh_ctype_##t #define dh_ctype(t) dh_ctype_##t
#ifdef NEED_CPU_H #ifdef COMPILING_PER_TARGET
# ifdef TARGET_LONG_BITS # ifdef TARGET_LONG_BITS
# if TARGET_LONG_BITS == 32 # if TARGET_LONG_BITS == 32
# define dh_alias_tl i32 # define dh_alias_tl i32
@ -54,7 +54,7 @@
# endif # endif
# endif # endif
# define dh_ctype_tl target_ulong # define dh_ctype_tl target_ulong
#endif #endif /* COMPILING_PER_TARGET */
/* We can't use glue() here because it falls foul of C preprocessor /* We can't use glue() here because it falls foul of C preprocessor
recursive expansion rules. */ recursive expansion rules. */

4
include/exec/memop.h
View File

@ -35,7 +35,7 @@ typedef enum MemOp {
MO_LE = 0, MO_LE = 0,
MO_BE = MO_BSWAP, MO_BE = MO_BSWAP,
#endif #endif
#ifdef NEED_CPU_H #ifdef COMPILING_PER_TARGET
#if TARGET_BIG_ENDIAN #if TARGET_BIG_ENDIAN
MO_TE = MO_BE, MO_TE = MO_BE,
#else #else
@ -135,7 +135,7 @@ typedef enum MemOp {
MO_BESL = MO_BE | MO_SL, MO_BESL = MO_BE | MO_SL,
MO_BESQ = MO_BE | MO_SQ, MO_BESQ = MO_BE | MO_SQ,
#ifdef NEED_CPU_H #ifdef COMPILING_PER_TARGET
MO_TEUW = MO_TE | MO_UW, MO_TEUW = MO_TE | MO_UW,
MO_TEUL = MO_TE | MO_UL, MO_TEUL = MO_TE | MO_UL,
MO_TEUQ = MO_TE | MO_UQ, MO_TEUQ = MO_TE | MO_UQ,

4
include/exec/memory.h
View File

@ -3107,7 +3107,7 @@ address_space_write_cached(MemoryRegionCache *cache, hwaddr addr,
MemTxResult address_space_set(AddressSpace *as, hwaddr addr, MemTxResult address_space_set(AddressSpace *as, hwaddr addr,
uint8_t c, hwaddr len, MemTxAttrs attrs); uint8_t c, hwaddr len, MemTxAttrs attrs);
#ifdef NEED_CPU_H #ifdef COMPILING_PER_TARGET
/* enum device_endian to MemOp. */ /* enum device_endian to MemOp. */
static inline MemOp devend_memop(enum device_endian end) static inline MemOp devend_memop(enum device_endian end)
{ {
@ -3125,7 +3125,7 @@ static inline MemOp devend_memop(enum device_endian end)
return (end == non_host_endianness) ? MO_BSWAP : 0; return (end == non_host_endianness) ? MO_BSWAP : 0;
#endif #endif
} }
#endif #endif /* COMPILING_PER_TARGET */
/* /*
* Inhibit technologies that require discarding of pages in RAM blocks, e.g., * Inhibit technologies that require discarding of pages in RAM blocks, e.g.,

4
include/exec/tswap.h
View File

@ -15,11 +15,11 @@
* If we're in target-specific code, we can hard-code the swapping * If we're in target-specific code, we can hard-code the swapping
* condition, otherwise we have to do (slower) run-time checks. * condition, otherwise we have to do (slower) run-time checks.
*/ */
#ifdef NEED_CPU_H #ifdef COMPILING_PER_TARGET
#define target_needs_bswap() (HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN) #define target_needs_bswap() (HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN)
#else #else
#define target_needs_bswap() (target_words_bigendian() != HOST_BIG_ENDIAN) #define target_needs_bswap() (target_words_bigendian() != HOST_BIG_ENDIAN)
#endif #endif /* COMPILING_PER_TARGET */
static inline uint16_t tswap16(uint16_t s) static inline uint16_t tswap16(uint16_t s)
{ {

2
include/gdbstub/helpers.h
View File

@ -12,7 +12,7 @@
#ifndef _GDBSTUB_HELPERS_H_ #ifndef _GDBSTUB_HELPERS_H_
#define _GDBSTUB_HELPERS_H_ #define _GDBSTUB_HELPERS_H_
#ifdef NEED_CPU_H #ifdef COMPILING_PER_TARGET
#include "cpu.h" #include "cpu.h"
/* /*

4
include/hw/core/cpu.h
View File

@ -1182,7 +1182,7 @@ bool target_words_bigendian(void);
const char *target_name(void); const char *target_name(void);
#ifdef NEED_CPU_H #ifdef COMPILING_PER_TARGET
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
@ -1197,7 +1197,7 @@ extern const VMStateDescription vmstate_cpu_common;
} }
#endif /* !CONFIG_USER_ONLY */ #endif /* !CONFIG_USER_ONLY */
#endif /* NEED_CPU_H */ #endif /* COMPILING_PER_TARGET */
#define UNASSIGNED_CPU_INDEX -1 #define UNASSIGNED_CPU_INDEX -1
#define UNASSIGNED_CLUSTER_INDEX -1 #define UNASSIGNED_CLUSTER_INDEX -1

2
include/qemu/osdep.h
View File

@ -32,7 +32,7 @@
#endif #endif
#include "config-host.h" #include "config-host.h"
#ifdef NEED_CPU_H #ifdef COMPILING_PER_TARGET
#include CONFIG_TARGET #include CONFIG_TARGET
#else #else
#include "exec/poison.h" #include "exec/poison.h"

8
include/sysemu/hvf.h
View File

@ -16,7 +16,7 @@
#include "qemu/accel.h" #include "qemu/accel.h"
#include "qom/object.h" #include "qom/object.h"
#ifdef NEED_CPU_H #ifdef COMPILING_PER_TARGET
#include "cpu.h" #include "cpu.h"
#ifdef CONFIG_HVF #ifdef CONFIG_HVF
@ -26,7 +26,7 @@ extern bool hvf_allowed;
#define hvf_enabled() 0 #define hvf_enabled() 0
#endif /* !CONFIG_HVF */ #endif /* !CONFIG_HVF */
#endif /* NEED_CPU_H */ #endif /* COMPILING_PER_TARGET */
#define TYPE_HVF_ACCEL ACCEL_CLASS_NAME("hvf") #define TYPE_HVF_ACCEL ACCEL_CLASS_NAME("hvf")
@ -34,7 +34,7 @@ typedef struct HVFState HVFState;
DECLARE_INSTANCE_CHECKER(HVFState, HVF_STATE, DECLARE_INSTANCE_CHECKER(HVFState, HVF_STATE,
TYPE_HVF_ACCEL) TYPE_HVF_ACCEL)
#ifdef NEED_CPU_H #ifdef COMPILING_PER_TARGET
struct hvf_sw_breakpoint { struct hvf_sw_breakpoint {
vaddr pc; vaddr pc;
vaddr saved_insn; vaddr saved_insn;
@ -66,6 +66,6 @@ void hvf_arch_update_guest_debug(CPUState *cpu);
* Return whether the guest supports debugging. * Return whether the guest supports debugging.
*/ */
bool hvf_arch_supports_guest_debug(void); bool hvf_arch_supports_guest_debug(void);
#endif /* NEED_CPU_H */ #endif /* COMPILING_PER_TARGET */
#endif #endif

6
include/sysemu/kvm.h
View File

@ -20,7 +20,7 @@
#include "qemu/accel.h" #include "qemu/accel.h"
#include "qom/object.h" #include "qom/object.h"
#ifdef NEED_CPU_H #ifdef COMPILING_PER_TARGET
# ifdef CONFIG_KVM # ifdef CONFIG_KVM
# include <linux/kvm.h> # include <linux/kvm.h>
# define CONFIG_KVM_IS_POSSIBLE # define CONFIG_KVM_IS_POSSIBLE
@ -210,7 +210,7 @@ bool kvm_arm_supports_user_irq(void);
int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr); int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr);
int kvm_on_sigbus(int code, void *addr); int kvm_on_sigbus(int code, void *addr);
#ifdef NEED_CPU_H #ifdef COMPILING_PER_TARGET
#include "cpu.h" #include "cpu.h"
void kvm_flush_coalesced_mmio_buffer(void); void kvm_flush_coalesced_mmio_buffer(void);
@ -435,7 +435,7 @@ void kvm_set_sigmask_len(KVMState *s, unsigned int sigmask_len);
int kvm_physical_memory_addr_from_host(KVMState *s, void *ram_addr, int kvm_physical_memory_addr_from_host(KVMState *s, void *ram_addr,
hwaddr *phys_addr); hwaddr *phys_addr);
#endif /* NEED_CPU_H */ #endif /* COMPILING_PER_TARGET */
void kvm_cpu_synchronize_state(CPUState *cpu); void kvm_cpu_synchronize_state(CPUState *cpu);

4
include/sysemu/nvmm.h
View File

@ -12,7 +12,7 @@
#ifndef QEMU_NVMM_H #ifndef QEMU_NVMM_H
#define QEMU_NVMM_H #define QEMU_NVMM_H
#ifdef NEED_CPU_H #ifdef COMPILING_PER_TARGET
#ifdef CONFIG_NVMM #ifdef CONFIG_NVMM
@ -24,6 +24,6 @@ int nvmm_enabled(void);
#endif /* CONFIG_NVMM */ #endif /* CONFIG_NVMM */
#endif /* NEED_CPU_H */ #endif /* COMPILING_PER_TARGET */
#endif /* QEMU_NVMM_H */ #endif /* QEMU_NVMM_H */

4
include/sysemu/whpx.h
View File

@ -15,7 +15,7 @@
#ifndef QEMU_WHPX_H #ifndef QEMU_WHPX_H
#define QEMU_WHPX_H #define QEMU_WHPX_H
#ifdef NEED_CPU_H #ifdef COMPILING_PER_TARGET
#ifdef CONFIG_WHPX #ifdef CONFIG_WHPX
@ -29,6 +29,6 @@ bool whpx_apic_in_platform(void);
#endif /* CONFIG_WHPX */ #endif /* CONFIG_WHPX */
#endif /* NEED_CPU_H */ #endif /* COMPILING_PER_TARGET */
#endif /* QEMU_WHPX_H */ #endif /* QEMU_WHPX_H */

4
include/sysemu/xen.h
View File

@ -16,13 +16,13 @@
#include "exec/cpu-common.h" #include "exec/cpu-common.h"
#ifdef NEED_CPU_H #ifdef COMPILING_PER_TARGET
# ifdef CONFIG_XEN # ifdef CONFIG_XEN
# define CONFIG_XEN_IS_POSSIBLE # define CONFIG_XEN_IS_POSSIBLE
# endif # endif
#else #else
# define CONFIG_XEN_IS_POSSIBLE # define CONFIG_XEN_IS_POSSIBLE
#endif #endif /* COMPILING_PER_TARGET */
#ifdef CONFIG_XEN_IS_POSSIBLE #ifdef CONFIG_XEN_IS_POSSIBLE

4
meson.build
View File

@ -3610,7 +3610,7 @@ foreach d, list : target_modules
if target.endswith('-softmmu') if target.endswith('-softmmu')
config_target = config_target_mak[target] config_target = config_target_mak[target]
target_inc = [include_directories('target' / config_target['TARGET_BASE_ARCH'])] target_inc = [include_directories('target' / config_target['TARGET_BASE_ARCH'])]
c_args = ['-DNEED_CPU_H', c_args = ['-DCOMPILING_PER_TARGET',
'-DCONFIG_TARGET="@0@-config-target.h"'.format(target), '-DCONFIG_TARGET="@0@-config-target.h"'.format(target),
'-DCONFIG_DEVICES="@0@-config-devices.h"'.format(target)] '-DCONFIG_DEVICES="@0@-config-devices.h"'.format(target)]
target_module_ss = module_ss.apply(config_target, strict: false) target_module_ss = module_ss.apply(config_target, strict: false)
@ -3793,7 +3793,7 @@ foreach target : target_dirs
target_base_arch = config_target['TARGET_BASE_ARCH'] target_base_arch = config_target['TARGET_BASE_ARCH']
arch_srcs = [config_target_h[target]] arch_srcs = [config_target_h[target]]
arch_deps = [] arch_deps = []
c_args = ['-DNEED_CPU_H', c_args = ['-DCOMPILING_PER_TARGET',
'-DCONFIG_TARGET="@0@-config-target.h"'.format(target), '-DCONFIG_TARGET="@0@-config-target.h"'.format(target),
'-DCONFIG_DEVICES="@0@-config-devices.h"'.format(target)] '-DCONFIG_DEVICES="@0@-config-devices.h"'.format(target)]
link_args = emulator_link_args link_args = emulator_link_args

6
scripts/analyze-inclusions
View File

@ -92,7 +92,7 @@ echo trace/generated-tracers.h:
analyze -include ../include/qemu/osdep.h trace/generated-tracers.h analyze -include ../include/qemu/osdep.h trace/generated-tracers.h
echo target/i386/cpu.h: echo target/i386/cpu.h:
analyze -DNEED_CPU_H -I../target/i386 -Ii386-softmmu -include ../include/qemu/osdep.h ../target/i386/cpu.h analyze -DCOMPILING_PER_TARGET -I../target/i386 -Ii386-softmmu -include ../include/qemu/osdep.h ../target/i386/cpu.h
echo hw/hw.h + NEED_CPU_H: echo hw/hw.h + COMPILING_PER_TARGET:
analyze -DNEED_CPU_H -I../target/i386 -Ii386-softmmu -include ../include/qemu/osdep.h ../include/hw/hw.h analyze -DCOMPILING_PER_TARGET -I../target/i386 -Ii386-softmmu -include ../include/qemu/osdep.h ../include/hw/hw.h

4
target/arm/kvm-consts.h
View File

@ -14,13 +14,13 @@
#ifndef ARM_KVM_CONSTS_H #ifndef ARM_KVM_CONSTS_H
#define ARM_KVM_CONSTS_H #define ARM_KVM_CONSTS_H
#ifdef NEED_CPU_H #ifdef COMPILING_PER_TARGET
#ifdef CONFIG_KVM #ifdef CONFIG_KVM
#include <linux/kvm.h> #include <linux/kvm.h>
#include <linux/psci.h> #include <linux/psci.h>
#define MISMATCH_CHECK(X, Y) QEMU_BUILD_BUG_ON(X != Y) #define MISMATCH_CHECK(X, Y) QEMU_BUILD_BUG_ON(X != Y)
#endif #endif
#endif #endif /* COMPILING_PER_TARGET */
#ifndef MISMATCH_CHECK #ifndef MISMATCH_CHECK
#define MISMATCH_CHECK(X, Y) QEMU_BUILD_BUG_ON(0) #define MISMATCH_CHECK(X, Y) QEMU_BUILD_BUG_ON(0)