Browse Source

include: move memory_ldst* to include/system

These partial headers are only included via system/memory.h, so keep them in
the same directory.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
pull/316/head
Paolo Bonzini 4 months ago
parent
commit
c611228c0e
  1. 14
      include/system/memory.h
  2. 0
      include/system/memory_ldst.h.inc
  3. 0
      include/system/memory_ldst_cached.h.inc
  4. 0
      include/system/memory_ldst_phys.h.inc

14
include/system/memory.h

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

0
include/exec/memory_ldst.h.inc → include/system/memory_ldst.h.inc

0
include/exec/memory_ldst_cached.h.inc → include/system/memory_ldst_cached.h.inc

0
include/exec/memory_ldst_phys.h.inc → include/system/memory_ldst_phys.h.inc

Loading…
Cancel
Save