diff options
| author | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-07-03 17:57:36 +0000 |
|---|---|---|
| committer | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-07-03 17:57:36 +0000 |
| commit | 551bd27f22638c854c43d7e6417d549764311c31 (patch) | |
| tree | b67965e4923a4b5367c47686b279be46ba79c2a0 /target-cris | |
| parent | 06e80fc92715ca720d23526f6d3db8c78fd8971c (diff) | |
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-71466251a162
Diffstat (limited to 'target-cris')
| -rw-r--r-- | target-cris/op_helper.c | 2 | ||||
| -rw-r--r-- | target-cris/translate.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c index 148c1e08f..fcf80705e 100644 --- a/target-cris/op_helper.c +++ b/target-cris/op_helper.c @@ -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__, env->pc, env->debug1, retaddr)); ret = cpu_cris_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-cris/translate.c b/target-cris/translate.c index 81b61326f..d971d1d2b 100644 --- a/target-cris/translate.c +++ b/target-cris/translate.c @@ -3191,7 +3191,7 @@ gen_intermediate_code_internal(CPUState *env, TranslationBlock *tb, cris_evaluate_flags (dc); - if (__builtin_expect(env->singlestep_enabled, 0)) { + if (unlikely(env->singlestep_enabled)) { tcg_gen_movi_tl(env_pc, npc); t_gen_raise_exception(EXCP_DEBUG); } else { |