diff options
author | Tom Tromey <tromey@gcc.gnu.org> | 2001-05-24 05:40:37 +0000 |
---|---|---|
committer | Tom Tromey <tromey@gcc.gnu.org> | 2001-05-24 05:40:37 +0000 |
commit | 3610e0d548721082f8b57cf3944cefc6b7605c49 (patch) | |
tree | ee7c6e621432b96c0092733f35d1cc29967a2b97 /libjava/resolve.cc | |
parent | 865e0a8389fed526cf9b68b33f7014117f956bca (diff) | |
download | gcc-3610e0d548721082f8b57cf3944cefc6b7605c49.zip gcc-3610e0d548721082f8b57cf3944cefc6b7605c49.tar.gz gcc-3610e0d548721082f8b57cf3944cefc6b7605c49.tar.bz2 |
[multiple changes]
2001-05-23 Tom Tromey <tromey@redhat.com>
* posix-threads.cc (_Jv_self_cache): Renamed from self_cache.
* gcj/Makefile.in: Rebuilt.
* gcj/Makefile.am (gcj_HEADERS): Added libgcj-config.h.
* gcj/javaprims.h: Include gcj/libgcj-config.h.
* gcj/libgcj-config.h.in: New file.
* libgcj.spec.in (*jc1): Added @HASH_SYNC_SPEC@.
* configure: Rebuilt.
* configure.in: Enable hash synchronization by default on some
platforms.
(HASH_SYNC_SPEC): New subst.
(AC_CONFIG_HEADER): Added gcj/libgcj-config.h.
Correctly use `test -z' instead of `test -n' in a couple places.
(JV_HASH_SYNCHRONIZATION): Use AC_DEFINE; don't add to
LIBGCJ_CXXFLAGS.
* configure.host (enable_java_net_default): Initialize.
(enable_hash_synchronization_default): New variable.
2001-05-23 Hans Boehm <Hans_Boehm@hp.com>
* boehm.cc (_Jv_MarkObj): Don't mark sync_info when hash
synchronization in use.
(_Jv_MarkArray): Likewise.
(_Jv_AllocBytes): Don't check return result.
(handle_out_of_memory): New function.
(_Jv_InitGC): Set GC_oom_fn.
(trace_one_vtable): New global.
(_Jv_AllocTraceOne): New function.
* configure.in: Added --enable-hash-synchronization.
* defineclass.cc, prims.cc, resolve.cc, java/lang/natString.cc,
java/net/natInetAddress.cc: Remove _Jv_AllocBytesChecked.
* nogc.cc (_Jv_AllocObj): Throw out-of-memory.
(_Jv_AllocArray): Likewise.
(_Jv_AllocBytes): Likewise.
(_Jv_AllocPtrFreeObject): New function.
(_Jv_AllocTraceOne): Likewise.
* posix-threads.cc (_Jv_ThreadRegister): Handle slow
pthread_self().
(self_cache): New global.
(_Jv_ThreadSelf_out_of_line): New function.
* prims.cc (_Jv_AllocBytesChecked): Removed.
(_Jv_ThrowNoMemory): New function.
(_Jv_AllocObject): Don't check for null return from allocator.
(_Jv_NewObjectArray): Likewise.
(_Jv_AllocPtrFreeObject): New function.
(_Jv_NewPrimArray): Allocate pointer-free object if possible.
* include/javaprims.h (_Jv_AllocPtrFreeObject): Declare.
(_Jv_MonitorEnter, _Jv_MonitorExit): Don't return value.
* include/boehm-gc.h (_Jv_AllocObj): Define.
(_Jv_AllocPtrFreeObj): Define.
* include/jvm.h (_Jv_AllocPtrFreeObj): Declare.
(_Jv_ThrowNoMemory): Declare.
(_Jv_AllocTraceOne): Declare.
(_Jv_AllocBytesChecked): Removed.
* include/posix-threads.h (_Jv_MutexInit, _Jv_MutexLock,
_Jv_MutexUnlock): Handle LOCK_DEBUG.
(_Jv_ThreadSelf): Handle case where system pthread_self() is
slow.
* java/lang/Class.h (Class): Declare _Jv_AllocPtrFreeObj as
friend.
* java/lang/Object.h (sync_info): Conditional upon presence of
hash synchronization.
* java/lang/natObject.cc: Much new code to handle thin locks and
hash synchronization.
* java/lang/natString.cc (_Jv_AllocString): Allocate pointer-free
object if possible.
From-SVN: r42519
Diffstat (limited to 'libjava/resolve.cc')
-rw-r--r-- | libjava/resolve.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libjava/resolve.cc b/libjava/resolve.cc index d165c80..9fbc963 100644 --- a/libjava/resolve.cc +++ b/libjava/resolve.cc @@ -583,7 +583,7 @@ _Jv_PrepareClass(jclass klass) // allocate static memory if (static_size != 0) { - char *static_data = (char*)_Jv_AllocBytesChecked (static_size); + char *static_data = (char*)_Jv_AllocBytes (static_size); memset (static_data, 0, static_size); @@ -697,7 +697,7 @@ _Jv_PrepareClass(jclass klass) /* allocate vtable structure */ _Jv_VTable *vtable = (_Jv_VTable*) - _Jv_AllocBytesChecked (sizeof (_Jv_VTable) + _Jv_AllocBytes (sizeof (_Jv_VTable) + (sizeof (void*) * (vtable_count))); vtable->clas = clz; vtable->gc_descr = _Jv_BuildGCDescr(clz); @@ -1076,7 +1076,7 @@ _Jv_InterpMethod::ncode () int arg_count = count_arguments (self->signature, staticp); ncode_closure *closure = - (ncode_closure*)_Jv_AllocBytesChecked (sizeof (ncode_closure) + (ncode_closure*)_Jv_AllocBytes (sizeof (ncode_closure) + arg_count * sizeof (ffi_type*)); init_cif (self->signature, @@ -1126,8 +1126,8 @@ _Jv_JNIMethod::ncode () int arg_count = count_arguments (self->signature, staticp); ncode_closure *closure = - (ncode_closure*)_Jv_AllocBytesChecked (sizeof (ncode_closure) - + arg_count * sizeof (ffi_type*)); + (ncode_closure*)_Jv_AllocBytes (sizeof (ncode_closure) + + arg_count * sizeof (ffi_type*)); ffi_type *rtype; init_cif (self->signature, @@ -1187,8 +1187,8 @@ _Jv_BuildResolvedMethod (_Jv_Method* method, int arg_count = count_arguments (method->signature, staticp); _Jv_ResolvedMethod* result = (_Jv_ResolvedMethod*) - _Jv_AllocBytesChecked (sizeof (_Jv_ResolvedMethod) - + arg_count*sizeof (ffi_type*)); + _Jv_AllocBytes (sizeof (_Jv_ResolvedMethod) + + arg_count*sizeof (ffi_type*)); result->stack_item_count = init_cif (method->signature, |