This commit is contained in:
jfrijters 2005-07-25 09:53:25 +00:00
Родитель 4caadd9ef5
Коммит 5bd3743200
9 изменённых файлов: 40 добавлений и 8 удалений

Просмотреть файл

@ -49,7 +49,7 @@ using System.Runtime.CompilerServices;
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("0.18.0.0")] [assembly: AssemblyVersion("0.19.*")]
// //
// In order to sign your assembly you must specify a key to use. Refer to the // In order to sign your assembly you must specify a key to use. Refer to the

Просмотреть файл

@ -9,7 +9,7 @@
<property name="ecj.compiler" value="true" /> <property name="ecj.compiler" value="true" />
<target name="HEAD"> <target name="HEAD">
<property name="Classpath.dir" value="${nant.project.basedir}/../../classpath-0.17" /> <property name="Classpath.dir" value="${nant.project.basedir}/../../classpath" />
<property name="allsources" value="allsources.lst" /> <property name="allsources" value="allsources.lst" />
<call target="IKVM.GNU.Classpath.dll" /> <call target="IKVM.GNU.Classpath.dll" />
</target> </target>
@ -48,7 +48,7 @@
<target name="IKVM.GNU.Classpath.dll" depends="classes"> <target name="IKVM.GNU.Classpath.dll" depends="classes">
<exec program="${nant.project.basedir}/../bin/ikvmc.exe" useruntimeengine="true"> <exec program="${nant.project.basedir}/../bin/ikvmc.exe" useruntimeengine="true">
<arg value="-version:0.18.0.0" /> <arg value="-version:0.19.*" />
<arg value="${signoption}" /> <arg value="${signoption}" />
<arg value="-compressresources" /> <arg value="-compressresources" />
<arg value="-opt:fields" /> <arg value="-opt:fields" />

Просмотреть файл

@ -437,4 +437,30 @@ final class VMClassLoader
} }
return ClassLoader.defaultGetSystemClassLoader(); return ClassLoader.defaultGetSystemClassLoader();
} }
/**
* If the VM wants to keep its own cache, this method can be replaced.
*/
static Class findLoadedClass(ClassLoader cl, String name)
{
if(name.startsWith("[") && name.endsWith(";"))
{
int rank = 1;
while(name.charAt(rank) == '[')
{
rank++;
}
if(name.charAt(rank) == 'L')
{
Class c = (Class)cl.loadedClasses.get(name.substring(rank + 1, name.length() - 1));
if(c != null)
{
return makeArrayClass(c, rank);
}
}
}
return (Class)cl.loadedClasses.get(name);
}
private static native Class makeArrayClass(Class c, int rank);
} }

Просмотреть файл

@ -49,7 +49,7 @@ using System.Runtime.CompilerServices;
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("0.18.0.0")] [assembly: AssemblyVersion("0.19.*")]
// //
// In order to sign your assembly you must specify a key to use. Refer to the // In order to sign your assembly you must specify a key to use. Refer to the

Просмотреть файл

@ -49,7 +49,7 @@ using System.Runtime.CompilerServices;
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("0.18.0.0")] [assembly: AssemblyVersion("0.19.*")]
// //
// In order to sign your assembly you must specify a key to use. Refer to the // In order to sign your assembly you must specify a key to use. Refer to the

Просмотреть файл

@ -49,7 +49,7 @@ using System.Runtime.CompilerServices;
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("0.18.0.0")] [assembly: AssemblyVersion("0.19.*")]
// //
// In order to sign your assembly you must specify a key to use. Refer to the // In order to sign your assembly you must specify a key to use. Refer to the

Просмотреть файл

@ -23,7 +23,7 @@
*/ */
.assembly JVM .assembly JVM
{ {
.ver 0:18:0:0 .ver 0:19:0:0
} }
.module JVM.DLL .module JVM.DLL

Просмотреть файл

@ -49,7 +49,7 @@ using System.Runtime.CompilerServices;
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("0.18.0.0")] [assembly: AssemblyVersion("0.19.*")]
// //
// In order to sign your assembly you must specify a key to use. Refer to the // In order to sign your assembly you must specify a key to use. Refer to the

Просмотреть файл

@ -652,6 +652,12 @@ namespace IKVM.NativeCode.java
} }
return null; return null;
} }
public static object makeArrayClass(object clazz, int rank)
{
TypeWrapper tw = VMClass.getWrapperFromClass(clazz);
return tw.MakeArrayType(rank).ClassObject;
}
} }
public class VMClass public class VMClass