OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

natClass.cc (_Jv_LayoutVTableMethods): Cast pointers to uaddr, not int. 

* java/lang/natClass.cc (_Jv_LayoutVTableMethods): Cast pointers
	to uaddr, not int.
	* java/lang/natClassLoader.cc (_Jv_PrepareCompiledClass):
	Likewise.

From-SVN: r89346
This commit is contained in:
Andreas Schwab 2004-10-20 21:42:33 +00:00 committed by Andreas Schwab
parent a03ea89be3
commit b3a450236a
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjava/ChangeLog
View File

@ -1,3 +1,10 @@
2004-10-20 Andreas Schwab <schwab@suse.de>
* java/lang/natClass.cc (_Jv_LayoutVTableMethods): Cast pointers
to uaddr, not int.
* java/lang/natClassLoader.cc (_Jv_PrepareCompiledClass):
Likewise.
2004-10-20 Michael Koch <konqueror@gmx.de>
* javax/print/attribute/standard/ColorSupported.java,

6
libjava/java/lang/natClass.cc
View File

@ -1816,11 +1816,11 @@ _Jv_LayoutVTableMethods (jclass klass)
// If superclass looks like a constant pool entry,
// resolve it now.
if ((uaddr)superclass < (uaddr)klass->constants.size)
if ((uaddr) superclass < (uaddr) klass->constants.size)
{
if (klass->state < JV_STATE_LINKED)
{
_Jv_Utf8Const *name = klass->constants.data[(int)superclass].utf8;
_Jv_Utf8Const *name = klass->constants.data[(uaddr) superclass].utf8;
superclass = _Jv_FindClass (name, klass->loader);
if (! superclass)
{
@ -1828,7 +1828,7 @@ _Jv_LayoutVTableMethods (jclass klass)
}
}
else
superclass = klass->constants.data[(int)superclass].clazz;
superclass = klass->constants.data[(uaddr) superclass].clazz;
}
if (superclass != NULL && superclass->vtable_method_count == -1)

4
libjava/java/lang/natClassLoader.cc
View File

@ -131,12 +131,12 @@ _Jv_PrepareCompiledClass (jclass klass)
// If superclass looks like a constant pool entry,
// resolve it now.
if ((uaddr) klass->superclass < pool->size)
klass->superclass = pool->data[(int) klass->superclass].clazz;
klass->superclass = pool->data[(uaddr) klass->superclass].clazz;
// Likewise for interfaces.
for (int i = 0; i < klass->interface_count; i++)
if ((uaddr) klass->interfaces[i] < pool->size)
klass->interfaces[i] = pool->data[(int) klass->interfaces[i]].clazz;
klass->interfaces[i] = pool->data[(uaddr) klass->interfaces[i]].clazz;
// Resolve the remaining constant pool entries.
for (int index = 1; index < pool->size; ++index)