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

natClass.cc (_Jv_LayoutInterfaceMethods): New method.

Browse Source 
2004-04-21  Bryce McKinlay  <mckinlay@redhat.com>

        * java/lang/natClass.cc (_Jv_LayoutInterfaceMethods): New method.
        Set method->index values for interface methods to their itable
	index.
        (initializeClass): Call _Jv_LayoutInterfaceMethods.

From-SVN: r80978
This commit is contained in:
Bryce McKinlay 2004-04-21 19:26:22 +00:00 committed by Bryce McKinlay
parent a031e78196
commit 746ecc7813
3 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -1,3 +1,9 @@
2004-04-21 Bryce McKinlay <mckinlay@redhat.com>
* java/lang/natClass.cc (_Jv_LayoutInterfaceMethods): New method.
Set method->index values for interface methods to their itable index.
(initializeClass): Call _Jv_LayoutInterfaceMethods.
2004-04-21 Michael Koch <konqueror@gmx.de>
* java/nio/DirectByteBufferImpl.java

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

@ -339,6 +339,7 @@ private:
friend jshort _Jv_AppendPartialITable (jclass, jclass, void **, jshort);
friend jshort _Jv_FindIIndex (jclass *, jshort *, jshort);
friend void _Jv_LinkSymbolTable (jclass);
friend void _Jv_LayoutInterfaceMethods (jclass);
friend void _Jv_LayoutVTableMethods (jclass klass);
friend void _Jv_SetVTableEntries (jclass, _Jv_VTable *, jboolean *);
friend void _Jv_MakeVTable (jclass);

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

@ -790,6 +790,9 @@ java::lang::Class::initializeClass (void)
}
}
if (isInterface ())
_Jv_LayoutInterfaceMethods (this);
_Jv_PrepareConstantTimeTables (this);
if (vtable == NULL)
@ -1787,6 +1790,20 @@ _Jv_abstractMethodError (void)
throw new java::lang::AbstractMethodError();
}
// Set itable method indexes for members of interface IFACE.
void
_Jv_LayoutInterfaceMethods (jclass iface)
{
if (! iface->isInterface())
return;
// itable indexes start at 1.
// FIXME: Static initalizers currently get a NULL placeholder entry in the
// itable so they are also assigned an index here.
for (int i = 0; i < iface->method_count; i++)
iface->methods[i].index = i + 1;
}
// Prepare virtual method declarations in KLASS, and any superclasses as
// required, by determining their vtable index, setting method->index, and
// finally setting the class's vtable_method_count. Must be called with the