mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2024-12-22 00:59:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Class.h (_Jv_Self): New union type.

Browse Source 
* java/lang/Class.h (_Jv_Self): New union type.
	(Class): Manipulate vtable pointer via _Jv_Self union. Thanks to
	Jeff Sturm and Fergus Henderson.

	* java/lang/ClassLoader.java: Remove dead code fragment.

From-SVN: r41876
This commit is contained in:
Bryce McKinlay 2001-05-06 13:42:11 +00:00 committed by Bryce McKinlay
parent 2a7f63c436
commit 7026707d15
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libjava/ChangeLog
View File

@ -1,3 +1,13 @@
2001-05-06 Bryce McKinlay <bryce@waitaki.otago.ac.nz>
* java/lang/Class.h (_Jv_Self): New union type.
(Class): Manipulate vtable pointer via _Jv_Self union. Thanks to
Jeff Sturm and Fergus Henderson.
2001-05-06 Bryce McKinlay <bryce@waitaki.otago.ac.nz>
* java/lang/ClassLoader.java: Remove dead code fragment.
2001-05-03 Martin Kahlert <martin.kahlert@infineon.com>
* jni.cc (_Jv_JNI_GetPrimitiveArrayRegion): Fixed bounds

12
libjava/java/lang/Class.h
View File

@ -99,6 +99,13 @@ struct _Jv_ifaces
jshort count;
};
// Used for vtable pointer manipulation.
union _Jv_Self
{
char *vtable_ptr;
jclass self;
};
#define JV_PRIMITIVE_VTABLE ((_Jv_VTable *) -1)
#define JV_CLASS(Obj) ((jclass) (*(_Jv_VTable **) Obj)->clas)
@ -211,9 +218,8 @@ public:
// C++ ctors set the vtbl pointer to point at an offset inside the vtable
// object. That doesn't work for Java, so this hack adjusts it back.
void *p = ((void **)this)[0];
((void **)this)[0] = (void *)((char *)p-2*sizeof (void *));
((_Jv_Self *)this)->vtable_ptr -= 2 * sizeof (void *);
// We must initialize every field of the class. We do this in the
// same order they are declared in Class.h, except for fields that
// are initialized to NULL.

4
libjava/java/lang/ClassLoader.java
View File

@ -91,10 +91,6 @@ public abstract class ClassLoader
return loadClass (name, false);
}
/* findClass implementation for the system classloader.
native Class systemFindClass(String name)
throws java.lang.ClassNotFoundException;
/**
* Loads the class by the given name. The default implementation
* will search for the class in the following order (similar to jdk 1.2)