+ 2000-04-22 Anthony Green <green@cygnus.com> + + * include/jvm.h (__builtin_expect): Define as unused for now.

+ 2000-04-22  Anthony Green  <green@cygnus.com>
+
+ 	* include/jvm.h (__builtin_expect): Define as unused for now.
+ 	* java/lang/natObject.cc (_Jv_MonitorEnter): Add __builtin_expect.
+ 	(notify): Ditto.
+ 	(notifyAll): Ditto.
+ 	(wait): Ditto.
+ 	(_Jv_MonitorExit): Ditto.
+ 	* boehm.cc (_Jv_MarkObj): Ditto.
+ 	(_Jv_MarkObj): Ditto.
+ 	(_Jv_MarkArray): Ditto.
+ 	(_Jv_AllocBytes): Ditto.
+ 	* prims.cc (_Jv_AllocObject): Ditto.
+ 	(_Jv_NewObjectArray): Ditto.
+ 	(_Jv_NewPrimArray): Ditto.
+ 	(_Jv_Malloc): Ditto.
+ 	(_Jv_Realloc): Ditto.
+ 	(_Jv_MallocUnchecked): Ditto.
+ 	(_Jv_divI): Ditto.
+ 	(_Jv_remI): Ditto.
+ 	(_Jv_divJ): Ditto.
+ 	(_Jv_remJ): Ditto.
+
+ 	* include/Makefile.in: Rebuilt.
+ 	* include/Makefile.am (include_HEADERS): Add jvmpi.h.
+

From-SVN: r33339

1 files changed, 4 insertions, 4 deletions

diff --git a/libjava/boehm.cc b/libjava/boehm.cc
index 6450df75d58..62b9a86fc97 100644
--- a/libjava/boehm.cc
+++ b/libjava/boehm.cc
@@ -87,7 +87,7 @@ _Jv_MarkObj (void *addr, void *msp, void *msl, void * /*env*/)
   _Jv_VTable *dt = *(_Jv_VTable **) addr;
   // We check this in case a GC occurs before the vtbl is set.  FIXME:
   // should use allocation lock while initializing object.
-  if (! dt)
+  if (__builtin_expect (! dt, 0))
     return mark_stack_ptr;
   jclass klass = dt->clas;
 
@@ -98,7 +98,7 @@ _Jv_MarkObj (void *addr, void *msp, void *msl, void * /*env*/)
   p = (ptr_t) klass;
   MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, obj, o2label);
 
-  if (klass == &ClassClass)
+  if (__builtin_expect (klass == &ClassClass, 0))
     {
       jclass c = (jclass) addr;
 
@@ -281,7 +281,7 @@ _Jv_MarkArray (void *addr, void *msp, void *msl, void * /*env*/)
   _Jv_VTable *dt = *(_Jv_VTable **) addr;
   // We check this in case a GC occurs before the vtbl is set.  FIXME:
   // should use allocation lock while initializing object.
-  if (! dt)
+  if (__builtin_expect (! dt, 0))
     return mark_stack_ptr;
   jclass klass = dt->clas;
 
@@ -329,7 +329,7 @@ _Jv_AllocBytes (jsize size)
   // guarantee that PTRFREE allocations are zeroed.  Note that we
   // don't have to do this for other allocation types because we set
   // the `ok_init' flag in the type descriptor.
-  if (r != NULL)
+  if (__builtin_expect (r != NULL, !NULL))
     memset (r, 0, size);
   return r;
 }