Commit e58eb534 authored by Richard Henderson's avatar Richard Henderson
Browse files

exec: Split softmmu_defs.h 



The _cmmu helpers can be moved to exec-all.h.  The helpers that are
used from TCG will shortly need access to tcg_target_long so move
their declarations into tcg.h.

This requires minor include adjustments to all TCG backends.

Reviewed-by: default avatarAurelien Jarno <aurelien@aurel32.net>
Signed-off-by: default avatarRichard Henderson <rth@twiddle.net>
parent b1669e5e

include/exec/exec-all.h

+4 −1
Original line number Diff line number Diff line
@@ -377,7 +377,10 @@ bool io_mem_write(struct MemoryRegion *mr, hwaddr addr, 
void tlb_fill(CPUArchState *env1, target_ulong addr, int is_write, int mmu_idx,

              uintptr_t retaddr);



#include "exec/softmmu_defs.h"

uint8_t helper_ldb_cmmu(CPUArchState *env, target_ulong addr, int mmu_idx);

uint16_t helper_ldw_cmmu(CPUArchState *env, target_ulong addr, int mmu_idx);

uint32_t helper_ldl_cmmu(CPUArchState *env, target_ulong addr, int mmu_idx);

uint64_t helper_ldq_cmmu(CPUArchState *env, target_ulong addr, int mmu_idx);



#define ACCESS_TYPE (NB_MMU_MODES + 1)

#define MEMSUFFIX _code

include/exec/softmmu_defs.h

deleted100644 → 0
+0 −49
Original line number Diff line number Diff line 
/*

 *  Software MMU support

 *

 * Declare helpers used by TCG for qemu_ld/st ops.

 *

 * Used by softmmu_exec.h, TCG targets and exec-all.h.

 *

 */

#ifndef SOFTMMU_DEFS_H

#define SOFTMMU_DEFS_H



uint8_t helper_ret_ldb_mmu(CPUArchState *env, target_ulong addr,

                           int mmu_idx, uintptr_t retaddr);

uint16_t helper_ret_ldw_mmu(CPUArchState *env, target_ulong addr,

                            int mmu_idx, uintptr_t retaddr);

uint32_t helper_ret_ldl_mmu(CPUArchState *env, target_ulong addr,

                            int mmu_idx, uintptr_t retaddr);

uint64_t helper_ret_ldq_mmu(CPUArchState *env, target_ulong addr,

                            int mmu_idx, uintptr_t retaddr);



void helper_ret_stb_mmu(CPUArchState *env, target_ulong addr, uint8_t val,

                        int mmu_idx, uintptr_t retaddr);

void helper_ret_stw_mmu(CPUArchState *env, target_ulong addr, uint16_t val,

                        int mmu_idx, uintptr_t retaddr);

void helper_ret_stl_mmu(CPUArchState *env, target_ulong addr, uint32_t val,

                        int mmu_idx, uintptr_t retaddr);

void helper_ret_stq_mmu(CPUArchState *env, target_ulong addr, uint64_t val,

                        int mmu_idx, uintptr_t retaddr);



uint8_t helper_ldb_mmu(CPUArchState *env, target_ulong addr, int mmu_idx);

uint16_t helper_ldw_mmu(CPUArchState *env, target_ulong addr, int mmu_idx);

uint32_t helper_ldl_mmu(CPUArchState *env, target_ulong addr, int mmu_idx);

uint64_t helper_ldq_mmu(CPUArchState *env, target_ulong addr, int mmu_idx);



void helper_stb_mmu(CPUArchState *env, target_ulong addr,

                    uint8_t val, int mmu_idx);

void helper_stw_mmu(CPUArchState *env, target_ulong addr,

                    uint16_t val, int mmu_idx);

void helper_stl_mmu(CPUArchState *env, target_ulong addr,

                    uint32_t val, int mmu_idx);

void helper_stq_mmu(CPUArchState *env, target_ulong addr,

                    uint64_t val, int mmu_idx);



uint8_t helper_ldb_cmmu(CPUArchState *env, target_ulong addr, int mmu_idx);

uint16_t helper_ldw_cmmu(CPUArchState *env, target_ulong addr, int mmu_idx);

uint32_t helper_ldl_cmmu(CPUArchState *env, target_ulong addr, int mmu_idx);

uint64_t helper_ldq_cmmu(CPUArchState *env, target_ulong addr, int mmu_idx);



#endif /* SOFTMMU_DEFS_H */

include/exec/softmmu_exec.h

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ 
#define ldul_executive  ldl_executive

#define ldul_supervisor ldl_supervisor



#include "exec/softmmu_defs.h"

/* The memory helpers for tcg-generated code need tcg_target_long etc.  */

#include "tcg.h"



#define ACCESS_TYPE 0

#define MEMSUFFIX MMU_MODE0_SUFFIX

tcg/aarch64/tcg-target.c

+0 −2
Original line number Diff line number Diff line
@@ -778,8 +778,6 @@ static inline void tcg_out_nop(TCGContext *s) 
}



#ifdef CONFIG_SOFTMMU

#include "exec/softmmu_defs.h"



/* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr,

   int mmu_idx) */

static const void * const qemu_ld_helpers[4] = {

tcg/arm/tcg-target.c

+0 −2
Original line number Diff line number Diff line
@@ -1058,8 +1058,6 @@ static inline void tcg_out_goto_label(TCGContext *s, int cond, int label_index) 


#ifdef CONFIG_SOFTMMU



#include "exec/softmmu_defs.h"



/* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr,

   int mmu_idx) */

static const void * const qemu_ld_helpers[4] = {