Commit a7d6039c authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

cpu: move endian-dependent load/store functions to cpu-all.h 



Disentangle cpu-common.h and memory.h from NEED_CPU_H.  Prototypes are
not defined for !NEED_CPU_H, so remove them from poison.h too.  Only
macros need poisoning.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 741da0d3

include/exec/cpu-all.h

+25 −0
Original line number Diff line number Diff line
@@ -165,6 +165,31 @@ extern unsigned long reserved_va; 


#define GUEST_ADDR_MAX (reserved_va ? reserved_va : \

                                    (1ul << TARGET_VIRT_ADDR_SPACE_BITS) - 1)

#else



#include "exec/hwaddr.h"

uint32_t lduw_phys(AddressSpace *as, hwaddr addr);

uint32_t ldl_phys(AddressSpace *as, hwaddr addr);

uint64_t ldq_phys(AddressSpace *as, hwaddr addr);

void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val);

void stw_phys(AddressSpace *as, hwaddr addr, uint32_t val);

void stl_phys(AddressSpace *as, hwaddr addr, uint32_t val);

void stq_phys(AddressSpace *as, hwaddr addr, uint64_t val);



uint32_t address_space_lduw(AddressSpace *as, hwaddr addr,

                            MemTxAttrs attrs, MemTxResult *result);

uint32_t address_space_ldl(AddressSpace *as, hwaddr addr,

                            MemTxAttrs attrs, MemTxResult *result);

uint64_t address_space_ldq(AddressSpace *as, hwaddr addr,

                            MemTxAttrs attrs, MemTxResult *result);

void address_space_stl_notdirty(AddressSpace *as, hwaddr addr, uint32_t val,

                            MemTxAttrs attrs, MemTxResult *result);

void address_space_stw(AddressSpace *as, hwaddr addr, uint32_t val,

                            MemTxAttrs attrs, MemTxResult *result);

void address_space_stl(AddressSpace *as, hwaddr addr, uint32_t val,

                            MemTxAttrs attrs, MemTxResult *result);

void address_space_stq(AddressSpace *as, hwaddr addr, uint64_t val,

                            MemTxAttrs attrs, MemTxResult *result);

#endif



/* page related stuff */

include/exec/cpu-common.h

+0 −10
Original line number Diff line number Diff line
@@ -109,16 +109,6 @@ void stl_be_phys(AddressSpace *as, hwaddr addr, uint32_t val); 
void stq_le_phys(AddressSpace *as, hwaddr addr, uint64_t val);

void stq_be_phys(AddressSpace *as, hwaddr addr, uint64_t val);



#ifdef NEED_CPU_H

uint32_t lduw_phys(AddressSpace *as, hwaddr addr);

uint32_t ldl_phys(AddressSpace *as, hwaddr addr);

uint64_t ldq_phys(AddressSpace *as, hwaddr addr);

void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val);

void stw_phys(AddressSpace *as, hwaddr addr, uint32_t val);

void stl_phys(AddressSpace *as, hwaddr addr, uint32_t val);

void stq_phys(AddressSpace *as, hwaddr addr, uint64_t val);

#endif



void cpu_physical_memory_write_rom(AddressSpace *as, hwaddr addr,

                                   const uint8_t *buf, int len);

void cpu_flush_icache_range(hwaddr start, int len);

include/exec/memory.h

+0 −17
Original line number Diff line number Diff line
@@ -1292,23 +1292,6 @@ void address_space_stq_le(AddressSpace *as, hwaddr addr, uint64_t val, 
void address_space_stq_be(AddressSpace *as, hwaddr addr, uint64_t val,

                            MemTxAttrs attrs, MemTxResult *result);



#ifdef NEED_CPU_H

uint32_t address_space_lduw(AddressSpace *as, hwaddr addr,

                            MemTxAttrs attrs, MemTxResult *result);

uint32_t address_space_ldl(AddressSpace *as, hwaddr addr,

                            MemTxAttrs attrs, MemTxResult *result);

uint64_t address_space_ldq(AddressSpace *as, hwaddr addr,

                            MemTxAttrs attrs, MemTxResult *result);

void address_space_stl_notdirty(AddressSpace *as, hwaddr addr, uint32_t val,

                            MemTxAttrs attrs, MemTxResult *result);

void address_space_stw(AddressSpace *as, hwaddr addr, uint32_t val,

                            MemTxAttrs attrs, MemTxResult *result);

void address_space_stl(AddressSpace *as, hwaddr addr, uint32_t val,

                            MemTxAttrs attrs, MemTxResult *result);

void address_space_stq(AddressSpace *as, hwaddr addr, uint64_t val,

                            MemTxAttrs attrs, MemTxResult *result);

#endif



/* address_space_translate: translate an address range into an address space

 * into a MemoryRegion and an address range into that section.  Should be

 * called from an RCU critical section, to avoid that the last reference

include/exec/poison.h

+0 −8
Original line number Diff line number Diff line
@@ -37,14 +37,6 @@ 


#pragma GCC poison CPUArchState



#pragma GCC poison lduw_phys

#pragma GCC poison ldl_phys

#pragma GCC poison ldq_phys

#pragma GCC poison stl_phys_notdirty

#pragma GCC poison stw_phys

#pragma GCC poison stl_phys

#pragma GCC poison stq_phys



#pragma GCC poison CPU_INTERRUPT_HARD

#pragma GCC poison CPU_INTERRUPT_EXITTB

#pragma GCC poison CPU_INTERRUPT_HALT