commit a20a99298b45b4b6c7c9c528066a3e055e601535
author Carl Shapiro <cshapiro@google.com> Thu Jul 29 21:22:12 2010 -0700
committer Carl Shapiro <cshapiro@google.com> Fri Jul 30 15:38:45 2010 -0700
tree 8509abd2506f1b73e469d93d86823cf12fe1ce22
parent 577534a45611f2011cbfa5aa99590e8ef565250e

Move LIKELY and UNLIKELY to a public header file.

Change-Id: I6c4429277f50ff34021bd2ef836834605323b9bd

vm/Common.h

diff --git a/vm/Common.h b/vm/Common.h
index 2f151b8..ae0938a 100644
--- a/vm/Common.h
+++ b/vm/Common.h
@@ -37,6 +37,9 @@
 #define MIN(x,y) (((x) < (y)) ? (x) : (y))
 #define MAX(x,y) (((x) > (y)) ? (x) : (y))
 
+#define LIKELY(exp) (__builtin_expect((exp) != 0, true))
+#define UNLIKELY(exp) (__builtin_expect((exp) != 0, false))
+
 /*
  * If "very verbose" logging is enabled, make it equivalent to LOGV.
  * Otherwise, make it disappear.

vm/alloc/HeapBitmap.c

diff --git a/vm/alloc/HeapBitmap.c b/vm/alloc/HeapBitmap.c
index 4df30e7..9aff8ad 100644
--- a/vm/alloc/HeapBitmap.c
+++ b/vm/alloc/HeapBitmap.c
@@ -19,9 +19,6 @@
 #include "clz.h"
 #include <sys/mman.h>   /* for PROT_* */
 
-#define LIKELY(exp)     (__builtin_expect((exp) != 0, true))
-#define UNLIKELY(exp)   (__builtin_expect((exp) != 0, false))
-
 /*
  * Initialize a HeapBitmap so that it points to a bitmap large
  * enough to cover a heap at <base> of <maxSize> bytes, where