From 7941ceabf0f14279e93443a63ca4d355f3a88830 Mon Sep 17 00:00:00 2001 From: Anthony Green Date: Tue, 10 Aug 1999 05:32:23 +0000 Subject: [multiple changes] Mon Aug 9 18:33:38 1999 Rainer Orth * Makefile: Rebuilt. * Makefile.am (toolexeclibdir): Add $(MULTISUBDIR) even for native builds. * java/net/natPlainSocketImpl.cc: Include only if present. * configure: Rebuilt. * configure.in: Properly align --help output, fix capitalization and punctuation. * acinclude.m4: Likewise. 1999-08-09 Kresten Krab Thorup * include/javaprims.h (_Jv_word, _Jv_word2): New types. * include/java-interp.h (_Jv_InterpMethodInvocation): Use _Jv_word. (_Jv_callInterpretedMethod): Unused. Remove. (_Jv_InterpMethod::run,run_normal,run_synch_object,run_synch_class): Use ffi_raw. * include/java-cpool.h (_Jv_get, _Jv_put): Remove. (_Jv_{store,load}{Indexes,Int,Float,Long,Double}): Use _Jv_word. * boehm.cc (_Jv_MarkObj): Use _Jv_word. * interpret.cc: use _Jv_word. * defineclass.cc: use_Jv_word. * resolve.cc: Use _Jv_word. (_Jv_ResolvePoolEntry): Return _Jv_word. * java/lang/Class.h (_Jv_Constants): Use _Jv_word for cpool. * java/lang/natClassLoader.cc (_Jv_InternClassStrings): Use _Jv_word. * interpret.cc (gnu::gcj::runtime::MethodInvocation::continue1): Change comment. From-SVN: r28641 --- libjava/java/lang/Class.h | 4 ++-- libjava/java/lang/natClassLoader.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'libjava/java/lang') diff --git a/libjava/java/lang/Class.h b/libjava/java/lang/Class.h index df55425..c4600bf 100644 --- a/libjava/java/lang/Class.h +++ b/libjava/java/lang/Class.h @@ -49,7 +49,7 @@ struct _Jv_Constants { jint size; jbyte *tags; - void **data; + _Jv_word *data; }; struct _Jv_Method @@ -192,7 +192,7 @@ private: friend int _Jv_DetermineVTableIndex (jclass, _Jv_Utf8Const *, _Jv_Utf8Const*); friend void _Jv_InitField (jobject, jclass, int); - friend void* _Jv_ResolvePoolEntry (jclass, int); + friend _Jv_word _Jv_ResolvePoolEntry (jclass, int); friend void _Jv_PrepareClass (jclass); friend class _Jv_ClassReader; diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc index 13452ec..0caaa4c 100644 --- a/libjava/java/lang/natClassLoader.cc +++ b/libjava/java/lang/natClassLoader.cc @@ -233,8 +233,8 @@ _Jv_InternClassStrings(jclass klass) if (pool->tags[i] == JV_CONSTANT_String) { jstring str; - str = _Jv_NewStringUtf8Const ((_Jv_Utf8Const *) pool->data[i]); - pool->data[i] = (void *) str; + str = _Jv_NewStringUtf8Const (pool->data[i].utf8); + pool->data[i].string = str; pool->tags[i] |= JV_CONSTANT_ResolvedFlag; } } -- cgit v1.1