From cbecba264bb870608ffbf7c9df8102116432a7df Mon Sep 17 00:00:00 2001 From: j_mayer Date: Thu, 20 Sep 2007 09:44:48 +0000 Subject: 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 --- exec-all.h | 3 +++ target-alpha/cpu.h | 4 ---- target-ppc/cpu.h | 4 ---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/exec-all.h b/exec-all.h index 434605d..39cb536 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 b219ad3..3f517e6 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 f36c979..3ca22e5 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 { -- cgit v1.1