aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorj_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162>2007-09-20 09:44:48 +0000
committerj_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162>2007-09-20 09:44:48 +0000
commitcbecba264bb870608ffbf7c9df8102116432a7df (patch)
tree87b63f978ba9eb619b86419cb9c8154a4061cb84
parentff937dbad1cf5ec787ed86c5e6e17503724e6d4c (diff)
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
-rw-r--r--exec-all.h3
-rw-r--r--target-alpha/cpu.h4
-rw-r--r--target-ppc/cpu.h4
3 files changed, 3 insertions, 8 deletions
diff --git a/exec-all.h b/exec-all.h
index 434605d8d1..39cb536adc 100644
--- 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 b219ad38b0..3f517e67b6 100644
--- 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 f36c979244..3ca22e57b9 100644
--- 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 {