commit 551bd27f22638c854c43d7e6417d549764311c31
author ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> Thu Jul 03 17:57:36 2008 +0000
committer ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> Thu Jul 03 17:57:36 2008 +0000
tree b67965e4923a4b5367c47686b279be46ba79c2a0
parent 06e80fc92715ca720d23526f6d3db8c78fd8971c

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

cpu-exec.c

diff --git a/cpu-exec.c b/cpu-exec.c
index 6b46bd2..8cc723d 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -224,8 +224,8 @@
 #error unsupported CPU
 #endif
     tb = env->tb_jmp_cache[tb_jmp_cache_hash_func(pc)];
-    if (__builtin_expect(!tb || tb->pc != pc || tb->cs_base != cs_base ||
-                         tb->flags != flags, 0)) {
+    if (unlikely(!tb || tb->pc != pc || tb->cs_base != cs_base ||
+                 tb->flags != flags)) {
         tb = tb_find_slow(pc, cs_base, flags);
     }
     return tb;
@@ -360,7 +360,7 @@
             next_tb = 0; /* force lookup of first TB */
             for(;;) {
                 interrupt_request = env->interrupt_request;
-                if (__builtin_expect(interrupt_request, 0) &&
+                if (unlikely(interrupt_request) &&
                     likely(!(env->singlestep_enabled & SSTEP_NOIRQ))) {
                     if (interrupt_request & CPU_INTERRUPT_DEBUG) {
                         env->interrupt_request &= ~CPU_INTERRUPT_DEBUG;