truffle: graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java annotate

annotate graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java @ 2865:7a4e6e11877f

Subclasses for Shift

author	Gilles Duboscq <gilles.duboscq@oracle.com>
date	Tue, 07 Jun 2011 19:06:20 +0200
parents	45422967cbcf
children	fc75fd3fa5e4 7d7cf33f8466

rev	line source
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1 /*
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	2 * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	4 *
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	5 * This code is free software; you can redistribute it and/or modify it
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	6 * under the terms of the GNU General Public License version 2 only, as
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	7 * published by the Free Software Foundation.
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	8 *
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	9 * This code is distributed in the hope that it will be useful, but WITHOUT
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	12 * version 2 for more details (a copy is included in the LICENSE file that
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	13 * accompanied this code).
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	14 *
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	15 * You should have received a copy of the GNU General Public License version
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	16 * 2 along with this work; if not, write to the Free Software Foundation,
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	18 *
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	20 * or visit www.oracle.com if you need additional information or have any
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	21 * questions.
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	22 */
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	23 package com.sun.c1x.graph;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	24
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	25 import static com.sun.cri.bytecode.Bytecodes.*;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	26 import static java.lang.reflect.Modifier.*;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	27
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	28 import java.lang.reflect.*;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	29 import java.util.*;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	30
2586 421da5f53b5e more Op2 changes Lukas Stadler <lukas.stadler@jku.at> parents: 2582 diff changeset	31 import com.oracle.graal.graph.*;
2840 75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	32 import com.oracle.max.graal.schedule.*;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	33 import com.sun.c1x.*;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	34 import com.sun.c1x.debug.*;
2840 75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	35 import com.sun.c1x.graph.BlockMap.Block;
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	36 import com.sun.c1x.graph.BlockMap.ExceptionBlock;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	37 import com.sun.c1x.ir.*;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	38 import com.sun.c1x.util.*;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	39 import com.sun.c1x.value.*;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	40 import com.sun.cri.bytecode.*;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	41 import com.sun.cri.ci.*;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	42 import com.sun.cri.ri.*;
2840 75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	43 import com.sun.cri.ri.RiType.Representation;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	44
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	45 /**
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	46 * The {@code GraphBuilder} class parses the bytecode of a method and builds the IR graph.
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	47 * A number of optimizations may be performed during parsing of the bytecode, including value
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	48 * numbering, inlining, constant folding, strength reduction, etc.
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	49 */
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	50 public final class GraphBuilder {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	51
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	52 /**
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	53 * The minimum value to which {@link C1XOptions#TraceBytecodeParserLevel} must be set to trace
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	54 * the bytecode instructions as they are parsed.
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	55 */
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	56 public static final int TRACELEVEL_INSTRUCTIONS = 1;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	57
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	58 /**
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	59 * The minimum value to which {@link C1XOptions#TraceBytecodeParserLevel} must be set to trace
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	60 * the frame state before each bytecode instruction as it is parsed.
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	61 */
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	62 public static final int TRACELEVEL_STATE = 2;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	63
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	64 private final C1XCompilation compilation;
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	65 private final CompilerGraph graph;
7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	66
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	67 private final CiStatistics stats;
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	68 private final RiRuntime runtime;
7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	69 private final RiMethod method;
7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	70 private final RiConstantPool constantPool;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	71
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	72 private final BytecodeStream stream; // the bytecode stream
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	73 private final LogStream log;
7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	74 private final FrameStateBuilder frameState; // the current execution state
7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	75
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	76 // bci-to-block mapping
2773 27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	77 private Block[] blockFromBci;
27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	78 private ArrayList<Block> blockList;
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	79
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	80 private int nextBlockNumber;
7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	81
7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	82 private Value methodSynchronizedObject;
2830 706047ee5f2e Removed ExceptionHandler class because of clean up. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2829 diff changeset	83 private CiExceptionHandler syncHandler;
706047ee5f2e Removed ExceptionHandler class because of clean up. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2829 diff changeset	84
2840 75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	85 private Block unwindBlock;
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	86 private Block returnBlock;
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	87
2730 027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	88 // the worklist of blocks, sorted by depth first number
027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	89 private final PriorityQueue<Block> workList = new PriorityQueue<Block>(10, new Comparator<Block>() {
027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	90 public int compare(Block o1, Block o2) {
027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	91 return o1.blockID - o2.blockID;
027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	92 }
027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	93 });
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	94
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	95 private Instruction lastInstr; // the last instruction added
2730 027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	96
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	97 private final Set<Block> blocksOnWorklist = new HashSet<Block>();
7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	98 private final Set<Block> blocksVisited = new HashSet<Block>();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	99
2586 421da5f53b5e more Op2 changes Lukas Stadler <lukas.stadler@jku.at> parents: 2582 diff changeset	100
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	101 /**
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	102 * Creates a new, initialized, {@code GraphBuilder} instance for a given compilation.
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	103 *
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	104 * @param compilation the compilation
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	105 * @param ir the IR to build the graph into
2602 0c6564c254af new node layout: BlockBegin, BlockEnd Lukas Stadler <lukas.stadler@jku.at> parents: 2600 diff changeset	106 * @param graph
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	107 */
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	108 public GraphBuilder(C1XCompilation compilation, RiMethod method, CompilerGraph graph) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	109 this.compilation = compilation;
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	110 this.graph = graph;
7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	111
7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	112 this.runtime = compilation.runtime;
7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	113 this.method = method;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	114 this.stats = compilation.stats;
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	115 this.log = C1XOptions.TraceBytecodeParserLevel > 0 ? new LogStream(TTY.out()) : null;
7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	116 this.stream = new BytecodeStream(method.code());
7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	117
7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	118 this.constantPool = runtime.getConstantPool(method);
7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	119 this.frameState = new FrameStateBuilder(method, graph);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	120 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	121
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	122 /**
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	123 * Builds the graph for a the specified {@code IRScope}.
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	124 * @param scope the top IRScope
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	125 */
2564 274360f98f97 Remove inlining (2nd part) removed IRScope Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2563 diff changeset	126 public void build() {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	127 if (log != null) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	128 log.println();
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	129 log.println("Compiling " + method);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	130 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	131
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	132 // 2. compute the block map, setup exception handlers and get the entrypoint(s)
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	133 BlockMap blockMap = compilation.getBlockMap(method);
2675 bcd20d26d52d Refactoring of BlockMap so that it doesn't create BlockBegin objects, but maintains its own Block data structure Christian.Wimmer@Oracle.com parents: 2671 diff changeset	134
2773 27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	135 blockList = new ArrayList<Block>(blockMap.blocks);
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	136 blockFromBci = new Block[method.code().length];
2773 27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	137 for (int i = 0; i < blockList.size(); i++) {
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	138 int blockID = nextBlockNumber();
2749 36440e516e44 block entry instructions created on-demand Lukas Stadler <lukas.stadler@jku.at> parents: 2747 diff changeset	139 assert blockID == i;
2773 27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	140 Block block = blockList.get(i);
27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	141 if (block.startBci >= 0) {
27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	142 blockFromBci[block.startBci] = block;
27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	143 }
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	144 }
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	145
2781 bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	146 // 1. create the start block
bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	147 Block startBlock = nextBlock(Instruction.SYNCHRONIZATION_ENTRY_BCI);
bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	148 markOnWorkList(startBlock);
bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	149 lastInstr = createTarget(startBlock, frameState);
bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	150 graph.start().setStart(lastInstr);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	151
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	152 if (isSynchronized(method.accessFlags())) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	153 // 4A.1 add a monitor enter to the start block
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	154 methodSynchronizedObject = synchronizedObject(frameState, method);
7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	155 genMonitorEnter(methodSynchronizedObject, Instruction.SYNCHRONIZATION_ENTRY_BCI);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	156 // 4A.2 finish the start block
2746 05c92e53a50d merge and clone before connecting blocks Lukas Stadler <lukas.stadler@jku.at> parents: 2741 diff changeset	157 finishStartBlock(startBlock);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	158
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	159 // 4A.3 setup an exception handler to unlock the root method synchronized object
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	160 syncHandler = new CiExceptionHandler(0, method.code().length, Instruction.SYNCHRONIZATION_ENTRY_BCI, 0, null);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	161 } else {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	162 // 4B.1 simply finish the start block
2746 05c92e53a50d merge and clone before connecting blocks Lukas Stadler <lukas.stadler@jku.at> parents: 2741 diff changeset	163 finishStartBlock(startBlock);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	164 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	165
2519 f6125fb5bfbc Removed intrinsics. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2516 diff changeset	166 // 5. SKIPPED: look for intrinsics
f6125fb5bfbc Removed intrinsics. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2516 diff changeset	167
f6125fb5bfbc Removed intrinsics. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2516 diff changeset	168 // 6B.1 do the normal parsing
2773 27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	169 addToWorkList(blockFromBci[0]);
2519 f6125fb5bfbc Removed intrinsics. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2516 diff changeset	170 iterateAllBlocks();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	171
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	172 // remove Placeholders
2781 bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	173 for (Node n : graph.getNodes()) {
bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	174 if (n instanceof Placeholder) {
bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	175 Placeholder p = (Placeholder) n;
2790 50677668afe3 Towards making goto removal work. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2789 diff changeset	176 assert p.blockPredecessors().size() == 1;
50677668afe3 Towards making goto removal work. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2789 diff changeset	177 Node pred = p.blockPredecessors().get(0);
50677668afe3 Towards making goto removal work. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2789 diff changeset	178 int predIndex = p.predecessorsIndex().get(0);
50677668afe3 Towards making goto removal work. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2789 diff changeset	179 pred.successors().setAndClear(predIndex, p, 0);
50677668afe3 Towards making goto removal work. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2789 diff changeset	180 p.delete();
2781 bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	181 }
bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	182 }
2783 9bc0c2eb00d6 Made graph builder removal of BlockBegin work. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2781 diff changeset	183
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	184 // remove FrameStates
2781 bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	185 for (Node n : graph.getNodes()) {
bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	186 if (n instanceof FrameState) {
bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	187 boolean delete = false;
bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	188 if (n.usages().size() == 0 && n.predecessors().size() == 0) {
bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	189 delete = true;
bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	190 }
bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	191 if (delete) {
bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	192 n.delete();
bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	193 }
bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	194 }
bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	195 }
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	196 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	197
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	198 private int nextBlockNumber() {
7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	199 stats.blockCount++;
7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	200 return nextBlockNumber++;
7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	201 }
7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	202
2730 027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	203 private Block nextBlock(int bci) {
027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	204 Block block = new Block();
027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	205 block.startBci = bci;
027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	206 block.endBci = bci;
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	207 block.blockID = nextBlockNumber();
2730 027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	208 return block;
027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	209 }
2705 d669ab61c7c7 Removed IsOnWorklistFlag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2703 diff changeset	210
2840 75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	211 private Block unwindBlock() {
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	212 if (unwindBlock == null) {
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	213 unwindBlock = new Block();
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	214 unwindBlock.startBci = Instruction.SYNCHRONIZATION_ENTRY_BCI;
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	215 unwindBlock.endBci = Instruction.SYNCHRONIZATION_ENTRY_BCI;
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	216 unwindBlock.blockID = nextBlockNumber();
2840 75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	217 addToWorkList(unwindBlock);
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	218 }
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	219 return unwindBlock;
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	220 }
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	221
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	222 private Block returnBlock() {
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	223 if (returnBlock == null) {
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	224 returnBlock = new Block();
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	225 returnBlock.startBci = Instruction.SYNCHRONIZATION_ENTRY_BCI;
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	226 returnBlock.endBci = Instruction.SYNCHRONIZATION_ENTRY_BCI;
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	227 returnBlock.blockID = nextBlockNumber();
2840 75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	228 addToWorkList(returnBlock);
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	229 }
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	230 return returnBlock;
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	231 }
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	232
2730 027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	233 private void markOnWorkList(Block block) {
2705 d669ab61c7c7 Removed IsOnWorklistFlag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2703 diff changeset	234 blocksOnWorklist.add(block);
d669ab61c7c7 Removed IsOnWorklistFlag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2703 diff changeset	235 }
d669ab61c7c7 Removed IsOnWorklistFlag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2703 diff changeset	236
2730 027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	237 private boolean isOnWorkList(Block block) {
2705 d669ab61c7c7 Removed IsOnWorklistFlag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2703 diff changeset	238 return blocksOnWorklist.contains(block);
d669ab61c7c7 Removed IsOnWorklistFlag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2703 diff changeset	239 }
d669ab61c7c7 Removed IsOnWorklistFlag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2703 diff changeset	240
2730 027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	241 private void markVisited(Block block) {
2706 5a784215351a Removed WasVisited flag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2705 diff changeset	242 blocksVisited.add(block);
5a784215351a Removed WasVisited flag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2705 diff changeset	243 }
5a784215351a Removed WasVisited flag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2705 diff changeset	244
2730 027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	245 private boolean isVisited(Block block) {
2706 5a784215351a Removed WasVisited flag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2705 diff changeset	246 return blocksVisited.contains(block);
5a784215351a Removed WasVisited flag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2705 diff changeset	247 }
5a784215351a Removed WasVisited flag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2705 diff changeset	248
2746 05c92e53a50d merge and clone before connecting blocks Lukas Stadler <lukas.stadler@jku.at> parents: 2741 diff changeset	249 private void finishStartBlock(Block startBlock) {
2730 027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	250 assert bci() == 0;
2774 93fd92c9f8b0 Removed usage of stateAfter on BlockEnd instructions. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2773 diff changeset	251 Instruction target = createTargetAt(0, frameState);
2788 df4c5254c5cc Towards goto removal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2785 diff changeset	252 appendGoto(target);
2730 027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	253 }
027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	254
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	255 public void mergeOrClone(Block target, FrameStateAccess newState) {
2773 27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	256 Instruction first = target.firstInstruction;
2799 e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	257 if (target.isLoopHeader && isVisited(target)) {
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	258 first = ((LoopBegin) first).loopEnd();
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	259 }
2781 bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	260 assert first instanceof StateSplit;
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	261
2781 bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	262 int bci = target.startBci;
bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	263
bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	264 FrameState existingState = ((StateSplit) first).stateBefore();
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	265
2773 27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	266 if (existingState == null) {
27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	267 // copy state because it is modified
27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	268 FrameState duplicate = newState.duplicate(bci);
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	269
2773 27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	270 // if the block is a loop header, insert all necessary phis
2799 e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	271 if (first instanceof LoopBegin && target.isLoopHeader) {
2793 d3fc4fe063bf Rename BlockBegin to Merge, remove some Block related member from it. Made CFGPrinter work with the Block class from schedule Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2791 diff changeset	272 assert first instanceof Merge;
d3fc4fe063bf Rename BlockBegin to Merge, remove some Block related member from it. Made CFGPrinter work with the Block class from schedule Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2791 diff changeset	273 insertLoopPhis((Merge) first, duplicate);
d3fc4fe063bf Rename BlockBegin to Merge, remove some Block related member from it. Made CFGPrinter work with the Block class from schedule Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2791 diff changeset	274 ((Merge) first).setStateBefore(duplicate);
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	275 } else {
2781 bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	276 ((StateSplit) first).setStateBefore(duplicate);
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	277 }
a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	278 } else {
2773 27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	279 if (!C1XOptions.AssumeVerifiedBytecode && !existingState.isCompatibleWith(newState)) {
27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	280 // stacks or locks do not match--bytecodes would not verify
2788 df4c5254c5cc Towards goto removal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2785 diff changeset	281 TTY.println(existingState.toString());
df4c5254c5cc Towards goto removal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2785 diff changeset	282 TTY.println(newState.duplicate(0).toString());
2773 27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	283 throw new CiBailout("stack or locks do not match");
27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	284 }
27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	285 assert existingState.localsSize() == newState.localsSize();
27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	286 assert existingState.stackSize() == newState.stackSize();
2768 43ffa0e47a46 Towards removing stateAfter on BlockEnd. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2763 diff changeset	287
2781 bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	288 if (first instanceof Placeholder) {
2799 e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	289 assert !target.isLoopHeader;
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	290 Merge merge = new Merge(graph);
2790 50677668afe3 Towards making goto removal work. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2789 diff changeset	291
50677668afe3 Towards making goto removal work. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2789 diff changeset	292 Placeholder p = (Placeholder) first;
50677668afe3 Towards making goto removal work. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2789 diff changeset	293 assert p.next() == null;
50677668afe3 Towards making goto removal work. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2789 diff changeset	294 p.replace(merge);
2781 bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	295 target.firstInstruction = merge;
bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	296 merge.setStateBefore(existingState);
2799 e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	297 first = merge;
2781 bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	298 }
bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	299
2799 e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	300 existingState.merge((Merge) first, newState);
2773 27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	301 }
2768 43ffa0e47a46 Towards removing stateAfter on BlockEnd. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2763 diff changeset	302
43ffa0e47a46 Towards removing stateAfter on BlockEnd. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2763 diff changeset	303 for (int j = 0; j < frameState.localsSize() + frameState.stackSize(); ++j) {
43ffa0e47a46 Towards removing stateAfter on BlockEnd. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2763 diff changeset	304 if (frameState.valueAt(j) != null) {
43ffa0e47a46 Towards removing stateAfter on BlockEnd. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2763 diff changeset	305 assert !frameState.valueAt(j).isDeleted();
43ffa0e47a46 Towards removing stateAfter on BlockEnd. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2763 diff changeset	306 }
43ffa0e47a46 Towards removing stateAfter on BlockEnd. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2763 diff changeset	307 }
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	308 }
a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	309
2793 d3fc4fe063bf Rename BlockBegin to Merge, remove some Block related member from it. Made CFGPrinter work with the Block class from schedule Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2791 diff changeset	310 private void insertLoopPhis(Merge merge, FrameState newState) {
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	311 int stackSize = newState.stackSize();
a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	312 for (int i = 0; i < stackSize; i++) {
a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	313 // always insert phis for the stack
2763 5e8a69041cd7 Model phi inputs as direct inputs in the graph instead of referring to the framestates of the predecessors. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2757 diff changeset	314 Value x = newState.stackAt(i);
5e8a69041cd7 Model phi inputs as direct inputs in the graph instead of referring to the framestates of the predecessors. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2757 diff changeset	315 if (x != null) {
5e8a69041cd7 Model phi inputs as direct inputs in the graph instead of referring to the framestates of the predecessors. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2757 diff changeset	316 newState.setupPhiForStack(merge, i).addInput(x);
5e8a69041cd7 Model phi inputs as direct inputs in the graph instead of referring to the framestates of the predecessors. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2757 diff changeset	317 }
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	318 }
a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	319 int localsSize = newState.localsSize();
a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	320 for (int i = 0; i < localsSize; i++) {
a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	321 Value x = newState.localAt(i);
a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	322 if (x != null) {
2763 5e8a69041cd7 Model phi inputs as direct inputs in the graph instead of referring to the framestates of the predecessors. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2757 diff changeset	323 newState.setupPhiForLocal(merge, i).addInput(x);
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	324 }
a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	325 }
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	326 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	327
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	328 public BytecodeStream stream() {
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	329 return stream;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	330 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	331
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	332 public int bci() {
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	333 return stream.currentBCI();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	334 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	335
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	336 private void loadLocal(int index, CiKind kind) {
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	337 frameState.push(kind, frameState.loadLocal(index));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	338 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	339
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	340 private void storeLocal(CiKind kind, int index) {
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	341 frameState.storeLocal(index, frameState.pop(kind));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	342 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	343
2830 706047ee5f2e Removed ExceptionHandler class because of clean up. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2829 diff changeset	344 public boolean covers(RiExceptionHandler handler, int bci) {
706047ee5f2e Removed ExceptionHandler class because of clean up. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2829 diff changeset	345 return handler.startBCI() <= bci && bci < handler.endBCI();
706047ee5f2e Removed ExceptionHandler class because of clean up. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2829 diff changeset	346 }
706047ee5f2e Removed ExceptionHandler class because of clean up. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2829 diff changeset	347
706047ee5f2e Removed ExceptionHandler class because of clean up. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2829 diff changeset	348 public boolean isCatchAll(RiExceptionHandler handler) {
706047ee5f2e Removed ExceptionHandler class because of clean up. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2829 diff changeset	349 return handler.catchTypeCPI() == 0;
706047ee5f2e Removed ExceptionHandler class because of clean up. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2829 diff changeset	350 }
706047ee5f2e Removed ExceptionHandler class because of clean up. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2829 diff changeset	351
2833 1cd59ca9ac86 Removed Throw HIR instruction. Removed special handling for exceptions in register allocator. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2830 diff changeset	352 private Instruction handleException(Value exceptionObject, int bci) {
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	353 assert bci == Instruction.SYNCHRONIZATION_ENTRY_BCI \|\| bci == bci() : "invalid bci";
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	354
2830 706047ee5f2e Removed ExceptionHandler class because of clean up. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2829 diff changeset	355 RiExceptionHandler firstHandler = null;
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	356 RiExceptionHandler[] exceptionHandlers = method.exceptionHandlers();
2564 274360f98f97 Remove inlining (2nd part) removed IRScope Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2563 diff changeset	357 // join with all potential exception handlers
2830 706047ee5f2e Removed ExceptionHandler class because of clean up. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2829 diff changeset	358 if (exceptionHandlers != null) {
706047ee5f2e Removed ExceptionHandler class because of clean up. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2829 diff changeset	359 for (RiExceptionHandler handler : exceptionHandlers) {
2707 7ed72769d51a exception handling related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2676 diff changeset	360 // if the handler covers this bytecode index, add it to the list
2830 706047ee5f2e Removed ExceptionHandler class because of clean up. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2829 diff changeset	361 if (covers(handler, bci)) {
706047ee5f2e Removed ExceptionHandler class because of clean up. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2829 diff changeset	362 firstHandler = handler;
2773 27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	363 break;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	364 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	365 }
2564 274360f98f97 Remove inlining (2nd part) removed IRScope Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2563 diff changeset	366 }
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	367
2830 706047ee5f2e Removed ExceptionHandler class because of clean up. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2829 diff changeset	368 if (firstHandler == null) {
706047ee5f2e Removed ExceptionHandler class because of clean up. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2829 diff changeset	369 firstHandler = syncHandler;
706047ee5f2e Removed ExceptionHandler class because of clean up. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2829 diff changeset	370 }
706047ee5f2e Removed ExceptionHandler class because of clean up. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2829 diff changeset	371
2773 27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	372 if (firstHandler != null) {
27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	373 compilation.setHasExceptionHandlers();
2707 7ed72769d51a exception handling related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2676 diff changeset	374
2773 27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	375 Block dispatchBlock = null;
27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	376 for (Block block : blockList) {
27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	377 if (block instanceof ExceptionBlock) {
27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	378 ExceptionBlock excBlock = (ExceptionBlock) block;
2830 706047ee5f2e Removed ExceptionHandler class because of clean up. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2829 diff changeset	379 if (excBlock.handler == firstHandler) {
2773 27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	380 dispatchBlock = block;
27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	381 break;
2707 7ed72769d51a exception handling related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2676 diff changeset	382 }
7ed72769d51a exception handling related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2676 diff changeset	383 }
7ed72769d51a exception handling related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2676 diff changeset	384 }
2773 27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	385 // if there's no dispatch block then the catch block needs to be a catch all
27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	386 if (dispatchBlock == null) {
2830 706047ee5f2e Removed ExceptionHandler class because of clean up. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2829 diff changeset	387 assert isCatchAll(firstHandler);
706047ee5f2e Removed ExceptionHandler class because of clean up. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2829 diff changeset	388 int handlerBCI = firstHandler.handlerBCI();
706047ee5f2e Removed ExceptionHandler class because of clean up. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2829 diff changeset	389 if (handlerBCI == Instruction.SYNCHRONIZATION_ENTRY_BCI) {
2840 75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	390 dispatchBlock = unwindBlock();
2830 706047ee5f2e Removed ExceptionHandler class because of clean up. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2829 diff changeset	391 } else {
706047ee5f2e Removed ExceptionHandler class because of clean up. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2829 diff changeset	392 dispatchBlock = blockFromBci[handlerBCI];
706047ee5f2e Removed ExceptionHandler class because of clean up. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2829 diff changeset	393 }
2773 27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	394 }
2707 7ed72769d51a exception handling related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2676 diff changeset	395 FrameState entryState = frameState.duplicateWithEmptyStack(bci);
7ed72769d51a exception handling related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2676 diff changeset	396
2781 bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	397 StateSplit entry = new Placeholder(graph);
2707 7ed72769d51a exception handling related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2676 diff changeset	398 entry.setStateBefore(entryState);
2833 1cd59ca9ac86 Removed Throw HIR instruction. Removed special handling for exceptions in register allocator. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2830 diff changeset	399
1cd59ca9ac86 Removed Throw HIR instruction. Removed special handling for exceptions in register allocator. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2830 diff changeset	400 Instruction currentNext = entry;
1cd59ca9ac86 Removed Throw HIR instruction. Removed special handling for exceptions in register allocator. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2830 diff changeset	401 Value currentExceptionObject = exceptionObject;
1cd59ca9ac86 Removed Throw HIR instruction. Removed special handling for exceptions in register allocator. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2830 diff changeset	402 if (currentExceptionObject == null) {
1cd59ca9ac86 Removed Throw HIR instruction. Removed special handling for exceptions in register allocator. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2830 diff changeset	403 ExceptionObject exception = new ExceptionObject(graph);
1cd59ca9ac86 Removed Throw HIR instruction. Removed special handling for exceptions in register allocator. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2830 diff changeset	404 entry.setNext(exception);
1cd59ca9ac86 Removed Throw HIR instruction. Removed special handling for exceptions in register allocator. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2830 diff changeset	405 currentNext = exception;
1cd59ca9ac86 Removed Throw HIR instruction. Removed special handling for exceptions in register allocator. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2830 diff changeset	406 currentExceptionObject = exception;
1cd59ca9ac86 Removed Throw HIR instruction. Removed special handling for exceptions in register allocator. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2830 diff changeset	407 }
1cd59ca9ac86 Removed Throw HIR instruction. Removed special handling for exceptions in register allocator. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2830 diff changeset	408 FrameState stateWithException = entryState.duplicateModified(bci, CiKind.Void, currentExceptionObject);
2773 27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	409
27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	410 Instruction successor = createTarget(dispatchBlock, stateWithException);
2836 a75ef246fab3 Removed last usage of anchor in the front-end. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2833 diff changeset	411 currentNext.setNext(successor);
2833 1cd59ca9ac86 Removed Throw HIR instruction. Removed special handling for exceptions in register allocator. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2830 diff changeset	412 return entry;
2707 7ed72769d51a exception handling related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2676 diff changeset	413 }
2833 1cd59ca9ac86 Removed Throw HIR instruction. Removed special handling for exceptions in register allocator. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2830 diff changeset	414 return null;
2707 7ed72769d51a exception handling related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2676 diff changeset	415 }
7ed72769d51a exception handling related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2676 diff changeset	416
2657 4a6518c4d17d Removed need for base instruction. Cleanup. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2652 diff changeset	417 private void genLoadConstant(int cpi) {
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	418 Object con = constantPool.lookupConstant(cpi);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	419
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	420 if (con instanceof RiType) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	421 // this is a load of class constant which might be unresolved
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	422 RiType riType = (RiType) con;
2650 ccab1d5f345e Removed TestPatching option. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2649 diff changeset	423 if (!riType.isResolved()) {
2709 7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	424 append(new Deoptimize(graph));
2671 d8601d421b96 New Deoptimize node, remove ResolveClass node and replace it with deoptimization Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2669 diff changeset	425 frameState.push(CiKind.Object, append(Constant.forObject(null, graph)));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	426 } else {
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	427 frameState.push(CiKind.Object, append(new Constant(riType.getEncoding(Representation.JavaClass), graph)));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	428 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	429 } else if (con instanceof CiConstant) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	430 CiConstant constant = (CiConstant) con;
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	431 frameState.push(constant.kind.stackKind(), appendConstant(constant));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	432 } else {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	433 throw new Error("lookupConstant returned an object of incorrect type");
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	434 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	435 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	436
2645 b2c1e959be46 Clean up around BlockBegin / StdEntry. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2644 diff changeset	437 private void genLoadIndexed(CiKind kind) {
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	438 Value index = frameState.ipop();
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	439 Value array = frameState.apop();
2644 4694daa6af3a Removed CSE array length. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2643 diff changeset	440 Value length = append(new ArrayLength(array, graph));
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	441 Value v = append(new LoadIndexed(array, index, length, kind, graph));
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	442 frameState.push(kind.stackKind(), v);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	443 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	444
2645 b2c1e959be46 Clean up around BlockBegin / StdEntry. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2644 diff changeset	445 private void genStoreIndexed(CiKind kind) {
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	446 Value value = frameState.pop(kind.stackKind());
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	447 Value index = frameState.ipop();
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	448 Value array = frameState.apop();
2644 4694daa6af3a Removed CSE array length. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2643 diff changeset	449 Value length = append(new ArrayLength(array, graph));
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	450 StoreIndexed result = new StoreIndexed(array, index, length, kind, value, graph);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	451 append(result);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	452 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	453
2645 b2c1e959be46 Clean up around BlockBegin / StdEntry. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2644 diff changeset	454 private void stackOp(int opcode) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	455 switch (opcode) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	456 case POP: {
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	457 frameState.xpop();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	458 break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	459 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	460 case POP2: {
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	461 frameState.xpop();
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	462 frameState.xpop();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	463 break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	464 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	465 case DUP: {
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	466 Value w = frameState.xpop();
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	467 frameState.xpush(w);
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	468 frameState.xpush(w);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	469 break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	470 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	471 case DUP_X1: {
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	472 Value w1 = frameState.xpop();
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	473 Value w2 = frameState.xpop();
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	474 frameState.xpush(w1);
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	475 frameState.xpush(w2);
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	476 frameState.xpush(w1);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	477 break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	478 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	479 case DUP_X2: {
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	480 Value w1 = frameState.xpop();
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	481 Value w2 = frameState.xpop();
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	482 Value w3 = frameState.xpop();
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	483 frameState.xpush(w1);
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	484 frameState.xpush(w3);
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	485 frameState.xpush(w2);
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	486 frameState.xpush(w1);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	487 break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	488 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	489 case DUP2: {
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	490 Value w1 = frameState.xpop();
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	491 Value w2 = frameState.xpop();
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	492 frameState.xpush(w2);
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	493 frameState.xpush(w1);
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	494 frameState.xpush(w2);
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	495 frameState.xpush(w1);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	496 break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	497 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	498 case DUP2_X1: {
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	499 Value w1 = frameState.xpop();
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	500 Value w2 = frameState.xpop();
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	501 Value w3 = frameState.xpop();
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	502 frameState.xpush(w2);
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	503 frameState.xpush(w1);
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	504 frameState.xpush(w3);
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	505 frameState.xpush(w2);
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	506 frameState.xpush(w1);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	507 break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	508 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	509 case DUP2_X2: {
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	510 Value w1 = frameState.xpop();
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	511 Value w2 = frameState.xpop();
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	512 Value w3 = frameState.xpop();
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	513 Value w4 = frameState.xpop();
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	514 frameState.xpush(w2);
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	515 frameState.xpush(w1);
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	516 frameState.xpush(w4);
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	517 frameState.xpush(w3);
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	518 frameState.xpush(w2);
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	519 frameState.xpush(w1);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	520 break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	521 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	522 case SWAP: {
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	523 Value w1 = frameState.xpop();
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	524 Value w2 = frameState.xpop();
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	525 frameState.xpush(w1);
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	526 frameState.xpush(w2);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	527 break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	528 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	529 default:
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	530 throw Util.shouldNotReachHere();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	531 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	532
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	533 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	534
2645 b2c1e959be46 Clean up around BlockBegin / StdEntry. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2644 diff changeset	535 private void genArithmeticOp(CiKind kind, int opcode) {
2622 91d3952f7eb7 Framestate work : using stateAFter and reducting the number of nodes with framestates. Intermediate state (does not pass tests) Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2621 diff changeset	536 genArithmeticOp(kind, opcode, false);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	537 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	538
2645 b2c1e959be46 Clean up around BlockBegin / StdEntry. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2644 diff changeset	539 private void genArithmeticOp(CiKind kind, int opcode, boolean canTrap) {
2622 91d3952f7eb7 Framestate work : using stateAFter and reducting the number of nodes with framestates. Intermediate state (does not pass tests) Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2621 diff changeset	540 genArithmeticOp(kind, opcode, kind, kind, canTrap);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	541 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	542
2645 b2c1e959be46 Clean up around BlockBegin / StdEntry. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2644 diff changeset	543 private void genArithmeticOp(CiKind result, int opcode, CiKind x, CiKind y, boolean canTrap) {
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	544 Value yValue = frameState.pop(y);
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	545 Value xValue = frameState.pop(x);
2852 c6bdec623ef9 Move TypeCHeck to floating nodes, rename Nodes to aboid using an Op suffix Gilles Duboscq <gilles.duboscq@oracle.com>* parents: 2850 diff changeset	546 Value result1 = append(new Arithmetic(opcode, result, xValue, yValue, isStrict(method.accessFlags()), canTrap, graph));
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	547 frameState.push(result, result1);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	548 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	549
2645 b2c1e959be46 Clean up around BlockBegin / StdEntry. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2644 diff changeset	550 private void genNegateOp(CiKind kind) {
2852 c6bdec623ef9 Move TypeCHeck to floating nodes, rename Nodes to aboid using an Op suffix Gilles Duboscq <gilles.duboscq@oracle.com>* parents: 2850 diff changeset	551 frameState.push(kind, append(new Negate(frameState.pop(kind), graph)));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	552 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	553
2645 b2c1e959be46 Clean up around BlockBegin / StdEntry. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2644 diff changeset	554 private void genShiftOp(CiKind kind, int opcode) {
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	555 Value s = frameState.ipop();
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	556 Value x = frameState.pop(kind);
2865 7a4e6e11877f Subclasses for Shift Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2862 diff changeset	557 Shift v;
7a4e6e11877f Subclasses for Shift Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2862 diff changeset	558 switch(opcode){
7a4e6e11877f Subclasses for Shift Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2862 diff changeset	559 case ISHL:
7a4e6e11877f Subclasses for Shift Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2862 diff changeset	560 case LSHL: v = new LeftShift(kind, x, s, graph); break;
7a4e6e11877f Subclasses for Shift Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2862 diff changeset	561 case ISHR:
7a4e6e11877f Subclasses for Shift Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2862 diff changeset	562 case LSHR: v = new RightShift(kind, x, s, graph); break;
7a4e6e11877f Subclasses for Shift Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2862 diff changeset	563 case IUSHR:
7a4e6e11877f Subclasses for Shift Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2862 diff changeset	564 case LUSHR: v = new UnsignedRightShift(kind, x, s, graph); break;
7a4e6e11877f Subclasses for Shift Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2862 diff changeset	565 default:
7a4e6e11877f Subclasses for Shift Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2862 diff changeset	566 throw new CiBailout("should not reach");
7a4e6e11877f Subclasses for Shift Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2862 diff changeset	567 }
7a4e6e11877f Subclasses for Shift Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2862 diff changeset	568 frameState.push(kind, append(v));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	569 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	570
2645 b2c1e959be46 Clean up around BlockBegin / StdEntry. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2644 diff changeset	571 private void genLogicOp(CiKind kind, int opcode) {
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	572 Value y = frameState.pop(kind);
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	573 Value x = frameState.pop(kind);
2853 0635ba16afe4 Reintroduce Logic subclasses, creating some Canonicalization related classes Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2852 diff changeset	574 Logic v;
0635ba16afe4 Reintroduce Logic subclasses, creating some Canonicalization related classes Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2852 diff changeset	575 switch(opcode){
0635ba16afe4 Reintroduce Logic subclasses, creating some Canonicalization related classes Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2852 diff changeset	576 case IAND:
0635ba16afe4 Reintroduce Logic subclasses, creating some Canonicalization related classes Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2852 diff changeset	577 case LAND: v = new And(kind, x, y, graph); break;
0635ba16afe4 Reintroduce Logic subclasses, creating some Canonicalization related classes Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2852 diff changeset	578 case IOR:
0635ba16afe4 Reintroduce Logic subclasses, creating some Canonicalization related classes Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2852 diff changeset	579 case LOR: v = new Or(kind, x, y, graph); break;
0635ba16afe4 Reintroduce Logic subclasses, creating some Canonicalization related classes Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2852 diff changeset	580 case IXOR:
0635ba16afe4 Reintroduce Logic subclasses, creating some Canonicalization related classes Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2852 diff changeset	581 case LXOR: v = new Xor(kind, x, y, graph); break;
0635ba16afe4 Reintroduce Logic subclasses, creating some Canonicalization related classes Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2852 diff changeset	582 default:
0635ba16afe4 Reintroduce Logic subclasses, creating some Canonicalization related classes Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2852 diff changeset	583 throw new CiBailout("should not reach");
0635ba16afe4 Reintroduce Logic subclasses, creating some Canonicalization related classes Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2852 diff changeset	584 }
0635ba16afe4 Reintroduce Logic subclasses, creating some Canonicalization related classes Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2852 diff changeset	585 frameState.push(kind, append(v));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	586 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	587
2645 b2c1e959be46 Clean up around BlockBegin / StdEntry. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2644 diff changeset	588 private void genCompareOp(CiKind kind, int opcode, CiKind resultKind) {
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	589 Value y = frameState.pop(kind);
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	590 Value x = frameState.pop(kind);
2862 45422967cbcf Rename Materialize => NormalizeCompare Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2858 diff changeset	591 Value value = append(new NormalizeCompare(opcode, resultKind, x, y, graph));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	592 if (!resultKind.isVoid()) {
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	593 frameState.ipush(value);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	594 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	595 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	596
2645 b2c1e959be46 Clean up around BlockBegin / StdEntry. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2644 diff changeset	597 private void genConvert(int opcode, CiKind from, CiKind to) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	598 CiKind tt = to.stackKind();
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	599 frameState.push(tt, append(new Convert(opcode, frameState.pop(from.stackKind()), tt, graph)));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	600 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	601
2645 b2c1e959be46 Clean up around BlockBegin / StdEntry. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2644 diff changeset	602 private void genIncrement() {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	603 int index = stream().readLocalIndex();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	604 int delta = stream().readIncrement();
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	605 Value x = frameState.localAt(index);
2594 092e628ddd5d changed Constant and Convert, more StoreIndexed changes Lukas Stadler <lukas.stadler@jku.at> parents: 2592 diff changeset	606 Value y = append(Constant.forInt(delta, graph));
2852 c6bdec623ef9 Move TypeCHeck to floating nodes, rename Nodes to aboid using an Op suffix Gilles Duboscq <gilles.duboscq@oracle.com>* parents: 2850 diff changeset	607 frameState.storeLocal(index, append(new Arithmetic(IADD, CiKind.Int, x, y, isStrict(method.accessFlags()), false, graph)));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	608 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	609
2645 b2c1e959be46 Clean up around BlockBegin / StdEntry. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2644 diff changeset	610 private void genGoto(int fromBCI, int toBCI) {
2788 df4c5254c5cc Towards goto removal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2785 diff changeset	611 appendGoto(createTargetAt(toBCI, frameState));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	612 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	613
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	614 private void ifNode(Value x, Condition cond, Value y) {
2768 43ffa0e47a46 Towards removing stateAfter on BlockEnd. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2763 diff changeset	615 assert !x.isDeleted() && !y.isDeleted();
2862 45422967cbcf Rename Materialize => NormalizeCompare Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2858 diff changeset	616 If ifNode = new If(new Compare(x, cond, y, graph), graph);
2768 43ffa0e47a46 Towards removing stateAfter on BlockEnd. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2763 diff changeset	617 append(ifNode);
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	618 Instruction tsucc = createTargetAt(stream().readBranchDest(), frameState);
2769 dd6419f4bfe2 Fixed several issues with incorrect predecessor count/order. One known issue around exception dispatch remaining in fop. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2768 diff changeset	619 ifNode.setBlockSuccessor(0, tsucc);
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	620 Instruction fsucc = createTargetAt(stream().nextBCI(), frameState);
2768 43ffa0e47a46 Towards removing stateAfter on BlockEnd. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2763 diff changeset	621 ifNode.setBlockSuccessor(1, fsucc);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	622 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	623
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	624 private void genIfZero(Condition cond) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	625 Value y = appendConstant(CiConstant.INT_0);
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	626 Value x = frameState.ipop();
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	627 ifNode(x, cond, y);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	628 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	629
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	630 private void genIfNull(Condition cond) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	631 Value y = appendConstant(CiConstant.NULL_OBJECT);
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	632 Value x = frameState.apop();
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	633 ifNode(x, cond, y);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	634 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	635
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	636 private void genIfSame(CiKind kind, Condition cond) {
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	637 Value y = frameState.pop(kind);
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	638 Value x = frameState.pop(kind);
2768 43ffa0e47a46 Towards removing stateAfter on BlockEnd. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2763 diff changeset	639 assert !x.isDeleted() && !y.isDeleted();
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	640 ifNode(x, cond, y);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	641 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	642
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	643 private void genThrow(int bci) {
2833 1cd59ca9ac86 Removed Throw HIR instruction. Removed special handling for exceptions in register allocator. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2830 diff changeset	644 Value exception = frameState.apop();
1cd59ca9ac86 Removed Throw HIR instruction. Removed special handling for exceptions in register allocator. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2830 diff changeset	645 append(new NullCheck(exception, graph));
2840 75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	646
2833 1cd59ca9ac86 Removed Throw HIR instruction. Removed special handling for exceptions in register allocator. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2830 diff changeset	647 Instruction entry = handleException(exception, bci);
2840 75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	648 if (entry != null) {
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	649 append(entry);
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	650 } else {
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	651 frameState.clearStack();
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	652 frameState.apush(exception);
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	653 appendGoto(createTarget(unwindBlock(), frameState));
2833 1cd59ca9ac86 Removed Throw HIR instruction. Removed special handling for exceptions in register allocator. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2830 diff changeset	654 }
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	655 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	656
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	657 private void genCheckCast() {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	658 int cpi = stream().readCPI();
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	659 RiType type = constantPool.lookupType(cpi, CHECKCAST);
2671 d8601d421b96 New Deoptimize node, remove ResolveClass node and replace it with deoptimization Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2669 diff changeset	660 boolean isInitialized = type.isResolved();
2709 7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	661 Value typeInstruction = genTypeOrDeopt(RiType.Representation.ObjectHub, type, isInitialized, cpi);
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	662 Value object = frameState.apop();
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	663 if (typeInstruction != null) {
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	664 frameState.apush(append(new CheckCast(type, typeInstruction, object, graph)));
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	665 } else {
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	666 frameState.apush(appendConstant(CiConstant.NULL_OBJECT));
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	667 }
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	668 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	669
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	670 private void genInstanceOf() {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	671 int cpi = stream().readCPI();
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	672 RiType type = constantPool.lookupType(cpi, INSTANCEOF);
2671 d8601d421b96 New Deoptimize node, remove ResolveClass node and replace it with deoptimization Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2669 diff changeset	673 boolean isInitialized = type.isResolved();
2709 7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	674 Value typeInstruction = genTypeOrDeopt(RiType.Representation.ObjectHub, type, isInitialized, cpi);
2673 98447ab8bd83 Create less nodes in case of Deopt Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2671 diff changeset	675 Value object = frameState.apop();
98447ab8bd83 Create less nodes in case of Deopt Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2671 diff changeset	676 if (typeInstruction != null) {
2709 7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	677 frameState.ipush(append(new InstanceOf(type, typeInstruction, object, graph)));
2673 98447ab8bd83 Create less nodes in case of Deopt Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2671 diff changeset	678 } else {
2709 7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	679 frameState.ipush(appendConstant(CiConstant.INT_0));
2673 98447ab8bd83 Create less nodes in case of Deopt Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2671 diff changeset	680 }
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	681 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	682
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	683 void genNewInstance(int cpi) {
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	684 RiType type = constantPool.lookupType(cpi, NEW);
2709 7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	685 if (type.isResolved()) {
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	686 NewInstance n = new NewInstance(type, cpi, constantPool, graph);
2709 7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	687 frameState.apush(append(n));
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	688 } else {
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	689 append(new Deoptimize(graph));
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	690 frameState.apush(appendConstant(CiConstant.NULL_OBJECT));
2634 4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	691 }
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	692 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	693
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	694 private void genNewTypeArray(int typeCode) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	695 CiKind kind = CiKind.fromArrayTypeCode(typeCode);
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	696 RiType elementType = runtime.asRiType(kind);
2634 4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	697 NewTypeArray nta = new NewTypeArray(frameState.ipop(), elementType, graph);
4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	698 frameState.apush(append(nta));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	699 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	700
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	701 private void genNewObjectArray(int cpi) {
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	702 RiType type = constantPool.lookupType(cpi, ANEWARRAY);
2709 7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	703 Value length = frameState.ipop();
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	704 if (type.isResolved()) {
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	705 NewArray n = new NewObjectArray(type, length, graph);
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	706 frameState.apush(append(n));
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	707 } else {
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	708 append(new Deoptimize(graph));
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	709 frameState.apush(appendConstant(CiConstant.NULL_OBJECT));
2634 4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	710 }
2709 7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	711
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	712 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	713
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	714 private void genNewMultiArray(int cpi) {
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	715 RiType type = constantPool.lookupType(cpi, MULTIANEWARRAY);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	716 int rank = stream().readUByte(bci() + 3);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	717 Value[] dims = new Value[rank];
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	718 for (int i = rank - 1; i >= 0; i--) {
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	719 dims[i] = frameState.ipop();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	720 }
2709 7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	721 if (type.isResolved()) {
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	722 NewArray n = new NewMultiArray(type, dims, cpi, constantPool, graph);
2709 7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	723 frameState.apush(append(n));
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	724 } else {
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	725 append(new Deoptimize(graph));
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	726 frameState.apush(appendConstant(CiConstant.NULL_OBJECT));
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	727 }
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	728 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	729
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	730 private void genGetField(int cpi, RiField field) {
2709 7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	731 CiKind kind = field.kind();
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	732 Value receiver = frameState.apop();
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	733 if (field.isResolved()) {
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	734 LoadField load = new LoadField(receiver, field, graph);
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	735 appendOptimizedLoadField(kind, load);
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	736 } else {
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	737 append(new Deoptimize(graph));
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	738 frameState.push(kind.stackKind(), append(Constant.defaultForKind(kind, graph)));
2634 4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	739 }
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	740 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	741
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	742 private void genPutField(int cpi, RiField field) {
2709 7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	743 Value value = frameState.pop(field.kind().stackKind());
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	744 Value receiver = frameState.apop();
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	745 if (field.isResolved()) {
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	746 StoreField store = new StoreField(receiver, field, value, graph);
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	747 appendOptimizedStoreField(store);
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	748 } else {
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	749 append(new Deoptimize(graph));
2634 4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	750 }
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	751 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	752
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	753 private void genGetStatic(int cpi, RiField field) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	754 RiType holder = field.holder();
2650 ccab1d5f345e Removed TestPatching option. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2649 diff changeset	755 boolean isInitialized = field.isResolved();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	756 CiConstant constantValue = null;
2533 c480605ef068 Removed canonicalizer. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2521 diff changeset	757 if (isInitialized) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	758 constantValue = field.constantValue(null);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	759 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	760 if (constantValue != null) {
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	761 frameState.push(constantValue.kind.stackKind(), appendConstant(constantValue));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	762 } else {
2709 7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	763 Value container = genTypeOrDeopt(RiType.Representation.StaticFields, holder, isInitialized, cpi);
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	764 CiKind kind = field.kind();
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	765 if (container != null) {
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	766 LoadField load = new LoadField(container, field, graph);
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	767 appendOptimizedLoadField(kind, load);
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	768 } else {
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	769 append(new Deoptimize(graph));
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	770 frameState.push(kind.stackKind(), append(Constant.defaultForKind(kind, graph)));
2673 98447ab8bd83 Create less nodes in case of Deopt Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2671 diff changeset	771 }
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	772 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	773 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	774
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	775 private void genPutStatic(int cpi, RiField field) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	776 RiType holder = field.holder();
2709 7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	777 Value container = genTypeOrDeopt(RiType.Representation.StaticFields, holder, field.isResolved(), cpi);
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	778 Value value = frameState.pop(field.kind().stackKind());
2673 98447ab8bd83 Create less nodes in case of Deopt Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2671 diff changeset	779 if (container != null) {
98447ab8bd83 Create less nodes in case of Deopt Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2671 diff changeset	780 StoreField store = new StoreField(container, field, value, graph);
98447ab8bd83 Create less nodes in case of Deopt Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2671 diff changeset	781 appendOptimizedStoreField(store);
2709 7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	782 } else {
7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	783 append(new Deoptimize(graph));
2671 d8601d421b96 New Deoptimize node, remove ResolveClass node and replace it with deoptimization Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2669 diff changeset	784 }
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	785 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	786
2709 7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	787 private Value genTypeOrDeopt(RiType.Representation representation, RiType holder, boolean initialized, int cpi) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	788 if (initialized) {
2673 98447ab8bd83 Create less nodes in case of Deopt Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2671 diff changeset	789 return appendConstant(holder.getEncoding(representation));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	790 } else {
2709 7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	791 append(new Deoptimize(graph));
2673 98447ab8bd83 Create less nodes in case of Deopt Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2671 diff changeset	792 return null;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	793 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	794 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	795
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	796 private void appendOptimizedStoreField(StoreField store) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	797 append(store);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	798 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	799
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	800 private void appendOptimizedLoadField(CiKind kind, LoadField load) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	801 // append the load to the instruction
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	802 Value optimized = append(load);
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	803 frameState.push(kind.stackKind(), optimized);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	804 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	805
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	806 private void genInvokeStatic(RiMethod target, int cpi, RiConstantPool constantPool) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	807 RiType holder = target.holder();
2650 ccab1d5f345e Removed TestPatching option. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2649 diff changeset	808 boolean isInitialized = target.isResolved() && holder.isInitialized();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	809 if (!isInitialized && C1XOptions.ResolveClassBeforeStaticInvoke) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	810 // Re-use the same resolution code as for accessing a static field. Even though
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	811 // the result of resolution is not used by the invocation (only the side effect
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	812 // of initialization is required), it can be commoned with static field accesses.
2709 7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	813 genTypeOrDeopt(RiType.Representation.StaticFields, holder, isInitialized, cpi);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	814 }
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	815 Value[] args = frameState.popArguments(target.signature().argumentSlots(false));
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	816 appendInvoke(INVOKESTATIC, target, args, cpi, constantPool);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	817 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	818
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	819 private void genInvokeInterface(RiMethod target, int cpi, RiConstantPool constantPool) {
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	820 Value[] args = frameState.popArguments(target.signature().argumentSlots(true));
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	821 genInvokeIndirect(INVOKEINTERFACE, target, args, cpi, constantPool);
2533 c480605ef068 Removed canonicalizer. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2521 diff changeset	822
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	823 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	824
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	825 private void genInvokeVirtual(RiMethod target, int cpi, RiConstantPool constantPool) {
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	826 Value[] args = frameState.popArguments(target.signature().argumentSlots(true));
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	827 genInvokeIndirect(INVOKEVIRTUAL, target, args, cpi, constantPool);
2533 c480605ef068 Removed canonicalizer. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2521 diff changeset	828
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	829 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	830
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	831 private void genInvokeSpecial(RiMethod target, RiType knownHolder, int cpi, RiConstantPool constantPool) {
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	832 Value[] args = frameState.popArguments(target.signature().argumentSlots(true));
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	833 invokeDirect(target, args, knownHolder, cpi, constantPool);
2533 c480605ef068 Removed canonicalizer. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2521 diff changeset	834
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	835 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	836
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	837 private void genInvokeIndirect(int opcode, RiMethod target, Value[] args, int cpi, RiConstantPool constantPool) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	838 Value receiver = args[0];
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	839 // attempt to devirtualize the call
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	840 if (target.isResolved()) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	841 RiType klass = target.holder();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	842
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	843 // 0. check for trivial cases
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	844 if (target.canBeStaticallyBound() && !isAbstract(target.accessFlags())) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	845 // check for trivial cases (e.g. final methods, nonvirtual methods)
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	846 invokeDirect(target, args, target.holder(), cpi, constantPool);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	847 return;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	848 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	849 // 1. check if the exact type of the receiver can be determined
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	850 RiType exact = getExactType(klass, receiver);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	851 if (exact != null && exact.isResolved()) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	852 // either the holder class is exact, or the receiver object has an exact type
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	853 invokeDirect(exact.resolveMethodImpl(target), args, exact, cpi, constantPool);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	854 return;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	855 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	856 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	857 // devirtualization failed, produce an actual invokevirtual
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	858 appendInvoke(opcode, target, args, cpi, constantPool);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	859 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	860
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	861 private CiKind returnKind(RiMethod target) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	862 return target.signature().returnKind();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	863 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	864
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	865 private void invokeDirect(RiMethod target, Value[] args, RiType knownHolder, int cpi, RiConstantPool constantPool) {
569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	866 appendInvoke(INVOKESPECIAL, target, args, cpi, constantPool);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	867 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	868
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	869 private void appendInvoke(int opcode, RiMethod target, Value[] args, int cpi, RiConstantPool constantPool) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	870 CiKind resultType = returnKind(target);
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	871 Invoke invoke = new Invoke(bci(), opcode, resultType.stackKind(), args, target, target.signature().returnType(method.holder()), graph);
2716 c1a9bf38da28 Removed bci from the Instruction class. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2715 diff changeset	872 Value result = appendWithBCI(invoke);
2833 1cd59ca9ac86 Removed Throw HIR instruction. Removed special handling for exceptions in register allocator. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2830 diff changeset	873 invoke.setExceptionEdge(handleException(null, bci()));
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	874 frameState.pushReturn(resultType, result);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	875 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	876
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	877 private RiType getExactType(RiType staticType, Value receiver) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	878 RiType exact = staticType.exactType();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	879 if (exact == null) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	880 exact = receiver.exactType();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	881 if (exact == null) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	882 if (receiver.isConstant()) {
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	883 exact = runtime.getTypeOf(receiver.asConstant());
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	884 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	885 if (exact == null) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	886 RiType declared = receiver.declaredType();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	887 exact = declared == null \|\| !declared.isResolved() ? null : declared.exactType();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	888 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	889 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	890 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	891 return exact;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	892 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	893
2647 0bf54306c139 Removed accessor workaround. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2645 diff changeset	894 private void callRegisterFinalizer() {
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	895 Value receiver = frameState.loadLocal(0);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	896 RiType declaredType = receiver.declaredType();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	897 RiType receiverType = declaredType;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	898 RiType exactType = receiver.exactType();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	899 if (exactType == null && declaredType != null) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	900 exactType = declaredType.exactType();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	901 }
2771 056e392d63d4 Connected local variables to start node. No more need for frame state to emit locals. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2769 diff changeset	902 if (exactType == null && receiver instanceof Local && ((Local) receiver).index() == 0) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	903 // the exact type isn't known, but the receiver is parameter 0 => use holder
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	904 receiverType = method.holder();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	905 exactType = receiverType.exactType();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	906 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	907 boolean needsCheck = true;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	908 if (exactType != null) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	909 // we have an exact type
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	910 needsCheck = exactType.hasFinalizer();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	911 } else {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	912 // if either the declared type of receiver or the holder can be assumed to have no finalizers
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	913 if (declaredType != null && !declaredType.hasFinalizableSubclass()) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	914 if (compilation.recordNoFinalizableSubclassAssumption(declaredType)) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	915 needsCheck = false;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	916 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	917 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	918
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	919 if (receiverType != null && !receiverType.hasFinalizableSubclass()) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	920 if (compilation.recordNoFinalizableSubclassAssumption(receiverType)) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	921 needsCheck = false;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	922 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	923 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	924 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	925
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	926 if (needsCheck) {
2519 f6125fb5bfbc Removed intrinsics. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2516 diff changeset	927 // append a call to the finalizer registration
2671 d8601d421b96 New Deoptimize node, remove ResolveClass node and replace it with deoptimization Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2669 diff changeset	928 append(new RegisterFinalizer(frameState.loadLocal(0), frameState.create(bci()), graph));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	929 C1XMetrics.InlinedFinalizerChecks++;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	930 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	931 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	932
2647 0bf54306c139 Removed accessor workaround. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2645 diff changeset	933 private void genReturn(Value x) {
2840 75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	934 frameState.clearStack();
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	935 if (x != null) {
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	936 frameState.push(x.kind, x);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	937 }
2840 75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	938 appendGoto(createTarget(returnBlock(), frameState));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	939 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	940
2647 0bf54306c139 Removed accessor workaround. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2645 diff changeset	941 private void genMonitorEnter(Value x, int bci) {
2644 4694daa6af3a Removed CSE array length. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2643 diff changeset	942 int lockNumber = frameState.locksSize();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	943 MonitorAddress lockAddress = null;
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	944 if (runtime.sizeOfBasicObjectLock() != 0) {
2602 0c6564c254af new node layout: BlockBegin, BlockEnd Lukas Stadler <lukas.stadler@jku.at> parents: 2600 diff changeset	945 lockAddress = new MonitorAddress(lockNumber, graph);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	946 append(lockAddress);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	947 }
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	948 MonitorEnter monitorEnter = new MonitorEnter(x, lockAddress, lockNumber, graph);
2716 c1a9bf38da28 Removed bci from the Instruction class. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2715 diff changeset	949 appendWithBCI(monitorEnter);
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	950 frameState.lock(x);
2640 9e30cf6dcf96 More frame state fixes. All jtt tests passing now again. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2639 diff changeset	951 if (bci == Instruction.SYNCHRONIZATION_ENTRY_BCI) {
9e30cf6dcf96 More frame state fixes. All jtt tests passing now again. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2639 diff changeset	952 monitorEnter.setStateAfter(frameState.create(0));
9e30cf6dcf96 More frame state fixes. All jtt tests passing now again. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2639 diff changeset	953 }
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	954 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	955
2784 e62cfea1c134 Simplified fillSyncHandler. Fixed LIRGenerator visitUnwind. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2783 diff changeset	956 private void genMonitorExit(Value x) {
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	957 int lockNumber = frameState.locksSize() - 1;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	958 if (lockNumber < 0) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	959 throw new CiBailout("monitor stack underflow");
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	960 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	961 MonitorAddress lockAddress = null;
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	962 if (runtime.sizeOfBasicObjectLock() != 0) {
2602 0c6564c254af new node layout: BlockBegin, BlockEnd Lukas Stadler <lukas.stadler@jku.at> parents: 2600 diff changeset	963 lockAddress = new MonitorAddress(lockNumber, graph);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	964 append(lockAddress);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	965 }
2716 c1a9bf38da28 Removed bci from the Instruction class. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2715 diff changeset	966 appendWithBCI(new MonitorExit(x, lockAddress, lockNumber, graph));
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	967 frameState.unlock();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	968 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	969
2647 0bf54306c139 Removed accessor workaround. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2645 diff changeset	970 private void genJsr(int dest) {
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	971 throw new CiBailout("jsr/ret not supported");
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	972 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	973
2647 0bf54306c139 Removed accessor workaround. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2645 diff changeset	974 private void genRet(int localIndex) {
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	975 throw new CiBailout("jsr/ret not supported");
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	976 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	977
2647 0bf54306c139 Removed accessor workaround. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2645 diff changeset	978 private void genTableswitch() {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	979 int bci = bci();
2747 84f4c7dceb14 fixes for mergeOrClone move Lukas Stadler <lukas.stadler@jku.at> parents: 2746 diff changeset	980 Value value = frameState.ipop();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	981 BytecodeTableSwitch ts = new BytecodeTableSwitch(stream(), bci);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	982 int max = ts.numberOfCases();
2730 027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	983 List<Instruction> list = new ArrayList<Instruction>(max + 1);
2769 dd6419f4bfe2 Fixed several issues with incorrect predecessor count/order. One known issue around exception dispatch remaining in fop. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2768 diff changeset	984 List<Integer> offsetList = new ArrayList<Integer>(max + 1);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	985 for (int i = 0; i < max; i++) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	986 // add all successors to the successor list
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	987 int offset = ts.offsetAt(i);
2769 dd6419f4bfe2 Fixed several issues with incorrect predecessor count/order. One known issue around exception dispatch remaining in fop. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2768 diff changeset	988 list.add(null);
dd6419f4bfe2 Fixed several issues with incorrect predecessor count/order. One known issue around exception dispatch remaining in fop. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2768 diff changeset	989 offsetList.add(offset);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	990 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	991 int offset = ts.defaultOffset();
2769 dd6419f4bfe2 Fixed several issues with incorrect predecessor count/order. One known issue around exception dispatch remaining in fop. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2768 diff changeset	992 list.add(null);
dd6419f4bfe2 Fixed several issues with incorrect predecessor count/order. One known issue around exception dispatch remaining in fop. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2768 diff changeset	993 offsetList.add(offset);
2774 93fd92c9f8b0 Removed usage of stateAfter on BlockEnd instructions. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2773 diff changeset	994 TableSwitch tableSwitch = new TableSwitch(value, list, ts.lowKey(), graph);
2769 dd6419f4bfe2 Fixed several issues with incorrect predecessor count/order. One known issue around exception dispatch remaining in fop. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2768 diff changeset	995 for (int i = 0; i < offsetList.size(); ++i) {
dd6419f4bfe2 Fixed several issues with incorrect predecessor count/order. One known issue around exception dispatch remaining in fop. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2768 diff changeset	996 tableSwitch.setBlockSuccessor(i, createTargetAt(bci + offsetList.get(i), frameState));
dd6419f4bfe2 Fixed several issues with incorrect predecessor count/order. One known issue around exception dispatch remaining in fop. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2768 diff changeset	997 }
dd6419f4bfe2 Fixed several issues with incorrect predecessor count/order. One known issue around exception dispatch remaining in fop. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2768 diff changeset	998 append(tableSwitch);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	999 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1000
2647 0bf54306c139 Removed accessor workaround. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2645 diff changeset	1001 private void genLookupswitch() {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1002 int bci = bci();
2747 84f4c7dceb14 fixes for mergeOrClone move Lukas Stadler <lukas.stadler@jku.at> parents: 2746 diff changeset	1003 Value value = frameState.ipop();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1004 BytecodeLookupSwitch ls = new BytecodeLookupSwitch(stream(), bci);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1005 int max = ls.numberOfCases();
2730 027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	1006 List<Instruction> list = new ArrayList<Instruction>(max + 1);
2769 dd6419f4bfe2 Fixed several issues with incorrect predecessor count/order. One known issue around exception dispatch remaining in fop. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2768 diff changeset	1007 List<Integer> offsetList = new ArrayList<Integer>(max + 1);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1008 int[] keys = new int[max];
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1009 for (int i = 0; i < max; i++) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1010 // add all successors to the successor list
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1011 int offset = ls.offsetAt(i);
2769 dd6419f4bfe2 Fixed several issues with incorrect predecessor count/order. One known issue around exception dispatch remaining in fop. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2768 diff changeset	1012 list.add(null);
dd6419f4bfe2 Fixed several issues with incorrect predecessor count/order. One known issue around exception dispatch remaining in fop. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2768 diff changeset	1013 offsetList.add(offset);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1014 keys[i] = ls.keyAt(i);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1015 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1016 int offset = ls.defaultOffset();
2769 dd6419f4bfe2 Fixed several issues with incorrect predecessor count/order. One known issue around exception dispatch remaining in fop. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2768 diff changeset	1017 list.add(null);
dd6419f4bfe2 Fixed several issues with incorrect predecessor count/order. One known issue around exception dispatch remaining in fop. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2768 diff changeset	1018 offsetList.add(offset);
2774 93fd92c9f8b0 Removed usage of stateAfter on BlockEnd instructions. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2773 diff changeset	1019 LookupSwitch lookupSwitch = new LookupSwitch(value, list, keys, graph);
2769 dd6419f4bfe2 Fixed several issues with incorrect predecessor count/order. One known issue around exception dispatch remaining in fop. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2768 diff changeset	1020 for (int i = 0; i < offsetList.size(); ++i) {
dd6419f4bfe2 Fixed several issues with incorrect predecessor count/order. One known issue around exception dispatch remaining in fop. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2768 diff changeset	1021 lookupSwitch.setBlockSuccessor(i, createTargetAt(bci + offsetList.get(i), frameState));
dd6419f4bfe2 Fixed several issues with incorrect predecessor count/order. One known issue around exception dispatch remaining in fop. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2768 diff changeset	1022 }
dd6419f4bfe2 Fixed several issues with incorrect predecessor count/order. One known issue around exception dispatch remaining in fop. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2768 diff changeset	1023 append(lookupSwitch);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1024 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1025
2709 7b7dbe19fafb Remove all unresolved cases from HotspotXirGenerator, use more explicit Deopt, Deopt to lastState instead of stateBefore Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2684 diff changeset	1026 private Value appendConstant(CiConstant constant) {
2805 c3f64b66fc78 Towards removing the next pointer from Constant and ArithmeticOp Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2799 diff changeset	1027 return append(new Constant(constant, graph));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1028 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1029
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1030 private Value append(Instruction x) {
2716 c1a9bf38da28 Removed bci from the Instruction class. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2715 diff changeset	1031 return appendWithBCI(x);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1032 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1033
2805 c3f64b66fc78 Towards removing the next pointer from Constant and ArithmeticOp Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2799 diff changeset	1034 private Value append(Value v) {
c3f64b66fc78 Towards removing the next pointer from Constant and ArithmeticOp Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2799 diff changeset	1035 return v;
c3f64b66fc78 Towards removing the next pointer from Constant and ArithmeticOp Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2799 diff changeset	1036 }
c3f64b66fc78 Towards removing the next pointer from Constant and ArithmeticOp Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2799 diff changeset	1037
2716 c1a9bf38da28 Removed bci from the Instruction class. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2715 diff changeset	1038 private Value appendWithBCI(Instruction x) {
2833 1cd59ca9ac86 Removed Throw HIR instruction. Removed special handling for exceptions in register allocator. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2830 diff changeset	1039 assert x.predecessors().size() == 0 : "instruction should not have been appended yet";
2820 2b8ef0a06391 Clean up in the graph builder. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2805 diff changeset	1040 assert lastInstr.next() == null : "cannot append instruction to instruction which isn't end (" + lastInstr + "->" + lastInstr.next() + ")";
2b8ef0a06391 Clean up in the graph builder. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2805 diff changeset	1041 lastInstr.setNext(x);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1042
2820 2b8ef0a06391 Clean up in the graph builder. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2805 diff changeset	1043 lastInstr = x;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1044 if (++stats.nodeCount >= C1XOptions.MaximumInstructionCount) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1045 // bailout if we've exceeded the maximum inlining size
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1046 throw new CiBailout("Method and/or inlining is too large");
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1047 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1048
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1049 return x;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1050 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1051
2750 6048da340364 less references to BlockBegin in BlockEnd instructions Lukas Stadler <lukas.stadler@jku.at> parents: 2749 diff changeset	1052 private Instruction createTargetAt(int bci, FrameStateAccess stateAfter) {
2773 27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	1053 return createTarget(blockFromBci[bci], stateAfter);
2750 6048da340364 less references to BlockBegin in BlockEnd instructions Lukas Stadler <lukas.stadler@jku.at> parents: 2749 diff changeset	1054 }
6048da340364 less references to BlockBegin in BlockEnd instructions Lukas Stadler <lukas.stadler@jku.at> parents: 2749 diff changeset	1055
6048da340364 less references to BlockBegin in BlockEnd instructions Lukas Stadler <lukas.stadler@jku.at> parents: 2749 diff changeset	1056 private Instruction createTarget(Block block, FrameStateAccess stateAfter) {
2773 27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	1057 assert block != null && stateAfter != null;
2781 bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	1058 assert block.isLoopHeader \|\| block.firstInstruction == null \|\| block.firstInstruction.next() == null : "non-loop block must be iterated after all its predecessors";
bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	1059
2788 df4c5254c5cc Towards goto removal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2785 diff changeset	1060 if (block.isExceptionEntry) {
df4c5254c5cc Towards goto removal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2785 diff changeset	1061 assert stateAfter.stackSize() == 1;
df4c5254c5cc Towards goto removal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2785 diff changeset	1062 }
df4c5254c5cc Towards goto removal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2785 diff changeset	1063
2750 6048da340364 less references to BlockBegin in BlockEnd instructions Lukas Stadler <lukas.stadler@jku.at> parents: 2749 diff changeset	1064 if (block.firstInstruction == null) {
2781 bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	1065 if (block.isLoopHeader) {
2799 e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1066 // block.firstInstruction = new Merge(block.startBci, graph);
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1067
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1068 LoopBegin loopBegin = new LoopBegin(graph);
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1069 LoopEnd loopEnd = new LoopEnd(graph);
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1070 loopEnd.setLoopBegin(loopBegin);
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1071 block.firstInstruction = loopBegin;
2781 bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	1072 } else {
bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	1073 block.firstInstruction = new Placeholder(graph);
bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	1074 }
2750 6048da340364 less references to BlockBegin in BlockEnd instructions Lukas Stadler <lukas.stadler@jku.at> parents: 2749 diff changeset	1075 }
2773 27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	1076 mergeOrClone(block, stateAfter);
2750 6048da340364 less references to BlockBegin in BlockEnd instructions Lukas Stadler <lukas.stadler@jku.at> parents: 2749 diff changeset	1077 addToWorkList(block);
2799 e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1078
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1079 if (block.firstInstruction instanceof LoopBegin && isVisited(block)) {
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1080 return ((LoopBegin) block.firstInstruction).loopEnd();
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1081 } else {
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1082 return block.firstInstruction;
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1083 }
2750 6048da340364 less references to BlockBegin in BlockEnd instructions Lukas Stadler <lukas.stadler@jku.at> parents: 2749 diff changeset	1084 }
6048da340364 less references to BlockBegin in BlockEnd instructions Lukas Stadler <lukas.stadler@jku.at> parents: 2749 diff changeset	1085
2652 6d19b4f476db Removed more OSR handling stuff. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2650 diff changeset	1086 private Value synchronizedObject(FrameStateAccess state, RiMethod target) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1087 if (isStatic(target.accessFlags())) {
2594 092e628ddd5d changed Constant and Convert, more StoreIndexed changes Lukas Stadler <lukas.stadler@jku.at> parents: 2592 diff changeset	1088 Constant classConstant = new Constant(target.holder().getEncoding(Representation.JavaClass), graph);
2805 c3f64b66fc78 Towards removing the next pointer from Constant and ArithmeticOp Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2799 diff changeset	1089 return append(classConstant);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1090 } else {
2652 6d19b4f476db Removed more OSR handling stuff. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2650 diff changeset	1091 return state.localAt(0);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1092 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1093 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1094
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1095 private void iterateAllBlocks() {
2730 027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	1096 Block block;
027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	1097 while ((block = removeFromWorkList()) != null) {
2707 7ed72769d51a exception handling related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2676 diff changeset	1098
7ed72769d51a exception handling related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2676 diff changeset	1099 // remove blocks that have no predecessors by the time it their bytecodes are parsed
2755 80b024e75b29 small fix for dead blocks Lukas Stadler <lukas.stadler@jku.at> parents: 2752 diff changeset	1100 if (block.firstInstruction == null) {
2730 027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	1101 markVisited(block);
2707 7ed72769d51a exception handling related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2676 diff changeset	1102 continue;
7ed72769d51a exception handling related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2676 diff changeset	1103 }
7ed72769d51a exception handling related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2676 diff changeset	1104
2730 027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	1105 if (!isVisited(block)) {
027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	1106 markVisited(block);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1107 // now parse the block
2781 bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	1108 frameState.initializeFrom(((StateSplit) block.firstInstruction).stateBefore());
2746 05c92e53a50d merge and clone before connecting blocks Lukas Stadler <lukas.stadler@jku.at> parents: 2741 diff changeset	1109 lastInstr = block.firstInstruction;
2781 bda5972a40a5 remove unnecessary BlockBegin nodes in frontend Lukas Stadler <lukas.stadler@jku.at> parents: 2776 diff changeset	1110 assert block.firstInstruction.next() == null : "instructions already appended at block " + block.blockID;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1111
2840 75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	1112 if (block == returnBlock) {
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	1113 createReturnBlock(block);
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	1114 } else if (block == unwindBlock) {
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	1115 createUnwindBlock(block);
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	1116 } else if (block instanceof ExceptionBlock) {
2773 27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	1117 createExceptionDispatch((ExceptionBlock) block);
27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	1118 } else {
27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	1119 iterateBytecodesForBlock(block);
27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	1120 }
27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	1121 }
27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	1122 }
2799 e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1123 for (Block b : blocksVisited) {
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1124 if (b.isLoopHeader) {
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1125 LoopBegin begin = (LoopBegin) b.firstInstruction;
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1126 LoopEnd end = begin.loopEnd();
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1127
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1128 // This can happen with degenerated loops like this one:
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1129 // for (;;) {
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1130 // try {
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1131 // break;
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1132 // } catch (UnresolvedException iioe) {
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1133 // }
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1134 // }
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1135 if (end.stateBefore() != null) {
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1136 begin.stateBefore().merge(begin, end.stateBefore());
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1137 } else {
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1138 end.delete();
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1139 Merge merge = new Merge(graph);
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1140 merge.successors().setAndClear(merge.nextIndex(), begin, begin.nextIndex());
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1141 begin.replace(merge);
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1142 }
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1143 }
e1dad0edd57a first part of loop reworking Lukas Stadler <lukas.stadler@jku.at> parents: 2796 diff changeset	1144 }
2773 27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	1145 }
27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	1146
2840 75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	1147 private void createUnwindBlock(Block block) {
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	1148 if (Modifier.isSynchronized(method.accessFlags())) {
7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	1149 genMonitorExit(methodSynchronizedObject);
2840 75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	1150 }
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	1151 append(graph.createUnwind(frameState.apop()));
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	1152 }
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	1153
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	1154 private void createReturnBlock(Block block) {
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	1155 if (method.isConstructor() && method.holder().superType() == null) {
2840 75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	1156 callRegisterFinalizer();
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	1157 }
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	1158 CiKind returnKind = method.signature().returnKind().stackKind();
2840 75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	1159 Value x = returnKind == CiKind.Void ? null : frameState.pop(returnKind);
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	1160 assert frameState.stackSize() == 0;
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	1161
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	1162 if (Modifier.isSynchronized(method.accessFlags())) {
7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	1163 genMonitorExit(methodSynchronizedObject);
2840 75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	1164 }
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	1165 append(graph.createReturn(x));
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	1166 }
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	1167
2773 27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	1168 private void createExceptionDispatch(ExceptionBlock block) {
27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	1169 if (block.handler == null) {
27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	1170 assert frameState.stackSize() == 1 : "only exception object expected on stack, actual size: " + frameState.stackSize();
2840 75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	1171 createUnwindBlock(block);
2773 27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	1172 } else {
27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	1173 assert frameState.stackSize() == 1;
27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	1174
2840 75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	1175 Block nextBlock = block.next == null ? unwindBlock() : block.next;
2773 27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	1176 if (block.handler.catchType().isResolved()) {
2830 706047ee5f2e Removed ExceptionHandler class because of clean up. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2829 diff changeset	1177 Instruction catchSuccessor = createTarget(blockFromBci[block.handler.handlerBCI()], frameState);
2840 75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	1178 Instruction nextDispatch = createTarget(nextBlock, frameState);
2774 93fd92c9f8b0 Removed usage of stateAfter on BlockEnd instructions. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2773 diff changeset	1179 append(new ExceptionDispatch(frameState.stackAt(0), catchSuccessor, nextDispatch, block.handler.catchType(), graph));
2773 27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	1180 } else {
27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	1181 Deoptimize deopt = new Deoptimize(graph);
27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	1182 deopt.setMessage("unresolved " + block.handler.catchType().name());
27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	1183 append(deopt);
2840 75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	1184 Instruction nextDispatch = createTarget(nextBlock, frameState);
2788 df4c5254c5cc Towards goto removal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2785 diff changeset	1185 appendGoto(nextDispatch);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1186 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1187 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1188 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1189
2788 df4c5254c5cc Towards goto removal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2785 diff changeset	1190 private void appendGoto(Instruction target) {
2820 2b8ef0a06391 Clean up in the graph builder. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2805 diff changeset	1191 lastInstr.setNext(target);
2788 df4c5254c5cc Towards goto removal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2785 diff changeset	1192 }
df4c5254c5cc Towards goto removal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2785 diff changeset	1193
2775 3b73b230b86b Removed more stateAfter usages. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2774 diff changeset	1194 private void iterateBytecodesForBlock(Block block) {
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	1195 assert frameState != null;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1196
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1197 stream.setBCI(block.startBci);
a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1198
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1199 int endBCI = stream.endBCI();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1200 boolean blockStart = true;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1201
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1202 int bci = block.startBci;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1203 while (bci < endBCI) {
2773 27512ea6bbcb exception dispatch simplification: Lukas Stadler <lukas.stadler@jku.at> parents: 2771 diff changeset	1204 Block nextBlock = blockFromBci[bci];
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1205 if (nextBlock != null && nextBlock != block) {
2788 df4c5254c5cc Towards goto removal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2785 diff changeset	1206 assert !nextBlock.isExceptionEntry;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1207 // we fell through to the next block, add a goto and break
2840 75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph Lukas Stadler <lukas.stadler@jku.at> parents: 2837 diff changeset	1208 appendGoto(createTarget(nextBlock, frameState));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1209 break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1210 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1211 // read the opcode
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1212 int opcode = stream.currentBC();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1213
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1214 traceState();
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1215 traceInstruction(bci, opcode, blockStart);
a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1216 processBytecode(bci, opcode);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1217
2822 530366123e46 Invoke is a block end Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2796 diff changeset	1218 if (Schedule.isBlockEnd(lastInstr) \|\| lastInstr.next() != null) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1219 break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1220 }
2788 df4c5254c5cc Towards goto removal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2785 diff changeset	1221
2640 9e30cf6dcf96 More frame state fixes. All jtt tests passing now again. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2639 diff changeset	1222 stream.next();
9e30cf6dcf96 More frame state fixes. All jtt tests passing now again. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2639 diff changeset	1223 bci = stream.currentBCI();
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	1224 if (lastInstr instanceof StateSplit) {
569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	1225 StateSplit stateSplit = (StateSplit) lastInstr;
569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	1226 if (stateSplit.stateAfter() == null && stateSplit.needsStateAfter()) {
569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	1227 stateSplit.setStateAfter(frameState.create(bci));
569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	1228 }
569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	1229 }
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1230 blockStart = false;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1231 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1232 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1233
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1234 private void traceState() {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1235 if (C1XOptions.TraceBytecodeParserLevel >= TRACELEVEL_STATE && !TTY.isSuppressed()) {
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	1236 log.println(String.format("\| state [nr locals = %d, stack depth = %d, method = %s]", frameState.localsSize(), frameState.stackSize(), method));
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	1237 for (int i = 0; i < frameState.localsSize(); ++i) {
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	1238 Value value = frameState.localAt(i);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1239 log.println(String.format("\| local[%d] = %-8s : %s", i, value == null ? "bogus" : value.kind.javaName, value));
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1240 }
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	1241 for (int i = 0; i < frameState.stackSize(); ++i) {
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	1242 Value value = frameState.stackAt(i);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1243 log.println(String.format("\| stack[%d] = %-8s : %s", i, value == null ? "bogus" : value.kind.javaName, value));
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1244 }
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	1245 for (int i = 0; i < frameState.locksSize(); ++i) {
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	1246 Value value = frameState.lockAt(i);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1247 log.println(String.format("\| lock[%d] = %-8s : %s", i, value == null ? "bogus" : value.kind.javaName, value));
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1248 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1249 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1250 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1251
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1252 private void processBytecode(int bci, int opcode) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1253 int cpi;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1254
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1255 // Checkstyle: stop
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1256 switch (opcode) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1257 case NOP : /* nothing to do */ break;
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1258 case ACONST_NULL : frameState.apush(appendConstant(CiConstant.NULL_OBJECT)); break;
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1259 case ICONST_M1 : frameState.ipush(appendConstant(CiConstant.INT_MINUS_1)); break;
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1260 case ICONST_0 : frameState.ipush(appendConstant(CiConstant.INT_0)); break;
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1261 case ICONST_1 : frameState.ipush(appendConstant(CiConstant.INT_1)); break;
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1262 case ICONST_2 : frameState.ipush(appendConstant(CiConstant.INT_2)); break;
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1263 case ICONST_3 : frameState.ipush(appendConstant(CiConstant.INT_3)); break;
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1264 case ICONST_4 : frameState.ipush(appendConstant(CiConstant.INT_4)); break;
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1265 case ICONST_5 : frameState.ipush(appendConstant(CiConstant.INT_5)); break;
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1266 case LCONST_0 : frameState.lpush(appendConstant(CiConstant.LONG_0)); break;
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1267 case LCONST_1 : frameState.lpush(appendConstant(CiConstant.LONG_1)); break;
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1268 case FCONST_0 : frameState.fpush(appendConstant(CiConstant.FLOAT_0)); break;
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1269 case FCONST_1 : frameState.fpush(appendConstant(CiConstant.FLOAT_1)); break;
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1270 case FCONST_2 : frameState.fpush(appendConstant(CiConstant.FLOAT_2)); break;
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1271 case DCONST_0 : frameState.dpush(appendConstant(CiConstant.DOUBLE_0)); break;
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1272 case DCONST_1 : frameState.dpush(appendConstant(CiConstant.DOUBLE_1)); break;
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1273 case BIPUSH : frameState.ipush(appendConstant(CiConstant.forInt(stream.readByte()))); break;
a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1274 case SIPUSH : frameState.ipush(appendConstant(CiConstant.forInt(stream.readShort()))); break;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1275 case LDC : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1276 case LDC_W : // fall through
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1277 case LDC2_W : genLoadConstant(stream.readCPI()); break;
a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1278 case ILOAD : loadLocal(stream.readLocalIndex(), CiKind.Int); break;
a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1279 case LLOAD : loadLocal(stream.readLocalIndex(), CiKind.Long); break;
a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1280 case FLOAD : loadLocal(stream.readLocalIndex(), CiKind.Float); break;
a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1281 case DLOAD : loadLocal(stream.readLocalIndex(), CiKind.Double); break;
a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1282 case ALOAD : loadLocal(stream.readLocalIndex(), CiKind.Object); break;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1283 case ILOAD_0 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1284 case ILOAD_1 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1285 case ILOAD_2 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1286 case ILOAD_3 : loadLocal(opcode - ILOAD_0, CiKind.Int); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1287 case LLOAD_0 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1288 case LLOAD_1 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1289 case LLOAD_2 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1290 case LLOAD_3 : loadLocal(opcode - LLOAD_0, CiKind.Long); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1291 case FLOAD_0 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1292 case FLOAD_1 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1293 case FLOAD_2 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1294 case FLOAD_3 : loadLocal(opcode - FLOAD_0, CiKind.Float); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1295 case DLOAD_0 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1296 case DLOAD_1 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1297 case DLOAD_2 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1298 case DLOAD_3 : loadLocal(opcode - DLOAD_0, CiKind.Double); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1299 case ALOAD_0 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1300 case ALOAD_1 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1301 case ALOAD_2 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1302 case ALOAD_3 : loadLocal(opcode - ALOAD_0, CiKind.Object); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1303 case IALOAD : genLoadIndexed(CiKind.Int ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1304 case LALOAD : genLoadIndexed(CiKind.Long ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1305 case FALOAD : genLoadIndexed(CiKind.Float ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1306 case DALOAD : genLoadIndexed(CiKind.Double); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1307 case AALOAD : genLoadIndexed(CiKind.Object); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1308 case BALOAD : genLoadIndexed(CiKind.Byte ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1309 case CALOAD : genLoadIndexed(CiKind.Char ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1310 case SALOAD : genLoadIndexed(CiKind.Short ); break;
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1311 case ISTORE : storeLocal(CiKind.Int, stream.readLocalIndex()); break;
a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1312 case LSTORE : storeLocal(CiKind.Long, stream.readLocalIndex()); break;
a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1313 case FSTORE : storeLocal(CiKind.Float, stream.readLocalIndex()); break;
a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1314 case DSTORE : storeLocal(CiKind.Double, stream.readLocalIndex()); break;
a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1315 case ASTORE : storeLocal(CiKind.Object, stream.readLocalIndex()); break;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1316 case ISTORE_0 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1317 case ISTORE_1 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1318 case ISTORE_2 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1319 case ISTORE_3 : storeLocal(CiKind.Int, opcode - ISTORE_0); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1320 case LSTORE_0 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1321 case LSTORE_1 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1322 case LSTORE_2 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1323 case LSTORE_3 : storeLocal(CiKind.Long, opcode - LSTORE_0); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1324 case FSTORE_0 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1325 case FSTORE_1 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1326 case FSTORE_2 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1327 case FSTORE_3 : storeLocal(CiKind.Float, opcode - FSTORE_0); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1328 case DSTORE_0 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1329 case DSTORE_1 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1330 case DSTORE_2 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1331 case DSTORE_3 : storeLocal(CiKind.Double, opcode - DSTORE_0); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1332 case ASTORE_0 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1333 case ASTORE_1 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1334 case ASTORE_2 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1335 case ASTORE_3 : storeLocal(CiKind.Object, opcode - ASTORE_0); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1336 case IASTORE : genStoreIndexed(CiKind.Int ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1337 case LASTORE : genStoreIndexed(CiKind.Long ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1338 case FASTORE : genStoreIndexed(CiKind.Float ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1339 case DASTORE : genStoreIndexed(CiKind.Double); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1340 case AASTORE : genStoreIndexed(CiKind.Object); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1341 case BASTORE : genStoreIndexed(CiKind.Byte ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1342 case CASTORE : genStoreIndexed(CiKind.Char ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1343 case SASTORE : genStoreIndexed(CiKind.Short ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1344 case POP : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1345 case POP2 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1346 case DUP : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1347 case DUP_X1 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1348 case DUP_X2 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1349 case DUP2 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1350 case DUP2_X1 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1351 case DUP2_X2 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1352 case SWAP : stackOp(opcode); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1353 case IADD : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1354 case ISUB : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1355 case IMUL : genArithmeticOp(CiKind.Int, opcode); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1356 case IDIV : // fall through
2622 91d3952f7eb7 Framestate work : using stateAFter and reducting the number of nodes with framestates. Intermediate state (does not pass tests) Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2621 diff changeset	1357 case IREM : genArithmeticOp(CiKind.Int, opcode, true); break;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1358 case LADD : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1359 case LSUB : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1360 case LMUL : genArithmeticOp(CiKind.Long, opcode); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1361 case LDIV : // fall through
2622 91d3952f7eb7 Framestate work : using stateAFter and reducting the number of nodes with framestates. Intermediate state (does not pass tests) Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2621 diff changeset	1362 case LREM : genArithmeticOp(CiKind.Long, opcode, true); break;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1363 case FADD : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1364 case FSUB : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1365 case FMUL : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1366 case FDIV : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1367 case FREM : genArithmeticOp(CiKind.Float, opcode); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1368 case DADD : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1369 case DSUB : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1370 case DMUL : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1371 case DDIV : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1372 case DREM : genArithmeticOp(CiKind.Double, opcode); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1373 case INEG : genNegateOp(CiKind.Int); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1374 case LNEG : genNegateOp(CiKind.Long); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1375 case FNEG : genNegateOp(CiKind.Float); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1376 case DNEG : genNegateOp(CiKind.Double); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1377 case ISHL : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1378 case ISHR : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1379 case IUSHR : genShiftOp(CiKind.Int, opcode); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1380 case IAND : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1381 case IOR : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1382 case IXOR : genLogicOp(CiKind.Int, opcode); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1383 case LSHL : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1384 case LSHR : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1385 case LUSHR : genShiftOp(CiKind.Long, opcode); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1386 case LAND : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1387 case LOR : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1388 case LXOR : genLogicOp(CiKind.Long, opcode); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1389 case IINC : genIncrement(); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1390 case I2L : genConvert(opcode, CiKind.Int , CiKind.Long ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1391 case I2F : genConvert(opcode, CiKind.Int , CiKind.Float ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1392 case I2D : genConvert(opcode, CiKind.Int , CiKind.Double); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1393 case L2I : genConvert(opcode, CiKind.Long , CiKind.Int ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1394 case L2F : genConvert(opcode, CiKind.Long , CiKind.Float ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1395 case L2D : genConvert(opcode, CiKind.Long , CiKind.Double); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1396 case F2I : genConvert(opcode, CiKind.Float , CiKind.Int ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1397 case F2L : genConvert(opcode, CiKind.Float , CiKind.Long ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1398 case F2D : genConvert(opcode, CiKind.Float , CiKind.Double); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1399 case D2I : genConvert(opcode, CiKind.Double, CiKind.Int ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1400 case D2L : genConvert(opcode, CiKind.Double, CiKind.Long ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1401 case D2F : genConvert(opcode, CiKind.Double, CiKind.Float ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1402 case I2B : genConvert(opcode, CiKind.Int , CiKind.Byte ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1403 case I2C : genConvert(opcode, CiKind.Int , CiKind.Char ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1404 case I2S : genConvert(opcode, CiKind.Int , CiKind.Short ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1405 case LCMP : genCompareOp(CiKind.Long, opcode, CiKind.Int); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1406 case FCMPL : genCompareOp(CiKind.Float, opcode, CiKind.Int); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1407 case FCMPG : genCompareOp(CiKind.Float, opcode, CiKind.Int); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1408 case DCMPL : genCompareOp(CiKind.Double, opcode, CiKind.Int); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1409 case DCMPG : genCompareOp(CiKind.Double, opcode, CiKind.Int); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1410 case IFEQ : genIfZero(Condition.EQ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1411 case IFNE : genIfZero(Condition.NE); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1412 case IFLT : genIfZero(Condition.LT); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1413 case IFGE : genIfZero(Condition.GE); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1414 case IFGT : genIfZero(Condition.GT); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1415 case IFLE : genIfZero(Condition.LE); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1416 case IF_ICMPEQ : genIfSame(CiKind.Int, Condition.EQ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1417 case IF_ICMPNE : genIfSame(CiKind.Int, Condition.NE); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1418 case IF_ICMPLT : genIfSame(CiKind.Int, Condition.LT); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1419 case IF_ICMPGE : genIfSame(CiKind.Int, Condition.GE); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1420 case IF_ICMPGT : genIfSame(CiKind.Int, Condition.GT); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1421 case IF_ICMPLE : genIfSame(CiKind.Int, Condition.LE); break;
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1422 case IF_ACMPEQ : genIfSame(frameState.peekKind(), Condition.EQ); break;
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1423 case IF_ACMPNE : genIfSame(frameState.peekKind(), Condition.NE); break;
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1424 case GOTO : genGoto(stream.currentBCI(), stream.readBranchDest()); break;
a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1425 case JSR : genJsr(stream.readBranchDest()); break;
a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1426 case RET : genRet(stream.readLocalIndex()); break;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1427 case TABLESWITCH : genTableswitch(); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1428 case LOOKUPSWITCH : genLookupswitch(); break;
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1429 case IRETURN : genReturn(frameState.ipop()); break;
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1430 case LRETURN : genReturn(frameState.lpop()); break;
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1431 case FRETURN : genReturn(frameState.fpop()); break;
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1432 case DRETURN : genReturn(frameState.dpop()); break;
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1433 case ARETURN : genReturn(frameState.apop()); break;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1434 case RETURN : genReturn(null ); break;
2842 7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	1435 case GETSTATIC : cpi = stream.readCPI(); genGetStatic(cpi, constantPool.lookupField(cpi, opcode)); break;
7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	1436 case PUTSTATIC : cpi = stream.readCPI(); genPutStatic(cpi, constantPool.lookupField(cpi, opcode)); break;
7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	1437 case GETFIELD : cpi = stream.readCPI(); genGetField(cpi, constantPool.lookupField(cpi, opcode)); break;
7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	1438 case PUTFIELD : cpi = stream.readCPI(); genPutField(cpi, constantPool.lookupField(cpi, opcode)); break;
7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	1439 case INVOKEVIRTUAL : cpi = stream.readCPI(); genInvokeVirtual(constantPool.lookupMethod(cpi, opcode), cpi, constantPool); break;
7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	1440 case INVOKESPECIAL : cpi = stream.readCPI(); genInvokeSpecial(constantPool.lookupMethod(cpi, opcode), null, cpi, constantPool); break;
7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	1441 case INVOKESTATIC : cpi = stream.readCPI(); genInvokeStatic(constantPool.lookupMethod(cpi, opcode), cpi, constantPool); break;
7596ae867a7b basic inlining passes all tests, including optimistic inlining Lukas Stadler <lukas.stadler@jku.at> parents: 2840 diff changeset	1442 case INVOKEINTERFACE: cpi = stream.readCPI(); genInvokeInterface(constantPool.lookupMethod(cpi, opcode), cpi, constantPool); break;
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1443 case NEW : genNewInstance(stream.readCPI()); break;
a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1444 case NEWARRAY : genNewTypeArray(stream.readLocalIndex()); break;
a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1445 case ANEWARRAY : genNewObjectArray(stream.readCPI()); break;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1446 case ARRAYLENGTH : genArrayLength(); break;
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1447 case ATHROW : genThrow(stream.currentBCI()); break;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1448 case CHECKCAST : genCheckCast(); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1449 case INSTANCEOF : genInstanceOf(); break;
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1450 case MONITORENTER : genMonitorEnter(frameState.apop(), stream.currentBCI()); break;
2784 e62cfea1c134 Simplified fillSyncHandler. Fixed LIRGenerator visitUnwind. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2783 diff changeset	1451 case MONITOREXIT : genMonitorExit(frameState.apop()); break;
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1452 case MULTIANEWARRAY : genNewMultiArray(stream.readCPI()); break;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1453 case IFNULL : genIfNull(Condition.EQ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1454 case IFNONNULL : genIfNull(Condition.NE); break;
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1455 case GOTO_W : genGoto(stream.currentBCI(), stream.readFarBranchDest()); break;
a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1456 case JSR_W : genJsr(stream.readFarBranchDest()); break;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1457 case BREAKPOINT:
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1458 throw new CiBailout("concurrent setting of breakpoint");
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1459 default:
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1460 throw new CiBailout("Unsupported opcode " + opcode + " (" + nameOf(opcode) + ") [bci=" + bci + "]");
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1461 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1462 // Checkstyle: resume
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1463 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1464
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1465 private void traceInstruction(int bci, int opcode, boolean blockStart) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1466 if (C1XOptions.TraceBytecodeParserLevel >= TRACELEVEL_INSTRUCTIONS && !TTY.isSuppressed()) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1467 StringBuilder sb = new StringBuilder(40);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1468 sb.append(blockStart ? '+' : '\|');
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1469 if (bci < 10) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1470 sb.append(" ");
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1471 } else if (bci < 100) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1472 sb.append(' ');
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1473 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1474 sb.append(bci).append(": ").append(Bytecodes.nameOf(opcode));
2741 a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1475 for (int i = bci + 1; i < stream.nextBCI(); ++i) {
a3cd5eb68837 more GraphBuilder cleanup, moved mergeOrClone to GraphBuilder Lukas Stadler <lukas.stadler@jku.at> parents: 2735 diff changeset	1476 sb.append(' ').append(stream.readUByte(i));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1477 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1478 log.println(sb.toString());
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1479 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1480 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1481
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1482 private void genArrayLength() {
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	1483 frameState.ipush(append(new ArrayLength(frameState.apop(), graph)));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1484 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1485
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1486 /**
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1487 * Adds a block to the worklist, if it is not already in the worklist.
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1488 * This method will keep the worklist topologically stored (i.e. the lower
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1489 * DFNs are earlier in the list).
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1490 * @param block the block to add to the work list
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1491 */
2730 027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	1492 private void addToWorkList(Block block) {
2705 d669ab61c7c7 Removed IsOnWorklistFlag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2703 diff changeset	1493 if (!isOnWorkList(block)) {
d669ab61c7c7 Removed IsOnWorklistFlag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2703 diff changeset	1494 markOnWorkList(block);
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1495 sortIntoWorkList(block);
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1496 }
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1497 }
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1498
2730 027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	1499 private void sortIntoWorkList(Block top) {
027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	1500 workList.offer(top);
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1501 }
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1502
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1503 /**
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1504 * Removes the next block from the worklist. The list is sorted topologically, so the
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1505 * block with the lowest depth first number in the list will be removed and returned.
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1506 * @return the next block from the worklist; {@code null} if there are no blocks
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1507 * in the worklist
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1508 */
2730 027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	1509 private Block removeFromWorkList() {
027adfafd47e first batch of GraphBuilder changes to remove dependencies on BlockBegin Lukas Stadler <lukas.stadler@jku.at> parents: 2724 diff changeset	1510 return workList.poll();
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1511 }
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1512 }

Mercurial > hg > truffle

annotate graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java @ 2865:7a4e6e11877f