mirror of https://github.com/proxmox/mirror_qemu
Convert remaining __builtin_expect to likely/unlikely, by Jan Kiszka.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4840 c046a42c-6fe2-441c-8c8c-71466251a162master
parent
06e80fc927
commit
551bd27f22
|
@ -224,8 +224,8 @@ static inline TranslationBlock *tb_find_fast(void)
|
||||||
#error unsupported CPU
|
#error unsupported CPU
|
||||||
#endif
|
#endif
|
||||||
tb = env->tb_jmp_cache[tb_jmp_cache_hash_func(pc)];
|
tb = env->tb_jmp_cache[tb_jmp_cache_hash_func(pc)];
|
||||||
if (__builtin_expect(!tb || tb->pc != pc || tb->cs_base != cs_base ||
|
if (unlikely(!tb || tb->pc != pc || tb->cs_base != cs_base ||
|
||||||
tb->flags != flags, 0)) {
|
tb->flags != flags)) {
|
||||||
tb = tb_find_slow(pc, cs_base, flags);
|
tb = tb_find_slow(pc, cs_base, flags);
|
||||||
}
|
}
|
||||||
return tb;
|
return tb;
|
||||||
|
@ -360,7 +360,7 @@ int cpu_exec(CPUState *env1)
|
||||||
next_tb = 0; /* force lookup of first TB */
|
next_tb = 0; /* force lookup of first TB */
|
||||||
for(;;) {
|
for(;;) {
|
||||||
interrupt_request = env->interrupt_request;
|
interrupt_request = env->interrupt_request;
|
||||||
if (__builtin_expect(interrupt_request, 0) &&
|
if (unlikely(interrupt_request) &&
|
||||||
likely(!(env->singlestep_enabled & SSTEP_NOIRQ))) {
|
likely(!(env->singlestep_enabled & SSTEP_NOIRQ))) {
|
||||||
if (interrupt_request & CPU_INTERRUPT_DEBUG) {
|
if (interrupt_request & CPU_INTERRUPT_DEBUG) {
|
||||||
env->interrupt_request &= ~CPU_INTERRUPT_DEBUG;
|
env->interrupt_request &= ~CPU_INTERRUPT_DEBUG;
|
||||||
|
|
|
@ -357,8 +357,8 @@ static inline target_ulong get_phys_addr_code(CPUState *env1, target_ulong addr)
|
||||||
|
|
||||||
page_index = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1);
|
page_index = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1);
|
||||||
mmu_idx = cpu_mmu_index(env1);
|
mmu_idx = cpu_mmu_index(env1);
|
||||||
if (__builtin_expect(env1->tlb_table[mmu_idx][page_index].addr_code !=
|
if (unlikely(env1->tlb_table[mmu_idx][page_index].addr_code !=
|
||||||
(addr & TARGET_PAGE_MASK), 0)) {
|
(addr & TARGET_PAGE_MASK))) {
|
||||||
ldub_code(addr);
|
ldub_code(addr);
|
||||||
}
|
}
|
||||||
pd = env1->tlb_table[mmu_idx][page_index].addr_code & ~TARGET_PAGE_MASK;
|
pd = env1->tlb_table[mmu_idx][page_index].addr_code & ~TARGET_PAGE_MASK;
|
||||||
|
|
|
@ -231,8 +231,8 @@ static inline RES_TYPE glue(glue(ld, USUFFIX), MEMSUFFIX)(target_ulong ptr)
|
||||||
addr = ptr;
|
addr = ptr;
|
||||||
page_index = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1);
|
page_index = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1);
|
||||||
mmu_idx = CPU_MMU_INDEX;
|
mmu_idx = CPU_MMU_INDEX;
|
||||||
if (__builtin_expect(env->tlb_table[mmu_idx][page_index].ADDR_READ !=
|
if (unlikely(env->tlb_table[mmu_idx][page_index].ADDR_READ !=
|
||||||
(addr & (TARGET_PAGE_MASK | (DATA_SIZE - 1))), 0)) {
|
(addr & (TARGET_PAGE_MASK | (DATA_SIZE - 1))))) {
|
||||||
res = glue(glue(__ld, SUFFIX), MMUSUFFIX)(addr, mmu_idx);
|
res = glue(glue(__ld, SUFFIX), MMUSUFFIX)(addr, mmu_idx);
|
||||||
} else {
|
} else {
|
||||||
physaddr = addr + env->tlb_table[mmu_idx][page_index].addend;
|
physaddr = addr + env->tlb_table[mmu_idx][page_index].addend;
|
||||||
|
@ -252,8 +252,8 @@ static inline int glue(glue(lds, SUFFIX), MEMSUFFIX)(target_ulong ptr)
|
||||||
addr = ptr;
|
addr = ptr;
|
||||||
page_index = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1);
|
page_index = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1);
|
||||||
mmu_idx = CPU_MMU_INDEX;
|
mmu_idx = CPU_MMU_INDEX;
|
||||||
if (__builtin_expect(env->tlb_table[mmu_idx][page_index].ADDR_READ !=
|
if (unlikely(env->tlb_table[mmu_idx][page_index].ADDR_READ !=
|
||||||
(addr & (TARGET_PAGE_MASK | (DATA_SIZE - 1))), 0)) {
|
(addr & (TARGET_PAGE_MASK | (DATA_SIZE - 1))))) {
|
||||||
res = (DATA_STYPE)glue(glue(__ld, SUFFIX), MMUSUFFIX)(addr, mmu_idx);
|
res = (DATA_STYPE)glue(glue(__ld, SUFFIX), MMUSUFFIX)(addr, mmu_idx);
|
||||||
} else {
|
} else {
|
||||||
physaddr = addr + env->tlb_table[mmu_idx][page_index].addend;
|
physaddr = addr + env->tlb_table[mmu_idx][page_index].addend;
|
||||||
|
@ -277,8 +277,8 @@ static inline void glue(glue(st, SUFFIX), MEMSUFFIX)(target_ulong ptr, RES_TYPE
|
||||||
addr = ptr;
|
addr = ptr;
|
||||||
page_index = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1);
|
page_index = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1);
|
||||||
mmu_idx = CPU_MMU_INDEX;
|
mmu_idx = CPU_MMU_INDEX;
|
||||||
if (__builtin_expect(env->tlb_table[mmu_idx][page_index].addr_write !=
|
if (unlikely(env->tlb_table[mmu_idx][page_index].addr_write !=
|
||||||
(addr & (TARGET_PAGE_MASK | (DATA_SIZE - 1))), 0)) {
|
(addr & (TARGET_PAGE_MASK | (DATA_SIZE - 1))))) {
|
||||||
glue(glue(__st, SUFFIX), MMUSUFFIX)(addr, v, mmu_idx);
|
glue(glue(__st, SUFFIX), MMUSUFFIX)(addr, v, mmu_idx);
|
||||||
} else {
|
} else {
|
||||||
physaddr = addr + env->tlb_table[mmu_idx][page_index].addend;
|
physaddr = addr + env->tlb_table[mmu_idx][page_index].addend;
|
||||||
|
|
|
@ -97,7 +97,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr)
|
||||||
saved_env = env;
|
saved_env = env;
|
||||||
env = cpu_single_env;
|
env = cpu_single_env;
|
||||||
ret = cpu_arm_handle_mmu_fault(env, addr, is_write, mmu_idx, 1);
|
ret = cpu_arm_handle_mmu_fault(env, addr, is_write, mmu_idx, 1);
|
||||||
if (__builtin_expect(ret, 0)) {
|
if (unlikely(ret)) {
|
||||||
if (retaddr) {
|
if (retaddr) {
|
||||||
/* now we have a real cpu fault */
|
/* now we have a real cpu fault */
|
||||||
pc = (unsigned long)retaddr;
|
pc = (unsigned long)retaddr;
|
||||||
|
|
|
@ -3393,7 +3393,7 @@ static inline void gen_goto_tb(DisasContext *s, int n, uint32_t dest)
|
||||||
|
|
||||||
static inline void gen_jmp (DisasContext *s, uint32_t dest)
|
static inline void gen_jmp (DisasContext *s, uint32_t dest)
|
||||||
{
|
{
|
||||||
if (__builtin_expect(s->singlestep_enabled, 0)) {
|
if (unlikely(s->singlestep_enabled)) {
|
||||||
/* An indirect jump so that we still trigger the debug exception. */
|
/* An indirect jump so that we still trigger the debug exception. */
|
||||||
if (s->thumb)
|
if (s->thumb)
|
||||||
dest |= 1;
|
dest |= 1;
|
||||||
|
@ -8703,7 +8703,7 @@ static inline int gen_intermediate_code_internal(CPUState *env,
|
||||||
/* At this stage dc->condjmp will only be set when the skipped
|
/* At this stage dc->condjmp will only be set when the skipped
|
||||||
instruction was a conditional branch or trap, and the PC has
|
instruction was a conditional branch or trap, and the PC has
|
||||||
already been written. */
|
already been written. */
|
||||||
if (__builtin_expect(env->singlestep_enabled, 0)) {
|
if (unlikely(env->singlestep_enabled)) {
|
||||||
/* Make sure the pc is updated, and raise a debug exception. */
|
/* Make sure the pc is updated, and raise a debug exception. */
|
||||||
if (dc->condjmp) {
|
if (dc->condjmp) {
|
||||||
gen_set_condexec(dc);
|
gen_set_condexec(dc);
|
||||||
|
|
|
@ -61,7 +61,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr)
|
||||||
D(fprintf(logfile, "%s pc=%x tpc=%x ra=%x\n", __func__,
|
D(fprintf(logfile, "%s pc=%x tpc=%x ra=%x\n", __func__,
|
||||||
env->pc, env->debug1, retaddr));
|
env->pc, env->debug1, retaddr));
|
||||||
ret = cpu_cris_handle_mmu_fault(env, addr, is_write, mmu_idx, 1);
|
ret = cpu_cris_handle_mmu_fault(env, addr, is_write, mmu_idx, 1);
|
||||||
if (__builtin_expect(ret, 0)) {
|
if (unlikely(ret)) {
|
||||||
if (retaddr) {
|
if (retaddr) {
|
||||||
/* now we have a real cpu fault */
|
/* now we have a real cpu fault */
|
||||||
pc = (unsigned long)retaddr;
|
pc = (unsigned long)retaddr;
|
||||||
|
|
|
@ -3191,7 +3191,7 @@ gen_intermediate_code_internal(CPUState *env, TranslationBlock *tb,
|
||||||
|
|
||||||
cris_evaluate_flags (dc);
|
cris_evaluate_flags (dc);
|
||||||
|
|
||||||
if (__builtin_expect(env->singlestep_enabled, 0)) {
|
if (unlikely(env->singlestep_enabled)) {
|
||||||
tcg_gen_movi_tl(env_pc, npc);
|
tcg_gen_movi_tl(env_pc, npc);
|
||||||
t_gen_raise_exception(EXCP_DEBUG);
|
t_gen_raise_exception(EXCP_DEBUG);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -61,7 +61,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr)
|
||||||
saved_env = env;
|
saved_env = env;
|
||||||
env = cpu_single_env;
|
env = cpu_single_env;
|
||||||
ret = cpu_m68k_handle_mmu_fault(env, addr, is_write, mmu_idx, 1);
|
ret = cpu_m68k_handle_mmu_fault(env, addr, is_write, mmu_idx, 1);
|
||||||
if (__builtin_expect(ret, 0)) {
|
if (unlikely(ret)) {
|
||||||
if (retaddr) {
|
if (retaddr) {
|
||||||
/* now we have a real cpu fault */
|
/* now we have a real cpu fault */
|
||||||
pc = (unsigned long)retaddr;
|
pc = (unsigned long)retaddr;
|
||||||
|
|
|
@ -873,7 +873,7 @@ static void gen_jmp_tb(DisasContext *s, int n, uint32_t dest)
|
||||||
TranslationBlock *tb;
|
TranslationBlock *tb;
|
||||||
|
|
||||||
tb = s->tb;
|
tb = s->tb;
|
||||||
if (__builtin_expect (s->singlestep_enabled, 0)) {
|
if (unlikely(s->singlestep_enabled)) {
|
||||||
gen_exception(s, dest, EXCP_DEBUG);
|
gen_exception(s, dest, EXCP_DEBUG);
|
||||||
} else if ((tb->pc & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK) ||
|
} else if ((tb->pc & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK) ||
|
||||||
(s->pc & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK)) {
|
(s->pc & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK)) {
|
||||||
|
@ -2991,7 +2991,7 @@ gen_intermediate_code_internal(CPUState *env, TranslationBlock *tb,
|
||||||
|
|
||||||
if (tb->cflags & CF_LAST_IO)
|
if (tb->cflags & CF_LAST_IO)
|
||||||
gen_io_end();
|
gen_io_end();
|
||||||
if (__builtin_expect(env->singlestep_enabled, 0)) {
|
if (unlikely(env->singlestep_enabled)) {
|
||||||
/* Make sure the pc is updated, and raise a debug exception. */
|
/* Make sure the pc is updated, and raise a debug exception. */
|
||||||
if (!dc->is_jmp) {
|
if (!dc->is_jmp) {
|
||||||
gen_flush_cc_op(dc);
|
gen_flush_cc_op(dc);
|
||||||
|
|
Loading…
Reference in New Issue