Commit 659ef5cb authored by Richard Henderson's avatar Richard Henderson
Browse files

tcg: Rearrange ldst label tracking 



Dispense with TCGBackendData, as it has never been used for more than
holding a single pointer.  Use a define in the cpu/tcg-target.h to
signal requirement for TCGLabelQemuLdst, so that we can drop the no-op
tcg-be-null.h stubs.  Rename tcg-be-ldst.h to tcg-ldst.inc.c.

Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarRichard Henderson <rth@twiddle.net>
parent a8583393

tcg/aarch64/tcg-target.h

+4 −0
Original line number Diff line number Diff line
@@ -122,4 +122,8 @@ static inline void flush_icache_range(uintptr_t start, uintptr_t stop) 


void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t);



#ifdef CONFIG_SOFTMMU

#define TCG_TARGET_NEED_LDST_LABELS

#endif



#endif /* AARCH64_TCG_TARGET_H */

tcg/aarch64/tcg-target.inc.c

+2 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
 * See the COPYING file in the top-level directory for details.

 */



#include "tcg-be-ldst.h"

#include "qemu/bitops.h"



/* We're going to re-use TCGType in setting of the SF bit, which controls
@@ -1070,6 +1069,8 @@ static void tcg_out_cltz(TCGContext *s, TCGType ext, TCGReg d, 
}



#ifdef CONFIG_SOFTMMU

#include "tcg-ldst.inc.c"



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

 *                                     TCGMemOpIdx oi, uintptr_t ra)

 */

tcg/arm/tcg-target.h

+4 −0
Original line number Diff line number Diff line
@@ -140,4 +140,8 @@ static inline void flush_icache_range(uintptr_t start, uintptr_t stop) 
/* not defined -- call should be eliminated at compile time */

void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t);



#ifdef CONFIG_SOFTMMU

#define TCG_TARGET_NEED_LDST_LABELS

#endif



#endif

tcg/arm/tcg-target.inc.c

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
 */



#include "elf.h"

#include "tcg-be-ldst.h"



int arm_arch = __ARM_ARCH;
@@ -1060,6 +1059,8 @@ static inline void tcg_out_mb(TCGContext *s, TCGArg a0) 
}



#ifdef CONFIG_SOFTMMU

#include "tcg-ldst.inc.c"



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

 *                                     int mmu_idx, uintptr_t ra)

 */

tcg/i386/tcg-target.h

+4 −0
Original line number Diff line number Diff line
@@ -186,4 +186,8 @@ static inline void tb_target_set_jmp_target(uintptr_t tc_ptr, 


#define TCG_TARGET_DEFAULT_MO (TCG_MO_ALL & ~TCG_MO_ST_LD)



#ifdef CONFIG_SOFTMMU

#define TCG_TARGET_NEED_LDST_LABELS

#endif



#endif