Mercurial > hg > graal-compiler
changeset 2690:abb4cc15283d
Sync with latest renamings
author | Gilles Duboscq <gilles.duboscq@oracle.com> |
---|---|
date | Wed, 18 May 2011 11:53:06 +0200 |
parents | 8fcf5179aafd |
children | 4149feada801 7b7dbe19fafb |
files | graal/GraalCompiler/.classpath graal/GraalCompiler/src/com/sun/c1x/value/ValueUtil.java graal/GraalRuntime/.classpath runtests.sh |
diffstat | 4 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/GraalCompiler/.classpath Wed May 18 09:44:05 2011 +0200 +++ b/graal/GraalCompiler/.classpath Wed May 18 11:53:06 2011 +0200 @@ -2,9 +2,9 @@ <classpath> <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" exported="true" kind="src" path="/CRI"/> <classpathentry combineaccessrules="false" kind="src" path="/GraalGraph"/> <classpathentry combineaccessrules="false" kind="src" path="/GraalGraphviz"/> + <classpathentry combineaccessrules="false" kind="src" path="/com.oracle.max.cri"/> <classpathentry combineaccessrules="false" kind="src" path="/com.oracle.max.asm"/> <classpathentry kind="output" path="bin"/> </classpath>
--- a/graal/GraalCompiler/src/com/sun/c1x/value/ValueUtil.java Wed May 18 09:44:05 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/value/ValueUtil.java Wed May 18 11:53:06 2011 +0200 @@ -23,6 +23,7 @@ package com.sun.c1x.value; import com.sun.c1x.ir.*; +import com.sun.c1x.util.*; import com.sun.cri.ci.*; @@ -73,7 +74,7 @@ } public static boolean typeMismatch(Value x, Value y) { - return y == null || x.kind != y.kind; + return y == null || !Util.archKindsEqual(x, y); } public static boolean isDoubleWord(Value x) {
--- a/graal/GraalRuntime/.classpath Wed May 18 09:44:05 2011 +0200 +++ b/graal/GraalRuntime/.classpath Wed May 18 11:53:06 2011 +0200 @@ -2,10 +2,10 @@ <classpath> <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> - <classpathentry combineaccessrules="false" kind="src" path="/Assembler"/> - <classpathentry combineaccessrules="false" kind="src" path="/CRI"/> <classpathentry combineaccessrules="false" kind="src" path="/GraalCompiler"/> + <classpathentry combineaccessrules="false" kind="src" path="/com.oracle.max.base"/> + <classpathentry combineaccessrules="false" kind="src" path="/com.oracle.max.cri"/> <classpathentry combineaccessrules="false" kind="src" path="/com.oracle.max.asm"/> - <classpathentry combineaccessrules="false" kind="src" path="/com.oracle.max.base"/> + <classpathentry combineaccessrules="false" kind="src" path="/com.oracle.max.asmdis"/> <classpathentry kind="output" path="bin"/> </classpath>
--- a/runtests.sh Wed May 18 09:44:05 2011 +0200 +++ b/runtests.sh Wed May 18 11:53:06 2011 +0200 @@ -11,4 +11,4 @@ echo "GRAAL is not defined. It must point to a maxine repository directory." exit 1; fi -${JDK7}/bin/java -client -d64 -graal -ea -esa -Xcomp -XX:+PrintCompilation -XX:CompileOnly=jtt -Xbootclasspath/p:"${MAXINE}/VM/bin" -Xbootclasspath/p:"${MAXINE}/com.oracle.max.base/bin" $1 test.com.sun.max.vm.compiler.JavaTester -verbose=1 -gen-run-scheme=false -run-scheme-package=all ${MAXINE}/VM/test/jtt/bytecode ${MAXINE}/VM/test/jtt/except ${MAXINE}/VM/test/jtt/hotpath ${MAXINE}/VM/test/jtt/jdk ${MAXINE}/VM/test/jtt/lang ${MAXINE}/VM/test/jtt/loop ${MAXINE}/VM/test/jtt/micro ${MAXINE}/VM/test/jtt/optimize ${MAXINE}/VM/test/jtt/reflect ${MAXINE}/VM/test/jtt/threads +${JDK7}/bin/java -client -d64 -graal -ea -esa -Xcomp -XX:+PrintCompilation -XX:CompileOnly=jtt -Xbootclasspath/p:"${MAXINE}/com.oracle.max.vm/bin" -Xbootclasspath/p:"${MAXINE}/com.oracle.max.base/bin" $1 test.com.sun.max.vm.compiler.JavaTester -verbose=1 -gen-run-scheme=false -run-scheme-package=all ${MAXINE}/com.oracle.max.vm/test/jtt/bytecode ${MAXINE}/com.oracle.max.vm/test/jtt/except ${MAXINE}/com.oracle.max.vm/test/jtt/hotpath ${MAXINE}/com.oracle.max.vm/test/jtt/jdk ${MAXINE}/com.oracle.max.vm/test/jtt/lang ${MAXINE}/com.oracle.max.vm/test/jtt/loop ${MAXINE}/com.oracle.max.vm/test/jtt/micro ${MAXINE}/com.oracle.max.vm/test/jtt/optimize ${MAXINE}/com.oracle.max.vm/test/jtt/reflect ${MAXINE}/com.oracle.max.vm/test/jtt/threads