mirror of https://github.com/proxmox/mirror_qemu
Merge remote-tracking branch 'rth/tcg-for-anthony' into staging
# By Richard Henderson # Via Richard Henderson * rth/tcg-for-anthony: tcg: Remove redundant tcg_target_init checks tcg: Use QEMU_BUILD_BUG_ON for CPU_TLB_ENTRY_BITS Message-id: 1370437167-11278-1-git-send-email-rth@twiddle.net Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>master
commit
6e8d2b6546
|
@ -99,7 +99,7 @@ typedef struct CPUTLBEntry {
|
|||
sizeof(uintptr_t))];
|
||||
} CPUTLBEntry;
|
||||
|
||||
extern int CPUTLBEntry_wrong_size[sizeof(CPUTLBEntry) == (1 << CPU_TLB_ENTRY_BITS) ? 1 : -1];
|
||||
QEMU_BUILD_BUG_ON(sizeof(CPUTLBEntry) != (1 << CPU_TLB_ENTRY_BITS));
|
||||
|
||||
#define CPU_COMMON_TLB \
|
||||
/* The meaning of the MMU modes is defined in the target code. */ \
|
||||
|
|
|
@ -2053,12 +2053,6 @@ static const TCGTargetOpDef arm_op_defs[] = {
|
|||
|
||||
static void tcg_target_init(TCGContext *s)
|
||||
{
|
||||
#if !defined(CONFIG_USER_ONLY)
|
||||
/* fail safe */
|
||||
if ((1 << CPU_TLB_ENTRY_BITS) != sizeof(CPUTLBEntry))
|
||||
tcg_abort();
|
||||
#endif
|
||||
|
||||
tcg_regset_set32(tcg_target_available_regs[TCG_TYPE_I32], 0, 0xffff);
|
||||
tcg_regset_set32(tcg_target_call_clobber_regs, 0,
|
||||
(1 << TCG_REG_R0) |
|
||||
|
|
|
@ -2283,12 +2283,6 @@ static void tcg_target_init(TCGContext *s)
|
|||
}
|
||||
#endif
|
||||
|
||||
#if !defined(CONFIG_USER_ONLY)
|
||||
/* fail safe */
|
||||
if ((1 << CPU_TLB_ENTRY_BITS) != sizeof(CPUTLBEntry))
|
||||
tcg_abort();
|
||||
#endif
|
||||
|
||||
if (TCG_TARGET_REG_BITS == 64) {
|
||||
tcg_regset_set32(tcg_target_available_regs[TCG_TYPE_I32], 0, 0xffff);
|
||||
tcg_regset_set32(tcg_target_available_regs[TCG_TYPE_I64], 0, 0xffff);
|
||||
|
|
|
@ -2324,13 +2324,6 @@ static void query_facilities(void)
|
|||
|
||||
static void tcg_target_init(TCGContext *s)
|
||||
{
|
||||
#if !defined(CONFIG_USER_ONLY)
|
||||
/* fail safe */
|
||||
if ((1 << CPU_TLB_ENTRY_BITS) != sizeof(CPUTLBEntry)) {
|
||||
tcg_abort();
|
||||
}
|
||||
#endif
|
||||
|
||||
query_facilities();
|
||||
|
||||
tcg_regset_set32(tcg_target_available_regs[TCG_TYPE_I32], 0, 0xffff);
|
||||
|
|
Loading…
Reference in New Issue