mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson: rename .inc.h files to .h.inc

Browse Source 
Make it consistent with '.c.inc' and '.rst.inc'.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2020-02-04 12:41:01 +01:00
parent 139c1837db
commit 0979ed017f
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/exec/cpu-all.h
View File

@ -189,13 +189,13 @@ extern unsigned long reserved_va;
#define ARG1 as #define ARG1 as
#define ARG1_DECL AddressSpace *as #define ARG1_DECL AddressSpace *as
#define TARGET_ENDIANNESS #define TARGET_ENDIANNESS
#include "exec/memory_ldst.inc.h" #include "exec/memory_ldst.h.inc"
#define SUFFIX _cached_slow #define SUFFIX _cached_slow
#define ARG1 cache #define ARG1 cache
#define ARG1_DECL MemoryRegionCache *cache #define ARG1_DECL MemoryRegionCache *cache
#define TARGET_ENDIANNESS #define TARGET_ENDIANNESS
#include "exec/memory_ldst.inc.h" #include "exec/memory_ldst.h.inc"
static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val) static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val)
{ {
@ -207,17 +207,17 @@ static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val
#define ARG1 as #define ARG1 as
#define ARG1_DECL AddressSpace *as #define ARG1_DECL AddressSpace *as
#define TARGET_ENDIANNESS #define TARGET_ENDIANNESS
#include "exec/memory_ldst_phys.inc.h" #include "exec/memory_ldst_phys.h.inc"
/* Inline fast path for direct RAM access. */ /* Inline fast path for direct RAM access. */
#define ENDIANNESS #define ENDIANNESS
#include "exec/memory_ldst_cached.inc.h" #include "exec/memory_ldst_cached.h.inc"
#define SUFFIX _cached #define SUFFIX _cached
#define ARG1 cache #define ARG1 cache
#define ARG1_DECL MemoryRegionCache *cache #define ARG1_DECL MemoryRegionCache *cache
#define TARGET_ENDIANNESS #define TARGET_ENDIANNESS
#include "exec/memory_ldst_phys.inc.h" #include "exec/memory_ldst_phys.h.inc"
#endif #endif
/* page related stuff */ /* page related stuff */

12
include/exec/memory.h
View File

@ -2133,12 +2133,12 @@ MemTxResult address_space_write_rom(AddressSpace *as, hwaddr addr,
#define SUFFIX #define SUFFIX
#define ARG1 as #define ARG1 as
#define ARG1_DECL AddressSpace *as #define ARG1_DECL AddressSpace *as
#include "exec/memory_ldst.inc.h" #include "exec/memory_ldst.h.inc"
#define SUFFIX #define SUFFIX
#define ARG1 as #define ARG1 as
#define ARG1_DECL AddressSpace *as #define ARG1_DECL AddressSpace *as
#include "exec/memory_ldst_phys.inc.h" #include "exec/memory_ldst_phys.h.inc"
struct MemoryRegionCache { struct MemoryRegionCache {
void *ptr; void *ptr;
@ -2179,7 +2179,7 @@ struct MemoryRegionCache {
#define SUFFIX _cached_slow #define SUFFIX _cached_slow
#define ARG1 cache #define ARG1 cache
#define ARG1_DECL MemoryRegionCache *cache #define ARG1_DECL MemoryRegionCache *cache
#include "exec/memory_ldst.inc.h" #include "exec/memory_ldst.h.inc"
/* Inline fast path for direct RAM access. */ /* Inline fast path for direct RAM access. */
static inline uint8_t address_space_ldub_cached(MemoryRegionCache *cache, static inline uint8_t address_space_ldub_cached(MemoryRegionCache *cache,
@ -2205,15 +2205,15 @@ static inline void address_space_stb_cached(MemoryRegionCache *cache,
} }
#define ENDIANNESS _le #define ENDIANNESS _le
#include "exec/memory_ldst_cached.inc.h" #include "exec/memory_ldst_cached.h.inc"
#define ENDIANNESS _be #define ENDIANNESS _be
#include "exec/memory_ldst_cached.inc.h" #include "exec/memory_ldst_cached.h.inc"
#define SUFFIX _cached #define SUFFIX _cached
#define ARG1 cache #define ARG1 cache
#define ARG1_DECL MemoryRegionCache *cache #define ARG1_DECL MemoryRegionCache *cache
#include "exec/memory_ldst_phys.inc.h" #include "exec/memory_ldst_phys.h.inc"
/* address_space_cache_init: prepare for repeated access to a physical /* address_space_cache_init: prepare for repeated access to a physical
* memory region * memory region

0
include/exec/memory_ldst.inc.h → include/exec/memory_ldst.h.inc
View File

0
include/exec/memory_ldst_cached.inc.h → include/exec/memory_ldst_cached.h.inc
View File

0
include/exec/memory_ldst_phys.inc.h → include/exec/memory_ldst_phys.h.inc
View File

2
target/s390x/cpu_features.c
View File

@ -23,7 +23,7 @@
.desc = _DESC, \ .desc = _DESC, \
}, },
static const S390FeatDef s390_features[S390_FEAT_MAX] = { static const S390FeatDef s390_features[S390_FEAT_MAX] = {
#include "cpu_features_def.inc.h" #include "cpu_features_def.h.inc"
}; };
#undef DEF_FEAT #undef DEF_FEAT

2
target/s390x/cpu_features_def.h
View File

@ -17,7 +17,7 @@
#define DEF_FEAT(_FEAT, ...) S390_FEAT_##_FEAT, #define DEF_FEAT(_FEAT, ...) S390_FEAT_##_FEAT,
typedef enum { typedef enum {
#include "cpu_features_def.inc.h" #include "cpu_features_def.h.inc"
S390_FEAT_MAX, S390_FEAT_MAX,
} S390Feat; } S390Feat;
#undef DEF_FEAT #undef DEF_FEAT

0
target/s390x/cpu_features_def.inc.h → target/s390x/cpu_features_def.h.inc
View File