Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode: [3084] branches/jikesRVM/core/src
|
From: <ans...@us...> - 2007-01-17 01:13:49
|
Revision: 3084
http://jnode.svn.sourceforge.net/jnode/?rev=3084&view=rev
Author: ansari82
Date: 2007-01-16 17:13:48 -0800 (Tue, 16 Jan 2007)
Log Message:
-----------
Latest compilable list
Modified Paths:
--------------
branches/jikesRVM/core/src/classpath/vm/java/lang/ClassLoader.java
branches/jikesRVM/core/src/core/com/ibm/JikesRVM/JikesRVMOptCompiler.java
branches/jikesRVM/core/src/core/org/jnode/vm/LoadCompileService.java
branches/jikesRVM/core/src/test/org/jnode/test/JikesTest.java
Modified: branches/jikesRVM/core/src/classpath/vm/java/lang/ClassLoader.java
===================================================================
--- branches/jikesRVM/core/src/classpath/vm/java/lang/ClassLoader.java 2007-01-16 23:32:46 UTC (rev 3083)
+++ branches/jikesRVM/core/src/classpath/vm/java/lang/ClassLoader.java 2007-01-17 01:13:48 UTC (rev 3084)
@@ -288,16 +288,21 @@
}
/* Can the class been loaded by a parent? */
- try {
- if ((parent == null) || skipParentLoader(name)) {
+ if ((parent == null) || skipParentLoader(name)) {
+ try {
if (vmClassLoader.isSystemClassLoader()) {
return vmClassLoader.loadClass(name, resolve).asClass();
}
- } else {
+ } catch (ClassNotFoundException e) {
+ // e.printStackTrace();
+ }
+ }
+ else {
+ try {
return parent.loadClass(name, resolve);
+ } catch (ClassNotFoundException e) {
+ // e.printStackTrace();
}
- } catch (ClassNotFoundException e) {
- // e.printStackTrace();
}
/* Still not found, we have to do it ourself. */
final Class c = findClass(name);
Modified: branches/jikesRVM/core/src/core/com/ibm/JikesRVM/JikesRVMOptCompiler.java
===================================================================
--- branches/jikesRVM/core/src/core/com/ibm/JikesRVM/JikesRVMOptCompiler.java 2007-01-16 23:32:46 UTC (rev 3083)
+++ branches/jikesRVM/core/src/core/com/ibm/JikesRVM/JikesRVMOptCompiler.java 2007-01-17 01:13:48 UTC (rev 3084)
@@ -221,76 +221,31 @@
public static boolean compilableMethod(VmMethod vmMethod) {
if (
-// vmMethod.getDeclaringClass().getName().startsWith("java.io")
-// || vmMethod.getDeclaringClass().getName().startsWith("java.lang")
-// || vmMethod.getDeclaringClass().getName().startsWith("java.net")
-// || vmMethod.getDeclaringClass().getName().startsWith("java.nio")
-// || vmMethod.getDeclaringClass().getName().startsWith("java.security")
-// || vmMethod.getDeclaringClass().getName().startsWith("java.util")
-// || vmMethod.getDeclaringClass().getName().startsWith("javax")
-// || vmMethod.getDeclaringClass().getName().startsWith("gnu.classpath")
-// || vmMethod.getDeclaringClass().getName().startsWith("gnu.java")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.assembler")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.boot")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.naming")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.plugin")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.protocol")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.security")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.system")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.util")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.bytecode")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.classmgr")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.compiler")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.isolate")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.scheduler")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.x86.compiler")
+ vmMethod.getDeclaringClass().getName().startsWith("java.io")
+ || vmMethod.getDeclaringClass().getName().startsWith("java.lang")
+ || vmMethod.getDeclaringClass().getName().startsWith("java.net")
+ || vmMethod.getDeclaringClass().getName().startsWith("java.nio")
+ || vmMethod.getDeclaringClass().getName().startsWith("java.security")
+ || vmMethod.getDeclaringClass().getName().startsWith("java.util")
+ || vmMethod.getDeclaringClass().getName().startsWith("javax")
+ || vmMethod.getDeclaringClass().getName().startsWith("gnu.classpath")
+ || vmMethod.getDeclaringClass().getName().startsWith("gnu.java")
+ || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.assembler")
+ || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.boot")
+ || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.naming")
+ || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.plugin")
+ || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.protocol")
+ || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.security")
+ || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.system")
+ || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.util")
+ || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.bytecode")
+ || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.classmgr")
+ || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.compiler")
+ || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.isolate")
+ || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.scheduler")
+ || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.x86.compiler")
// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm")
-// && !(
-// vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.VmSystemClassLoader")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.VmReflection")
-// && vmMethod.getName().contentEquals("invoke") //manipulates ESP, which Jikes needs to control
-// )
-
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.A")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.B")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.C")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.H")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.I")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.J")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.L")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.M")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.O")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.R")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.S")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.U")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.Vi")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.VmA")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.VmE")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.VmJ")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.VmM")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.VmP")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.VmR")
-// && !vmMethod.getName().contentEquals("invoke") //manipulates ESP, which Jikes needs to control
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.VmSt")
-// || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.VmSystem")
- vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.VmSystemClassLoader$")
- || vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.VmSystemClassLoader")
-//
- && (
- vmMethod.getName().contains("init")
- || vmMethod.getName().startsWith("a")
- || vmMethod.getName().startsWith("c")
- || vmMethod.getName().startsWith("d")
- || vmMethod.getName().startsWith("f")
- || vmMethod.getName().startsWith("g")
- || vmMethod.getName().startsWith("i")
- || vmMethod.getName().startsWith("l")
- || vmMethod.getName().startsWith("p")
- || vmMethod.getName().startsWith("r")
- || vmMethod.getName().startsWith("s")
-
- )
-
+// && !vmMethod.getDeclaringClass().getName().startsWith("org.jnode.vm.VmSystemClassLoader")
)
{
return true;
@@ -301,7 +256,7 @@
public void compileBootstrap(VmMethod method, NativeStream os,
int level) {
VM_BootstrapClassLoader.fromJikesCompiler = method.getDeclaringClass().getLoader();
- System.out.println(method.getFullName());
+// System.out.println(method.getFullName());
int start = os.getLength();
final CompiledMethod cm;
final boolean abstractM = method.isAbstract();
Modified: branches/jikesRVM/core/src/core/org/jnode/vm/LoadCompileService.java
===================================================================
--- branches/jikesRVM/core/src/core/org/jnode/vm/LoadCompileService.java 2007-01-16 23:32:46 UTC (rev 3083)
+++ branches/jikesRVM/core/src/core/org/jnode/vm/LoadCompileService.java 2007-01-17 01:13:48 UTC (rev 3084)
@@ -211,7 +211,7 @@
}
if (vmMethod.getNativeCodeOptLevel() < optLevel) {
if(cmps[index] == optCompiler &&
- !(vmMethod.getDeclaringClass().getName().startsWith("org.jnode.test")
+ (!vmMethod.getDeclaringClass().getName().startsWith("org.jnode.test")
|| vmMethod.hasNoOptCompilePragma()))
cmp = fallbackCompiler;
else
Modified: branches/jikesRVM/core/src/test/org/jnode/test/JikesTest.java
===================================================================
--- branches/jikesRVM/core/src/test/org/jnode/test/JikesTest.java 2007-01-16 23:32:46 UTC (rev 3083)
+++ branches/jikesRVM/core/src/test/org/jnode/test/JikesTest.java 2007-01-17 01:13:48 UTC (rev 3084)
@@ -31,6 +31,7 @@
System.out.println("jikesAllocMultiArray expect true, return "+(jikesAllocMultiArray()[1][1]==localSTATIC?true:false));
System.out.println("jikesMonitor expect true, return "+jikesMonitor());
System.out.print( "jikesTryCatchException expect true, return ");jikesTryCatch();
+ System.out.print( "jikesComplexException expect true, return ");jikesComplexException(true);
t0 = time();System.out.print("jikestestSmallLoop:"+jikestestsmallloop()+" time:");t1 = time();System.out.println(t1 - t0);
t0 = time();System.out.print("jikestestBigLoop: "+jikestestbigloop() +" time:");t1 = time();System.out.println(t1 - t0);
sayHi2();
@@ -77,6 +78,21 @@
}
}
+ private static boolean jikesComplexException(boolean first) {
+
+ boolean local = first;
+ try{
+ if(local) {
+ jikesTryException();
+ } else {
+ jikesTryException();
+ }
+ } catch (Exception e) {
+ //Do nothing
+ }
+ return local;
+ }
+
private static boolean jikesMonitor() {
Object a = new Object();
boolean b = false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
