+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.
+
2000-04-21 Tom Tromey <tromey@cygnus.com>
* java/io/PipedInputStream.java, java/io/PipedOutputStream.java:
_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;
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;
_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;
// 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;
}
AUTOMAKE_OPTIONS = foreign no-installinfo
-include_HEADERS = jni.h
+include_HEADERS = jni.h jvmpi.h
AUTOMAKE_OPTIONS = foreign no-installinfo
-include_HEADERS = jni.h
+include_HEADERS = jni.h jvmpi.h
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-TAR = tar
+TAR = gtar
GZIP_ENV = --best
all: all-redirect
.SUFFIXES:
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
- cp -pr $$/$$file $(distdir)/$$file; \
+ cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
#ifndef __JAVA_JVM_H__
#define __JAVA_JVM_H__
+// FIXME: __builtin_expect doesn't work yet.
+#define __builtin_expect(A,B) (A)
+
#include <gcj/javaprims.h>
#include <java-assert.h>
void
java::lang::Object::notify (void)
{
- if (INIT_NEEDED (this))
+ if (__builtin_expect (INIT_NEEDED (this), 0))
sync_init ();
_Jv_SyncInfo *si = (_Jv_SyncInfo *) sync_info;
- if (_Jv_CondNotify (&si->condition, &si->mutex))
+ if (__builtin_expect (_Jv_CondNotify (&si->condition, &si->mutex), 0))
JvThrow (new IllegalMonitorStateException(JvNewStringLatin1
("current thread not owner")));
}
void
java::lang::Object::notifyAll (void)
{
- if (INIT_NEEDED (this))
+ if (__builtin_expect (INIT_NEEDED (this), 0))
sync_init ();
_Jv_SyncInfo *si = (_Jv_SyncInfo *) sync_info;
- if (_Jv_CondNotifyAll (&si->condition, &si->mutex))
+ if (__builtin_expect (_Jv_CondNotifyAll (&si->condition, &si->mutex), 0))
JvThrow (new IllegalMonitorStateException(JvNewStringLatin1
("current thread not owner")));
}
void
java::lang::Object::wait (jlong timeout, jint nanos)
{
- if (INIT_NEEDED (this))
+ if (__builtin_expect (INIT_NEEDED (this), 0))
sync_init ();
- if (timeout < 0 || nanos < 0 || nanos > 999999)
+ if (__builtin_expect (timeout < 0 || nanos < 0 || nanos > 999999, 0))
JvThrow (new IllegalArgumentException);
_Jv_SyncInfo *si = (_Jv_SyncInfo *) sync_info;
switch (_Jv_CondWait (&si->condition, &si->mutex, timeout, nanos))
_Jv_MonitorEnter (jobject obj)
{
#ifndef HANDLE_SEGV
- if (! obj)
+ if (__builtin_expect (! obj, 0))
JvThrow (new java::lang::NullPointerException);
#endif
- if (INIT_NEEDED (obj))
+ if (__builtin_expect (INIT_NEEDED (obj), 0))
obj->sync_init ();
_Jv_SyncInfo *si = (_Jv_SyncInfo *) obj->sync_info;
return _Jv_MutexLock (&si->mutex);
JvAssert (obj);
JvAssert (! INIT_NEEDED (obj));
_Jv_SyncInfo *si = (_Jv_SyncInfo *) obj->sync_info;
- if (_Jv_MutexUnlock (&si->mutex))
+ if (__builtin_expect (_Jv_MutexUnlock (&si->mutex), 0))
JvThrow (new java::lang::IllegalMonitorStateException);
return 0;
}
_Jv_InitClass (c);
jobject obj = (jobject) _Jv_AllocObj (size);
- if (! obj)
+ if (__builtin_expect (! obj, 0))
JvThrow (no_memory);
*((_Jv_VTable **) obj) = c->vtable;
#ifdef ENABLE_JVMPI
// Service JVMPI request.
- if (_Jv_JVMPI_Notify_OBJECT_ALLOC)
+ if (__builtin_expect (_Jv_JVMPI_Notify_OBJECT_ALLOC != 0, 0))
{
JVMPI_Event event;
jobjectArray
_Jv_NewObjectArray (jsize count, jclass elementClass, jobject init)
{
- if (count < 0)
+ if (__builtin_expect (count < 0, 0))
JvThrow (new java::lang::NegativeArraySizeException);
JvAssert (! elementClass->isPrimitive ());
elementClass);
// Check for overflow.
- if ((size_t) count > (SIZE_T_MAX - size) / sizeof (jobject))
+ if (__builtin_expect ((size_t) count >
+ (SIZE_T_MAX - size) / sizeof (jobject), 0));
JvThrow (no_memory);
size += count * sizeof (jobject);
jclass clas = _Jv_FindArrayClass (elementClass, 0);
obj = (jobjectArray) _Jv_AllocArray (size);
- if (! obj)
+ if (__builtin_expect (! obj, 0))
JvThrow (no_memory);
obj->length = count;
jobject* ptr = elements(obj);
_Jv_NewPrimArray (jclass eltype, jint count)
{
int elsize = eltype->size();
- if (count < 0)
+ if (__builtin_expect (count < 0, 0))
JvThrow (new java::lang::NegativeArraySizeException ());
JvAssert (eltype->isPrimitive ());
size_t size = (size_t) _Jv_GetArrayElementFromElementType (dummy, eltype);
// Check for overflow.
- if ((size_t) count > (SIZE_T_MAX - size) / elsize)
+ if (__builtin_expect ((size_t) count >
+ (SIZE_T_MAX - size) / elsize, 0))
JvThrow (no_memory);
__JArray *arr = (__JArray*) _Jv_AllocObj (size + elsize * count);
- if (! arr)
+ if (__builtin_expect (! arr, 0))
JvThrow (no_memory);
arr->length = count;
// Note that we assume we are given zeroed memory by the allocator.
void *
_Jv_Malloc (jsize size)
{
- if (size == 0)
+ if (__builtin_expect (size == 0, 0))
size = 1;
void *ptr = malloc ((size_t) size);
- if (ptr == NULL)
+ if (__builtin_expect (ptr == NULL, 0))
JvThrow (no_memory);
return ptr;
}
void *
_Jv_Realloc (void *ptr, jsize size)
{
- if (size == 0)
+ if (__builtin_expect (size == 0, 0))
size = 1;
ptr = realloc (ptr, (size_t) size);
- if (ptr == NULL)
+ if (__builtin_expect (ptr == NULL, 0))
JvThrow (no_memory);
return ptr;
}
void *
_Jv_MallocUnchecked (jsize size)
{
- if (size == 0)
+ if (__builtin_expect (size == 0, 0))
size = 1;
return malloc ((size_t) size);
}
jint
_Jv_divI (jint dividend, jint divisor)
{
- if (divisor == 0)
+ if (__builtin_expect (divisor == 0, 0))
_Jv_Throw (arithexception);
if (dividend == (jint) 0x80000000L && divisor == -1)
jint
_Jv_remI (jint dividend, jint divisor)
{
- if (divisor == 0)
+ if (__builtin_expect (divisor == 0, 0))
_Jv_Throw (arithexception);
if (dividend == (jint) 0x80000000L && divisor == -1)
jlong
_Jv_divJ (jlong dividend, jlong divisor)
{
- if (divisor == 0)
+ if (__builtin_expect (divisor == 0, 0))
_Jv_Throw (arithexception);
if (dividend == (jlong) 0x8000000000000000LL && divisor == -1)
jlong
_Jv_remJ (jlong dividend, jlong divisor)
{
- if (divisor == 0)
+ if (__builtin_expect (divisor == 0, 0))
_Jv_Throw (arithexception);
if (dividend == (jlong) 0x8000000000000000LL && divisor == -1)
projects / platform / upstream / gcc.git / commitdiff