summaryrefslogtreecommitdiff
path: root/libjava/prims.cc
diff options
context:
space:
mode:
authorbryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>2004-07-24 01:17:29 +0000
committerbryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>2004-07-24 01:17:29 +0000
commitb4b14ae31419a5087558c6f3b54ad187c326787f (patch)
tree2a0020f7a0787de7e1df677eb515c257dc704d33 /libjava/prims.cc
parentcbbefea46e5a749a5182df5770cc70f30e12aa2e (diff)
downloadgcc-b4b14ae31419a5087558c6f3b54ad187c326787f.tar.gz
2004-07-23 Bryce McKinlay <mckinlay@redhat.com>
* prims.cc (_Jv_InitPrimClass): Don't create an array class. (_Jv_CreateJavaVM): Don't pass array vtable parameter to _Jv_InitPrimClass. (DECLARE_PRIM_TYPE): Don't declare array vtables. * include/jvm.h (struct _Jv_ArrayVTable): Removed. * java/lang/Class.h (_Jv_InitPrimClass): Update friend declaration. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@85109 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/prims.cc')
-rw-r--r--libjava/prims.cc24
1 files changed, 10 insertions, 14 deletions
diff --git a/libjava/prims.cc b/libjava/prims.cc
index a0ad08e738f..0346b02371b 100644
--- a/libjava/prims.cc
+++ b/libjava/prims.cc
@@ -670,7 +670,6 @@ _Jv_NewMultiArray (jclass array_type, jint dimensions, ...)
// Ensure 8-byte alignment, for hash synchronization.
#define DECLARE_PRIM_TYPE(NAME) \
- _Jv_ArrayVTable _Jv_##NAME##VTable; \
java::lang::Class _Jv_##NAME##Class __attribute__ ((aligned (8)));
DECLARE_PRIM_TYPE(byte)
@@ -684,8 +683,7 @@ DECLARE_PRIM_TYPE(double)
DECLARE_PRIM_TYPE(void)
void
-_Jv_InitPrimClass (jclass cl, char *cname, char sig, int len,
- _Jv_ArrayVTable *array_vtable)
+_Jv_InitPrimClass (jclass cl, char *cname, char sig, int len)
{
using namespace java::lang::reflect;
@@ -702,8 +700,6 @@ _Jv_InitPrimClass (jclass cl, char *cname, char sig, int len,
cl->vtable = JV_PRIMITIVE_VTABLE;
cl->state = JV_STATE_DONE;
cl->depth = -1;
- if (sig != 'V')
- _Jv_NewArrayClass (cl, NULL, (_Jv_VTable *) array_vtable);
}
jclass
@@ -976,15 +972,15 @@ _Jv_CreateJavaVM (void* /*vm_args*/)
finit_name = _Jv_makeUtf8Const ("finit$", 6);
/* Initialize built-in classes to represent primitive TYPEs. */
- _Jv_InitPrimClass (&_Jv_byteClass, "byte", 'B', 1, &_Jv_byteVTable);
- _Jv_InitPrimClass (&_Jv_shortClass, "short", 'S', 2, &_Jv_shortVTable);
- _Jv_InitPrimClass (&_Jv_intClass, "int", 'I', 4, &_Jv_intVTable);
- _Jv_InitPrimClass (&_Jv_longClass, "long", 'J', 8, &_Jv_longVTable);
- _Jv_InitPrimClass (&_Jv_booleanClass, "boolean", 'Z', 1, &_Jv_booleanVTable);
- _Jv_InitPrimClass (&_Jv_charClass, "char", 'C', 2, &_Jv_charVTable);
- _Jv_InitPrimClass (&_Jv_floatClass, "float", 'F', 4, &_Jv_floatVTable);
- _Jv_InitPrimClass (&_Jv_doubleClass, "double", 'D', 8, &_Jv_doubleVTable);
- _Jv_InitPrimClass (&_Jv_voidClass, "void", 'V', 0, &_Jv_voidVTable);
+ _Jv_InitPrimClass (&_Jv_byteClass, "byte", 'B', 1);
+ _Jv_InitPrimClass (&_Jv_shortClass, "short", 'S', 2);
+ _Jv_InitPrimClass (&_Jv_intClass, "int", 'I', 4);
+ _Jv_InitPrimClass (&_Jv_longClass, "long", 'J', 8);
+ _Jv_InitPrimClass (&_Jv_booleanClass, "boolean", 'Z', 1);
+ _Jv_InitPrimClass (&_Jv_charClass, "char", 'C', 2);
+ _Jv_InitPrimClass (&_Jv_floatClass, "float", 'F', 4);
+ _Jv_InitPrimClass (&_Jv_doubleClass, "double", 'D', 8);
+ _Jv_InitPrimClass (&_Jv_voidClass, "void", 'V', 0);
// Turn stack trace generation off while creating exception objects.
_Jv_InitClass (&java::lang::VMThrowable::class$);