Move likely and unlikely macros in a common place (Aurelien Jarno).

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3192 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/exec-all.h b/exec-all.h
index 434605d8d1bc10cdc9baf1d3fc8623d64f8b2da1..39cb536adc53dcff8f70004628049db60852b161 100644 (file)
--- a/exec-all.h
+++ b/exec-all.h
@@ -32,6 +32,9 @@
 #define __builtin_expect(x, n) (x)
 #endif
 
+#define likely(x)   __builtin_expect(!!(x), 1)
+#define unlikely(x)   __builtin_expect(!!(x), 0)
+
 #ifdef __i386__
 #define REGPARM(n) __attribute((regparm(n)))
 #else

diff --git a/target-alpha/cpu.h b/target-alpha/cpu.h
index b219ad38b09bdef5320c00c009089c8b861653bb..3f517e67b6ec35c664e6fb059bd0ec38ce7d5ed8 100644 (file)
--- a/target-alpha/cpu.h
+++ b/target-alpha/cpu.h
@@ -32,10 +32,6 @@
 
 #include "softfloat.h"
 
-/* XXX: put this in a common place */
-#define likely(x)   __builtin_expect(!!(x), 1)
-#define unlikely(x)   __builtin_expect(!!(x), 0)
-
 #define TARGET_HAS_ICE 1
 
 #define ELF_MACHINE    EM_ALPHA

diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
index f36c979244860916eb23a70e23667080908b4595..3ca22e57b949d372548d70128a0ce72be628237e 100644 (file)
--- a/target-ppc/cpu.h
+++ b/target-ppc/cpu.h
@@ -88,10 +88,6 @@ typedef uint32_t ppc_gpr_t;
 #define ICACHE_LINE_SIZE 32
 #define DCACHE_LINE_SIZE 32
 
-/* XXX: put this in a common place */
-#define likely(x)   __builtin_expect(!!(x), 1)
-#define unlikely(x) __builtin_expect(!!(x), 0)
-
 /*****************************************************************************/
 /* PVR definitions for most known PowerPC */
 enum {