ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

include/exec: Replace `TARGET_TB_PCREL` with `CF_PCREL` 

Signed-off-by: Anton Johansson <anjo@rev.ng>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230227135202.9710-6-anjo@rev.ng>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Anton Johansson 2023-02-27 14:51:40 +01:00 committed by Richard Henderson
parent 4be790263f
commit 1fad5fce19
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/exec/exec-all.h
View File

@ -506,22 +506,20 @@ struct tb_tc {
}; };
struct TranslationBlock { struct TranslationBlock {
#if !TARGET_TB_PCREL
/* /*
* Guest PC corresponding to this block. This must be the true * Guest PC corresponding to this block. This must be the true
* virtual address. Therefore e.g. x86 stores EIP + CS_BASE, and * virtual address. Therefore e.g. x86 stores EIP + CS_BASE, and
* targets like Arm, MIPS, HP-PA, which reuse low bits for ISA or * targets like Arm, MIPS, HP-PA, which reuse low bits for ISA or
* privilege, must store those bits elsewhere. * privilege, must store those bits elsewhere.
* *
* If TARGET_TB_PCREL, the opcodes for the TranslationBlock are * If CF_PCREL, the opcodes for the TranslationBlock are written
* written such that the TB is associated only with the physical * such that the TB is associated only with the physical page and
* page and may be run in any virtual address context. In this case, * may be run in any virtual address context. In this case, PC
* PC must always be taken from ENV in a target-specific manner. * must always be taken from ENV in a target-specific manner.
* Unwind information is taken as offsets from the page, to be * Unwind information is taken as offsets from the page, to be
* deposited into the "current" PC. * deposited into the "current" PC.
*/ */
target_ulong pc; target_ulong pc;
#endif
/* /*
* Target-specific data associated with the TranslationBlock, e.g.: * Target-specific data associated with the TranslationBlock, e.g.:
@ -615,22 +613,19 @@ struct TranslationBlock {
uintptr_t jmp_dest[2]; uintptr_t jmp_dest[2];
}; };
/* Hide the read to avoid ifdefs for TARGET_TB_PCREL. */
static inline target_ulong tb_pc(const TranslationBlock *tb)
{
#if TARGET_TB_PCREL
qemu_build_not_reached();
#else
return tb->pc;
#endif
}
/* Hide the qatomic_read to make code a little easier on the eyes */ /* Hide the qatomic_read to make code a little easier on the eyes */
static inline uint32_t tb_cflags(const TranslationBlock *tb) static inline uint32_t tb_cflags(const TranslationBlock *tb)
{ {
return qatomic_read(&tb->cflags); return qatomic_read(&tb->cflags);
} }
/* Hide the read to avoid ifdefs for CF_PCREL. */
static inline target_ulong tb_pc(const TranslationBlock *tb)
{
assert(!(tb_cflags(tb) & CF_PCREL));
return tb->pc;
}
static inline tb_page_addr_t tb_page_addr0(const TranslationBlock *tb) static inline tb_page_addr_t tb_page_addr0(const TranslationBlock *tb)
{ {
#ifdef CONFIG_USER_ONLY #ifdef CONFIG_USER_ONLY