# HG changeset patch # User Christos Kotselidis # Date 1366721497 -7200 # Node ID 3f67694757413394d6e2ae56a740209143e5c48c # Parent e49ea51a33953b5493f741924b0a8d765cb1cda6# Parent ba3dfa9e36d8510c71c8a79f4f81c85aa597793a Merge diff -r e49ea51a3395 -r 3f6769475741 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AddLocationNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AddLocationNode.java Tue Apr 23 14:51:08 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AddLocationNode.java Tue Apr 23 14:51:37 2013 +0200 @@ -86,20 +86,20 @@ } @Override - public Value generateLea(LIRGeneratorTool gen, Value base) { - Value xAddr = getX().generateLea(gen, base); - return getY().generateLea(gen, xAddr); + public Value generateAddress(LIRGeneratorTool gen, Value base) { + Value xAddr = getX().generateAddress(gen, base); + return getY().generateAddress(gen, xAddr); } @Override public Value generateLoad(LIRGeneratorTool gen, Value base, DeoptimizingNode deopting) { - Value xAddr = getX().generateLea(gen, base); + Value xAddr = getX().generateAddress(gen, base); return getY().generateLoad(gen, xAddr, deopting); } @Override public void generateStore(LIRGeneratorTool gen, Value base, Value value, DeoptimizingNode deopting) { - Value xAddr = getX().generateLea(gen, base); + Value xAddr = getX().generateAddress(gen, base); getY().generateStore(gen, xAddr, value, deopting); } diff -r e49ea51a3395 -r 3f6769475741 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ComputeAddressNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ComputeAddressNode.java Tue Apr 23 14:51:08 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ComputeAddressNode.java Tue Apr 23 14:51:37 2013 +0200 @@ -49,7 +49,7 @@ @Override public void generate(LIRGeneratorTool gen) { - Value addr = getLocation().generateLea(gen, gen.operand(getObject())); + Value addr = getLocation().generateAddress(gen, gen.operand(getObject())); gen.setResult(this, addr); } } diff -r e49ea51a3395 -r 3f6769475741 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ConstantLocationNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ConstantLocationNode.java Tue Apr 23 14:51:08 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ConstantLocationNode.java Tue Apr 23 14:51:37 2013 +0200 @@ -55,7 +55,7 @@ } @Override - public Value generateLea(LIRGeneratorTool gen, Value base) { + public Value generateAddress(LIRGeneratorTool gen, Value base) { return gen.emitLea(base, displacement(), Value.ILLEGAL, 0); } diff -r e49ea51a3395 -r 3f6769475741 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/IndexedLocationNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/IndexedLocationNode.java Tue Apr 23 14:51:08 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/IndexedLocationNode.java Tue Apr 23 14:51:37 2013 +0200 @@ -90,7 +90,7 @@ } @Override - public Value generateLea(LIRGeneratorTool gen, Value base) { + public Value generateAddress(LIRGeneratorTool gen, Value base) { return gen.emitLea(base, displacement, gen.operand(index()), indexScaling()); } diff -r e49ea51a3395 -r 3f6769475741 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LocationNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LocationNode.java Tue Apr 23 14:51:08 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LocationNode.java Tue Apr 23 14:51:37 2013 +0200 @@ -99,7 +99,7 @@ // nothing to do... } - public abstract Value generateLea(LIRGeneratorTool gen, Value base); + public abstract Value generateAddress(LIRGeneratorTool gen, Value base); public abstract Value generateLoad(LIRGeneratorTool gen, Value base, DeoptimizingNode deopting); diff -r e49ea51a3395 -r 3f6769475741 graal/com.oracle.truffle.api/src/com/oracle/truffle/api/CompilerAsserts.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/CompilerAsserts.java Tue Apr 23 14:51:37 2013 +0200 @@ -0,0 +1,132 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package com.oracle.truffle.api; + +/** + * Assertions about the code produced by the Truffle compiler. All operations have no effect when + * either executed in the interpreter or in the compiled code. The assertions are checked during + * code generation and the Truffle compiler produces for failing assertions a stack trace that + * identifies the code position of the assertion in the context of the current compilation. + * + */ +public class CompilerAsserts { + + /** + * Assertion that this code position should never be reached during compilation. It can be used + * for exceptional code paths or rare code paths that should never be included in a compilation + * unit. See {@link CompilerDirectives#transferToInterpreter()} for the corresponding compiler + * directive. + */ + public static void neverPartOfCompilation() { + } + + /** + * Assertion that the corresponding value is reduced to a constant during compilation. + * + * @param value the value that must be constant during compilation + * @return the value given as parameter + */ + public static boolean compilationConstant(boolean value) { + return value; + } + + /** + * Assertion that the corresponding value is reduced to a constant during compilation. + * + * @param value the value that must be constant during compilation + * @return the value given as parameter + */ + public static byte compilationConstant(byte value) { + return value; + } + + /** + * Assertion that the corresponding value is reduced to a constant during compilation. + * + * @param value the value that must be constant during compilation + * @return the value given as parameter + */ + public static char compilationConstant(char value) { + return value; + } + + /** + * Assertion that the corresponding value is reduced to a constant during compilation. + * + * @param value the value that must be constant during compilation + * @return the value given as parameter + */ + public static short compilationConstant(short value) { + return value; + } + + /** + * Assertion that the corresponding value is reduced to a constant during compilation. + * + * @param value the value that must be constant during compilation + * @return the value given as parameter + */ + public static int compilationConstant(int value) { + return value; + } + + /** + * Assertion that the corresponding value is reduced to a constant during compilation. + * + * @param value the value that must be constant during compilation + * @return the value given as parameter + */ + public static long compilationConstant(long value) { + return value; + } + + /** + * Assertion that the corresponding value is reduced to a constant during compilation. + * + * @param value the value that must be constant during compilation + * @return the value given as parameter + */ + public static float compilationConstant(float value) { + return value; + } + + /** + * Assertion that the corresponding value is reduced to a constant during compilation. + * + * @param value the value that must be constant during compilation + * @return the value given as parameter + */ + public static double compilationConstant(double value) { + return value; + } + + /** + * Assertion that the corresponding value is reduced to a constant during compilation. + * + * @param value the value that must be constant during compilation + * @return the value given as parameter + */ + public static Object compilationConstant(Object value) { + return value; + } +} diff -r e49ea51a3395 -r 3f6769475741 graal/com.oracle.truffle.api/src/com/oracle/truffle/api/CompilerDirectives.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/CompilerDirectives.java Tue Apr 23 14:51:37 2013 +0200 @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package com.oracle.truffle.api; + +import java.util.concurrent.*; + +/** + * Directives that influence the optimizations of the Truffle compiler. All of the operations have + * no effect when executed in the Truffle interpreter. + */ +public class CompilerDirectives { + + private static final double SLOWPATH_PROBABILITY = 0.0001; + + /** + * Directive for the compiler to discontinue compilation at this code position and instead + * insert a transfer to the interpreter. + */ + public static void transferToInterpreter() { + } + + /** + * Directive for the compiler that the given runnable should only be executed in the interpreter + * and ignored in the compiled code. + * + * @param runnable the closure that should only be executed in the interpreter + */ + public static void interpreterOnly(Runnable runnable) { + runnable.run(); + } + + /** + * Directive for the compiler that the given callable should only be executed in the + * interpreter. + * + * @param callable the closure that should only be executed in the interpreter + * @return the result of executing the closure in the interpreter and null in the compiled code + * @throws Exception If the closure throws an exception when executed in the interpreter. + */ + public static T interpreterOnly(Callable callable) throws Exception { + return callable.call(); + } + + /** + * Directive for the compiler that the current path has a very low probability to be executed. + */ + public static void slowpath() { + injectBranchProbability(SLOWPATH_PROBABILITY); + } + + /** + * Injects a probability for the current path into the probability information of the + * immediately preceeding branch instruction. + * + * @param probability the probability value between 0.0 and 1.0 that should be injected + */ + public static void injectBranchProbability(double probability) { + assert probability >= 0.0 && probability <= 1.0; + } +} diff -r e49ea51a3395 -r 3f6769475741 make/build-graal.xml