diff options
Diffstat (limited to 'target-m68k')
| -rw-r--r-- | target-m68k/op_helper.c | 2 | ||||
| -rw-r--r-- | target-m68k/translate.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target-m68k/op_helper.c b/target-m68k/op_helper.c index f2e9f03599..aa36a33563 100644 --- a/target-m68k/op_helper.c +++ b/target-m68k/op_helper.c @@ -61,7 +61,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) saved_env = env; env = cpu_single_env; ret = cpu_m68k_handle_mmu_fault(env, addr, is_write, mmu_idx, 1); - if (__builtin_expect(ret, 0)) { + if (unlikely(ret)) { if (retaddr) { /* now we have a real cpu fault */ pc = (unsigned long)retaddr; diff --git a/target-m68k/translate.c b/target-m68k/translate.c index e808db5e84..9486c31d7c 100644 --- a/target-m68k/translate.c +++ b/target-m68k/translate.c @@ -873,7 +873,7 @@ static void gen_jmp_tb(DisasContext *s, int n, uint32_t dest) TranslationBlock *tb; tb = s->tb; - if (__builtin_expect (s->singlestep_enabled, 0)) { + if (unlikely(s->singlestep_enabled)) { gen_exception(s, dest, EXCP_DEBUG); } else if ((tb->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) 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. */ if (!dc->is_jmp) { gen_flush_cc_op(dc); |