truffle: graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java annotate

annotate graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java @ 6521:2a0c9f20baa1

consolidated framework for runtime and stub calls and moved declaration of descriptors for such calls to the source file in which they are used

author	Doug Simon <doug.simon@oracle.com>
date	Fri, 05 Oct 2012 17:55:12 +0200
parents	0b62a9d44c21
children	2c913b643422

rev	line source
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1 /*
4233 fa53d5e4aa35 Remove lock information from frame states, and compute it instead when LIR is generated. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4205 diff changeset	2 * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	4 *
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	5 * This code is free software; you can redistribute it and/or modify it
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	6 * under the terms of the GNU General Public License version 2 only, as
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	7 * published by the Free Software Foundation.
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	8 *
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	9 * This code is distributed in the hope that it will be useful, but WITHOUT
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	12 * version 2 for more details (a copy is included in the LICENSE file that
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	13 * accompanied this code).
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	14 *
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	15 * You should have received a copy of the GNU General Public License version
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	16 * 2 along with this work; if not, write to the Free Software Foundation,
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	18 *
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	20 * or visit www.oracle.com if you need additional information or have any
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	21 * questions.
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	22 */
5060 4ed4295ce15f Update import statements. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5059 diff changeset	23 package com.oracle.graal.java;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	24
5568 fdf19fa15ce4 Split bytecode utilities into separate project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5547 diff changeset	25 import static com.oracle.graal.bytecode.Bytecodes.*;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	26 import static java.lang.reflect.Modifier.*;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	27
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	28 import java.lang.reflect.*;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	29 import java.util.*;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	30
5510 426c605c9d3c Move cri.ci to api.code. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5507 diff changeset	31 import com.oracle.graal.api.code.*;
6521 2a0c9f20baa1 consolidated framework for runtime and stub calls and moved declaration of descriptors for such calls to the source file in which they are used Doug Simon <doug.simon@oracle.com> parents: 6511 diff changeset	32 import com.oracle.graal.api.code.RuntimeCall.*;
5507 dc71b06d09f8 Moving classes from cri.ri to api.meta. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5506 diff changeset	33 import com.oracle.graal.api.meta.*;
5760 87e8baf5447c added snippets for lowering array creation and initialization (in NewObjectSnippets) Doug Simon <doug.simon@oracle.com> parents: 5719 diff changeset	34 import com.oracle.graal.api.meta.JavaType.Representation;
87e8baf5447c added snippets for lowering array creation and initialization (in NewObjectSnippets) Doug Simon <doug.simon@oracle.com> parents: 5719 diff changeset	35 import com.oracle.graal.api.meta.JavaTypeProfile.ProfiledType;
5568 fdf19fa15ce4 Split bytecode utilities into separate project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5547 diff changeset	36 import com.oracle.graal.bytecode.*;
5060 4ed4295ce15f Update import statements. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5059 diff changeset	37 import com.oracle.graal.compiler.*;
4ed4295ce15f Update import statements. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5059 diff changeset	38 import com.oracle.graal.compiler.phases.*;
4ed4295ce15f Update import statements. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5059 diff changeset	39 import com.oracle.graal.compiler.util.*;
4ed4295ce15f Update import statements. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5059 diff changeset	40 import com.oracle.graal.debug.*;
4ed4295ce15f Update import statements. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5059 diff changeset	41 import com.oracle.graal.graph.*;
4ed4295ce15f Update import statements. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5059 diff changeset	42 import com.oracle.graal.java.BciBlockMapping.Block;
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	43 import com.oracle.graal.java.BciBlockMapping.ExceptionDispatchBlock;
5060 4ed4295ce15f Update import statements. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5059 diff changeset	44 import com.oracle.graal.nodes.*;
4ed4295ce15f Update import statements. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5059 diff changeset	45 import com.oracle.graal.nodes.calc.*;
4ed4295ce15f Update import statements. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5059 diff changeset	46 import com.oracle.graal.nodes.extended.*;
4ed4295ce15f Update import statements. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5059 diff changeset	47 import com.oracle.graal.nodes.java.*;
4ed4295ce15f Update import statements. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5059 diff changeset	48 import com.oracle.graal.nodes.java.MethodCallTargetNode.InvokeKind;
4ed4295ce15f Update import statements. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5059 diff changeset	49 import com.oracle.graal.nodes.type.*;
5210 e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	50 import com.oracle.graal.nodes.util.*;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	51
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	52 /**
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	53 * The {@code GraphBuilder} class parses the bytecode of a method and builds the IR graph.
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	54 */
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	55 public final class GraphBuilderPhase extends Phase {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	56
6521 2a0c9f20baa1 consolidated framework for runtime and stub calls and moved declaration of descriptors for such calls to the source file in which they are used Doug Simon <doug.simon@oracle.com> parents: 6511 diff changeset	57 public static final Descriptor CREATE_NULL_POINTER_EXCEPTION = new Descriptor("createNullPointerException", Kind.Object);
2a0c9f20baa1 consolidated framework for runtime and stub calls and moved declaration of descriptors for such calls to the source file in which they are used Doug Simon <doug.simon@oracle.com> parents: 6511 diff changeset	58 public static final Descriptor CREATE_OUT_OF_BOUNDS_EXCEPTION = new Descriptor("createOutOfBoundsException", Kind.Object, Kind.Int);
2a0c9f20baa1 consolidated framework for runtime and stub calls and moved declaration of descriptors for such calls to the source file in which they are used Doug Simon <doug.simon@oracle.com> parents: 6511 diff changeset	59
2a0c9f20baa1 consolidated framework for runtime and stub calls and moved declaration of descriptors for such calls to the source file in which they are used Doug Simon <doug.simon@oracle.com> parents: 6511 diff changeset	60
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	61 /**
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	62 * The minimum value to which {@link GraalOptions#TraceBytecodeParserLevel} must be set to trace
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	63 * the bytecode instructions as they are parsed.
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	64 */
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	65 public static final int TRACELEVEL_INSTRUCTIONS = 1;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	66
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	67 /**
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	68 * The minimum value to which {@link GraalOptions#TraceBytecodeParserLevel} must be set to trace
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	69 * the frame state before each bytecode instruction as it is parsed.
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	70 */
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	71 public static final int TRACELEVEL_STATE = 2;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	72
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	73 private StructuredGraph currentGraph;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	74
5629 26a060cc58ca Initial implementation of closed world analysis by iteratively expanding the universe starting at method entry points. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5572 diff changeset	75 private final MetaAccessProvider runtime;
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	76 private ConstantPool constantPool;
b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	77 private ResolvedJavaMethod method;
b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	78 private ProfilingInfo profilingInfo;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	79
4203 847e9dcb4980 Add graph builder to the phase plan. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4199 diff changeset	80 private BytecodeStream stream; // the bytecode stream
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	81 private final LogStream log;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	82
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	83 private FrameStateBuilder frameState; // the current execution state
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	84 private Block currentBlock;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	85
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	86 private ValueNode methodSynchronizedObject;
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	87 private ExceptionDispatchBlock unwindBlock;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	88 private Block returnBlock;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	89
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	90 private FixedWithNextNode lastInstr; // the last instruction added
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	91
5109 6766253384bf more preparations for disabling runtime feedback selectively based on deoptimization history Christian Haeubl <christian.haeubl@oracle.com> parents: 5105 diff changeset	92 private final GraphBuilderConfiguration graphBuilderConfig;
5114 dad1ac9dba7d finished first implementation of disabling runtime feedback selectively based on deoptimization history Christian Haeubl <christian.haeubl@oracle.com> parents: 5110 diff changeset	93 private final OptimisticOptimizations optimisticOpts;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	94
5129 51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5061 diff changeset	95 private long graphId;
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	96
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	97 /**
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	98 * Node that marks the begin of block during bytecode parsing. When a block is identified the first
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	99 * time as a jump target, the placeholder is created and used as the successor for the jump. When the
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	100 * block is seen the second time, a MergeNode is created to correctly merge the now two different
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	101 * predecessor states.
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	102 */
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	103 private static class BlockPlaceholderNode extends FixedWithNextNode implements Node.IterableNodeType {
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	104 public BlockPlaceholderNode() {
5443 141817e206d4 changes to the dependencies and stamp system: Lukas Stadler <lukas.stadler@jku.at> parents: 5425 diff changeset	105 super(StampFactory.forVoid());
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	106 }
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	107 }
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	108
5210 e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	109 private Block[] loopHeaders;
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	110
5629 26a060cc58ca Initial implementation of closed world analysis by iteratively expanding the universe starting at method entry points. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5572 diff changeset	111 public GraphBuilderPhase(MetaAccessProvider runtime, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts) {
5109 6766253384bf more preparations for disabling runtime feedback selectively based on deoptimization history Christian Haeubl <christian.haeubl@oracle.com> parents: 5105 diff changeset	112 this.graphBuilderConfig = graphBuilderConfig;
5114 dad1ac9dba7d finished first implementation of disabling runtime feedback selectively based on deoptimization history Christian Haeubl <christian.haeubl@oracle.com> parents: 5110 diff changeset	113 this.optimisticOpts = optimisticOpts;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	114 this.runtime = runtime;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	115 this.log = GraalOptions.TraceBytecodeParserLevel > 0 ? new LogStream(TTY.out()) : null;
5629 26a060cc58ca Initial implementation of closed world analysis by iteratively expanding the universe starting at method entry points. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5572 diff changeset	116 assert runtime != null;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	117 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	118
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	119 @Override
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	120 protected void run(StructuredGraph graph) {
4203 847e9dcb4980 Add graph builder to the phase plan. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4199 diff changeset	121 method = graph.method();
5129 51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5061 diff changeset	122 graphId = graph.graphId();
4440 271220b49abc profiling info fixes Christian Haeubl <christian.haeubl@oracle.com> parents: 4266 diff changeset	123 profilingInfo = method.profilingInfo();
4203 847e9dcb4980 Add graph builder to the phase plan. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4199 diff changeset	124 assert method.code() != null : "method must contain bytecodes: " + method;
847e9dcb4980 Add graph builder to the phase plan. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4199 diff changeset	125 this.stream = new BytecodeStream(method.code());
847e9dcb4980 Add graph builder to the phase plan. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4199 diff changeset	126 this.constantPool = method.getConstantPool();
847e9dcb4980 Add graph builder to the phase plan. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4199 diff changeset	127 unwindBlock = null;
847e9dcb4980 Add graph builder to the phase plan. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4199 diff changeset	128 returnBlock = null;
847e9dcb4980 Add graph builder to the phase plan. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4199 diff changeset	129 methodSynchronizedObject = null;
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	130 this.currentGraph = graph;
5109 6766253384bf more preparations for disabling runtime feedback selectively based on deoptimization history Christian Haeubl <christian.haeubl@oracle.com> parents: 5105 diff changeset	131 this.frameState = new FrameStateBuilder(method, graph, graphBuilderConfig.eagerResolving());
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	132 build();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	133 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	134
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	135 @Override
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	136 protected String getDetailedName() {
5719 429accae15aa moved some methods from CodeUtil to MetaUtil Doug Simon <doug.simon@oracle.com> parents: 5704 diff changeset	137 return getName() + " " + MetaUtil.format("%H.%n(%p):%r", method);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	138 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	139
4435 57cb8ec5f6bb Restructure block and control flow graph data structures Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4433 diff changeset	140 private BciBlockMapping createBlockMap() {
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	141 BciBlockMapping map = new BciBlockMapping(method);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	142 map.build();
5719 429accae15aa moved some methods from CodeUtil to MetaUtil Doug Simon <doug.simon@oracle.com> parents: 5704 diff changeset	143 Debug.dump(map, MetaUtil.format("After block building %f %R %H.%n(%P)", method));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	144
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	145 return map;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	146 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	147
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	148 private void build() {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	149 if (log != null) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	150 log.println();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	151 log.println("Compiling " + method);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	152 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	153
5040 4d6e5ddf70e5 added option to print the profiling information Christian Haeubl <christian.haeubl@oracle.com> parents: 4997 diff changeset	154 if (GraalOptions.PrintProfilingInformation) {
5344 f47c770756e6 moved RiResolvedMethod.dumpProfile() to CiUtil.profileAsString() Doug Simon <doug.simon@oracle.com> parents: 5343 diff changeset	155 TTY.println("Profiling info for " + method);
5719 429accae15aa moved some methods from CodeUtil to MetaUtil Doug Simon <doug.simon@oracle.com> parents: 5704 diff changeset	156 TTY.println(MetaUtil.indent(MetaUtil.profileToString(profilingInfo, method, CodeUtil.NEW_LINE), " "));
5040 4d6e5ddf70e5 added option to print the profiling information Christian Haeubl <christian.haeubl@oracle.com> parents: 4997 diff changeset	157 }
4d6e5ddf70e5 added option to print the profiling information Christian Haeubl <christian.haeubl@oracle.com> parents: 4997 diff changeset	158
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	159 // compute the block map, setup exception handlers and get the entrypoint(s)
4435 57cb8ec5f6bb Restructure block and control flow graph data structures Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4433 diff changeset	160 BciBlockMapping blockMap = createBlockMap();
5210 e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	161 loopHeaders = blockMap.loopHeaders;
4265 4643ccd37dac * removed CiStatistics Lukas Stadler <lukas.stadler@jku.at> parents: 4233 diff changeset	162
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	163 lastInstr = currentGraph.start();
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	164 if (isSynchronized(method.accessFlags())) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	165 // add a monitor enter to the start block
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	166 currentGraph.start().setStateAfter(frameState.create(FrameState.BEFORE_BCI));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	167 methodSynchronizedObject = synchronizedObject(frameState, method);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	168 lastInstr = genMonitorEnter(methodSynchronizedObject);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	169 }
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	170 frameState.clearNonLiveLocals(blockMap.startBlock.localsLiveIn);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	171
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	172 // finish the start block
5373 53cc37c27b04 used more specific BeginNode subclass where appropriate Doug Simon <doug.simon@oracle.com> parents: 5372 diff changeset	173 ((StateSplit) lastInstr).setStateAfter(frameState.create(0));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	174 if (blockMap.startBlock.isLoopHeader) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	175 appendGoto(createTarget(blockMap.startBlock, frameState));
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	176 } else {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	177 blockMap.startBlock.firstInstruction = lastInstr;
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	178 blockMap.startBlock.entryState = frameState;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	179 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	180
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	181 for (Block block : blockMap.blocks) {
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	182 processBlock(block);
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	183 }
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	184 processBlock(returnBlock);
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	185 processBlock(unwindBlock);
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	186
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	187 Debug.dump(currentGraph, "After bytecode parsing");
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	188
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	189 connectLoopEndToBegin();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	190
5097 5d0925455be1 Canonicalize some filter usages. Fix for graph printer's escape (escape invalid control chars). Small comment fixes Gilles Duboscq <duboscq@ssw.jku.at> parents: 5061 diff changeset	191 // remove Placeholders
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	192 for (BlockPlaceholderNode n : currentGraph.getNodes(BlockPlaceholderNode.class)) {
4309 4a609a685fa4 changes to Node structures: Lukas Stadler <lukas.stadler@jku.at> parents: 4307 diff changeset	193 currentGraph.removeFixed(n);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	194 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	195
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	196 // remove dead FrameStates
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	197 for (Node n : currentGraph.getNodes(FrameState.class)) {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	198 if (n.usages().size() == 0 && n.predecessor() == null) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	199 n.safeDelete();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	200 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	201 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	202 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	203
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	204 private Block unwindBlock(int bci) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	205 if (unwindBlock == null) {
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	206 unwindBlock = new ExceptionDispatchBlock();
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	207 unwindBlock.startBci = -1;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	208 unwindBlock.endBci = -1;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	209 unwindBlock.deoptBci = bci;
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	210 unwindBlock.blockID = Integer.MAX_VALUE;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	211 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	212 return unwindBlock;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	213 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	214
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	215 private Block returnBlock(int bci) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	216 if (returnBlock == null) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	217 returnBlock = new Block();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	218 returnBlock.startBci = bci;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	219 returnBlock.endBci = bci;
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	220 returnBlock.blockID = Integer.MAX_VALUE;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	221 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	222 return returnBlock;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	223 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	224
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	225 public BytecodeStream stream() {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	226 return stream;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	227 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	228
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	229 public int bci() {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	230 return stream.currentBCI();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	231 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	232
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	233 private void loadLocal(int index, Kind kind) {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	234 frameState.push(kind, frameState.loadLocal(index));
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	235 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	236
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	237 private void storeLocal(Kind kind, int index) {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	238 frameState.storeLocal(index, frameState.pop(kind));
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	239 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	240
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	241 public static boolean covers(ExceptionHandler handler, int bci) {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	242 return handler.startBCI() <= bci && bci < handler.endBCI();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	243 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	244
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	245 public static boolean isCatchAll(ExceptionHandler handler) {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	246 return handler.catchTypeCPI() == 0;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	247 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	248
5373 53cc37c27b04 used more specific BeginNode subclass where appropriate Doug Simon <doug.simon@oracle.com> parents: 5372 diff changeset	249 private DispatchBeginNode handleException(ValueNode exceptionObject, int bci) {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	250 assert bci == FrameState.BEFORE_BCI \|\| bci == bci() : "invalid bci";
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	251 Debug.log("Creating exception dispatch edges at %d, exception object=%s, exception seen=%s", bci, exceptionObject, profilingInfo.getExceptionSeen(bci));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	252
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	253 Block dispatchBlock = currentBlock.exceptionDispatchBlock();
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	254 // The exception dispatch block is always for the last bytecode of a block, so if we are not at the endBci yet,
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	255 // there is no exception handler for this bci and we can unwind immediately.
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	256 if (bci != currentBlock.endBci \|\| dispatchBlock == null) {
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	257 dispatchBlock = unwindBlock(bci);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	258 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	259
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	260 FrameStateBuilder dispatchState = frameState.copy();
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	261 dispatchState.clearStack();
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	262
5373 53cc37c27b04 used more specific BeginNode subclass where appropriate Doug Simon <doug.simon@oracle.com> parents: 5372 diff changeset	263 DispatchBeginNode dispatchBegin = currentGraph.add(new DispatchBeginNode());
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	264 dispatchBegin.setStateAfter(dispatchState.create(bci));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	265
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	266 if (exceptionObject == null) {
5443 141817e206d4 changes to the dependencies and stamp system: Lukas Stadler <lukas.stadler@jku.at> parents: 5425 diff changeset	267 ExceptionObjectNode newExceptionObject = currentGraph.add(new ExceptionObjectNode(runtime));
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	268 dispatchState.apush(newExceptionObject);
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	269 dispatchState.setRethrowException(true);
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	270 newExceptionObject.setStateAfter(dispatchState.create(bci));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	271
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	272 FixedNode target = createTarget(dispatchBlock, dispatchState);
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	273 dispatchBegin.setNext(newExceptionObject);
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	274 newExceptionObject.setNext(target);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	275 } else {
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	276 dispatchState.apush(exceptionObject);
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	277 dispatchState.setRethrowException(true);
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	278
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	279 FixedNode target = createTarget(dispatchBlock, dispatchState);
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	280 dispatchBegin.setNext(target);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	281 }
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	282 return dispatchBegin;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	283 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	284
4315 4c223446c28e Replace the eagerResolving option of GraphBuilderConfiguration with three resolve policies: Default, EagerForSnippets (previously eagerResolving), and Eager (resolves exceptions and types of constants as well) Peter Hofer <peter.hofer@jku.at> parents: 4310 diff changeset	285 private void genLoadConstant(int cpi, int opcode) {
4316 b4b16e4e043f Fix eager resolving for class constants Peter Hofer <peter.hofer@jku.at> parents: 4315 diff changeset	286 Object con = lookupConstant(cpi, opcode);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	287
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	288 if (con instanceof JavaType) {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	289 // this is a load of class constant which might be unresolved
5719 429accae15aa moved some methods from CodeUtil to MetaUtil Doug Simon <doug.simon@oracle.com> parents: 5704 diff changeset	290 JavaType type = (JavaType) con;
429accae15aa moved some methods from CodeUtil to MetaUtil Doug Simon <doug.simon@oracle.com> parents: 5704 diff changeset	291 if (type instanceof ResolvedJavaType) {
429accae15aa moved some methods from CodeUtil to MetaUtil Doug Simon <doug.simon@oracle.com> parents: 5704 diff changeset	292 frameState.push(Kind.Object, append(ConstantNode.forConstant(((ResolvedJavaType) type).getEncoding(Representation.JavaClass), runtime, currentGraph)));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	293 } else {
5547 b6617d13ea44 Dropping Ci* prefixes. Some additional renamings in the api.code interface. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5541 diff changeset	294 append(currentGraph.add(new DeoptimizeNode(DeoptimizationAction.InvalidateRecompile, DeoptimizationReason.Unresolved, graphId)));
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	295 frameState.push(Kind.Object, append(ConstantNode.forObject(null, runtime, currentGraph)));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	296 }
5538 e18ba36bfebc Renamed RiConstant => Constant. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5531 diff changeset	297 } else if (con instanceof Constant) {
e18ba36bfebc Renamed RiConstant => Constant. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5531 diff changeset	298 Constant constant = (Constant) con;
6329 92bc58dc5b5e More clean up and documentation in api.code and api.meta. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5814 diff changeset	299 frameState.push(constant.getKind().stackKind(), appendConstant(constant));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	300 } else {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	301 throw new Error("lookupConstant returned an object of incorrect type");
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	302 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	303 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	304
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	305 private void genLoadIndexed(Kind kind) {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	306 emitExplicitExceptions(frameState.peek(1), frameState.peek(0));
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	307
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	308 ValueNode index = frameState.ipop();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	309 ValueNode array = frameState.apop();
5401 332a3c0d7b3b remove array length input from LoadIndexedNode and StoreIndexedNode Lukas Stadler <lukas.stadler@jku.at> parents: 5375 diff changeset	310 ValueNode v = append(currentGraph.add(new LoadIndexedNode(array, index, kind, graphId)));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	311 frameState.push(kind.stackKind(), v);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	312 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	313
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	314 private void genStoreIndexed(Kind kind) {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	315 emitExplicitExceptions(frameState.peek(2), frameState.peek(1));
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	316
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	317 ValueNode value = frameState.pop(kind.stackKind());
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	318 ValueNode index = frameState.ipop();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	319 ValueNode array = frameState.apop();
5401 332a3c0d7b3b remove array length input from LoadIndexedNode and StoreIndexedNode Lukas Stadler <lukas.stadler@jku.at> parents: 5375 diff changeset	320 StoreIndexedNode result = currentGraph.add(new StoreIndexedNode(array, index, kind, value, graphId));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	321 append(result);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	322 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	323
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	324 private void stackOp(int opcode) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	325 switch (opcode) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	326 case POP: {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	327 frameState.xpop();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	328 break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	329 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	330 case POP2: {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	331 frameState.xpop();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	332 frameState.xpop();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	333 break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	334 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	335 case DUP: {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	336 ValueNode w = frameState.xpop();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	337 frameState.xpush(w);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	338 frameState.xpush(w);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	339 break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	340 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	341 case DUP_X1: {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	342 ValueNode w1 = frameState.xpop();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	343 ValueNode w2 = frameState.xpop();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	344 frameState.xpush(w1);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	345 frameState.xpush(w2);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	346 frameState.xpush(w1);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	347 break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	348 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	349 case DUP_X2: {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	350 ValueNode w1 = frameState.xpop();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	351 ValueNode w2 = frameState.xpop();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	352 ValueNode w3 = frameState.xpop();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	353 frameState.xpush(w1);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	354 frameState.xpush(w3);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	355 frameState.xpush(w2);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	356 frameState.xpush(w1);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	357 break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	358 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	359 case DUP2: {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	360 ValueNode w1 = frameState.xpop();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	361 ValueNode w2 = frameState.xpop();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	362 frameState.xpush(w2);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	363 frameState.xpush(w1);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	364 frameState.xpush(w2);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	365 frameState.xpush(w1);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	366 break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	367 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	368 case DUP2_X1: {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	369 ValueNode w1 = frameState.xpop();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	370 ValueNode w2 = frameState.xpop();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	371 ValueNode w3 = frameState.xpop();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	372 frameState.xpush(w2);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	373 frameState.xpush(w1);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	374 frameState.xpush(w3);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	375 frameState.xpush(w2);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	376 frameState.xpush(w1);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	377 break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	378 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	379 case DUP2_X2: {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	380 ValueNode w1 = frameState.xpop();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	381 ValueNode w2 = frameState.xpop();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	382 ValueNode w3 = frameState.xpop();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	383 ValueNode w4 = frameState.xpop();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	384 frameState.xpush(w2);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	385 frameState.xpush(w1);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	386 frameState.xpush(w4);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	387 frameState.xpush(w3);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	388 frameState.xpush(w2);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	389 frameState.xpush(w1);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	390 break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	391 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	392 case SWAP: {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	393 ValueNode w1 = frameState.xpop();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	394 ValueNode w2 = frameState.xpop();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	395 frameState.xpush(w1);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	396 frameState.xpush(w2);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	397 break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	398 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	399 default:
4524 dcc8f5c6f394 Refactorings to prepare for LIR project splitting Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4484 diff changeset	400 throw GraalInternalError.shouldNotReachHere();
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	401 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	402
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	403 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	404
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	405 private void genArithmeticOp(Kind result, int opcode, boolean canTrap) {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	406 ValueNode y = frameState.pop(result);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	407 ValueNode x = frameState.pop(result);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	408 boolean isStrictFP = isStrict(method.accessFlags());
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	409 ArithmeticNode v;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	410 switch(opcode){
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	411 case IADD:
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	412 case LADD: v = new IntegerAddNode(result, x, y); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	413 case FADD:
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	414 case DADD: v = new FloatAddNode(result, x, y, isStrictFP); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	415 case ISUB:
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	416 case LSUB: v = new IntegerSubNode(result, x, y); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	417 case FSUB:
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	418 case DSUB: v = new FloatSubNode(result, x, y, isStrictFP); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	419 case IMUL:
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	420 case LMUL: v = new IntegerMulNode(result, x, y); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	421 case FMUL:
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	422 case DMUL: v = new FloatMulNode(result, x, y, isStrictFP); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	423 case IDIV:
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	424 case LDIV: v = new IntegerDivNode(result, x, y); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	425 case FDIV:
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	426 case DDIV: v = new FloatDivNode(result, x, y, isStrictFP); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	427 case IREM:
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	428 case LREM: v = new IntegerRemNode(result, x, y); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	429 case FREM:
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	430 case DREM: v = new FloatRemNode(result, x, y, isStrictFP); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	431 default:
4616 53168434d0df Transform some CiBailout into GraalInternalError Gilles Duboscq <duboscq@ssw.jku.at> parents: 4614 diff changeset	432 throw new GraalInternalError("should not reach");
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	433 }
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	434 ValueNode result1 = append(currentGraph.unique(v));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	435 if (canTrap) {
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	436 append(currentGraph.add(new ValueAnchorNode(result1)));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	437 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	438 frameState.push(result, result1);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	439 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	440
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	441 private void genNegateOp(Kind kind) {
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	442 frameState.push(kind, append(currentGraph.unique(new NegateNode(frameState.pop(kind)))));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	443 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	444
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	445 private void genShiftOp(Kind kind, int opcode) {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	446 ValueNode s = frameState.ipop();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	447 ValueNode x = frameState.pop(kind);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	448 ShiftNode v;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	449 switch(opcode){
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	450 case ISHL:
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	451 case LSHL: v = new LeftShiftNode(kind, x, s); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	452 case ISHR:
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	453 case LSHR: v = new RightShiftNode(kind, x, s); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	454 case IUSHR:
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	455 case LUSHR: v = new UnsignedRightShiftNode(kind, x, s); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	456 default:
4616 53168434d0df Transform some CiBailout into GraalInternalError Gilles Duboscq <duboscq@ssw.jku.at> parents: 4614 diff changeset	457 throw new GraalInternalError("should not reach");
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	458 }
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	459 frameState.push(kind, append(currentGraph.unique(v)));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	460 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	461
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	462 private void genLogicOp(Kind kind, int opcode) {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	463 ValueNode y = frameState.pop(kind);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	464 ValueNode x = frameState.pop(kind);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	465 LogicNode v;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	466 switch(opcode){
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	467 case IAND:
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	468 case LAND: v = new AndNode(kind, x, y); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	469 case IOR:
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	470 case LOR: v = new OrNode(kind, x, y); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	471 case IXOR:
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	472 case LXOR: v = new XorNode(kind, x, y); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	473 default:
4616 53168434d0df Transform some CiBailout into GraalInternalError Gilles Duboscq <duboscq@ssw.jku.at> parents: 4614 diff changeset	474 throw new GraalInternalError("should not reach");
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	475 }
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	476 frameState.push(kind, append(currentGraph.unique(v)));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	477 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	478
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	479 private void genCompareOp(Kind kind, boolean isUnorderedLess) {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	480 ValueNode y = frameState.pop(kind);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	481 ValueNode x = frameState.pop(kind);
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	482 frameState.ipush(append(currentGraph.unique(new NormalizeCompareNode(x, y, isUnorderedLess))));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	483 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	484
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	485 private void genConvert(ConvertNode.Op opcode) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	486 ValueNode input = frameState.pop(opcode.from.stackKind());
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	487 frameState.push(opcode.to.stackKind(), append(currentGraph.unique(new ConvertNode(opcode, input))));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	488 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	489
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	490 private void genIncrement() {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	491 int index = stream().readLocalIndex();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	492 int delta = stream().readIncrement();
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	493 ValueNode x = frameState.loadLocal(index);
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	494 ValueNode y = append(ConstantNode.forInt(delta, currentGraph));
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	495 frameState.storeLocal(index, append(currentGraph.unique(new IntegerAddNode(Kind.Int, x, y))));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	496 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	497
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	498 private void genGoto() {
5050 9f4224ae490f bugfix Christian Haeubl <christian.haeubl@oracle.com> parents: 5049 diff changeset	499 double probability = profilingInfo.getBranchTakenProbability(bci());
9f4224ae490f bugfix Christian Haeubl <christian.haeubl@oracle.com> parents: 5049 diff changeset	500 if (probability < 0) {
9f4224ae490f bugfix Christian Haeubl <christian.haeubl@oracle.com> parents: 5049 diff changeset	501 probability = 1;
9f4224ae490f bugfix Christian Haeubl <christian.haeubl@oracle.com> parents: 5049 diff changeset	502 }
5051 2ab527c53dba another fix for goto's deopt case Christian Haeubl <christian.haeubl@oracle.com> parents: 5050 diff changeset	503 appendGoto(createTarget(probability, currentBlock.successors.get(0), frameState));
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	504 assert currentBlock.numNormalSuccessors() == 1;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	505 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	506
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	507 private void ifNode(ValueNode x, Condition cond, ValueNode y) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	508 assert !x.isDeleted() && !y.isDeleted();
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	509 assert currentBlock.numNormalSuccessors() == 2;
5029 74f47ef37394 Fix and enable liveness analysis to prune unnecessary frame state entries Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5026 diff changeset	510 Block trueBlock = currentBlock.successors.get(0);
74f47ef37394 Fix and enable liveness analysis to prune unnecessary frame state entries Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5026 diff changeset	511 Block falseBlock = currentBlock.successors.get(1);
74f47ef37394 Fix and enable liveness analysis to prune unnecessary frame state entries Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5026 diff changeset	512 if (trueBlock == falseBlock) {
74f47ef37394 Fix and enable liveness analysis to prune unnecessary frame state entries Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5026 diff changeset	513 appendGoto(createTarget(trueBlock, frameState));
74f47ef37394 Fix and enable liveness analysis to prune unnecessary frame state entries Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5026 diff changeset	514 return;
74f47ef37394 Fix and enable liveness analysis to prune unnecessary frame state entries Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5026 diff changeset	515 }
74f47ef37394 Fix and enable liveness analysis to prune unnecessary frame state entries Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5026 diff changeset	516
4440 271220b49abc profiling info fixes Christian Haeubl <christian.haeubl@oracle.com> parents: 4266 diff changeset	517 double probability = profilingInfo.getBranchTakenProbability(bci());
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	518 if (probability < 0) {
4997 0c9196f57172 use profiling information whenever possible Christian Haeubl <christian.haeubl@oracle.com> parents: 4692 diff changeset	519 assert probability == -1 : "invalid probability";
4399 a74fd31c017e Remove TraceProbability flag. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4370 diff changeset	520 Debug.log("missing probability in %s at bci %d", method, bci());
5043 879ac08596b8 fix after merge Christian Haeubl <christian.haeubl@oracle.com> parents: 5042 diff changeset	521 probability = 0.5;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	522 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	523
5425 0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5401 diff changeset	524 // the mirroring and negation operations get the condition into canonical form
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5401 diff changeset	525 boolean mirror = cond.canonicalMirror();
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5401 diff changeset	526 boolean negate = cond.canonicalNegate();
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5401 diff changeset	527
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5401 diff changeset	528 ValueNode a = mirror ? y : x;
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5401 diff changeset	529 ValueNode b = mirror ? x : y;
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5401 diff changeset	530
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5401 diff changeset	531 CompareNode condition;
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5401 diff changeset	532 assert !a.kind().isFloatOrDouble();
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5401 diff changeset	533 if (cond == Condition.EQ \|\| cond == Condition.NE) {
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	534 if (a.kind() == Kind.Object) {
5425 0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5401 diff changeset	535 condition = new ObjectEqualsNode(a, b);
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5401 diff changeset	536 } else {
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5401 diff changeset	537 condition = new IntegerEqualsNode(a, b);
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5401 diff changeset	538 }
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5401 diff changeset	539 } else {
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	540 assert a.kind() != Kind.Object && !cond.isUnsigned();
5425 0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5401 diff changeset	541 condition = new IntegerLessThanNode(a, b);
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5401 diff changeset	542 }
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5401 diff changeset	543 condition = currentGraph.unique(condition);
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5401 diff changeset	544
5029 74f47ef37394 Fix and enable liveness analysis to prune unnecessary frame state entries Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5026 diff changeset	545 BeginNode trueSuccessor = createBlockTarget(probability, trueBlock, frameState);
74f47ef37394 Fix and enable liveness analysis to prune unnecessary frame state entries Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5026 diff changeset	546 BeginNode falseSuccessor = createBlockTarget(1 - probability, falseBlock, frameState);
5425 0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5401 diff changeset	547
5695 a63ed5993987 Add leadGraphID to IfNOde so that we can convert them to deopts Gilles Duboscq <duboscq@ssw.jku.at> parents: 5648 diff changeset	548 IfNode ifNode = negate ? new IfNode(condition, falseSuccessor, trueSuccessor, 1 - probability, graphId) : new IfNode(condition, trueSuccessor, falseSuccessor, probability, graphId);
5425 0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5401 diff changeset	549 append(currentGraph.add(ifNode));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	550 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	551
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	552 private void genIfZero(Condition cond) {
5538 e18ba36bfebc Renamed RiConstant => Constant. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5531 diff changeset	553 ValueNode y = appendConstant(Constant.INT_0);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	554 ValueNode x = frameState.ipop();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	555 ifNode(x, cond, y);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	556 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	557
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	558 private void genIfNull(Condition cond) {
5538 e18ba36bfebc Renamed RiConstant => Constant. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5531 diff changeset	559 ValueNode y = appendConstant(Constant.NULL_OBJECT);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	560 ValueNode x = frameState.apop();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	561 ifNode(x, cond, y);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	562 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	563
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	564 private void genIfSame(Kind kind, Condition cond) {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	565 ValueNode y = frameState.pop(kind);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	566 ValueNode x = frameState.pop(kind);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	567 assert !x.isDeleted() && !y.isDeleted();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	568 ifNode(x, cond, y);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	569 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	570
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	571 private void genThrow() {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	572 ValueNode exception = frameState.apop();
5547 b6617d13ea44 Dropping Ci* prefixes. Some additional renamings in the api.code interface. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5541 diff changeset	573 FixedGuardNode node = currentGraph.add(new FixedGuardNode(currentGraph.unique(new IsNullNode(exception)), DeoptimizationReason.NullCheckException, DeoptimizationAction.InvalidateReprofile, true, graphId));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	574 append(node);
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	575 append(handleException(exception, bci()));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	576 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	577
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	578 private JavaType lookupType(int cpi, int bytecode) {
4315 4c223446c28e Replace the eagerResolving option of GraphBuilderConfiguration with three resolve policies: Default, EagerForSnippets (previously eagerResolving), and Eager (resolves exceptions and types of constants as well) Peter Hofer <peter.hofer@jku.at> parents: 4310 diff changeset	579 eagerResolvingForSnippets(cpi, bytecode);
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	580 JavaType result = constantPool.lookupType(cpi, bytecode);
b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	581 assert !graphBuilderConfig.eagerResolvingForSnippets() \|\| result instanceof ResolvedJavaType;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	582 return result;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	583 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	584
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	585 private JavaMethod lookupMethod(int cpi, int opcode) {
4315 4c223446c28e Replace the eagerResolving option of GraphBuilderConfiguration with three resolve policies: Default, EagerForSnippets (previously eagerResolving), and Eager (resolves exceptions and types of constants as well) Peter Hofer <peter.hofer@jku.at> parents: 4310 diff changeset	586 eagerResolvingForSnippets(cpi, opcode);
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	587 JavaMethod result = constantPool.lookupMethod(cpi, opcode);
b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	588 assert !graphBuilderConfig.eagerResolvingForSnippets() \|\| ((result instanceof ResolvedJavaMethod) && ((ResolvedJavaMethod) result).holder().isInitialized());
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	589 return result;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	590 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	591
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	592 private JavaField lookupField(int cpi, int opcode) {
4315 4c223446c28e Replace the eagerResolving option of GraphBuilderConfiguration with three resolve policies: Default, EagerForSnippets (previously eagerResolving), and Eager (resolves exceptions and types of constants as well) Peter Hofer <peter.hofer@jku.at> parents: 4310 diff changeset	593 eagerResolvingForSnippets(cpi, opcode);
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	594 JavaField result = constantPool.lookupField(cpi, opcode);
b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	595 assert !graphBuilderConfig.eagerResolvingForSnippets() \|\| (result instanceof ResolvedJavaField && ((ResolvedJavaField) result).holder().isInitialized());
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	596 return result;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	597 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	598
4316 b4b16e4e043f Fix eager resolving for class constants Peter Hofer <peter.hofer@jku.at> parents: 4315 diff changeset	599 private Object lookupConstant(int cpi, int opcode) {
5562 4ffc061dc71a commented out use of non-snippet eager resolving in GraphBuilder Doug Simon <doug.simon@oracle.com> parents: 5547 diff changeset	600 eagerResolvingForSnippets(cpi, opcode);
4316 b4b16e4e043f Fix eager resolving for class constants Peter Hofer <peter.hofer@jku.at> parents: 4315 diff changeset	601 Object result = constantPool.lookupConstant(cpi);
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	602 assert !graphBuilderConfig.eagerResolving() \|\| !(result instanceof JavaType) \|\| (result instanceof ResolvedJavaType);
4316 b4b16e4e043f Fix eager resolving for class constants Peter Hofer <peter.hofer@jku.at> parents: 4315 diff changeset	603 return result;
b4b16e4e043f Fix eager resolving for class constants Peter Hofer <peter.hofer@jku.at> parents: 4315 diff changeset	604 }
b4b16e4e043f Fix eager resolving for class constants Peter Hofer <peter.hofer@jku.at> parents: 4315 diff changeset	605
5562 4ffc061dc71a commented out use of non-snippet eager resolving in GraphBuilder Doug Simon <doug.simon@oracle.com> parents: 5547 diff changeset	606 // private void eagerResolving(int cpi, int bytecode) {
4ffc061dc71a commented out use of non-snippet eager resolving in GraphBuilder Doug Simon <doug.simon@oracle.com> parents: 5547 diff changeset	607 // if (graphBuilderConfig.eagerResolving()) {
4ffc061dc71a commented out use of non-snippet eager resolving in GraphBuilder Doug Simon <doug.simon@oracle.com> parents: 5547 diff changeset	608 // constantPool.loadReferencedType(cpi, bytecode);
4ffc061dc71a commented out use of non-snippet eager resolving in GraphBuilder Doug Simon <doug.simon@oracle.com> parents: 5547 diff changeset	609 // }
4ffc061dc71a commented out use of non-snippet eager resolving in GraphBuilder Doug Simon <doug.simon@oracle.com> parents: 5547 diff changeset	610 // }
4316 b4b16e4e043f Fix eager resolving for class constants Peter Hofer <peter.hofer@jku.at> parents: 4315 diff changeset	611
4315 4c223446c28e Replace the eagerResolving option of GraphBuilderConfiguration with three resolve policies: Default, EagerForSnippets (previously eagerResolving), and Eager (resolves exceptions and types of constants as well) Peter Hofer <peter.hofer@jku.at> parents: 4310 diff changeset	612 private void eagerResolvingForSnippets(int cpi, int bytecode) {
5109 6766253384bf more preparations for disabling runtime feedback selectively based on deoptimization history Christian Haeubl <christian.haeubl@oracle.com> parents: 5105 diff changeset	613 if (graphBuilderConfig.eagerResolvingForSnippets()) {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	614 constantPool.loadReferencedType(cpi, bytecode);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	615 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	616 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	617
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	618 private JavaTypeProfile getProfileForTypeCheck(ResolvedJavaType type) {
5369 2e9a5365dfb0 moved conversion of type profiles into hints for type check instructions from front end to lowering phase Doug Simon <doug.simon@oracle.com> parents: 5362 diff changeset	619 if (!optimisticOpts.useTypeCheckHints() \|\| TypeCheckHints.isFinalClass(type)) {
2e9a5365dfb0 moved conversion of type profiles into hints for type check instructions from front end to lowering phase Doug Simon <doug.simon@oracle.com> parents: 5362 diff changeset	620 return null;
4433 b494d6f329a3 some more checkcast opts Lukas Stadler <lukas.stadler@jku.at> parents: 4432 diff changeset	621 } else {
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	622 ResolvedJavaType uniqueSubtype = type.uniqueConcreteSubtype();
4433 b494d6f329a3 some more checkcast opts Lukas Stadler <lukas.stadler@jku.at> parents: 4432 diff changeset	623 if (uniqueSubtype != null) {
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	624 return new JavaTypeProfile(0.0D, new ProfiledType(uniqueSubtype, 1.0D));
4433 b494d6f329a3 some more checkcast opts Lukas Stadler <lukas.stadler@jku.at> parents: 4432 diff changeset	625 } else {
5369 2e9a5365dfb0 moved conversion of type profiles into hints for type check instructions from front end to lowering phase Doug Simon <doug.simon@oracle.com> parents: 5362 diff changeset	626 return profilingInfo.getTypeProfile(bci());
4433 b494d6f329a3 some more checkcast opts Lukas Stadler <lukas.stadler@jku.at> parents: 4432 diff changeset	627 }
b494d6f329a3 some more checkcast opts Lukas Stadler <lukas.stadler@jku.at> parents: 4432 diff changeset	628 }
b494d6f329a3 some more checkcast opts Lukas Stadler <lukas.stadler@jku.at> parents: 4432 diff changeset	629 }
b494d6f329a3 some more checkcast opts Lukas Stadler <lukas.stadler@jku.at> parents: 4432 diff changeset	630
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	631 private void genCheckCast() {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	632 int cpi = stream().readCPI();
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	633 JavaType type = lookupType(cpi, CHECKCAST);
b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	634 boolean initialized = type instanceof ResolvedJavaType;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	635 if (initialized) {
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	636 ConstantNode typeInstruction = genTypeOrDeopt(JavaType.Representation.ObjectHub, type, true);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	637 ValueNode object = frameState.apop();
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	638 CheckCastNode checkCast = currentGraph.add(new CheckCastNode(typeInstruction, (ResolvedJavaType) type, object, getProfileForTypeCheck((ResolvedJavaType) type)));
5372 4485e0edd1af made CheckCastNode be a FixedNode instead of a BooleanNode Doug Simon <doug.simon@oracle.com> parents: 5371 diff changeset	639 append(checkCast);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	640 frameState.apush(checkCast);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	641 } else {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	642 ValueNode object = frameState.apop();
5547 b6617d13ea44 Dropping Ci* prefixes. Some additional renamings in the api.code interface. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5541 diff changeset	643 append(currentGraph.add(new FixedGuardNode(currentGraph.unique(new IsNullNode(object)), DeoptimizationReason.Unresolved, DeoptimizationAction.InvalidateRecompile, graphId)));
5538 e18ba36bfebc Renamed RiConstant => Constant. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5531 diff changeset	644 frameState.apush(appendConstant(Constant.NULL_OBJECT));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	645 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	646 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	647
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	648 private void genInstanceOf() {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	649 int cpi = stream().readCPI();
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	650 JavaType type = lookupType(cpi, INSTANCEOF);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	651 ValueNode object = frameState.apop();
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	652 if (type instanceof ResolvedJavaType) {
b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	653 ResolvedJavaType resolvedType = (ResolvedJavaType) type;
b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	654 ConstantNode hub = appendConstant(resolvedType.getEncoding(JavaType.Representation.ObjectHub));
b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	655 InstanceOfNode instanceOfNode = new InstanceOfNode(hub, (ResolvedJavaType) type, object, getProfileForTypeCheck(resolvedType));
5763 a3d71693e0ce removed bytecode disassembly from CodeCacheRuntime into separate BytecodeDisassembler class Doug Simon <doug.simon@oracle.com> parents: 5760 diff changeset	656 frameState.ipush(append(MaterializeNode.create(currentGraph.unique(instanceOfNode))));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	657 } else {
5425 0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5401 diff changeset	658 BlockPlaceholderNode successor = currentGraph.add(new BlockPlaceholderNode());
5547 b6617d13ea44 Dropping Ci* prefixes. Some additional renamings in the api.code interface. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5541 diff changeset	659 DeoptimizeNode deopt = currentGraph.add(new DeoptimizeNode(DeoptimizationAction.InvalidateRecompile, DeoptimizationReason.Unresolved, graphId));
5703 05c5f68e23d5 Fix some If probabilities in graph builder Gilles Duboscq <duboscq@ssw.jku.at> parents: 5695 diff changeset	660 IfNode ifNode = currentGraph.add(new IfNode(currentGraph.unique(new IsNullNode(object)), successor, deopt, 1, graphId));
4326 2b7474c492a9 Generate if(!=null){Deopt}else{...} In the unresolved case for instanceof instead of always deopting Gilles Duboscq <duboscq@ssw.jku.at> parents: 4316 diff changeset	661 append(ifNode);
5425 0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5401 diff changeset	662 lastInstr = successor;
5538 e18ba36bfebc Renamed RiConstant => Constant. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5531 diff changeset	663 frameState.ipush(appendConstant(Constant.INT_0));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	664 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	665 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	666
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	667 void genNewInstance(int cpi) {
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	668 JavaType type = lookupType(cpi, NEW);
5648 1cfa35d467de removed support for compiling allocation of instances of non-initialized classes Doug Simon <doug.simon@oracle.com> parents: 5630 diff changeset	669 if (type instanceof ResolvedJavaType && ((ResolvedJavaType) type).isInitialized()) {
6511 0b62a9d44c21 add infrastructure for creating locked objects Lukas Stadler <lukas.stadler@jku.at> parents: 6500 diff changeset	670 NewInstanceNode n = currentGraph.add(new NewInstanceNode((ResolvedJavaType) type, true, false));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	671 frameState.apush(append(n));
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	672 } else {
5547 b6617d13ea44 Dropping Ci* prefixes. Some additional renamings in the api.code interface. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5541 diff changeset	673 append(currentGraph.add(new DeoptimizeNode(DeoptimizationAction.InvalidateRecompile, DeoptimizationReason.Unresolved, graphId)));
5538 e18ba36bfebc Renamed RiConstant => Constant. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5531 diff changeset	674 frameState.apush(appendConstant(Constant.NULL_OBJECT));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	675 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	676 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	677
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	678 /**
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	679 * Gets the kind of array elements for the array type code that appears
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	680 * in a {@link Bytecodes#NEWARRAY} bytecode.
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	681 * @param code the array type code
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	682 * @return the kind from the array type code
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	683 */
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	684 public static Kind arrayTypeCodeToKind(int code) {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	685 // Checkstyle: stop
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	686 switch (code) {
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	687 case 4: return Kind.Boolean;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	688 case 5: return Kind.Char;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	689 case 6: return Kind.Float;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	690 case 7: return Kind.Double;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	691 case 8: return Kind.Byte;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	692 case 9: return Kind.Short;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	693 case 10: return Kind.Int;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	694 case 11: return Kind.Long;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	695 default: throw new IllegalArgumentException("unknown array type code: " + code);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	696 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	697 // Checkstyle: resume
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	698 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	699
5760 87e8baf5447c added snippets for lowering array creation and initialization (in NewObjectSnippets) Doug Simon <doug.simon@oracle.com> parents: 5719 diff changeset	700 private void genNewPrimitiveArray(int typeCode) {
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	701 Kind kind = arrayTypeCodeToKind(typeCode);
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	702 ResolvedJavaType elementType = runtime.getResolvedJavaType(kind);
6511 0b62a9d44c21 add infrastructure for creating locked objects Lukas Stadler <lukas.stadler@jku.at> parents: 6500 diff changeset	703 NewPrimitiveArrayNode nta = currentGraph.add(new NewPrimitiveArrayNode(elementType, frameState.ipop(), true, false));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	704 frameState.apush(append(nta));
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	705 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	706
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	707 private void genNewObjectArray(int cpi) {
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	708 JavaType type = lookupType(cpi, ANEWARRAY);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	709 ValueNode length = frameState.ipop();
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	710 if (type instanceof ResolvedJavaType) {
6511 0b62a9d44c21 add infrastructure for creating locked objects Lukas Stadler <lukas.stadler@jku.at> parents: 6500 diff changeset	711 NewArrayNode n = currentGraph.add(new NewObjectArrayNode((ResolvedJavaType) type, length, true, false));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	712 frameState.apush(append(n));
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	713 } else {
5547 b6617d13ea44 Dropping Ci* prefixes. Some additional renamings in the api.code interface. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5541 diff changeset	714 append(currentGraph.add(new DeoptimizeNode(DeoptimizationAction.InvalidateRecompile, DeoptimizationReason.Unresolved, graphId)));
5538 e18ba36bfebc Renamed RiConstant => Constant. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5531 diff changeset	715 frameState.apush(appendConstant(Constant.NULL_OBJECT));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	716 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	717
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	718 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	719
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	720 private void genNewMultiArray(int cpi) {
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	721 JavaType type = lookupType(cpi, MULTIANEWARRAY);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	722 int rank = stream().readUByte(bci() + 3);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	723 ValueNode[] dims = new ValueNode[rank];
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	724 for (int i = rank - 1; i >= 0; i--) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	725 dims[i] = frameState.ipop();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	726 }
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	727 if (type instanceof ResolvedJavaType) {
b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	728 FixedWithNextNode n = currentGraph.add(new NewMultiArrayNode((ResolvedJavaType) type, dims));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	729 frameState.apush(append(n));
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	730 } else {
5547 b6617d13ea44 Dropping Ci* prefixes. Some additional renamings in the api.code interface. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5541 diff changeset	731 append(currentGraph.add(new DeoptimizeNode(DeoptimizationAction.InvalidateRecompile, DeoptimizationReason.Unresolved, graphId)));
5538 e18ba36bfebc Renamed RiConstant => Constant. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5531 diff changeset	732 frameState.apush(appendConstant(Constant.NULL_OBJECT));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	733 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	734 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	735
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	736 private void genGetField(JavaField field) {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	737 emitExplicitExceptions(frameState.peek(0), null);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	738
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	739 Kind kind = field.kind();
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	740 ValueNode receiver = frameState.apop();
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	741 if ((field instanceof ResolvedJavaField) && ((ResolvedJavaField) field).holder().isInitialized()) {
b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	742 LoadFieldNode load = currentGraph.add(new LoadFieldNode(receiver, (ResolvedJavaField) field, graphId));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	743 appendOptimizedLoadField(kind, load);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	744 } else {
5547 b6617d13ea44 Dropping Ci* prefixes. Some additional renamings in the api.code interface. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5541 diff changeset	745 append(currentGraph.add(new DeoptimizeNode(DeoptimizationAction.InvalidateRecompile, DeoptimizationReason.Unresolved, graphId)));
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	746 frameState.push(kind.stackKind(), append(ConstantNode.defaultForKind(kind, currentGraph)));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	747 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	748 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	749
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	750 public static class ExceptionInfo {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	751
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	752 public final FixedWithNextNode exceptionEdge;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	753 public final ValueNode exception;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	754
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	755 public ExceptionInfo(FixedWithNextNode exceptionEdge, ValueNode exception) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	756 this.exceptionEdge = exceptionEdge;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	757 this.exception = exception;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	758 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	759 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	760
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	761 private void emitNullCheck(ValueNode receiver) {
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	762 BlockPlaceholderNode trueSucc = currentGraph.add(new BlockPlaceholderNode());
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	763 BlockPlaceholderNode falseSucc = currentGraph.add(new BlockPlaceholderNode());
5703 05c5f68e23d5 Fix some If probabilities in graph builder Gilles Duboscq <duboscq@ssw.jku.at> parents: 5695 diff changeset	764 IfNode ifNode = currentGraph.add(new IfNode(currentGraph.unique(new IsNullNode(receiver)), trueSucc, falseSucc, 0.5, graphId));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	765
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	766 append(ifNode);
5425 0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5401 diff changeset	767 lastInstr = falseSucc;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	768
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	769 if (GraalOptions.OmitHotExceptionStacktrace) {
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	770 ValueNode exception = ConstantNode.forObject(new NullPointerException(), runtime, currentGraph);
5425 0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5401 diff changeset	771 trueSucc.setNext(handleException(exception, bci()));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	772 } else {
6521 2a0c9f20baa1 consolidated framework for runtime and stub calls and moved declaration of descriptors for such calls to the source file in which they are used Doug Simon <doug.simon@oracle.com> parents: 6511 diff changeset	773 RuntimeCallNode call = currentGraph.add(new RuntimeCallNode(CREATE_NULL_POINTER_EXCEPTION));
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	774 call.setStateAfter(frameState.create(bci()));
5425 0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5401 diff changeset	775 trueSucc.setNext(call);
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	776 call.setNext(handleException(call, bci()));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	777 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	778 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	779
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	780 private void emitBoundsCheck(ValueNode index, ValueNode length) {
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	781 BlockPlaceholderNode trueSucc = currentGraph.add(new BlockPlaceholderNode());
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	782 BlockPlaceholderNode falseSucc = currentGraph.add(new BlockPlaceholderNode());
5703 05c5f68e23d5 Fix some If probabilities in graph builder Gilles Duboscq <duboscq@ssw.jku.at> parents: 5695 diff changeset	783 IfNode ifNode = currentGraph.add(new IfNode(currentGraph.unique(new IntegerBelowThanNode(index, length)), trueSucc, falseSucc, 0.5, graphId));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	784
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	785 append(ifNode);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	786 lastInstr = trueSucc;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	787
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	788 if (GraalOptions.OmitHotExceptionStacktrace) {
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	789 ValueNode exception = ConstantNode.forObject(new ArrayIndexOutOfBoundsException(), runtime, currentGraph);
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	790 falseSucc.setNext(handleException(exception, bci()));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	791 } else {
6521 2a0c9f20baa1 consolidated framework for runtime and stub calls and moved declaration of descriptors for such calls to the source file in which they are used Doug Simon <doug.simon@oracle.com> parents: 6511 diff changeset	792 RuntimeCallNode call = currentGraph.add(new RuntimeCallNode(CREATE_OUT_OF_BOUNDS_EXCEPTION, index));
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	793 call.setStateAfter(frameState.create(bci()));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	794 falseSucc.setNext(call);
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	795 call.setNext(handleException(call, bci()));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	796 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	797 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	798
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	799 private void emitExplicitExceptions(ValueNode receiver, ValueNode outOfBoundsIndex) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	800 assert receiver != null;
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	801 if (!GraalOptions.AllowExplicitExceptionChecks \|\| (optimisticOpts.useExceptionProbability() && profilingInfo.getExceptionSeen(bci()) == ExceptionSeen.FALSE)) {
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	802 return;
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	803 }
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	804
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	805 emitNullCheck(receiver);
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	806 if (outOfBoundsIndex != null) {
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	807 ValueNode length = append(currentGraph.add(new ArrayLengthNode(receiver)));
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	808 emitBoundsCheck(outOfBoundsIndex, length);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	809 }
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	810 Debug.metric("ExplicitExceptions").increment();
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	811 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	812
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	813 private void genPutField(JavaField field) {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	814 emitExplicitExceptions(frameState.peek(1), null);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	815
5531 816fb2492760 Remove architecture boolean from Ri* interfaces. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5510 diff changeset	816 ValueNode value = frameState.pop(field.kind().stackKind());
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	817 ValueNode receiver = frameState.apop();
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	818 if (field instanceof ResolvedJavaField && ((ResolvedJavaField) field).holder().isInitialized()) {
b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	819 StoreFieldNode store = currentGraph.add(new StoreFieldNode(receiver, (ResolvedJavaField) field, value, graphId));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	820 appendOptimizedStoreField(store);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	821 } else {
5547 b6617d13ea44 Dropping Ci* prefixes. Some additional renamings in the api.code interface. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5541 diff changeset	822 append(currentGraph.add(new DeoptimizeNode(DeoptimizationAction.InvalidateRecompile, DeoptimizationReason.Unresolved, graphId)));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	823 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	824 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	825
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	826 private void genGetStatic(JavaField field) {
b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	827 JavaType holder = field.holder();
b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	828 boolean isInitialized = (field instanceof ResolvedJavaField) && ((ResolvedJavaType) holder).isInitialized();
5538 e18ba36bfebc Renamed RiConstant => Constant. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5531 diff changeset	829 Constant constantValue = null;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	830 if (isInitialized) {
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	831 constantValue = ((ResolvedJavaField) field).constantValue(null);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	832 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	833 if (constantValue != null) {
6329 92bc58dc5b5e More clean up and documentation in api.code and api.meta. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5814 diff changeset	834 frameState.push(constantValue.getKind().stackKind(), appendConstant(constantValue));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	835 } else {
6401 3b3af8fc32a7 Distinguish between the Representation of primitive and Object fields so that Object fields can be stored in a different place. Christian Wimmer <christian.wimmer@oracle.com> parents: 6354 diff changeset	836 ValueNode container = genTypeOrDeopt(field.kind() == Kind.Object ? JavaType.Representation.StaticObjectFields : JavaType.Representation.StaticPrimitiveFields, holder, isInitialized);
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	837 Kind kind = field.kind();
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	838 if (container != null) {
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	839 LoadFieldNode load = currentGraph.add(new LoadFieldNode(container, (ResolvedJavaField) field, graphId));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	840 appendOptimizedLoadField(kind, load);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	841 } else {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	842 // deopt will be generated by genTypeOrDeopt, not needed here
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	843 frameState.push(kind.stackKind(), append(ConstantNode.defaultForKind(kind, currentGraph)));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	844 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	845 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	846 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	847
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	848 private void genPutStatic(JavaField field) {
b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	849 JavaType holder = field.holder();
6401 3b3af8fc32a7 Distinguish between the Representation of primitive and Object fields so that Object fields can be stored in a different place. Christian Wimmer <christian.wimmer@oracle.com> parents: 6354 diff changeset	850 boolean isInitialized = (field instanceof ResolvedJavaField) && ((ResolvedJavaType) holder).isInitialized();
3b3af8fc32a7 Distinguish between the Representation of primitive and Object fields so that Object fields can be stored in a different place. Christian Wimmer <christian.wimmer@oracle.com> parents: 6354 diff changeset	851 ValueNode container = genTypeOrDeopt(field.kind() == Kind.Object ? JavaType.Representation.StaticObjectFields : JavaType.Representation.StaticPrimitiveFields, holder, isInitialized);
5531 816fb2492760 Remove architecture boolean from Ri* interfaces. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5510 diff changeset	852 ValueNode value = frameState.pop(field.kind().stackKind());
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	853 if (container != null) {
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	854 StoreFieldNode store = currentGraph.add(new StoreFieldNode(container, (ResolvedJavaField) field, value, graphId));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	855 appendOptimizedStoreField(store);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	856 } else {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	857 // deopt will be generated by genTypeOrDeopt, not needed here
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	858 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	859 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	860
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	861 private ConstantNode genTypeOrDeopt(JavaType.Representation representation, JavaType holder, boolean initialized) {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	862 if (initialized) {
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	863 return appendConstant(((ResolvedJavaType) holder).getEncoding(representation));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	864 } else {
5547 b6617d13ea44 Dropping Ci* prefixes. Some additional renamings in the api.code interface. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5541 diff changeset	865 append(currentGraph.add(new DeoptimizeNode(DeoptimizationAction.InvalidateRecompile, DeoptimizationReason.Unresolved, graphId)));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	866 return null;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	867 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	868 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	869
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	870 private void appendOptimizedStoreField(StoreFieldNode store) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	871 append(store);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	872 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	873
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	874 private void appendOptimizedLoadField(Kind kind, LoadFieldNode load) {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	875 // append the load to the instruction
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	876 ValueNode optimized = append(load);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	877 frameState.push(kind.stackKind(), optimized);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	878 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	879
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	880 private void genInvokeStatic(JavaMethod target) {
b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	881 if (target instanceof ResolvedJavaMethod) {
b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	882 ResolvedJavaMethod resolvedTarget = (ResolvedJavaMethod) target;
b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	883 ResolvedJavaType holder = resolvedTarget.holder();
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	884 if (!holder.isInitialized() && GraalOptions.ResolveClassBeforeStaticInvoke) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	885 genInvokeDeopt(target, false);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	886 } else {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	887 ValueNode[] args = frameState.popArguments(resolvedTarget.signature().argumentSlots(false), resolvedTarget.signature().argumentCount(false));
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	888 appendInvoke(InvokeKind.Static, resolvedTarget, args);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	889 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	890 } else {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	891 genInvokeDeopt(target, false);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	892 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	893 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	894
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	895 private void genInvokeInterface(JavaMethod target) {
b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	896 if (target instanceof ResolvedJavaMethod) {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	897 ValueNode[] args = frameState.popArguments(target.signature().argumentSlots(true), target.signature().argumentCount(true));
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	898 genInvokeIndirect(InvokeKind.Interface, (ResolvedJavaMethod) target, args);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	899 } else {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	900 genInvokeDeopt(target, true);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	901 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	902 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	903
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	904 private void genInvokeVirtual(JavaMethod target) {
b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	905 if (target instanceof ResolvedJavaMethod) {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	906 ValueNode[] args = frameState.popArguments(target.signature().argumentSlots(true), target.signature().argumentCount(true));
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	907 genInvokeIndirect(InvokeKind.Virtual, (ResolvedJavaMethod) target, args);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	908 } else {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	909 genInvokeDeopt(target, true);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	910 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	911
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	912 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	913
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	914 private void genInvokeSpecial(JavaMethod target) {
b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	915 if (target instanceof ResolvedJavaMethod) {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	916 assert target != null;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	917 assert target.signature() != null;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	918 ValueNode[] args = frameState.popArguments(target.signature().argumentSlots(true), target.signature().argumentCount(true));
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	919 invokeDirect((ResolvedJavaMethod) target, args);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	920 } else {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	921 genInvokeDeopt(target, true);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	922 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	923 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	924
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	925 private void genInvokeDeopt(JavaMethod unresolvedTarget, boolean withReceiver) {
5547 b6617d13ea44 Dropping Ci* prefixes. Some additional renamings in the api.code interface. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5541 diff changeset	926 append(currentGraph.add(new DeoptimizeNode(DeoptimizationAction.InvalidateRecompile, DeoptimizationReason.Unresolved, graphId)));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	927 frameState.popArguments(unresolvedTarget.signature().argumentSlots(withReceiver), unresolvedTarget.signature().argumentCount(withReceiver));
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	928 Kind kind = unresolvedTarget.signature().returnKind();
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	929 if (kind != Kind.Void) {
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	930 frameState.push(kind.stackKind(), append(ConstantNode.defaultForKind(kind, currentGraph)));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	931 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	932 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	933
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	934 private void genInvokeIndirect(InvokeKind invokeKind, ResolvedJavaMethod target, ValueNode[] args) {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	935 ValueNode receiver = args[0];
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	936 // attempt to devirtualize the call
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	937 ResolvedJavaType klass = target.holder();
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	938
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	939 // 0. check for trivial cases
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	940 if (target.canBeStaticallyBound() && !isAbstract(target.accessFlags())) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	941 // check for trivial cases (e.g. final methods, nonvirtual methods)
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	942 invokeDirect(target, args);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	943 return;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	944 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	945 // 1. check if the exact type of the receiver can be determined
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	946 ResolvedJavaType exact = klass.exactType();
5443 141817e206d4 changes to the dependencies and stamp system: Lukas Stadler <lukas.stadler@jku.at> parents: 5425 diff changeset	947 if (exact == null && receiver.objectStamp().isExactType()) {
141817e206d4 changes to the dependencies and stamp system: Lukas Stadler <lukas.stadler@jku.at> parents: 5425 diff changeset	948 exact = receiver.objectStamp().type();
141817e206d4 changes to the dependencies and stamp system: Lukas Stadler <lukas.stadler@jku.at> parents: 5425 diff changeset	949 }
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	950 if (exact != null) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	951 // either the holder class is exact, or the receiver object has an exact type
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	952 invokeDirect(exact.resolveMethodImpl(target), args);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	953 return;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	954 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	955 // devirtualization failed, produce an actual invokevirtual
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	956 appendInvoke(invokeKind, target, args);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	957 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	958
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	959 private void invokeDirect(ResolvedJavaMethod target, ValueNode[] args) {
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	960 appendInvoke(InvokeKind.Special, target, args);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	961 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	962
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	963 private void appendInvoke(InvokeKind invokeKind, ResolvedJavaMethod targetMethod, ValueNode[] args) {
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	964 Kind resultType = targetMethod.signature().returnKind();
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	965 if (GraalOptions.DeoptALot) {
5547 b6617d13ea44 Dropping Ci* prefixes. Some additional renamings in the api.code interface. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5541 diff changeset	966 DeoptimizeNode deoptimize = currentGraph.add(new DeoptimizeNode(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint, graphId));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	967 deoptimize.setMessage("invoke " + targetMethod.name());
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	968 append(deoptimize);
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	969 frameState.pushReturn(resultType, ConstantNode.defaultForKind(resultType, currentGraph));
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	970 return;
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	971 }
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	972
5752 6e9c7af8ce5d Fixed propagation of return type into call sites. Eager resolve return type when specified in the graph builder. Added new test case. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5648 diff changeset	973 JavaType returnType = targetMethod.signature().returnType(method.holder());
6e9c7af8ce5d Fixed propagation of return type into call sites. Eager resolve return type when specified in the graph builder. Added new test case. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5648 diff changeset	974 if (graphBuilderConfig.eagerResolvingForSnippets()) {
6e9c7af8ce5d Fixed propagation of return type into call sites. Eager resolve return type when specified in the graph builder. Added new test case. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5648 diff changeset	975 returnType = returnType.resolve(targetMethod.holder());
6e9c7af8ce5d Fixed propagation of return type into call sites. Eager resolve return type when specified in the graph builder. Added new test case. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5648 diff changeset	976 }
6e9c7af8ce5d Fixed propagation of return type into call sites. Eager resolve return type when specified in the graph builder. Added new test case. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5648 diff changeset	977 MethodCallTargetNode callTarget = currentGraph.add(new MethodCallTargetNode(invokeKind, targetMethod, args, returnType));
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	978 // be conservative if information was not recorded (could result in endless recompiles otherwise)
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	979 if (optimisticOpts.useExceptionProbability() && profilingInfo.getExceptionSeen(bci()) == ExceptionSeen.FALSE) {
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	980 ValueNode result = appendWithBCI(currentGraph.add(new InvokeNode(callTarget, bci(), graphId)));
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	981 frameState.pushReturn(resultType, result);
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	982
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	983 } else {
5373 53cc37c27b04 used more specific BeginNode subclass where appropriate Doug Simon <doug.simon@oracle.com> parents: 5372 diff changeset	984 DispatchBeginNode exceptionEdge = handleException(null, bci());
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	985 InvokeWithExceptionNode invoke = currentGraph.add(new InvokeWithExceptionNode(callTarget, exceptionEdge, bci(), graphId));
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	986 ValueNode result = append(invoke);
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	987 frameState.pushReturn(resultType, result);
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	988 Block nextBlock = currentBlock.successors.get(0);
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	989
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	990 assert bci() == currentBlock.endBci;
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	991 frameState.clearNonLiveLocals(currentBlock.localsLiveOut);
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	992
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	993 invoke.setNext(createTarget(nextBlock, frameState));
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	994 invoke.setStateAfter(frameState.create(nextBlock.startBci));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	995 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	996 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	997
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	998 private void callRegisterFinalizer() {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	999 // append a call to the finalizer registration
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	1000 append(currentGraph.add(new RegisterFinalizerNode(frameState.loadLocal(0))));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1001 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1002
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1003 private void genReturn(ValueNode x) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1004 frameState.clearStack();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1005 if (x != null) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1006 frameState.push(x.kind(), x);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1007 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1008 appendGoto(createTarget(returnBlock(bci()), frameState));
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1009 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1010
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1011 private MonitorEnterNode genMonitorEnter(ValueNode x) {
6444 5ebe3e5a892b fix bailouts due to insufficient balanced monitor checks Lukas Stadler <lukas.stadler@jku.at> parents: 6436 diff changeset	1012 frameState.pushLock(x);
4233 fa53d5e4aa35 Remove lock information from frame states, and compute it instead when LIR is generated. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4205 diff changeset	1013 MonitorEnterNode monitorEnter = currentGraph.add(new MonitorEnterNode(x));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1014 appendWithBCI(monitorEnter);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1015 return monitorEnter;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1016 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1017
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1018 private MonitorExitNode genMonitorExit(ValueNode x) {
6436 5395ecdfce8a move monitors into FrameState (fixes subtle issues for tail duplication and other optimizations) Lukas Stadler <lukas.stadler@jku.at> parents: 6401 diff changeset	1019 ValueNode lockedObject = frameState.popLock();
6444 5ebe3e5a892b fix bailouts due to insufficient balanced monitor checks Lukas Stadler <lukas.stadler@jku.at> parents: 6436 diff changeset	1020 if (GraphUtil.originalValue(lockedObject) != GraphUtil.originalValue(x)) {
5ebe3e5a892b fix bailouts due to insufficient balanced monitor checks Lukas Stadler <lukas.stadler@jku.at> parents: 6436 diff changeset	1021 throw new BailoutException("unbalanced monitors: mismatch at monitorexit, %s != %s", GraphUtil.originalValue(x), GraphUtil.originalValue(lockedObject));
6436 5395ecdfce8a move monitors into FrameState (fixes subtle issues for tail duplication and other optimizations) Lukas Stadler <lukas.stadler@jku.at> parents: 6401 diff changeset	1022 }
4233 fa53d5e4aa35 Remove lock information from frame states, and compute it instead when LIR is generated. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4205 diff changeset	1023 MonitorExitNode monitorExit = currentGraph.add(new MonitorExitNode(x));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1024 appendWithBCI(monitorExit);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1025 return monitorExit;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1026 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1027
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1028 private void genJsr(int dest) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1029 Block successor = currentBlock.jsrSuccessor;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1030 assert successor.startBci == dest : successor.startBci + " != " + dest + " @" + bci();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1031 JsrScope scope = currentBlock.jsrScope;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1032 if (!successor.jsrScope.pop().equals(scope)) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1033 throw new JsrNotSupportedBailout("unstructured control flow (internal limitation)");
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1034 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1035 if (successor.jsrScope.nextReturnAddress() != stream().nextBCI()) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1036 throw new JsrNotSupportedBailout("unstructured control flow (internal limitation)");
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1037 }
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1038 frameState.push(Kind.Jsr, ConstantNode.forJsr(stream().nextBCI(), currentGraph));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1039 appendGoto(createTarget(successor, frameState));
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1040 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1041
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1042 private void genRet(int localIndex) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1043 Block successor = currentBlock.retSuccessor;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1044 ValueNode local = frameState.loadLocal(localIndex);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1045 JsrScope scope = currentBlock.jsrScope;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1046 int retAddress = scope.nextReturnAddress();
5547 b6617d13ea44 Dropping Ci* prefixes. Some additional renamings in the api.code interface. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5541 diff changeset	1047 append(currentGraph.add(new FixedGuardNode(currentGraph.unique(new IntegerEqualsNode(local, ConstantNode.forJsr(retAddress, currentGraph))), DeoptimizationReason.JavaSubroutineMismatch, DeoptimizationAction.InvalidateReprofile, graphId)));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1048 if (!successor.jsrScope.equals(scope.pop())) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1049 throw new JsrNotSupportedBailout("unstructured control flow (ret leaves more than one scope)");
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1050 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1051 appendGoto(createTarget(successor, frameState));
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1052 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1053
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1054 private double[] switchProbability(int numberOfCases, int bci) {
4440 271220b49abc profiling info fixes Christian Haeubl <christian.haeubl@oracle.com> parents: 4266 diff changeset	1055 double[] prob = profilingInfo.getSwitchProbabilities(bci);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1056 if (prob != null) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1057 assert prob.length == numberOfCases;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1058 } else {
4399 a74fd31c017e Remove TraceProbability flag. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4370 diff changeset	1059 Debug.log("Missing probability (switch) in %s at bci %d", method, bci);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1060 prob = new double[numberOfCases];
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1061 for (int i = 0; i < numberOfCases; i++) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1062 prob[i] = 1.0d / numberOfCases;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1063 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1064 }
5146 25903e52af48 Add assertion around probabilities, and fix potential problem in ComputeProbabilityPhase Gilles Duboscq <duboscq@ssw.jku.at> parents: 5130 diff changeset	1065 assert allPositive(prob);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1066 return prob;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1067 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1068
5146 25903e52af48 Add assertion around probabilities, and fix potential problem in ComputeProbabilityPhase Gilles Duboscq <duboscq@ssw.jku.at> parents: 5130 diff changeset	1069 private static boolean allPositive(double[] a) {
25903e52af48 Add assertion around probabilities, and fix potential problem in ComputeProbabilityPhase Gilles Duboscq <duboscq@ssw.jku.at> parents: 5130 diff changeset	1070 for (double d : a) {
25903e52af48 Add assertion around probabilities, and fix potential problem in ComputeProbabilityPhase Gilles Duboscq <duboscq@ssw.jku.at> parents: 5130 diff changeset	1071 if (d < 0) {
25903e52af48 Add assertion around probabilities, and fix potential problem in ComputeProbabilityPhase Gilles Duboscq <duboscq@ssw.jku.at> parents: 5130 diff changeset	1072 return false;
25903e52af48 Add assertion around probabilities, and fix potential problem in ComputeProbabilityPhase Gilles Duboscq <duboscq@ssw.jku.at> parents: 5130 diff changeset	1073 }
25903e52af48 Add assertion around probabilities, and fix potential problem in ComputeProbabilityPhase Gilles Duboscq <duboscq@ssw.jku.at> parents: 5130 diff changeset	1074 }
25903e52af48 Add assertion around probabilities, and fix potential problem in ComputeProbabilityPhase Gilles Duboscq <duboscq@ssw.jku.at> parents: 5130 diff changeset	1075 return true;
25903e52af48 Add assertion around probabilities, and fix potential problem in ComputeProbabilityPhase Gilles Duboscq <duboscq@ssw.jku.at> parents: 5130 diff changeset	1076 }
25903e52af48 Add assertion around probabilities, and fix potential problem in ComputeProbabilityPhase Gilles Duboscq <duboscq@ssw.jku.at> parents: 5130 diff changeset	1077
5698 764db9ada24f rework of switch operations: unify lookup- and tableswitch, introduce switch lir instructions Lukas Stadler <lukas.stadler@jku.at> parents: 5695 diff changeset	1078 private void genSwitch(BytecodeSwitch bs) {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1079 int bci = bci();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1080 ValueNode value = frameState.ipop();
5698 764db9ada24f rework of switch operations: unify lookup- and tableswitch, introduce switch lir instructions Lukas Stadler <lukas.stadler@jku.at> parents: 5695 diff changeset	1081
764db9ada24f rework of switch operations: unify lookup- and tableswitch, introduce switch lir instructions Lukas Stadler <lukas.stadler@jku.at> parents: 5695 diff changeset	1082 int nofCases = bs.numberOfCases();
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1083
5698 764db9ada24f rework of switch operations: unify lookup- and tableswitch, introduce switch lir instructions Lukas Stadler <lukas.stadler@jku.at> parents: 5695 diff changeset	1084 Map<Integer, Integer> bciToSuccessorIndex = new HashMap<>();
764db9ada24f rework of switch operations: unify lookup- and tableswitch, introduce switch lir instructions Lukas Stadler <lukas.stadler@jku.at> parents: 5695 diff changeset	1085 int successorCount = currentBlock.successors.size();
764db9ada24f rework of switch operations: unify lookup- and tableswitch, introduce switch lir instructions Lukas Stadler <lukas.stadler@jku.at> parents: 5695 diff changeset	1086 for (int i = 0; i < successorCount; i++) {
764db9ada24f rework of switch operations: unify lookup- and tableswitch, introduce switch lir instructions Lukas Stadler <lukas.stadler@jku.at> parents: 5695 diff changeset	1087 assert !bciToSuccessorIndex.containsKey(currentBlock.successors.get(i).startBci);
764db9ada24f rework of switch operations: unify lookup- and tableswitch, introduce switch lir instructions Lukas Stadler <lukas.stadler@jku.at> parents: 5695 diff changeset	1088 if (!bciToSuccessorIndex.containsKey(currentBlock.successors.get(i).startBci)) {
764db9ada24f rework of switch operations: unify lookup- and tableswitch, introduce switch lir instructions Lukas Stadler <lukas.stadler@jku.at> parents: 5695 diff changeset	1089 bciToSuccessorIndex.put(currentBlock.successors.get(i).startBci, i);
764db9ada24f rework of switch operations: unify lookup- and tableswitch, introduce switch lir instructions Lukas Stadler <lukas.stadler@jku.at> parents: 5695 diff changeset	1090 }
764db9ada24f rework of switch operations: unify lookup- and tableswitch, introduce switch lir instructions Lukas Stadler <lukas.stadler@jku.at> parents: 5695 diff changeset	1091 }
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1092
5698 764db9ada24f rework of switch operations: unify lookup- and tableswitch, introduce switch lir instructions Lukas Stadler <lukas.stadler@jku.at> parents: 5695 diff changeset	1093 double[] keyProbabilities = switchProbability(nofCases + 1, bci);
764db9ada24f rework of switch operations: unify lookup- and tableswitch, introduce switch lir instructions Lukas Stadler <lukas.stadler@jku.at> parents: 5695 diff changeset	1094
764db9ada24f rework of switch operations: unify lookup- and tableswitch, introduce switch lir instructions Lukas Stadler <lukas.stadler@jku.at> parents: 5695 diff changeset	1095 int[] keys = new int[nofCases];
764db9ada24f rework of switch operations: unify lookup- and tableswitch, introduce switch lir instructions Lukas Stadler <lukas.stadler@jku.at> parents: 5695 diff changeset	1096 int[] keySuccessors = new int[nofCases + 1];
764db9ada24f rework of switch operations: unify lookup- and tableswitch, introduce switch lir instructions Lukas Stadler <lukas.stadler@jku.at> parents: 5695 diff changeset	1097 for (int i = 0; i < nofCases; i++) {
764db9ada24f rework of switch operations: unify lookup- and tableswitch, introduce switch lir instructions Lukas Stadler <lukas.stadler@jku.at> parents: 5695 diff changeset	1098 keys[i] = bs.keyAt(i);
764db9ada24f rework of switch operations: unify lookup- and tableswitch, introduce switch lir instructions Lukas Stadler <lukas.stadler@jku.at> parents: 5695 diff changeset	1099 keySuccessors[i] = bciToSuccessorIndex.get(bs.targetAt(i));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1100 }
5698 764db9ada24f rework of switch operations: unify lookup- and tableswitch, introduce switch lir instructions Lukas Stadler <lukas.stadler@jku.at> parents: 5695 diff changeset	1101 keySuccessors[nofCases] = bciToSuccessorIndex.get(bs.defaultTarget());
764db9ada24f rework of switch operations: unify lookup- and tableswitch, introduce switch lir instructions Lukas Stadler <lukas.stadler@jku.at> parents: 5695 diff changeset	1102
764db9ada24f rework of switch operations: unify lookup- and tableswitch, introduce switch lir instructions Lukas Stadler <lukas.stadler@jku.at> parents: 5695 diff changeset	1103 double[] successorProbabilities = IntegerSwitchNode.successorProbabilites(successorCount, keySuccessors, keyProbabilities);
764db9ada24f rework of switch operations: unify lookup- and tableswitch, introduce switch lir instructions Lukas Stadler <lukas.stadler@jku.at> parents: 5695 diff changeset	1104 IntegerSwitchNode lookupSwitch = currentGraph.add(new IntegerSwitchNode(value, successorCount, keys, keyProbabilities, keySuccessors));
764db9ada24f rework of switch operations: unify lookup- and tableswitch, introduce switch lir instructions Lukas Stadler <lukas.stadler@jku.at> parents: 5695 diff changeset	1105 for (int i = 0; i < successorCount; i++) {
764db9ada24f rework of switch operations: unify lookup- and tableswitch, introduce switch lir instructions Lukas Stadler <lukas.stadler@jku.at> parents: 5695 diff changeset	1106 lookupSwitch.setBlockSuccessor(i, createBlockTarget(successorProbabilities[i], currentBlock.successors.get(i), frameState));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1107 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1108 append(lookupSwitch);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1109 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1110
5538 e18ba36bfebc Renamed RiConstant => Constant. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5531 diff changeset	1111 private ConstantNode appendConstant(Constant constant) {
5629 26a060cc58ca Initial implementation of closed world analysis by iteratively expanding the universe starting at method entry points. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5572 diff changeset	1112 assert constant != null;
5572 8f9c9d372e31 small renaming and doc fixes Lukas Stadler <lukas.stadler@jku.at> parents: 5571 diff changeset	1113 return ConstantNode.forConstant(constant, runtime, currentGraph);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1114 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1115
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1116 private ValueNode append(FixedNode fixed) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1117 lastInstr.setNext(fixed);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1118 lastInstr = null;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1119 return fixed;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1120 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1121
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1122 private ValueNode append(FixedWithNextNode x) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1123 return appendWithBCI(x);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1124 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1125
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	1126 private static ValueNode append(ValueNode v) {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1127 return v;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1128 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1129
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1130 private ValueNode appendWithBCI(FixedWithNextNode x) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1131 assert x.predecessor() == null : "instruction should not have been appended yet";
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1132 assert lastInstr.next() == null : "cannot append instruction to instruction which isn't end (" + lastInstr + "->" + lastInstr.next() + ")";
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1133 lastInstr.setNext(x);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1134 lastInstr = x;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1135 return x;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1136 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1137
5210 e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1138 private static class Target {
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1139 FixedNode fixed;
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1140 FrameStateBuilder state;
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1141 public Target(FixedNode fixed, FrameStateBuilder state) {
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1142 this.fixed = fixed;
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1143 this.state = state;
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1144 }
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1145 }
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1146
5255 38feba3e8526 separated safepoints out of LoopEndNodes into SafepointNodes Doug Simon <doug.simon@oracle.com> parents: 5210 diff changeset	1147 private Target checkLoopExit(FixedNode target, Block targetBlock, FrameStateBuilder state) {
5210 e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1148 if (currentBlock != null) {
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1149 long exits = currentBlock.loops & ~targetBlock.loops;
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1150 if (exits != 0) {
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1151 LoopExitNode firstLoopExit = null;
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1152 LoopExitNode lastLoopExit = null;
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1153
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1154 int pos = 0;
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1155 ArrayList<Block> exitLoops = new ArrayList<>(Long.bitCount(exits));
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1156 do {
5767 5967805da8f5 fix bug in BciBlockMapping that leads to bailouts on methods with more than 32 loops Lukas Stadler <lukas.stadler@jku.at> parents: 5719 diff changeset	1157 long lMask = 1L << pos;
5210 e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1158 if ((exits & lMask) != 0) {
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1159 exitLoops.add(loopHeaders[pos]);
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1160 exits &= ~lMask;
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1161 }
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1162 pos++;
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1163 } while (exits != 0);
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1164
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1165 Collections.sort(exitLoops, new Comparator<Block>() {
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1166 @Override
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1167 public int compare(Block o1, Block o2) {
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1168 return Long.bitCount(o2.loops) - Long.bitCount(o1.loops);
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1169 }
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1170 });
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1171
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1172 int bci = targetBlock.startBci;
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1173 if (targetBlock instanceof ExceptionDispatchBlock) {
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1174 bci = ((ExceptionDispatchBlock) targetBlock).deoptBci;
5210 e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1175 }
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1176 FrameStateBuilder newState = state.copy();
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1177 for (Block loop : exitLoops) {
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1178 LoopBeginNode loopBegin = (LoopBeginNode) loop.firstInstruction;
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1179 LoopExitNode loopExit = currentGraph.add(new LoopExitNode(loopBegin));
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1180 if (lastLoopExit != null) {
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1181 lastLoopExit.setNext(loopExit);
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1182 }
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1183 if (firstLoopExit == null) {
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1184 firstLoopExit = loopExit;
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1185 }
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1186 lastLoopExit = loopExit;
5255 38feba3e8526 separated safepoints out of LoopEndNodes into SafepointNodes Doug Simon <doug.simon@oracle.com> parents: 5210 diff changeset	1187 Debug.log("Target %s (%s) Exits %s, scanning framestates...", targetBlock, target, loop);
5210 e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1188 newState.insertProxies(loopExit, loop.entryState);
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1189 loopExit.setStateAfter(newState.create(bci));
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1190 }
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1191
5255 38feba3e8526 separated safepoints out of LoopEndNodes into SafepointNodes Doug Simon <doug.simon@oracle.com> parents: 5210 diff changeset	1192 lastLoopExit.setNext(target);
5210 e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1193 return new Target(firstLoopExit, newState);
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1194 }
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1195 }
5255 38feba3e8526 separated safepoints out of LoopEndNodes into SafepointNodes Doug Simon <doug.simon@oracle.com> parents: 5210 diff changeset	1196 return new Target(target, state);
5210 e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1197 }
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1198
5051 2ab527c53dba another fix for goto's deopt case Christian Haeubl <christian.haeubl@oracle.com> parents: 5050 diff changeset	1199 private FixedNode createTarget(double probability, Block block, FrameStateBuilder stateAfter) {
5786 f69a406355b2 new tail duplication phase Lukas Stadler <lukas.stadler@jku.at> parents: 5768 diff changeset	1200 assert probability >= 0 && probability <= 1.01 : probability;
5114 dad1ac9dba7d finished first implementation of disabling runtime feedback selectively based on deoptimization history Christian Haeubl <christian.haeubl@oracle.com> parents: 5110 diff changeset	1201 if (probability == 0 && optimisticOpts.removeNeverExecutedCode()) {
5547 b6617d13ea44 Dropping Ci* prefixes. Some additional renamings in the api.code interface. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5541 diff changeset	1202 return currentGraph.add(new DeoptimizeNode(DeoptimizationAction.InvalidateReprofile, DeoptimizationReason.UnreachedCode, graphId));
5051 2ab527c53dba another fix for goto's deopt case Christian Haeubl <christian.haeubl@oracle.com> parents: 5050 diff changeset	1203 } else {
2ab527c53dba another fix for goto's deopt case Christian Haeubl <christian.haeubl@oracle.com> parents: 5050 diff changeset	1204 return createTarget(block, stateAfter);
2ab527c53dba another fix for goto's deopt case Christian Haeubl <christian.haeubl@oracle.com> parents: 5050 diff changeset	1205 }
2ab527c53dba another fix for goto's deopt case Christian Haeubl <christian.haeubl@oracle.com> parents: 5050 diff changeset	1206 }
2ab527c53dba another fix for goto's deopt case Christian Haeubl <christian.haeubl@oracle.com> parents: 5050 diff changeset	1207
5210 e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1208 private FixedNode createTarget(Block block, FrameStateBuilder state) {
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1209 assert block != null && state != null;
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1210 assert !block.isExceptionEntry \|\| state.stackSize() == 1;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1211
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1212 if (block.firstInstruction == null) {
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1213 // This is the first time we see this block as a branch target.
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1214 // Create and return a placeholder that later can be replaced with a MergeNode when we see this block again.
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1215 block.firstInstruction = currentGraph.add(new BlockPlaceholderNode());
5210 e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1216 Target target = checkLoopExit(block.firstInstruction, block, state);
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1217 FixedNode result = target.fixed;
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1218 block.entryState = target.state == state ? state.copy() : target.state;
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1219 block.entryState.clearNonLiveLocals(block.localsLiveIn);
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1220
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1221 Debug.log("createTarget %s: first visit, result: %s", block, block.firstInstruction);
5210 e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1222 return result;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1223 }
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1224
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1225 // We already saw this block before, so we have to merge states.
5210 e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1226 if (!block.entryState.isCompatibleWith(state)) {
5547 b6617d13ea44 Dropping Ci* prefixes. Some additional renamings in the api.code interface. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5541 diff changeset	1227 throw new BailoutException("stacks do not match; bytecodes would not verify");
4614 a3882fd1ae61 Make it possible to have multiple LoopEnds per LoopBegin Gilles Duboscq <duboscq@ssw.jku.at> parents: 4554 diff changeset	1228 }
a3882fd1ae61 Make it possible to have multiple LoopEnds per LoopBegin Gilles Duboscq <duboscq@ssw.jku.at> parents: 4554 diff changeset	1229
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1230 if (block.firstInstruction instanceof LoopBeginNode) {
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1231 assert block.isLoopHeader && currentBlock.blockID >= block.blockID : "must be backward branch";
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1232 // Backward loop edge. We need to create a special LoopEndNode and merge with the loop begin node created before.
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1233 LoopBeginNode loopBegin = (LoopBeginNode) block.firstInstruction;
5210 e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1234 Target target = checkLoopExit(currentGraph.add(new LoopEndNode(loopBegin)), block, state);
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1235 FixedNode result = target.fixed;
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1236 block.entryState.merge(loopBegin, target.state);
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1237
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1238 Debug.log("createTarget %s: merging backward branch to loop header %s, result: %s", block, loopBegin, result);
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1239 return result;
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1240 }
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1241 assert currentBlock == null \|\| currentBlock.blockID < block.blockID : "must not be backward branch";
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1242 assert block.firstInstruction.next() == null : "bytecodes already parsed for block";
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1243
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1244 if (block.firstInstruction instanceof BlockPlaceholderNode) {
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1245 // This is the second time we see this block. Create the actual MergeNode and the End Node for the already existing edge.
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1246 // For simplicity, we leave the placeholder in the graph and just append the new nodes after the placeholder.
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1247 BlockPlaceholderNode placeholder = (BlockPlaceholderNode) block.firstInstruction;
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1248
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1249 // The EndNode for the already existing edge.
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1250 EndNode end = currentGraph.add(new EndNode());
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1251 // The MergeNode that replaces the placeholder.
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1252 MergeNode mergeNode = currentGraph.add(new MergeNode());
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1253 FixedNode next = placeholder.next();
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1254
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1255 placeholder.setNext(end);
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1256 mergeNode.addForwardEnd(end);
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1257 mergeNode.setNext(next);
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1258
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1259 block.firstInstruction = mergeNode;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1260 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1261
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1262 MergeNode mergeNode = (MergeNode) block.firstInstruction;
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1263
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1264 // The EndNode for the newly merged edge.
5210 e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1265 EndNode newEnd = currentGraph.add(new EndNode());
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1266 Target target = checkLoopExit(newEnd, block, state);
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1267 FixedNode result = target.fixed;
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1268 block.entryState.merge(mergeNode, target.state);
e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1269 mergeNode.addForwardEnd(newEnd);
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1270
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1271 Debug.log("createTarget %s: merging state, result: %s", block, result);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1272 return result;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1273 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1274
5029 74f47ef37394 Fix and enable liveness analysis to prune unnecessary frame state entries Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5026 diff changeset	1275 /**
74f47ef37394 Fix and enable liveness analysis to prune unnecessary frame state entries Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5026 diff changeset	1276 * Returns a block begin node with the specified state. If the specified probability is 0, the block
74f47ef37394 Fix and enable liveness analysis to prune unnecessary frame state entries Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5026 diff changeset	1277 * deoptimizes immediately.
74f47ef37394 Fix and enable liveness analysis to prune unnecessary frame state entries Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5026 diff changeset	1278 */
74f47ef37394 Fix and enable liveness analysis to prune unnecessary frame state entries Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5026 diff changeset	1279 private BeginNode createBlockTarget(double probability, Block block, FrameStateBuilder stateAfter) {
5051 2ab527c53dba another fix for goto's deopt case Christian Haeubl <christian.haeubl@oracle.com> parents: 5050 diff changeset	1280 FixedNode target = createTarget(probability, block, stateAfter);
5210 e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1281 BeginNode begin = BeginNode.begin(target);
5053 c53115427ff9 added assertion Christian Haeubl <christian.haeubl@oracle.com> parents: 5051 diff changeset	1282
5375 3035b6b881d9 removed stateAfter field from FixedWithNextNode - now only StateSplit implementations have this field Doug Simon <doug.simon@oracle.com> parents: 5373 diff changeset	1283 assert !(target instanceof DeoptimizeNode && begin.stateAfter() != null) :
5053 c53115427ff9 added assertion Christian Haeubl <christian.haeubl@oracle.com> parents: 5051 diff changeset	1284 "We are not allowed to set the stateAfter of the begin node, because we have to deoptimize to a bci _before_ the actual if, so that the interpreter can update the profiling information.";
5029 74f47ef37394 Fix and enable liveness analysis to prune unnecessary frame state entries Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5026 diff changeset	1285 return begin;
74f47ef37394 Fix and enable liveness analysis to prune unnecessary frame state entries Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5026 diff changeset	1286 }
74f47ef37394 Fix and enable liveness analysis to prune unnecessary frame state entries Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5026 diff changeset	1287
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	1288 private ValueNode synchronizedObject(FrameStateBuilder state, ResolvedJavaMethod target) {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1289 if (isStatic(target.accessFlags())) {
5572 8f9c9d372e31 small renaming and doc fixes Lukas Stadler <lukas.stadler@jku.at> parents: 5571 diff changeset	1290 return append(ConstantNode.forConstant(target.holder().getEncoding(Representation.JavaClass), runtime, currentGraph));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1291 } else {
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1292 return state.loadLocal(0);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1293 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1294 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1295
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1296 private void processBlock(Block block) {
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1297 // Ignore blocks that have no predecessors by the time it their bytecodes are parsed
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1298 if (block == null \|\| block.firstInstruction == null) {
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1299 Debug.log("Ignoring block %s", block);
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1300 return;
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1301 }
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1302 Debug.log("Parsing block %s firstInstruction: %s loopHeader: %b", block, block.firstInstruction, block.isLoopHeader);
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1303
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1304 lastInstr = block.firstInstruction;
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1305 frameState = block.entryState;
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1306 currentBlock = block;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1307
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1308 frameState.cleanupDeletedPhis();
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1309 if (lastInstr instanceof MergeNode) {
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1310 int bci = block.startBci;
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1311 if (block instanceof ExceptionDispatchBlock) {
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1312 bci = ((ExceptionDispatchBlock) block).deoptBci;
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1313 }
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1314 ((MergeNode) lastInstr).setStateAfter(frameState.create(bci));
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1315 }
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1316
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1317 if (block == returnBlock) {
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1318 frameState.setRethrowException(false);
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1319 createReturn();
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1320 } else if (block == unwindBlock) {
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1321 frameState.setRethrowException(false);
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1322 createUnwind();
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1323 } else if (block instanceof ExceptionDispatchBlock) {
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1324 createExceptionDispatch((ExceptionDispatchBlock) block);
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1325 } else {
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1326 frameState.setRethrowException(false);
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1327 iterateBytecodesForBlock(block);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1328 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1329 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1330
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1331 private void connectLoopEndToBegin() {
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	1332 for (LoopBeginNode begin : currentGraph.getNodes(LoopBeginNode.class)) {
4614 a3882fd1ae61 Make it possible to have multiple LoopEnds per LoopBegin Gilles Duboscq <duboscq@ssw.jku.at> parents: 4554 diff changeset	1333 if (begin.loopEnds().isEmpty()) {
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1334 // Remove loop header without loop ends.
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1335 // This can happen with degenerated loops like this one:
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1336 // for (;;) {
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1337 // try {
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1338 // break;
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1339 // } catch (UnresolvedException iioe) {
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1340 // }
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1341 // }
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1342 assert begin.forwardEndCount() == 1;
4614 a3882fd1ae61 Make it possible to have multiple LoopEnds per LoopBegin Gilles Duboscq <duboscq@ssw.jku.at> parents: 4554 diff changeset	1343 currentGraph.reduceDegenerateLoopBegin(begin);
a3882fd1ae61 Make it possible to have multiple LoopEnds per LoopBegin Gilles Duboscq <duboscq@ssw.jku.at> parents: 4554 diff changeset	1344 } else {
5210 e3e7542d78b7 Loop-closed form GraphBuidling Gilles Duboscq <duboscq@ssw.jku.at> parents: 5160 diff changeset	1345 GraphUtil.normalizeLoopBegin(begin);
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1346 }
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1347 }
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1348 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1349
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	1350 private void createUnwind() {
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1351 assert frameState.stackSize() == 1 : frameState;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1352 synchronizedEpilogue(FrameState.AFTER_EXCEPTION_BCI);
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	1353 UnwindNode unwindNode = currentGraph.add(new UnwindNode(frameState.apop()));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1354 append(unwindNode);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1355 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1356
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	1357 private void createReturn() {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1358 if (method.isConstructor() && method.holder().superType() == null) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1359 callRegisterFinalizer();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1360 }
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1361 Kind returnKind = method.signature().returnKind().stackKind();
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1362 ValueNode x = returnKind == Kind.Void ? null : frameState.pop(returnKind);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1363 assert frameState.stackSize() == 0;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1364
5056 2f2c6347fce4 comments cleanup/retagging Gilles Duboscq <duboscq@ssw.jku.at> parents: 5053 diff changeset	1365 // TODO (gdub) remove this when FloatingRead can handle this case
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1366 if (Modifier.isSynchronized(method.accessFlags())) {
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	1367 append(currentGraph.add(new ValueAnchorNode(x)));
4689 15849962252d Make sure rethrowException flag is cleared also when return/unwind blocks are entered, they could use the framestate for the synchronization epilogue. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4618 diff changeset	1368 assert !frameState.rethrowException();
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1369 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1370
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1371 synchronizedEpilogue(FrameState.AFTER_BCI);
6436 5395ecdfce8a move monitors into FrameState (fixes subtle issues for tail duplication and other optimizations) Lukas Stadler <lukas.stadler@jku.at> parents: 6401 diff changeset	1372 if (!frameState.locksEmpty()) {
5395ecdfce8a move monitors into FrameState (fixes subtle issues for tail duplication and other optimizations) Lukas Stadler <lukas.stadler@jku.at> parents: 6401 diff changeset	1373 System.out.println("unbalanced monitors");
5395ecdfce8a move monitors into FrameState (fixes subtle issues for tail duplication and other optimizations) Lukas Stadler <lukas.stadler@jku.at> parents: 6401 diff changeset	1374 throw new BailoutException("unbalanced monitors");
5395ecdfce8a move monitors into FrameState (fixes subtle issues for tail duplication and other optimizations) Lukas Stadler <lukas.stadler@jku.at> parents: 6401 diff changeset	1375 }
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	1376 ReturnNode returnNode = currentGraph.add(new ReturnNode(x));
6436 5395ecdfce8a move monitors into FrameState (fixes subtle issues for tail duplication and other optimizations) Lukas Stadler <lukas.stadler@jku.at> parents: 6401 diff changeset	1377
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1378 append(returnNode);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1379 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1380
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1381 private void synchronizedEpilogue(int bci) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1382 if (Modifier.isSynchronized(method.accessFlags())) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1383 MonitorExitNode monitorExit = genMonitorExit(methodSynchronizedObject);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1384 monitorExit.setStateAfter(frameState.create(bci));
4689 15849962252d Make sure rethrowException flag is cleared also when return/unwind blocks are entered, they could use the framestate for the synchronization epilogue. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4618 diff changeset	1385 assert !frameState.rethrowException();
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1386 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1387 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1388
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1389 private void createExceptionDispatch(ExceptionDispatchBlock block) {
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1390 assert frameState.stackSize() == 1 : frameState;
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1391 if (block.handler.isCatchAll()) {
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1392 assert block.successors.size() == 1;
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1393 appendGoto(createTarget(block.successors.get(0), frameState));
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1394 return;
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1395 }
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1396
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	1397 JavaType catchType = block.handler.catchType();
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1398 if (graphBuilderConfig.eagerResolving()) {
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1399 catchType = lookupType(block.handler.catchTypeCPI(), INSTANCEOF);
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1400 }
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	1401 boolean initialized = (catchType instanceof ResolvedJavaType);
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1402 if (initialized && graphBuilderConfig.getSkippedExceptionTypes() != null) {
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	1403 ResolvedJavaType resolvedCatchType = (ResolvedJavaType) catchType;
b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	1404 for (ResolvedJavaType skippedType : graphBuilderConfig.getSkippedExceptionTypes()) {
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1405 initialized &= !resolvedCatchType.isSubtypeOf(skippedType);
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1406 if (!initialized) {
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1407 break;
4548 f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4541 diff changeset	1408 }
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4541 diff changeset	1409 }
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1410 }
4548 f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4541 diff changeset	1411
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	1412 ConstantNode typeInstruction = genTypeOrDeopt(JavaType.Representation.ObjectHub, catchType, initialized);
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1413 if (typeInstruction != null) {
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1414 Block nextBlock = block.successors.size() == 1 ? unwindBlock(block.deoptBci) : block.successors.get(1);
5630 b60a368c8104 Add correct checkcast node to entry of catch block after exception dispatch. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5629 diff changeset	1415 ValueNode exception = frameState.stackAt(0);
b60a368c8104 Add correct checkcast node to entry of catch block after exception dispatch. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5629 diff changeset	1416 CheckCastNode checkCast = currentGraph.add(new CheckCastNode(typeInstruction, (ResolvedJavaType) catchType, exception));
b60a368c8104 Add correct checkcast node to entry of catch block after exception dispatch. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5629 diff changeset	1417 frameState.apop();
b60a368c8104 Add correct checkcast node to entry of catch block after exception dispatch. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5629 diff changeset	1418 frameState.push(Kind.Object, checkCast);
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1419 FixedNode catchSuccessor = createTarget(block.successors.get(0), frameState);
5630 b60a368c8104 Add correct checkcast node to entry of catch block after exception dispatch. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5629 diff changeset	1420 frameState.apop();
b60a368c8104 Add correct checkcast node to entry of catch block after exception dispatch. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5629 diff changeset	1421 frameState.push(Kind.Object, exception);
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1422 FixedNode nextDispatch = createTarget(nextBlock, frameState);
5630 b60a368c8104 Add correct checkcast node to entry of catch block after exception dispatch. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5629 diff changeset	1423 checkCast.setNext(catchSuccessor);
5695 a63ed5993987 Add leadGraphID to IfNOde so that we can convert them to deopts Gilles Duboscq <duboscq@ssw.jku.at> parents: 5648 diff changeset	1424 IfNode ifNode = currentGraph.add(new IfNode(currentGraph.unique(new InstanceOfNode(typeInstruction, (ResolvedJavaType) catchType, exception)), checkCast, nextDispatch, 0.5, graphId));
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1425 append(ifNode);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1426 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1427 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1428
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1429 private void appendGoto(FixedNode target) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1430 if (lastInstr != null) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1431 lastInstr.setNext(target);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1432 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1433 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1434
4435 57cb8ec5f6bb Restructure block and control flow graph data structures Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4433 diff changeset	1435 private static boolean isBlockEnd(Node n) {
57cb8ec5f6bb Restructure block and control flow graph data structures Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4433 diff changeset	1436 return trueSuccessorCount(n) > 1 \|\| n instanceof ReturnNode \|\| n instanceof UnwindNode \|\| n instanceof DeoptimizeNode;
57cb8ec5f6bb Restructure block and control flow graph data structures Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4433 diff changeset	1437 }
57cb8ec5f6bb Restructure block and control flow graph data structures Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4433 diff changeset	1438
57cb8ec5f6bb Restructure block and control flow graph data structures Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4433 diff changeset	1439 private static int trueSuccessorCount(Node n) {
57cb8ec5f6bb Restructure block and control flow graph data structures Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4433 diff changeset	1440 if (n == null) {
57cb8ec5f6bb Restructure block and control flow graph data structures Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4433 diff changeset	1441 return 0;
57cb8ec5f6bb Restructure block and control flow graph data structures Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4433 diff changeset	1442 }
57cb8ec5f6bb Restructure block and control flow graph data structures Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4433 diff changeset	1443 int i = 0;
57cb8ec5f6bb Restructure block and control flow graph data structures Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4433 diff changeset	1444 for (Node s : n.successors()) {
57cb8ec5f6bb Restructure block and control flow graph data structures Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4433 diff changeset	1445 if (Util.isFixed(s)) {
57cb8ec5f6bb Restructure block and control flow graph data structures Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4433 diff changeset	1446 i++;
57cb8ec5f6bb Restructure block and control flow graph data structures Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4433 diff changeset	1447 }
57cb8ec5f6bb Restructure block and control flow graph data structures Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4433 diff changeset	1448 }
57cb8ec5f6bb Restructure block and control flow graph data structures Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4433 diff changeset	1449 return i;
57cb8ec5f6bb Restructure block and control flow graph data structures Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4433 diff changeset	1450 }
57cb8ec5f6bb Restructure block and control flow graph data structures Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4433 diff changeset	1451
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1452 private void iterateBytecodesForBlock(Block block) {
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1453 if (block.isLoopHeader) {
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1454 // Create the loop header block, which later will merge the backward branches of the loop.
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1455 EndNode preLoopEnd = currentGraph.add(new EndNode());
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1456 LoopBeginNode loopBegin = currentGraph.add(new LoopBeginNode());
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1457 lastInstr.setNext(preLoopEnd);
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1458 // Add the single non-loop predecessor of the loop header.
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1459 loopBegin.addForwardEnd(preLoopEnd);
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1460 lastInstr = loopBegin;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1461
5026 b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1462 // Create phi functions for all local variables and operand stack slots.
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1463 frameState.insertLoopPhis(loopBegin);
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1464 loopBegin.setStateAfter(frameState.create(block.startBci));
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1465
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1466 // We have seen all forward branches. All subsequent backward branches will merge to the loop header.
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1467 // This ensures that the loop header has exactly one non-loop predecessor.
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1468 block.firstInstruction = loopBegin;
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1469 // We need to preserve the frame state builder of the loop header so that we can merge values for
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1470 // phi functions, so make a copy of it.
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1471 block.entryState = frameState.copy();
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1472
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1473 Debug.log(" created loop header %s", loopBegin);
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1474 }
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1475 assert lastInstr.next() == null : "instructions already appended at block " + block;
b11561111585 Remove FrameStateAccess: Make FrameState immutable and move all modification logic into FrameStateBuilder Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4997 diff changeset	1476 Debug.log(" frameState: %s", frameState);
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1477
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1478 int endBCI = stream.endBCI();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1479
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1480 stream.setBCI(block.startBci);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1481 int bci = block.startBci;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1482 while (bci < endBCI) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1483 // read the opcode
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1484 int opcode = stream.currentBC();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1485 traceState();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1486 traceInstruction(bci, opcode, bci == block.startBci);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1487 processBytecode(bci, opcode);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1488
4435 57cb8ec5f6bb Restructure block and control flow graph data structures Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 4433 diff changeset	1489 if (lastInstr == null \|\| isBlockEnd(lastInstr) \|\| lastInstr.next() != null) {
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1490 break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1491 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1492
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1493 stream.next();
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1494 bci = stream.currentBCI();
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1495
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1496 if (bci > block.endBci) {
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1497 frameState.clearNonLiveLocals(currentBlock.localsLiveOut);
1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1498 }
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1499 if (lastInstr instanceof StateSplit) {
5375 3035b6b881d9 removed stateAfter field from FixedWithNextNode - now only StateSplit implementations have this field Doug Simon <doug.simon@oracle.com> parents: 5373 diff changeset	1500 if (lastInstr.getClass() == BeginNode.class) {
3035b6b881d9 removed stateAfter field from FixedWithNextNode - now only StateSplit implementations have this field Doug Simon <doug.simon@oracle.com> parents: 5373 diff changeset	1501 // BeginNodes do not need a frame state
3035b6b881d9 removed stateAfter field from FixedWithNextNode - now only StateSplit implementations have this field Doug Simon <doug.simon@oracle.com> parents: 5373 diff changeset	1502 } else {
3035b6b881d9 removed stateAfter field from FixedWithNextNode - now only StateSplit implementations have this field Doug Simon <doug.simon@oracle.com> parents: 5373 diff changeset	1503 StateSplit stateSplit = (StateSplit) lastInstr;
3035b6b881d9 removed stateAfter field from FixedWithNextNode - now only StateSplit implementations have this field Doug Simon <doug.simon@oracle.com> parents: 5373 diff changeset	1504 if (stateSplit.stateAfter() == null) {
3035b6b881d9 removed stateAfter field from FixedWithNextNode - now only StateSplit implementations have this field Doug Simon <doug.simon@oracle.com> parents: 5373 diff changeset	1505 stateSplit.setStateAfter(frameState.create(bci));
3035b6b881d9 removed stateAfter field from FixedWithNextNode - now only StateSplit implementations have this field Doug Simon <doug.simon@oracle.com> parents: 5373 diff changeset	1506 }
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1507 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1508 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1509 if (bci < endBCI) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1510 if (bci > block.endBci) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1511 assert !block.successors.get(0).isExceptionEntry;
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1512 assert block.numNormalSuccessors() == 1;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1513 // we fell through to the next block, add a goto and break
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1514 appendGoto(createTarget(block.successors.get(0), frameState));
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1515 break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1516 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1517 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1518 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1519 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1520
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1521 private void traceState() {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1522 if (GraalOptions.TraceBytecodeParserLevel >= TRACELEVEL_STATE && !TTY.isSuppressed()) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1523 log.println(String.format("\| state [nr locals = %d, stack depth = %d, method = %s]", frameState.localsSize(), frameState.stackSize(), method));
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1524 for (int i = 0; i < frameState.localsSize(); ++i) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1525 ValueNode value = frameState.localAt(i);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1526 log.println(String.format("\| local[%d] = %-8s : %s", i, value == null ? "bogus" : value.kind().javaName, value));
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1527 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1528 for (int i = 0; i < frameState.stackSize(); ++i) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1529 ValueNode value = frameState.stackAt(i);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1530 log.println(String.format("\| stack[%d] = %-8s : %s", i, value == null ? "bogus" : value.kind().javaName, value));
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1531 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1532 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1533 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1534
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1535 private void processBytecode(int bci, int opcode) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1536 int cpi;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1537
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1538 // Checkstyle: stop
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1539 switch (opcode) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1540 case NOP : /* nothing to do */ break;
5538 e18ba36bfebc Renamed RiConstant => Constant. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5531 diff changeset	1541 case ACONST_NULL : frameState.apush(appendConstant(Constant.NULL_OBJECT)); break;
e18ba36bfebc Renamed RiConstant => Constant. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5531 diff changeset	1542 case ICONST_M1 : frameState.ipush(appendConstant(Constant.INT_MINUS_1)); break;
e18ba36bfebc Renamed RiConstant => Constant. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5531 diff changeset	1543 case ICONST_0 : frameState.ipush(appendConstant(Constant.INT_0)); break;
e18ba36bfebc Renamed RiConstant => Constant. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5531 diff changeset	1544 case ICONST_1 : frameState.ipush(appendConstant(Constant.INT_1)); break;
e18ba36bfebc Renamed RiConstant => Constant. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5531 diff changeset	1545 case ICONST_2 : frameState.ipush(appendConstant(Constant.INT_2)); break;
e18ba36bfebc Renamed RiConstant => Constant. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5531 diff changeset	1546 case ICONST_3 : frameState.ipush(appendConstant(Constant.INT_3)); break;
e18ba36bfebc Renamed RiConstant => Constant. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5531 diff changeset	1547 case ICONST_4 : frameState.ipush(appendConstant(Constant.INT_4)); break;
e18ba36bfebc Renamed RiConstant => Constant. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5531 diff changeset	1548 case ICONST_5 : frameState.ipush(appendConstant(Constant.INT_5)); break;
e18ba36bfebc Renamed RiConstant => Constant. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5531 diff changeset	1549 case LCONST_0 : frameState.lpush(appendConstant(Constant.LONG_0)); break;
e18ba36bfebc Renamed RiConstant => Constant. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5531 diff changeset	1550 case LCONST_1 : frameState.lpush(appendConstant(Constant.LONG_1)); break;
e18ba36bfebc Renamed RiConstant => Constant. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5531 diff changeset	1551 case FCONST_0 : frameState.fpush(appendConstant(Constant.FLOAT_0)); break;
e18ba36bfebc Renamed RiConstant => Constant. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5531 diff changeset	1552 case FCONST_1 : frameState.fpush(appendConstant(Constant.FLOAT_1)); break;
e18ba36bfebc Renamed RiConstant => Constant. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5531 diff changeset	1553 case FCONST_2 : frameState.fpush(appendConstant(Constant.FLOAT_2)); break;
e18ba36bfebc Renamed RiConstant => Constant. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5531 diff changeset	1554 case DCONST_0 : frameState.dpush(appendConstant(Constant.DOUBLE_0)); break;
e18ba36bfebc Renamed RiConstant => Constant. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5531 diff changeset	1555 case DCONST_1 : frameState.dpush(appendConstant(Constant.DOUBLE_1)); break;
e18ba36bfebc Renamed RiConstant => Constant. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5531 diff changeset	1556 case BIPUSH : frameState.ipush(appendConstant(Constant.forInt(stream.readByte()))); break;
e18ba36bfebc Renamed RiConstant => Constant. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5531 diff changeset	1557 case SIPUSH : frameState.ipush(appendConstant(Constant.forInt(stream.readShort()))); break;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1558 case LDC : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1559 case LDC_W : // fall through
4315 4c223446c28e Replace the eagerResolving option of GraphBuilderConfiguration with three resolve policies: Default, EagerForSnippets (previously eagerResolving), and Eager (resolves exceptions and types of constants as well) Peter Hofer <peter.hofer@jku.at> parents: 4310 diff changeset	1560 case LDC2_W : genLoadConstant(stream.readCPI(), opcode); break;
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1561 case ILOAD : loadLocal(stream.readLocalIndex(), Kind.Int); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1562 case LLOAD : loadLocal(stream.readLocalIndex(), Kind.Long); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1563 case FLOAD : loadLocal(stream.readLocalIndex(), Kind.Float); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1564 case DLOAD : loadLocal(stream.readLocalIndex(), Kind.Double); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1565 case ALOAD : loadLocal(stream.readLocalIndex(), Kind.Object); break;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1566 case ILOAD_0 : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1567 case ILOAD_1 : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1568 case ILOAD_2 : // fall through
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1569 case ILOAD_3 : loadLocal(opcode - ILOAD_0, Kind.Int); break;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1570 case LLOAD_0 : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1571 case LLOAD_1 : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1572 case LLOAD_2 : // fall through
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1573 case LLOAD_3 : loadLocal(opcode - LLOAD_0, Kind.Long); break;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1574 case FLOAD_0 : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1575 case FLOAD_1 : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1576 case FLOAD_2 : // fall through
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1577 case FLOAD_3 : loadLocal(opcode - FLOAD_0, Kind.Float); break;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1578 case DLOAD_0 : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1579 case DLOAD_1 : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1580 case DLOAD_2 : // fall through
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1581 case DLOAD_3 : loadLocal(opcode - DLOAD_0, Kind.Double); break;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1582 case ALOAD_0 : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1583 case ALOAD_1 : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1584 case ALOAD_2 : // fall through
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1585 case ALOAD_3 : loadLocal(opcode - ALOAD_0, Kind.Object); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1586 case IALOAD : genLoadIndexed(Kind.Int ); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1587 case LALOAD : genLoadIndexed(Kind.Long ); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1588 case FALOAD : genLoadIndexed(Kind.Float ); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1589 case DALOAD : genLoadIndexed(Kind.Double); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1590 case AALOAD : genLoadIndexed(Kind.Object); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1591 case BALOAD : genLoadIndexed(Kind.Byte ); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1592 case CALOAD : genLoadIndexed(Kind.Char ); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1593 case SALOAD : genLoadIndexed(Kind.Short ); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1594 case ISTORE : storeLocal(Kind.Int, stream.readLocalIndex()); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1595 case LSTORE : storeLocal(Kind.Long, stream.readLocalIndex()); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1596 case FSTORE : storeLocal(Kind.Float, stream.readLocalIndex()); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1597 case DSTORE : storeLocal(Kind.Double, stream.readLocalIndex()); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1598 case ASTORE : storeLocal(Kind.Object, stream.readLocalIndex()); break;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1599 case ISTORE_0 : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1600 case ISTORE_1 : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1601 case ISTORE_2 : // fall through
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1602 case ISTORE_3 : storeLocal(Kind.Int, opcode - ISTORE_0); break;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1603 case LSTORE_0 : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1604 case LSTORE_1 : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1605 case LSTORE_2 : // fall through
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1606 case LSTORE_3 : storeLocal(Kind.Long, opcode - LSTORE_0); break;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1607 case FSTORE_0 : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1608 case FSTORE_1 : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1609 case FSTORE_2 : // fall through
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1610 case FSTORE_3 : storeLocal(Kind.Float, opcode - FSTORE_0); break;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1611 case DSTORE_0 : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1612 case DSTORE_1 : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1613 case DSTORE_2 : // fall through
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1614 case DSTORE_3 : storeLocal(Kind.Double, opcode - DSTORE_0); break;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1615 case ASTORE_0 : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1616 case ASTORE_1 : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1617 case ASTORE_2 : // fall through
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1618 case ASTORE_3 : storeLocal(Kind.Object, opcode - ASTORE_0); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1619 case IASTORE : genStoreIndexed(Kind.Int ); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1620 case LASTORE : genStoreIndexed(Kind.Long ); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1621 case FASTORE : genStoreIndexed(Kind.Float ); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1622 case DASTORE : genStoreIndexed(Kind.Double); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1623 case AASTORE : genStoreIndexed(Kind.Object); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1624 case BASTORE : genStoreIndexed(Kind.Byte ); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1625 case CASTORE : genStoreIndexed(Kind.Char ); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1626 case SASTORE : genStoreIndexed(Kind.Short ); break;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1627 case POP : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1628 case POP2 : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1629 case DUP : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1630 case DUP_X1 : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1631 case DUP_X2 : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1632 case DUP2 : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1633 case DUP2_X1 : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1634 case DUP2_X2 : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1635 case SWAP : stackOp(opcode); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1636 case IADD : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1637 case ISUB : // fall through
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1638 case IMUL : genArithmeticOp(Kind.Int, opcode, false); break;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1639 case IDIV : // fall through
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1640 case IREM : genArithmeticOp(Kind.Int, opcode, true); break;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1641 case LADD : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1642 case LSUB : // fall through
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1643 case LMUL : genArithmeticOp(Kind.Long, opcode, false); break;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1644 case LDIV : // fall through
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1645 case LREM : genArithmeticOp(Kind.Long, opcode, true); break;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1646 case FADD : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1647 case FSUB : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1648 case FMUL : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1649 case FDIV : // fall through
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1650 case FREM : genArithmeticOp(Kind.Float, opcode, false); break;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1651 case DADD : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1652 case DSUB : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1653 case DMUL : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1654 case DDIV : // fall through
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1655 case DREM : genArithmeticOp(Kind.Double, opcode, false); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1656 case INEG : genNegateOp(Kind.Int); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1657 case LNEG : genNegateOp(Kind.Long); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1658 case FNEG : genNegateOp(Kind.Float); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1659 case DNEG : genNegateOp(Kind.Double); break;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1660 case ISHL : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1661 case ISHR : // fall through
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1662 case IUSHR : genShiftOp(Kind.Int, opcode); break;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1663 case IAND : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1664 case IOR : // fall through
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1665 case IXOR : genLogicOp(Kind.Int, opcode); break;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1666 case LSHL : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1667 case LSHR : // fall through
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1668 case LUSHR : genShiftOp(Kind.Long, opcode); break;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1669 case LAND : // fall through
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1670 case LOR : // fall through
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1671 case LXOR : genLogicOp(Kind.Long, opcode); break;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1672 case IINC : genIncrement(); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1673 case I2L : genConvert(ConvertNode.Op.I2L); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1674 case I2F : genConvert(ConvertNode.Op.I2F); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1675 case I2D : genConvert(ConvertNode.Op.I2D); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1676 case L2I : genConvert(ConvertNode.Op.L2I); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1677 case L2F : genConvert(ConvertNode.Op.L2F); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1678 case L2D : genConvert(ConvertNode.Op.L2D); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1679 case F2I : genConvert(ConvertNode.Op.F2I); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1680 case F2L : genConvert(ConvertNode.Op.F2L); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1681 case F2D : genConvert(ConvertNode.Op.F2D); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1682 case D2I : genConvert(ConvertNode.Op.D2I); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1683 case D2L : genConvert(ConvertNode.Op.D2L); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1684 case D2F : genConvert(ConvertNode.Op.D2F); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1685 case I2B : genConvert(ConvertNode.Op.I2B); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1686 case I2C : genConvert(ConvertNode.Op.I2C); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1687 case I2S : genConvert(ConvertNode.Op.I2S); break;
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1688 case LCMP : genCompareOp(Kind.Long, false); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1689 case FCMPL : genCompareOp(Kind.Float, true); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1690 case FCMPG : genCompareOp(Kind.Float, false); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1691 case DCMPL : genCompareOp(Kind.Double, true); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1692 case DCMPG : genCompareOp(Kind.Double, false); break;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1693 case IFEQ : genIfZero(Condition.EQ); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1694 case IFNE : genIfZero(Condition.NE); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1695 case IFLT : genIfZero(Condition.LT); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1696 case IFGE : genIfZero(Condition.GE); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1697 case IFGT : genIfZero(Condition.GT); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1698 case IFLE : genIfZero(Condition.LE); break;
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1699 case IF_ICMPEQ : genIfSame(Kind.Int, Condition.EQ); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1700 case IF_ICMPNE : genIfSame(Kind.Int, Condition.NE); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1701 case IF_ICMPLT : genIfSame(Kind.Int, Condition.LT); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1702 case IF_ICMPGE : genIfSame(Kind.Int, Condition.GE); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1703 case IF_ICMPGT : genIfSame(Kind.Int, Condition.GT); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1704 case IF_ICMPLE : genIfSame(Kind.Int, Condition.LE); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1705 case IF_ACMPEQ : genIfSame(Kind.Object, Condition.EQ); break;
a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1706 case IF_ACMPNE : genIfSame(Kind.Object, Condition.NE); break;
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	1707 case GOTO : genGoto(); break;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1708 case JSR : genJsr(stream.readBranchDest()); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1709 case RET : genRet(stream.readLocalIndex()); break;
5698 764db9ada24f rework of switch operations: unify lookup- and tableswitch, introduce switch lir instructions Lukas Stadler <lukas.stadler@jku.at> parents: 5695 diff changeset	1710 case TABLESWITCH : genSwitch(new BytecodeTableSwitch(stream(), bci())); break;
764db9ada24f rework of switch operations: unify lookup- and tableswitch, introduce switch lir instructions Lukas Stadler <lukas.stadler@jku.at> parents: 5695 diff changeset	1711 case LOOKUPSWITCH : genSwitch(new BytecodeLookupSwitch(stream(), bci())); break;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1712 case IRETURN : genReturn(frameState.ipop()); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1713 case LRETURN : genReturn(frameState.lpop()); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1714 case FRETURN : genReturn(frameState.fpop()); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1715 case DRETURN : genReturn(frameState.dpop()); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1716 case ARETURN : genReturn(frameState.apop()); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1717 case RETURN : genReturn(null); break;
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	1718 case GETSTATIC : cpi = stream.readCPI(); genGetStatic(lookupField(cpi, opcode)); break;
bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	1719 case PUTSTATIC : cpi = stream.readCPI(); genPutStatic(lookupField(cpi, opcode)); break;
bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	1720 case GETFIELD : cpi = stream.readCPI(); genGetField(lookupField(cpi, opcode)); break;
bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	1721 case PUTFIELD : cpi = stream.readCPI(); genPutField(lookupField(cpi, opcode)); break;
bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	1722 case INVOKEVIRTUAL : cpi = stream.readCPI(); genInvokeVirtual(lookupMethod(cpi, opcode)); break;
bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	1723 case INVOKESPECIAL : cpi = stream.readCPI(); genInvokeSpecial(lookupMethod(cpi, opcode)); break;
bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	1724 case INVOKESTATIC : cpi = stream.readCPI(); genInvokeStatic(lookupMethod(cpi, opcode)); break;
bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	1725 case INVOKEINTERFACE: cpi = stream.readCPI(); genInvokeInterface(lookupMethod(cpi, opcode)); break;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1726 case NEW : genNewInstance(stream.readCPI()); break;
5760 87e8baf5447c added snippets for lowering array creation and initialization (in NewObjectSnippets) Doug Simon <doug.simon@oracle.com> parents: 5719 diff changeset	1727 case NEWARRAY : genNewPrimitiveArray(stream.readLocalIndex()); break;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1728 case ANEWARRAY : genNewObjectArray(stream.readCPI()); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1729 case ARRAYLENGTH : genArrayLength(); break;
5256 1e153fdac9fb Fix and simplify exception handling in the bytecode parser Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5255 diff changeset	1730 case ATHROW : genThrow(); break;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1731 case CHECKCAST : genCheckCast(); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1732 case INSTANCEOF : genInstanceOf(); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1733 case MONITORENTER : genMonitorEnter(frameState.apop()); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1734 case MONITOREXIT : genMonitorExit(frameState.apop()); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1735 case MULTIANEWARRAY : genNewMultiArray(stream.readCPI()); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1736 case IFNULL : genIfNull(Condition.EQ); break;
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1737 case IFNONNULL : genIfNull(Condition.NE); break;
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	1738 case GOTO_W : genGoto(); break;
5031 4d152e5e34ba Use BytecodeStream in BciBlockMapping instead of hand-crafted byte-array accesses Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5030 diff changeset	1739 case JSR_W : genJsr(stream.readBranchDest()); break;
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1740 case BREAKPOINT:
5547 b6617d13ea44 Dropping Ci* prefixes. Some additional renamings in the api.code interface. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5541 diff changeset	1741 throw new BailoutException("concurrent setting of breakpoint");
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1742 default:
5547 b6617d13ea44 Dropping Ci* prefixes. Some additional renamings in the api.code interface. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5541 diff changeset	1743 throw new BailoutException("Unsupported opcode " + opcode + " (" + nameOf(opcode) + ") [bci=" + bci + "]");
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1744 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1745 // Checkstyle: resume
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1746 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1747
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1748 private void traceInstruction(int bci, int opcode, boolean blockStart) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1749 if (GraalOptions.TraceBytecodeParserLevel >= TRACELEVEL_INSTRUCTIONS && !TTY.isSuppressed()) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1750 StringBuilder sb = new StringBuilder(40);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1751 sb.append(blockStart ? '+' : '\|');
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1752 if (bci < 10) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1753 sb.append(" ");
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1754 } else if (bci < 100) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1755 sb.append(' ');
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1756 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1757 sb.append(bci).append(": ").append(Bytecodes.nameOf(opcode));
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1758 for (int i = bci + 1; i < stream.nextBCI(); ++i) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1759 sb.append(' ').append(stream.readUByte(i));
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1760 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1761 if (!currentBlock.jsrScope.isEmpty()) {
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1762 sb.append(' ').append(currentBlock.jsrScope);
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1763 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1764 log.println(sb.toString());
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1765 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1766 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1767
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1768 private void genArrayLength() {
4142 bc8527f3071c Adjust code base to new level of warnings. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3733 diff changeset	1769 frameState.ipush(append(currentGraph.add(new ArrayLengthNode(frameState.apop()))));
3733 e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1770 }
e233f5660da4 Added Java files from Maxine project. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: diff changeset	1771 }

Mercurial > hg > truffle

annotate graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java @ 6521:2a0c9f20baa1