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

annotate graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java @ 2706:5a784215351a

Removed WasVisited flag

author	Thomas Wuerthinger <thomas@wuerthinger.net>
date	Wed, 18 May 2011 17:35:14 +0200
parents	d669ab61c7c7
children	4272b7af2d17

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.*;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	32 import com.sun.c1x.*;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	33 import com.sun.c1x.debug.*;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	34 import com.sun.c1x.ir.*;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	35 import com.sun.c1x.util.*;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	36 import com.sun.c1x.value.*;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	37 import com.sun.cri.bytecode.*;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	38 import com.sun.cri.ci.*;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	39 import com.sun.cri.ri.*;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	40 import com.sun.cri.ri.RiType.Representation;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	41
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	42 /**
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	43 * 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	44 * 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	45 * numbering, inlining, constant folding, strength reduction, etc.
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	46 */
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	47 public final class GraphBuilder {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	48
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 * 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	51 * the bytecode instructions as they are parsed.
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 public static final int TRACELEVEL_INSTRUCTIONS = 1;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	54
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 * 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	57 * 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	58 */
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	59 public static final int TRACELEVEL_STATE = 2;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	60
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	61 /**
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	62 * An enumeration of flags describing scope attributes.
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	63 */
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	64 public enum Flag {
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	65 /**
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	66 * Scope is protected by an exception handler.
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	67 * This attribute is inherited by nested scopes.
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	68 */
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	69 HasHandler,
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	70
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	71 /**
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	72 * Code in scope cannot contain safepoints.
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	73 * This attribute is inherited by nested scopes.
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	74 */
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	75 NoSafepoints;
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	76
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	77 public final int mask = 1 << ordinal();
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	78 }
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	79
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	80 private final IR ir;
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	81 private final C1XCompilation compilation;
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	82 private final CiStatistics stats;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	83
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	84 private final BytecodeStream stream; // the bytecode stream
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	85 // bci-to-block mapping
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	86 private BlockBegin[] blockList;
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	87
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	88 // the constant pool
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	89 private final RiConstantPool constantPool;
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	90
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	91 // the worklist of blocks, managed like a sorted list
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	92 private BlockBegin[] workList;
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	93
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	94 // the current position in the worklist
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 int workListIndex;
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	96
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	97 /**
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	98 * Mask of {@link Flag} values.
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	99 */
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	100 private int flags;
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	101
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	102 // Exception handler list
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	103 private List<ExceptionHandler> exceptionHandlers;
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	104
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	105 private BlockBegin curBlock; // the current block
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	106 private FrameStateBuilder frameState; // the current execution state
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	107 private Instruction lastInstr; // the last instruction added
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	108 private final LogStream log;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	109
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	110 private Value rootMethodSynchronizedObject;
2586 421da5f53b5e more Op2 changes Lukas Stadler <lukas.stadler@jku.at> parents: 2582 diff changeset	111
2602 0c6564c254af new node layout: BlockBegin, BlockEnd Lukas Stadler <lukas.stadler@jku.at> parents: 2600 diff changeset	112 private final Graph graph;
2586 421da5f53b5e more Op2 changes Lukas Stadler <lukas.stadler@jku.at> parents: 2582 diff changeset	113
2674 6ab73784566a * BlockBegin.predecessors changed to List<BlockEnd> Lukas Stadler <lukas.stadler@jku.at> parents: 2673 diff changeset	114 private final List<BlockBegin> newExceptionHandlers = new ArrayList<BlockBegin>();
6ab73784566a * BlockBegin.predecessors changed to List<BlockEnd> Lukas Stadler <lukas.stadler@jku.at> parents: 2673 diff changeset	115
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	116 /**
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	117 * 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	118 *
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	119 * @param compilation the compilation
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	120 * @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	121 * @param graph
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	122 */
2602 0c6564c254af new node layout: BlockBegin, BlockEnd Lukas Stadler <lukas.stadler@jku.at> parents: 2600 diff changeset	123 public GraphBuilder(C1XCompilation compilation, IR ir, Graph graph) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	124 this.compilation = compilation;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	125 this.ir = ir;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	126 this.stats = compilation.stats;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	127 log = C1XOptions.TraceBytecodeParserLevel > 0 ? new LogStream(TTY.out()) : null;
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	128 stream = new BytecodeStream(compilation.method.code());
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	129 constantPool = compilation.runtime.getConstantPool(compilation.method);
2602 0c6564c254af new node layout: BlockBegin, BlockEnd Lukas Stadler <lukas.stadler@jku.at> parents: 2600 diff changeset	130 this.graph = graph;
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	131 this.frameState = new FrameStateBuilder(compilation.method, graph);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	132 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	133
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	134 /**
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	135 * 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	136 * @param scope the top IRScope
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	137 */
2564 274360f98f97 Remove inlining (2nd part) removed IRScope Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2563 diff changeset	138 public void build() {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	139 RiMethod rootMethod = compilation.method;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	140
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	141 if (log != null) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	142 log.println();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	143 log.println("Compiling " + compilation.method);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	144 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	145
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	146 if (rootMethod.noSafepoints()) {
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	147 flags \|= Flag.NoSafepoints.mask;
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	148 }
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	149
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	150 // 2. compute the block map, setup exception handlers and get the entrypoint(s)
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	151 BlockMap blockMap = compilation.getBlockMap(rootMethod);
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	152
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	153 blockList = new BlockBegin[rootMethod.code().length];
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	154 for (int i = 0; i < blockMap.blocks.size(); i++) {
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	155 BlockMap.Block block = blockMap.blocks.get(i);
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	156 BlockBegin blockBegin = new BlockBegin(block.startBci, ir.nextBlockNumber(), graph);
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	157 if (block.isExceptionEntry) {
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	158 blockBegin.setBlockFlag(BlockBegin.BlockFlag.ExceptionEntry);
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	159 }
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	160 if (block.isLoopHeader) {
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	161 blockBegin.setBlockFlag(BlockBegin.BlockFlag.ParserLoopHeader);
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	162 }
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	163 blockBegin.setDepthFirstNumber(blockBegin.blockID);
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	164 blockList[block.startBci] = blockBegin;
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	165 }
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	166
2695 785e9ecdcc69 Removed the instruction substitutor. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2684 diff changeset	167
785e9ecdcc69 Removed the instruction substitutor. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2684 diff changeset	168 // 1. create the start block
785e9ecdcc69 Removed the instruction substitutor. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2684 diff changeset	169 ir.startBlock = new BlockBegin(0, ir.nextBlockNumber(), graph);
785e9ecdcc69 Removed the instruction substitutor. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2684 diff changeset	170 BlockBegin startBlock = ir.startBlock;
785e9ecdcc69 Removed the instruction substitutor. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2684 diff changeset	171 graph.root().setStart(startBlock);
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	172 curBlock = startBlock;
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	173
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	174 RiExceptionHandler[] handlers = rootMethod.exceptionHandlers();
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	175 if (handlers != null && handlers.length > 0) {
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	176 exceptionHandlers = new ArrayList<ExceptionHandler>(handlers.length);
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	177 for (RiExceptionHandler ch : handlers) {
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	178 BlockBegin entry = blockAtOrNull(ch.handlerBCI());
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	179 // entry == null means that the exception handler is unreachable according to the BlockMap conservative analysis
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	180 if (entry != null) {
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	181 ExceptionHandler h = new ExceptionHandler(ch);
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	182 h.setEntryBlock(entry);
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	183 exceptionHandlers.add(h);
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	184 }
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	185 }
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	186 flags \|= Flag.HasHandler.mask;
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	187 }
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	188
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	189 startBlock.mergeOrClone(frameState, rootMethod);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	190 BlockBegin syncHandler = null;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	191
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	192 // 3. setup internal state for appending instructions
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	193 curBlock = startBlock;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	194 lastInstr = startBlock;
2582 768d77a1c7af new node layout: Instruction Lukas Stadler <lukas.stadler@jku.at> parents: 2581 diff changeset	195 lastInstr.appendNext(null, -1);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	196
2695 785e9ecdcc69 Removed the instruction substitutor. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2684 diff changeset	197 BlockBegin entryBlock = blockList[0];
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	198 if (isSynchronized(rootMethod.accessFlags())) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	199 // 4A.1 add a monitor enter to the start block
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	200 rootMethodSynchronizedObject = synchronizedObject(frameState, compilation.method);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	201 genMonitorEnter(rootMethodSynchronizedObject, Instruction.SYNCHRONIZATION_ENTRY_BCI);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	202 // 4A.2 finish the start block
2695 785e9ecdcc69 Removed the instruction substitutor. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2684 diff changeset	203 finishStartBlock(startBlock, entryBlock);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	204
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	205 // 4A.3 setup an exception handler to unlock the root method synchronized object
2602 0c6564c254af new node layout: BlockBegin, BlockEnd Lukas Stadler <lukas.stadler@jku.at> parents: 2600 diff changeset	206 syncHandler = new BlockBegin(Instruction.SYNCHRONIZATION_ENTRY_BCI, ir.nextBlockNumber(), graph);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	207 syncHandler.setExceptionEntry();
2705 d669ab61c7c7 Removed IsOnWorklistFlag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2703 diff changeset	208 markOnWorkList(syncHandler);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	209
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	210 ExceptionHandler h = new ExceptionHandler(new CiExceptionHandler(0, rootMethod.code().length, -1, 0, null));
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	211 h.setEntryBlock(syncHandler);
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	212 addExceptionHandler(h);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	213 } else {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	214 // 4B.1 simply finish the start block
2695 785e9ecdcc69 Removed the instruction substitutor. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2684 diff changeset	215 finishStartBlock(startBlock, entryBlock);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	216 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	217
2519 f6125fb5bfbc Removed intrinsics. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2516 diff changeset	218 // 5. SKIPPED: look for intrinsics
f6125fb5bfbc Removed intrinsics. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2516 diff changeset	219
f6125fb5bfbc Removed intrinsics. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2516 diff changeset	220 // 6B.1 do the normal parsing
2695 785e9ecdcc69 Removed the instruction substitutor. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2684 diff changeset	221 addToWorkList(entryBlock);
2519 f6125fb5bfbc Removed intrinsics. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2516 diff changeset	222 iterateAllBlocks();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	223
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	224 if (syncHandler != null && syncHandler.stateBefore() != null) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	225 // generate unlocking code if the exception handler is reachable
2570 46586c77b129 Cleaned some remaining references to scope/inlining Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2566 diff changeset	226 fillSyncHandler(rootMethodSynchronizedObject, syncHandler);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	227 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	228 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	229
2705 d669ab61c7c7 Removed IsOnWorklistFlag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2703 diff changeset	230 private Set<BlockBegin> blocksOnWorklist = new HashSet<BlockBegin>();
d669ab61c7c7 Removed IsOnWorklistFlag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2703 diff changeset	231
d669ab61c7c7 Removed IsOnWorklistFlag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2703 diff changeset	232 private void markOnWorkList(BlockBegin block) {
d669ab61c7c7 Removed IsOnWorklistFlag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2703 diff changeset	233 blocksOnWorklist.add(block);
d669ab61c7c7 Removed IsOnWorklistFlag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2703 diff changeset	234 }
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 private boolean isOnWorkList(BlockBegin block) {
d669ab61c7c7 Removed IsOnWorklistFlag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2703 diff changeset	237 return blocksOnWorklist.contains(block);
d669ab61c7c7 Removed IsOnWorklistFlag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2703 diff changeset	238 }
d669ab61c7c7 Removed IsOnWorklistFlag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2703 diff changeset	239
2706 5a784215351a Removed WasVisited flag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2705 diff changeset	240 private Set<BlockBegin> blocksVisited = new HashSet<BlockBegin>();
5a784215351a Removed WasVisited flag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2705 diff changeset	241
5a784215351a Removed WasVisited flag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2705 diff changeset	242 private void markVisited(BlockBegin block) {
5a784215351a Removed WasVisited flag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2705 diff changeset	243 blocksVisited.add(block);
5a784215351a Removed WasVisited flag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2705 diff changeset	244 }
5a784215351a Removed WasVisited flag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2705 diff changeset	245
5a784215351a Removed WasVisited flag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2705 diff changeset	246 private boolean isVisited(BlockBegin block) {
5a784215351a Removed WasVisited flag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2705 diff changeset	247 return blocksVisited.contains(block);
5a784215351a Removed WasVisited flag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2705 diff changeset	248 }
5a784215351a Removed WasVisited flag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2705 diff changeset	249
2516 a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2515 diff changeset	250 private void finishStartBlock(BlockBegin startBlock, BlockBegin stdEntry) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	251 assert curBlock == startBlock;
2657 4a6518c4d17d Removed need for base instruction. Cleanup. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2652 diff changeset	252 FrameState stateAfter = frameState.create(bci());
4a6518c4d17d Removed need for base instruction. Cleanup. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2652 diff changeset	253 Goto base = new Goto(stdEntry, stateAfter, false, graph);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	254 appendWithoutOptimization(base, 0);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	255 startBlock.setEnd(base);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	256 assert stdEntry.stateBefore() == null;
2565 cc1f1d396288 Remove inlining (3rd part) Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2564 diff changeset	257 stdEntry.mergeOrClone(stateAfter, method());
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	258 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	259
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	260 public RiMethod method() {
2564 274360f98f97 Remove inlining (2nd part) removed IRScope Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2563 diff changeset	261 return compilation.method;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	262 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	263
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	264 public BytecodeStream stream() {
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	265 return stream;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	266 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	267
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	268 public int bci() {
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	269 return stream.currentBCI();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	270 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	271
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	272 public int nextBCI() {
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	273 return stream.nextBCI();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	274 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	275
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	276 private void loadLocal(int index, CiKind kind) {
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	277 frameState.push(kind, frameState.loadLocal(index));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	278 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	279
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	280 private void storeLocal(CiKind kind, int index) {
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	281 frameState.storeLocal(index, frameState.pop(kind));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	282 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	283
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	284 List<ExceptionHandler> handleException(Instruction x, int bci) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	285 if (!hasHandler()) {
2671 d8601d421b96 New Deoptimize node, remove ResolveClass node and replace it with deoptimization Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2669 diff changeset	286 return ExceptionHandler.ZERO_HANDLERS;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	287 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	288
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	289 ArrayList<ExceptionHandler> exceptionHandlers = new ArrayList<ExceptionHandler>();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	290
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	291 FrameState state = frameState.create(bci);
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	292 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	293
2564 274360f98f97 Remove inlining (2nd part) removed IRScope Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2563 diff changeset	294 // join with all potential exception handlers
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	295 if (this.exceptionHandlers != null) {
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	296 for (ExceptionHandler handler : this.exceptionHandlers) {
2564 274360f98f97 Remove inlining (2nd part) removed IRScope Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2563 diff changeset	297 if (handler.covers(bci)) {
274360f98f97 Remove inlining (2nd part) removed IRScope Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2563 diff changeset	298 // if the handler covers this bytecode index, add it to the list
2570 46586c77b129 Cleaned some remaining references to scope/inlining Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2566 diff changeset	299 if (addExceptionHandler(exceptionHandlers, handler, state)) {
2564 274360f98f97 Remove inlining (2nd part) removed IRScope Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2563 diff changeset	300 // if the handler was a default handler, we are done
274360f98f97 Remove inlining (2nd part) removed IRScope Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2563 diff changeset	301 return exceptionHandlers;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	302 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	303 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	304 }
2564 274360f98f97 Remove inlining (2nd part) removed IRScope Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2563 diff changeset	305 }
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	306
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	307 return exceptionHandlers;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	308 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	309
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	310 /**
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	311 * Adds an exception handler to the {@linkplain BlockBegin#exceptionHandlerBlocks() list}
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	312 * of exception handlers for the {@link #curBlock current block}.
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	313 *
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	314 * @param exceptionHandlers
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	315 * @param handler
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	316 * @param curScopeData
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	317 * @param curState the current state with empty stack
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	318 * @param scopeCount
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	319 * @return {@code true} if handler catches all exceptions (i.e. {@code handler.isCatchAll() == true})
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	320 */
2570 46586c77b129 Cleaned some remaining references to scope/inlining Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2566 diff changeset	321 private boolean addExceptionHandler(ArrayList<ExceptionHandler> exceptionHandlers, ExceptionHandler handler, FrameState curState) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	322 compilation.setHasExceptionHandlers();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	323
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	324 BlockBegin entry = handler.entryBlock();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	325 FrameState entryState = entry.stateBefore();
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 assert entry.bci() == handler.handler.handlerBCI();
2592 fec99fc30af1 checkstyle fixes, updated AccessArray + subclasses Lukas Stadler <lukas.stadler@jku.at> parents: 2587 diff changeset	328 assert entryState == null \|\| curState.locksSize() == entryState.locksSize() : "locks do not match : cur:" + curState.locksSize() + " entry:" + entryState.locksSize();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	329
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	330 // exception handler starts with an empty expression stack
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	331 curState = curState.duplicateWithEmptyStack();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	332
2565 cc1f1d396288 Remove inlining (3rd part) Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2564 diff changeset	333 entry.mergeOrClone(curState, method());
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 // add current state for correct handling of phi functions
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	336 int phiOperand = entry.addExceptionState(curState);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	337
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	338 // add entry to the list of exception handlers of this block
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	339 curBlock.addExceptionHandler(entry);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	340
2674 6ab73784566a * BlockBegin.predecessors changed to List<BlockEnd> Lukas Stadler <lukas.stadler@jku.at> parents: 2673 diff changeset	341 newExceptionHandlers.add(entry);
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 // clone exception handler
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	344 ExceptionHandler newHandler = new ExceptionHandler(handler);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	345 newHandler.setPhiOperand(phiOperand);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	346 exceptionHandlers.add(newHandler);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	347
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	348 // fill in exception handler subgraph lazily
2706 5a784215351a Removed WasVisited flag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2705 diff changeset	349 if (!isVisited(entry)) {
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	350 addToWorkList(entry);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	351 } else {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	352 // This will occur for exception handlers that cover themselves. This code
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	353 // pattern is generated by javac for synchronized blocks. See the following
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	354 // for why this change to javac was made:
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	355 //
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	356 // http://www.cs.arizona.edu/projects/sumatra/hallofshame/java-async-race.html
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	357 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	358
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	359 // stop when reaching catch all
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	360 return handler.isCatchAll();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	361 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	362
2657 4a6518c4d17d Removed need for base instruction. Cleanup. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2652 diff changeset	363 private void genLoadConstant(int cpi) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	364 Object con = constantPool().lookupConstant(cpi);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	365
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	366 if (con instanceof RiType) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	367 // 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	368 RiType riType = (RiType) con;
2650 ccab1d5f345e Removed TestPatching option. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2649 diff changeset	369 if (!riType.isResolved()) {
2671 d8601d421b96 New Deoptimize node, remove ResolveClass node and replace it with deoptimization Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2669 diff changeset	370 append(new Deoptimize(graph, frameState.create(bci())));
d8601d421b96 New Deoptimize node, remove ResolveClass node and replace it with deoptimization Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2669 diff changeset	371 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	372 } else {
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	373 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	374 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	375 } else if (con instanceof CiConstant) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	376 CiConstant constant = (CiConstant) con;
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	377 frameState.push(constant.kind.stackKind(), appendConstant(constant));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	378 } else {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	379 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	380 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	381 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	382
2645 b2c1e959be46 Clean up around BlockBegin / StdEntry. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2644 diff changeset	383 private void genLoadIndexed(CiKind kind) {
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	384 Value index = frameState.ipop();
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	385 Value array = frameState.apop();
2644 4694daa6af3a Removed CSE array length. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2643 diff changeset	386 Value length = append(new ArrayLength(array, graph));
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	387 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	388 frameState.push(kind.stackKind(), v);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	389 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	390
2645 b2c1e959be46 Clean up around BlockBegin / StdEntry. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2644 diff changeset	391 private void genStoreIndexed(CiKind kind) {
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	392 Value value = frameState.pop(kind.stackKind());
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	393 Value index = frameState.ipop();
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	394 Value array = frameState.apop();
2644 4694daa6af3a Removed CSE array length. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2643 diff changeset	395 Value length = append(new ArrayLength(array, graph));
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	396 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	397 append(result);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	398 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	399
2645 b2c1e959be46 Clean up around BlockBegin / StdEntry. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2644 diff changeset	400 private void stackOp(int opcode) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	401 switch (opcode) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	402 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	403 frameState.xpop();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	404 break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	405 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	406 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	407 frameState.xpop();
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	408 frameState.xpop();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	409 break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	410 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	411 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	412 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	413 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	414 frameState.xpush(w);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	415 break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	416 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	417 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	418 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	419 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	420 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	421 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	422 frameState.xpush(w1);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	423 break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	424 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	425 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	426 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	427 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	428 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	429 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	430 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	431 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	432 frameState.xpush(w1);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	433 break;
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 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	436 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	437 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	438 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	439 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	440 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	441 frameState.xpush(w1);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	442 break;
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 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	445 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	446 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	447 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	448 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	449 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	450 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	451 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	452 frameState.xpush(w1);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	453 break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	454 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	455 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	456 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	457 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	458 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	459 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	460 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	461 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	462 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	463 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	464 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	465 frameState.xpush(w1);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	466 break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	467 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	468 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	469 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	470 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	471 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	472 frameState.xpush(w2);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	473 break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	474 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	475 default:
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	476 throw Util.shouldNotReachHere();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	477 }
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 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	480
2645 b2c1e959be46 Clean up around BlockBegin / StdEntry. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2644 diff changeset	481 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	482 genArithmeticOp(kind, opcode, false);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	483 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	484
2645 b2c1e959be46 Clean up around BlockBegin / StdEntry. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2644 diff changeset	485 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	486 genArithmeticOp(kind, opcode, kind, kind, canTrap);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	487 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	488
2645 b2c1e959be46 Clean up around BlockBegin / StdEntry. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2644 diff changeset	489 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	490 Value yValue = frameState.pop(y);
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	491 Value xValue = frameState.pop(x);
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	492 Value result1 = append(new ArithmeticOp(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	493 frameState.push(result, result1);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	494 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	495
2645 b2c1e959be46 Clean up around BlockBegin / StdEntry. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2644 diff changeset	496 private void genNegateOp(CiKind kind) {
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	497 frameState.push(kind, append(new NegateOp(frameState.pop(kind), graph)));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	498 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	499
2645 b2c1e959be46 Clean up around BlockBegin / StdEntry. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2644 diff changeset	500 private void genShiftOp(CiKind kind, int opcode) {
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	501 Value s = frameState.ipop();
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	502 Value x = frameState.pop(kind);
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	503 frameState.push(kind, append(new ShiftOp(opcode, x, s, graph)));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	504 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	505
2645 b2c1e959be46 Clean up around BlockBegin / StdEntry. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2644 diff changeset	506 private void genLogicOp(CiKind kind, int opcode) {
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	507 Value y = frameState.pop(kind);
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	508 Value x = frameState.pop(kind);
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	509 frameState.push(kind, append(new LogicOp(opcode, x, y, graph)));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	510 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	511
2645 b2c1e959be46 Clean up around BlockBegin / StdEntry. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2644 diff changeset	512 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	513 Value y = frameState.pop(kind);
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	514 Value x = frameState.pop(kind);
2586 421da5f53b5e more Op2 changes Lukas Stadler <lukas.stadler@jku.at> parents: 2582 diff changeset	515 Value value = append(new CompareOp(opcode, resultKind, x, y, graph));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	516 if (!resultKind.isVoid()) {
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	517 frameState.ipush(value);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	518 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	519 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	520
2645 b2c1e959be46 Clean up around BlockBegin / StdEntry. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2644 diff changeset	521 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	522 CiKind tt = to.stackKind();
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	523 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	524 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	525
2645 b2c1e959be46 Clean up around BlockBegin / StdEntry. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2644 diff changeset	526 private void genIncrement() {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	527 int index = stream().readLocalIndex();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	528 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	529 Value x = frameState.localAt(index);
2594 092e628ddd5d changed Constant and Convert, more StoreIndexed changes Lukas Stadler <lukas.stadler@jku.at> parents: 2592 diff changeset	530 Value y = append(Constant.forInt(delta, graph));
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	531 frameState.storeLocal(index, append(new ArithmeticOp(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	532 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	533
2645 b2c1e959be46 Clean up around BlockBegin / StdEntry. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2644 diff changeset	534 private void genGoto(int fromBCI, int toBCI) {
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	535 boolean isSafepoint = !noSafepoints() && toBCI <= fromBCI;
2602 0c6564c254af new node layout: BlockBegin, BlockEnd Lukas Stadler <lukas.stadler@jku.at> parents: 2600 diff changeset	536 append(new Goto(blockAt(toBCI), null, isSafepoint, graph));
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 ifNode(Value x, Condition cond, Value y, FrameState stateBefore) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	540 BlockBegin tsucc = blockAt(stream().readBranchDest());
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	541 BlockBegin fsucc = blockAt(stream().nextBCI());
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	542 int bci = stream().currentBCI();
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	543 boolean isSafepoint = !noSafepoints() && (tsucc.bci() <= bci \|\| fsucc.bci() <= bci);
2674 6ab73784566a * BlockBegin.predecessors changed to List<BlockEnd> Lukas Stadler <lukas.stadler@jku.at> parents: 2673 diff changeset	544 if (isSafepoint) {
6ab73784566a * BlockBegin.predecessors changed to List<BlockEnd> Lukas Stadler <lukas.stadler@jku.at> parents: 2673 diff changeset	545 append(new If(x, cond, y, tsucc, fsucc, stateBefore, isSafepoint, graph));
6ab73784566a * BlockBegin.predecessors changed to List<BlockEnd> Lukas Stadler <lukas.stadler@jku.at> parents: 2673 diff changeset	546 } else {
6ab73784566a * BlockBegin.predecessors changed to List<BlockEnd> Lukas Stadler <lukas.stadler@jku.at> parents: 2673 diff changeset	547 append(new If(x, cond, y, tsucc, fsucc, null, isSafepoint, graph));
6ab73784566a * BlockBegin.predecessors changed to List<BlockEnd> Lukas Stadler <lukas.stadler@jku.at> parents: 2673 diff changeset	548 stateBefore.delete();
6ab73784566a * BlockBegin.predecessors changed to List<BlockEnd> Lukas Stadler <lukas.stadler@jku.at> parents: 2673 diff changeset	549 }
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	550 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	551
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	552 private void genIfZero(Condition cond) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	553 Value y = appendConstant(CiConstant.INT_0);
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	554 FrameState stateBefore = frameState.create(bci());
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	555 Value x = frameState.ipop();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	556 ifNode(x, cond, y, stateBefore);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	557 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	558
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	559 private void genIfNull(Condition cond) {
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	560 FrameState stateBefore = frameState.create(bci());
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	561 Value y = appendConstant(CiConstant.NULL_OBJECT);
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	562 Value x = frameState.apop();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	563 ifNode(x, cond, y, stateBefore);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	564 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	565
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	566 private void genIfSame(CiKind kind, Condition cond) {
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	567 FrameState stateBefore = frameState.create(bci());
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	568 Value y = frameState.pop(kind);
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	569 Value x = frameState.pop(kind);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	570 ifNode(x, cond, y, stateBefore);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	571 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	572
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	573 private void genThrow(int bci) {
2639 8e96b2b3a866 Added stateBefore to Throw instruction. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2634 diff changeset	574 FrameState stateBefore = frameState.create(bci);
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	575 Throw t = new Throw(frameState.apop(), !noSafepoints(), graph);
2639 8e96b2b3a866 Added stateBefore to Throw instruction. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2634 diff changeset	576 t.setStateBefore(stateBefore);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	577 appendWithoutOptimization(t, bci);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	578 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	579
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	580 private void genCheckCast() {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	581 int cpi = stream().readCPI();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	582 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	583 boolean isInitialized = type.isResolved();
2674 6ab73784566a * BlockBegin.predecessors changed to List<BlockEnd> Lukas Stadler <lukas.stadler@jku.at> parents: 2673 diff changeset	584 Value typeInstruction = genTypeOrDeopt(RiType.Representation.ObjectHub, type, isInitialized, cpi, frameState);
6ab73784566a * BlockBegin.predecessors changed to List<BlockEnd> Lukas Stadler <lukas.stadler@jku.at> parents: 2673 diff changeset	585 CheckCast c = new CheckCast(type, typeInstruction, frameState.apop(), graph);
6ab73784566a * BlockBegin.predecessors changed to List<BlockEnd> Lukas Stadler <lukas.stadler@jku.at> parents: 2673 diff changeset	586 frameState.apush(append(c));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	587 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	588
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	589 private void genInstanceOf() {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	590 int cpi = stream().readCPI();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	591 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	592 boolean isInitialized = type.isResolved();
d8601d421b96 New Deoptimize node, remove ResolveClass node and replace it with deoptimization Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2669 diff changeset	593 //System.out.println("instanceof : type.isResolved() = " + type.isResolved() + "; type.isInitialized() = " + type.isInitialized());
2674 6ab73784566a * BlockBegin.predecessors changed to List<BlockEnd> Lukas Stadler <lukas.stadler@jku.at> parents: 2673 diff changeset	594 Value typeInstruction = genTypeOrDeopt(RiType.Representation.ObjectHub, type, isInitialized, cpi, frameState);
2673 98447ab8bd83 Create less nodes in case of Deopt Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2671 diff changeset	595 Instruction result;
98447ab8bd83 Create less nodes in case of Deopt Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2671 diff changeset	596 Value object = frameState.apop();
98447ab8bd83 Create less nodes in case of Deopt Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2671 diff changeset	597 if (typeInstruction != null) {
98447ab8bd83 Create less nodes in case of Deopt Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2671 diff changeset	598 result = new InstanceOf(type, typeInstruction, object, graph);
98447ab8bd83 Create less nodes in case of Deopt Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2671 diff changeset	599 } else {
98447ab8bd83 Create less nodes in case of Deopt Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2671 diff changeset	600 result = Constant.forInt(0, graph);
98447ab8bd83 Create less nodes in case of Deopt Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2671 diff changeset	601 }
98447ab8bd83 Create less nodes in case of Deopt Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2671 diff changeset	602 frameState.ipush(append(result));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	603 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	604
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	605 void genNewInstance(int cpi) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	606 RiType type = constantPool().lookupType(cpi, NEW);
2634 4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	607 FrameState stateBefore = null;
4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	608 if (!type.isResolved()) {
4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	609 stateBefore = frameState.create(bci());
4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	610 }
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	611 NewInstance n = new NewInstance(type, cpi, constantPool(), graph);
2634 4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	612 n.setStateBefore(stateBefore);
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	613 frameState.apush(append(n));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	614 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	615
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	616 private void genNewTypeArray(int typeCode) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	617 CiKind kind = CiKind.fromArrayTypeCode(typeCode);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	618 RiType elementType = compilation.runtime.asRiType(kind);
2634 4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	619 NewTypeArray nta = new NewTypeArray(frameState.ipop(), elementType, graph);
4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	620 frameState.apush(append(nta));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	621 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	622
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	623 private void genNewObjectArray(int cpi) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	624 RiType type = constantPool().lookupType(cpi, ANEWARRAY);
2634 4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	625 FrameState stateBefore = null;
4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	626 if (!type.isResolved()) {
4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	627 stateBefore = frameState.create(bci());
4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	628 }
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	629 NewArray n = new NewObjectArray(type, frameState.ipop(), graph);
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	630 frameState.apush(append(n));
2634 4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	631 n.setStateBefore(stateBefore);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	632 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	633
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	634 private void genNewMultiArray(int cpi) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	635 RiType type = constantPool().lookupType(cpi, MULTIANEWARRAY);
2634 4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	636 FrameState stateBefore = null;
4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	637 if (!type.isResolved()) {
4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	638 stateBefore = frameState.create(bci());
4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	639 }
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	640 int rank = stream().readUByte(bci() + 3);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	641 Value[] dims = new Value[rank];
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	642 for (int i = rank - 1; i >= 0; i--) {
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	643 dims[i] = frameState.ipop();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	644 }
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	645 NewArray n = new NewMultiArray(type, dims, cpi, constantPool(), graph);
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	646 frameState.apush(append(n));
2634 4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	647 n.setStateBefore(stateBefore);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	648 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	649
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	650 private void genGetField(int cpi, RiField field) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	651 // Must copy the state here, because the field holder must still be on the stack.
2634 4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	652 FrameState stateBefore = null;
4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	653 if (!field.isResolved()) {
4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	654 stateBefore = frameState.create(bci());
4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	655 }
2673 98447ab8bd83 Create less nodes in case of Deopt Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2671 diff changeset	656 LoadField load = new LoadField(frameState.apop(), field, stateBefore, graph);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	657 appendOptimizedLoadField(field.kind(), load);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	658 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	659
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	660 private void genPutField(int cpi, RiField field) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	661 // Must copy the state here, because the field holder must still be on the stack.
2634 4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	662 FrameState stateBefore = null;
4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	663 if (!field.isResolved()) {
4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	664 stateBefore = frameState.create(bci());
4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	665 }
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	666 Value value = frameState.pop(field.kind().stackKind());
2634 4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	667 StoreField store = new StoreField(frameState.apop(), field, value, graph);
4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	668 appendOptimizedStoreField(store);
4dd0573f510b FrameState fixes. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2633 diff changeset	669 store.setStateBefore(stateBefore);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	670 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	671
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	672 private void genGetStatic(int cpi, RiField field) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	673 RiType holder = field.holder();
2650 ccab1d5f345e Removed TestPatching option. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2649 diff changeset	674 boolean isInitialized = field.isResolved();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	675 CiConstant constantValue = null;
2533 c480605ef068 Removed canonicalizer. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2521 diff changeset	676 if (isInitialized) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	677 constantValue = field.constantValue(null);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	678 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	679 if (constantValue != null) {
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	680 frameState.push(constantValue.kind.stackKind(), appendConstant(constantValue));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	681 } else {
2674 6ab73784566a * BlockBegin.predecessors changed to List<BlockEnd> Lukas Stadler <lukas.stadler@jku.at> parents: 2673 diff changeset	682 FrameState stateBefore = frameState.create(bci());
6ab73784566a * BlockBegin.predecessors changed to List<BlockEnd> Lukas Stadler <lukas.stadler@jku.at> parents: 2673 diff changeset	683 Value container = genTypeOrDeopt(RiType.Representation.StaticFields, holder, isInitialized, cpi, frameState);
2673 98447ab8bd83 Create less nodes in case of Deopt Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2671 diff changeset	684 if (container == null) {
98447ab8bd83 Create less nodes in case of Deopt Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2671 diff changeset	685 container = Constant.forObject(null, graph);
98447ab8bd83 Create less nodes in case of Deopt Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2671 diff changeset	686 }
98447ab8bd83 Create less nodes in case of Deopt Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2671 diff changeset	687 LoadField load = new LoadField(container, field, stateBefore, graph);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	688 appendOptimizedLoadField(field.kind(), load);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	689 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	690 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	691
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	692 private void genPutStatic(int cpi, RiField field) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	693 RiType holder = field.holder();
2671 d8601d421b96 New Deoptimize node, remove ResolveClass node and replace it with deoptimization Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2669 diff changeset	694 FrameState stateBefore = frameState.create(bci());
2674 6ab73784566a * BlockBegin.predecessors changed to List<BlockEnd> Lukas Stadler <lukas.stadler@jku.at> parents: 2673 diff changeset	695 Value container = genTypeOrDeopt(RiType.Representation.StaticFields, holder, field.isResolved(), cpi, frameState);
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	696 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	697 if (container != null) {
98447ab8bd83 Create less nodes in case of Deopt Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2671 diff changeset	698 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	699 appendOptimizedStoreField(store);
98447ab8bd83 Create less nodes in case of Deopt Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2671 diff changeset	700 if (!field.isResolved()) {
98447ab8bd83 Create less nodes in case of Deopt Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2671 diff changeset	701 store.setStateBefore(stateBefore);
98447ab8bd83 Create less nodes in case of Deopt Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2671 diff changeset	702 }
2671 d8601d421b96 New Deoptimize node, remove ResolveClass node and replace it with deoptimization Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2669 diff changeset	703 }
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	704 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	705
2674 6ab73784566a * BlockBegin.predecessors changed to List<BlockEnd> Lukas Stadler <lukas.stadler@jku.at> parents: 2673 diff changeset	706 private Value genTypeOrDeopt(RiType.Representation representation, RiType holder, boolean initialized, int cpi, FrameStateAccess stateBefore) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	707 if (initialized) {
2673 98447ab8bd83 Create less nodes in case of Deopt Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2671 diff changeset	708 return appendConstant(holder.getEncoding(representation));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	709 } else {
2674 6ab73784566a * BlockBegin.predecessors changed to List<BlockEnd> Lukas Stadler <lukas.stadler@jku.at> parents: 2673 diff changeset	710 append(new Deoptimize(graph, stateBefore.duplicate(bci())));
2673 98447ab8bd83 Create less nodes in case of Deopt Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2671 diff changeset	711 return null;
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 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	714
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	715 private void appendOptimizedStoreField(StoreField store) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	716 append(store);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	717 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	718
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	719 private void appendOptimizedLoadField(CiKind kind, LoadField load) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	720 // append the load to the instruction
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	721 Value optimized = append(load);
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	722 frameState.push(kind.stackKind(), optimized);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	723 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	724
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	725 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	726 RiType holder = target.holder();
2650 ccab1d5f345e Removed TestPatching option. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2649 diff changeset	727 boolean isInitialized = target.isResolved() && holder.isInitialized();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	728 if (!isInitialized && C1XOptions.ResolveClassBeforeStaticInvoke) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	729 // 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	730 // 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	731 // of initialization is required), it can be commoned with static field accesses.
2674 6ab73784566a * BlockBegin.predecessors changed to List<BlockEnd> Lukas Stadler <lukas.stadler@jku.at> parents: 2673 diff changeset	732 genTypeOrDeopt(RiType.Representation.StaticFields, holder, isInitialized, cpi, frameState);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	733 }
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	734 Value[] args = frameState.popArguments(target.signature().argumentSlots(false));
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	735 appendInvoke(INVOKESTATIC, target, args, cpi, constantPool);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	736 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	737
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	738 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	739 Value[] args = frameState.popArguments(target.signature().argumentSlots(true));
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	740 genInvokeIndirect(INVOKEINTERFACE, target, args, cpi, constantPool);
2533 c480605ef068 Removed canonicalizer. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2521 diff changeset	741
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	742 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	743
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	744 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	745 Value[] args = frameState.popArguments(target.signature().argumentSlots(true));
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	746 genInvokeIndirect(INVOKEVIRTUAL, target, args, cpi, constantPool);
2533 c480605ef068 Removed canonicalizer. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2521 diff changeset	747
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	748 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	749
2649 62306ff0ccc2 Removed check for direct compare. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2647 diff changeset	750 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	751 Value[] args = frameState.popArguments(target.signature().argumentSlots(true));
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	752 invokeDirect(target, args, knownHolder, cpi, constantPool);
2533 c480605ef068 Removed canonicalizer. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2521 diff changeset	753
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	754 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	755
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	756 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	757 Value receiver = args[0];
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	758 // attempt to devirtualize the call
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	759 if (target.isResolved()) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	760 RiType klass = target.holder();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	761
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	762 // 0. check for trivial cases
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	763 if (target.canBeStaticallyBound() && !isAbstract(target.accessFlags())) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	764 // 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	765 invokeDirect(target, args, target.holder(), cpi, constantPool);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	766 return;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	767 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	768 // 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	769 RiType exact = getExactType(klass, receiver);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	770 if (exact != null && exact.isResolved()) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	771 // 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	772 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	773 return;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	774 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	775 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	776 // devirtualization failed, produce an actual invokevirtual
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	777 appendInvoke(opcode, target, args, cpi, constantPool);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	778 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	779
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	780 private CiKind returnKind(RiMethod target) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	781 return target.signature().returnKind();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	782 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	783
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	784 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	785 appendInvoke(INVOKESPECIAL, target, args, cpi, constantPool);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	786 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	787
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	788 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	789 CiKind resultType = returnKind(target);
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	790 Value result = append(new Invoke(opcode, resultType.stackKind(), args, target, target.signature().returnType(compilation.method.holder()), graph));
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	791 frameState.pushReturn(resultType, result);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	792 }
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 private RiType getExactType(RiType staticType, Value receiver) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	795 RiType exact = staticType.exactType();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	796 if (exact == null) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	797 exact = receiver.exactType();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	798 if (exact == null) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	799 if (receiver.isConstant()) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	800 exact = compilation.runtime.getTypeOf(receiver.asConstant());
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	801 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	802 if (exact == null) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	803 RiType declared = receiver.declaredType();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	804 exact = declared == null \|\| !declared.isResolved() ? null : declared.exactType();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	805 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	806 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	807 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	808 return exact;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	809 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	810
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	811 private RiType getAssumedLeafType(RiType type) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	812 if (isFinal(type.accessFlags())) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	813 return type;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	814 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	815 RiType assumed = null;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	816 if (C1XOptions.UseAssumptions) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	817 assumed = type.uniqueConcreteSubtype();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	818 if (assumed != null) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	819 if (C1XOptions.PrintAssumptions) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	820 TTY.println("Recording concrete subtype assumption in context of " + type.name() + ": " + assumed.name());
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	821 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	822 compilation.assumptions.recordConcreteSubtype(type, assumed);
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 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	825 return assumed;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	826 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	827
2647 0bf54306c139 Removed accessor workaround. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2645 diff changeset	828 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	829 Value receiver = frameState.loadLocal(0);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	830 RiType declaredType = receiver.declaredType();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	831 RiType receiverType = declaredType;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	832 RiType exactType = receiver.exactType();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	833 if (exactType == null && declaredType != null) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	834 exactType = declaredType.exactType();
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 if (exactType == null && receiver instanceof Local && ((Local) receiver).javaIndex() == 0) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	837 // the exact type isn't known, but the receiver is parameter 0 => use holder
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	838 receiverType = compilation.method.holder();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	839 exactType = receiverType.exactType();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	840 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	841 boolean needsCheck = true;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	842 if (exactType != null) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	843 // we have an exact type
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	844 needsCheck = exactType.hasFinalizer();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	845 } else {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	846 // 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	847 if (declaredType != null && !declaredType.hasFinalizableSubclass()) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	848 if (compilation.recordNoFinalizableSubclassAssumption(declaredType)) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	849 needsCheck = false;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	850 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	851 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	852
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	853 if (receiverType != null && !receiverType.hasFinalizableSubclass()) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	854 if (compilation.recordNoFinalizableSubclassAssumption(receiverType)) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	855 needsCheck = false;
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 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	858 }
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 if (needsCheck) {
2519 f6125fb5bfbc Removed intrinsics. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2516 diff changeset	861 // 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	862 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	863 C1XMetrics.InlinedFinalizerChecks++;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	864 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	865 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	866
2647 0bf54306c139 Removed accessor workaround. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2645 diff changeset	867 private void genReturn(Value x) {
2519 f6125fb5bfbc Removed intrinsics. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2516 diff changeset	868 if (method().isConstructor() && method().holder().superType() == null) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	869 callRegisterFinalizer();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	870 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	871
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	872 frameState.clearStack();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	873 if (Modifier.isSynchronized(method().accessFlags())) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	874 // unlock before exiting the method
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	875 int lockNumber = frameState.locksSize() - 1;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	876 MonitorAddress lockAddress = null;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	877 if (compilation.runtime.sizeOfBasicObjectLock() != 0) {
2602 0c6564c254af new node layout: BlockBegin, BlockEnd Lukas Stadler <lukas.stadler@jku.at> parents: 2600 diff changeset	878 lockAddress = new MonitorAddress(lockNumber, graph);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	879 append(lockAddress);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	880 }
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	881 append(new MonitorExit(rootMethodSynchronizedObject, 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	882 frameState.unlock();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	883 }
2602 0c6564c254af new node layout: BlockBegin, BlockEnd Lukas Stadler <lukas.stadler@jku.at> parents: 2600 diff changeset	884 append(new Return(x, !noSafepoints(), graph));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	885 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	886
2647 0bf54306c139 Removed accessor workaround. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2645 diff changeset	887 private void genMonitorEnter(Value x, int bci) {
2644 4694daa6af3a Removed CSE array length. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2643 diff changeset	888 int lockNumber = frameState.locksSize();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	889 MonitorAddress lockAddress = null;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	890 if (compilation.runtime.sizeOfBasicObjectLock() != 0) {
2602 0c6564c254af new node layout: BlockBegin, BlockEnd Lukas Stadler <lukas.stadler@jku.at> parents: 2600 diff changeset	891 lockAddress = new MonitorAddress(lockNumber, graph);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	892 append(lockAddress);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	893 }
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	894 MonitorEnter monitorEnter = new MonitorEnter(x, lockAddress, lockNumber, graph);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	895 appendWithoutOptimization(monitorEnter, bci);
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	896 frameState.lock(ir, x, lockNumber + 1);
2640 9e30cf6dcf96 More frame state fixes. All jtt tests passing now again. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2639 diff changeset	897 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	898 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	899 }
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	900 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	901
2647 0bf54306c139 Removed accessor workaround. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2645 diff changeset	902 private void genMonitorExit(Value x, int bci) {
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	903 int lockNumber = frameState.locksSize() - 1;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	904 if (lockNumber < 0) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	905 throw new CiBailout("monitor stack underflow");
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 MonitorAddress lockAddress = null;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	908 if (compilation.runtime.sizeOfBasicObjectLock() != 0) {
2602 0c6564c254af new node layout: BlockBegin, BlockEnd Lukas Stadler <lukas.stadler@jku.at> parents: 2600 diff changeset	909 lockAddress = new MonitorAddress(lockNumber, graph);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	910 append(lockAddress);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	911 }
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	912 appendWithoutOptimization(new MonitorExit(x, lockAddress, lockNumber, graph), bci);
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	913 frameState.unlock();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	914 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	915
2647 0bf54306c139 Removed accessor workaround. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2645 diff changeset	916 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	917 throw new CiBailout("jsr/ret not supported");
2507 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
2647 0bf54306c139 Removed accessor workaround. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2645 diff changeset	920 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	921 throw new CiBailout("jsr/ret not supported");
2507 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
2647 0bf54306c139 Removed accessor workaround. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2645 diff changeset	924 private void genTableswitch() {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	925 int bci = bci();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	926 BytecodeTableSwitch ts = new BytecodeTableSwitch(stream(), bci);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	927 int max = ts.numberOfCases();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	928 List<BlockBegin> list = new ArrayList<BlockBegin>(max + 1);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	929 boolean isBackwards = false;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	930 for (int i = 0; i < max; i++) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	931 // add all successors to the successor list
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	932 int offset = ts.offsetAt(i);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	933 list.add(blockAt(bci + offset));
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	934 isBackwards \|= offset < 0; // track if any of the successors are backwards
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	935 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	936 int offset = ts.defaultOffset();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	937 isBackwards \|= offset < 0; // if the default successor is backwards
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	938 list.add(blockAt(bci + offset));
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	939 boolean isSafepoint = isBackwards && !noSafepoints();
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	940 FrameState stateBefore = isSafepoint ? frameState.create(bci()) : null;
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	941 append(new TableSwitch(frameState.ipop(), list, ts.lowKey(), stateBefore, isSafepoint, graph));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	942 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	943
2647 0bf54306c139 Removed accessor workaround. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2645 diff changeset	944 private void genLookupswitch() {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	945 int bci = bci();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	946 BytecodeLookupSwitch ls = new BytecodeLookupSwitch(stream(), bci);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	947 int max = ls.numberOfCases();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	948 List<BlockBegin> list = new ArrayList<BlockBegin>(max + 1);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	949 int[] keys = new int[max];
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	950 boolean isBackwards = false;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	951 for (int i = 0; i < max; i++) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	952 // add all successors to the successor list
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	953 int offset = ls.offsetAt(i);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	954 list.add(blockAt(bci + offset));
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	955 keys[i] = ls.keyAt(i);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	956 isBackwards \|= offset < 0; // track if any of the successors are backwards
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	957 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	958 int offset = ls.defaultOffset();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	959 isBackwards \|= offset < 0; // if the default successor is backwards
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	960 list.add(blockAt(bci + offset));
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	961 boolean isSafepoint = isBackwards && !noSafepoints();
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	962 FrameState stateBefore = isSafepoint ? frameState.create(bci()) : null;
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	963 append(new LookupSwitch(frameState.ipop(), list, keys, stateBefore, isSafepoint, graph));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	964 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	965
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	966 private Value appendConstant(CiConstant type) {
2594 092e628ddd5d changed Constant and Convert, more StoreIndexed changes Lukas Stadler <lukas.stadler@jku.at> parents: 2592 diff changeset	967 return appendWithBCI(new Constant(type, graph), bci());
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
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	970 private Value append(Instruction x) {
2533 c480605ef068 Removed canonicalizer. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2521 diff changeset	971 return appendWithBCI(x, bci());
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
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	974 private Value appendWithoutOptimization(Instruction x, int bci) {
2533 c480605ef068 Removed canonicalizer. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2521 diff changeset	975 return appendWithBCI(x, bci);
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
2533 c480605ef068 Removed canonicalizer. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2521 diff changeset	978 private Value appendWithBCI(Instruction x, int bci) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	979 if (x.isAppended()) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	980 // the instruction has already been added
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	981 return x;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	982 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	983
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	984 assert x.next() == null : "instruction should not have been appended yet";
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	985 assert lastInstr.next() == null : "cannot append instruction to instruction which isn't end (" + lastInstr + "->" + lastInstr.next() + ")";
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	986
2657 4a6518c4d17d Removed need for base instruction. Cleanup. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2652 diff changeset	987 lastInstr = lastInstr.appendNext(x, bci);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	988 if (++stats.nodeCount >= C1XOptions.MaximumInstructionCount) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	989 // 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	990 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	991 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	992
2662 440ceca8e3d7 Add exception handlers only to Invoke and Throw instructions. Deoptimize if there is an exception in a HotSpot runtime call. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2661 diff changeset	993 if (x instanceof Invoke \|\| x instanceof Throw) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	994 // connect the instruction to any exception handlers
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	995 x.setExceptionHandlers(handleException(x, bci));
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	996 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	997
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	998 return x;
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
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1001 private BlockBegin blockAtOrNull(int bci) {
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	1002 return blockList[bci];
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1003 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1004
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1005 private BlockBegin blockAt(int bci) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1006 BlockBegin result = blockAtOrNull(bci);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1007 assert result != null : "Expected a block to begin at " + bci;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1008 return result;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1009 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1010
2652 6d19b4f476db Removed more OSR handling stuff. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2650 diff changeset	1011 private Value synchronizedObject(FrameStateAccess state, RiMethod target) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1012 if (isStatic(target.accessFlags())) {
2594 092e628ddd5d changed Constant and Convert, more StoreIndexed changes Lukas Stadler <lukas.stadler@jku.at> parents: 2592 diff changeset	1013 Constant classConstant = new Constant(target.holder().getEncoding(Representation.JavaClass), graph);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1014 return appendWithoutOptimization(classConstant, Instruction.SYNCHRONIZATION_ENTRY_BCI);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1015 } else {
2652 6d19b4f476db Removed more OSR handling stuff. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2650 diff changeset	1016 return state.localAt(0);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1017 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1018 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1019
2570 46586c77b129 Cleaned some remaining references to scope/inlining Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2566 diff changeset	1020 private void fillSyncHandler(Value lock, BlockBegin syncHandler) {
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1021 BlockBegin origBlock = curBlock;
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	1022 FrameState origState = frameState.create(-1);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1023 Instruction origLast = lastInstr;
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 lastInstr = curBlock = syncHandler;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1026 while (lastInstr.next() != null) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1027 // go forward to the end of the block
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1028 lastInstr = lastInstr.next();
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1029 }
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	1030 frameState.initializeFrom(syncHandler.stateBefore());
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1031
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1032 int bci = Instruction.SYNCHRONIZATION_ENTRY_BCI;
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	1033 Value exception = appendWithoutOptimization(new ExceptionObject(graph), bci);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1034
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1035 assert lock != null;
2644 4694daa6af3a Removed CSE array length. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2643 diff changeset	1036 assert frameState.locksSize() > 0 && frameState.lockAt(frameState.locksSize() - 1) == lock;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1037 if (lock instanceof Instruction) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1038 Instruction l = (Instruction) lock;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1039 if (!l.isAppended()) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1040 lock = appendWithoutOptimization(l, Instruction.SYNCHRONIZATION_ENTRY_BCI);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1041 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1042 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1043 // exit the monitor
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1044 genMonitorExit(lock, Instruction.SYNCHRONIZATION_ENTRY_BCI);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1045
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1046 frameState.apush(exception);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1047 genThrow(bci);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1048 BlockEnd end = (BlockEnd) lastInstr;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1049 curBlock.setEnd(end);
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	1050 end.setStateAfter(frameState.create(bci()));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1051
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1052 curBlock = origBlock;
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	1053 frameState.initializeFrom(origState);
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1054 origState.delete();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1055 lastInstr = origLast;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1056 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1057
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1058 private void iterateAllBlocks() {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1059 BlockBegin b;
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1060 while ((b = removeFromWorkList()) != null) {
2706 5a784215351a Removed WasVisited flag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2705 diff changeset	1061 if (!isVisited(b)) {
5a784215351a Removed WasVisited flag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2705 diff changeset	1062 markVisited(b);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1063 // now parse the block
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1064 curBlock = b;
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	1065 frameState.initializeFrom(b.stateBefore());
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1066 lastInstr = b;
2582 768d77a1c7af new node layout: Instruction Lukas Stadler <lukas.stadler@jku.at> parents: 2581 diff changeset	1067 b.appendNext(null, -1);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1068
2703 42450f536d24 More cleanup towards separation of graphbuilding<>graph<>lirgeneration Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2700 diff changeset	1069 iterateBytecodesForBlock(b.bci());
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1070 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1071 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1072 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1073
2703 42450f536d24 More cleanup towards separation of graphbuilding<>graph<>lirgeneration Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2700 diff changeset	1074 private BlockEnd iterateBytecodesForBlock(int bci) {
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	1075 assert frameState != null;
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1076 stream.setBCI(bci);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1077
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1078 BlockBegin block = curBlock;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1079 BlockEnd end = null;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1080 boolean pushException = block.isExceptionEntry() && block.next() == null;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1081 int prevBCI = bci;
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1082 int endBCI = stream.endBCI();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1083 boolean blockStart = true;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1084
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1085 while (bci < endBCI) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1086 BlockBegin nextBlock = blockAtOrNull(bci);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1087 if (nextBlock != null && nextBlock != block) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1088 // we fell through to the next block, add a goto and break
2602 0c6564c254af new node layout: BlockBegin, BlockEnd Lukas Stadler <lukas.stadler@jku.at> parents: 2600 diff changeset	1089 end = new Goto(nextBlock, null, false, graph);
2582 768d77a1c7af new node layout: Instruction Lukas Stadler <lukas.stadler@jku.at> parents: 2581 diff changeset	1090 lastInstr = lastInstr.appendNext(end, prevBCI);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1091 break;
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 // read the opcode
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1094 int opcode = stream.currentBC();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1095
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1096 // push an exception object onto the stack if we are parsing an exception handler
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1097 if (pushException) {
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	1098 frameState.apush(append(new ExceptionObject(graph)));
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1099 pushException = false;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1100 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1101
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1102 traceState();
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1103 traceInstruction(bci, stream, opcode, blockStart);
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1104 processBytecode(bci, stream, opcode);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1105
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1106 prevBCI = bci;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1107
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1108 if (lastInstr instanceof BlockEnd) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1109 end = (BlockEnd) lastInstr;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1110 break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1111 }
2640 9e30cf6dcf96 More frame state fixes. All jtt tests passing now again. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2639 diff changeset	1112 stream.next();
9e30cf6dcf96 More frame state fixes. All jtt tests passing now again. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2639 diff changeset	1113 bci = stream.currentBCI();
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	1114 if (lastInstr instanceof StateSplit) {
569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	1115 StateSplit stateSplit = (StateSplit) lastInstr;
569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	1116 if (stateSplit.stateAfter() == null && stateSplit.needsStateAfter()) {
569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	1117 stateSplit.setStateAfter(frameState.create(bci));
569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	1118 }
569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	1119 }
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1120 blockStart = false;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1121 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1122
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1123 // if the method terminates, we don't need the stack anymore
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1124 if (end instanceof Return \|\| end instanceof Throw) {
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	1125 frameState.clearStack();
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1126 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1127
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1128 // connect to begin and set state
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1129 // NOTE that inlining may have changed the block we are parsing
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1130 assert end != null : "end should exist after iterating over bytecodes";
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	1131 FrameState stateAtEnd = frameState.create(bci());
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	1132 end.setStateAfter(stateAtEnd);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1133 curBlock.setEnd(end);
2674 6ab73784566a * BlockBegin.predecessors changed to List<BlockEnd> Lukas Stadler <lukas.stadler@jku.at> parents: 2673 diff changeset	1134
6ab73784566a * BlockBegin.predecessors changed to List<BlockEnd> Lukas Stadler <lukas.stadler@jku.at> parents: 2673 diff changeset	1135 for (BlockBegin entry : newExceptionHandlers) {
6ab73784566a * BlockBegin.predecessors changed to List<BlockEnd> Lukas Stadler <lukas.stadler@jku.at> parents: 2673 diff changeset	1136 // add back-edge from exception handler entry to this block
6ab73784566a * BlockBegin.predecessors changed to List<BlockEnd> Lukas Stadler <lukas.stadler@jku.at> parents: 2673 diff changeset	1137 if (!entry.blockPredecessors().contains(curBlock.end())) {
6ab73784566a * BlockBegin.predecessors changed to List<BlockEnd> Lukas Stadler <lukas.stadler@jku.at> parents: 2673 diff changeset	1138 entry.addPredecessor(curBlock.end());
6ab73784566a * BlockBegin.predecessors changed to List<BlockEnd> Lukas Stadler <lukas.stadler@jku.at> parents: 2673 diff changeset	1139 }
6ab73784566a * BlockBegin.predecessors changed to List<BlockEnd> Lukas Stadler <lukas.stadler@jku.at> parents: 2673 diff changeset	1140 }
6ab73784566a * BlockBegin.predecessors changed to List<BlockEnd> Lukas Stadler <lukas.stadler@jku.at> parents: 2673 diff changeset	1141 newExceptionHandlers.clear();
6ab73784566a * BlockBegin.predecessors changed to List<BlockEnd> Lukas Stadler <lukas.stadler@jku.at> parents: 2673 diff changeset	1142
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1143 // propagate the state
2581 4a36a0bd6d18 added GraalGraph to classpath, Node as superclass of Value Lukas Stadler <lukas.stadler@jku.at> parents: 2570 diff changeset	1144 for (BlockBegin succ : end.blockSuccessors()) {
2674 6ab73784566a * BlockBegin.predecessors changed to List<BlockEnd> Lukas Stadler <lukas.stadler@jku.at> parents: 2673 diff changeset	1145 assert succ.blockPredecessors().contains(curBlock.end());
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	1146 succ.mergeOrClone(stateAtEnd, method());
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1147 addToWorkList(succ);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1148 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1149 return end;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1150 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1151
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1152 private void traceState() {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1153 if (C1XOptions.TraceBytecodeParserLevel >= TRACELEVEL_STATE && !TTY.isSuppressed()) {
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	1154 log.println(String.format("\| state [nr locals = %d, stack depth = %d, method = %s]", frameState.localsSize(), frameState.stackSize(), method()));
bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	1155 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	1156 Value value = frameState.localAt(i);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1157 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	1158 }
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	1159 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	1160 Value value = frameState.stackAt(i);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1161 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	1162 }
2611 bd235cb4375a FrameState cleanup: split into FrameStateBuilder and fixed-size FrameState, removed MutableFrameState Lukas Stadler <lukas.stadler@jku.at> parents: 2603 diff changeset	1163 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	1164 Value value = frameState.lockAt(i);
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1165 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	1166 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1167 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1168 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1169
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1170 private void processBytecode(int bci, BytecodeStream s, int opcode) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1171 int cpi;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1172
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1173 // Checkstyle: stop
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1174 switch (opcode) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1175 case NOP : /* nothing to do */ break;
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1176 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	1177 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	1178 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	1179 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	1180 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	1181 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	1182 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	1183 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	1184 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	1185 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	1186 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	1187 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	1188 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	1189 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	1190 case DCONST_1 : frameState.dpush(appendConstant(CiConstant.DOUBLE_1)); break;
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1191 case BIPUSH : frameState.ipush(appendConstant(CiConstant.forInt(s.readByte()))); break;
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1192 case SIPUSH : frameState.ipush(appendConstant(CiConstant.forInt(s.readShort()))); break;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1193 case LDC : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1194 case LDC_W : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1195 case LDC2_W : genLoadConstant(s.readCPI()); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1196 case ILOAD : loadLocal(s.readLocalIndex(), CiKind.Int); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1197 case LLOAD : loadLocal(s.readLocalIndex(), CiKind.Long); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1198 case FLOAD : loadLocal(s.readLocalIndex(), CiKind.Float); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1199 case DLOAD : loadLocal(s.readLocalIndex(), CiKind.Double); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1200 case ALOAD : loadLocal(s.readLocalIndex(), CiKind.Object); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1201 case ILOAD_0 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1202 case ILOAD_1 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1203 case ILOAD_2 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1204 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	1205 case LLOAD_0 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1206 case LLOAD_1 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1207 case LLOAD_2 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1208 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	1209 case FLOAD_0 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1210 case FLOAD_1 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1211 case FLOAD_2 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1212 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	1213 case DLOAD_0 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1214 case DLOAD_1 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1215 case DLOAD_2 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1216 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	1217 case ALOAD_0 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1218 case ALOAD_1 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1219 case ALOAD_2 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1220 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	1221 case IALOAD : genLoadIndexed(CiKind.Int ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1222 case LALOAD : genLoadIndexed(CiKind.Long ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1223 case FALOAD : genLoadIndexed(CiKind.Float ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1224 case DALOAD : genLoadIndexed(CiKind.Double); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1225 case AALOAD : genLoadIndexed(CiKind.Object); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1226 case BALOAD : genLoadIndexed(CiKind.Byte ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1227 case CALOAD : genLoadIndexed(CiKind.Char ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1228 case SALOAD : genLoadIndexed(CiKind.Short ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1229 case ISTORE : storeLocal(CiKind.Int, s.readLocalIndex()); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1230 case LSTORE : storeLocal(CiKind.Long, s.readLocalIndex()); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1231 case FSTORE : storeLocal(CiKind.Float, s.readLocalIndex()); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1232 case DSTORE : storeLocal(CiKind.Double, s.readLocalIndex()); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1233 case ASTORE : storeLocal(CiKind.Object, s.readLocalIndex()); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1234 case ISTORE_0 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1235 case ISTORE_1 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1236 case ISTORE_2 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1237 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	1238 case LSTORE_0 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1239 case LSTORE_1 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1240 case LSTORE_2 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1241 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	1242 case FSTORE_0 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1243 case FSTORE_1 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1244 case FSTORE_2 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1245 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	1246 case DSTORE_0 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1247 case DSTORE_1 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1248 case DSTORE_2 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1249 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	1250 case ASTORE_0 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1251 case ASTORE_1 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1252 case ASTORE_2 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1253 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	1254 case IASTORE : genStoreIndexed(CiKind.Int ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1255 case LASTORE : genStoreIndexed(CiKind.Long ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1256 case FASTORE : genStoreIndexed(CiKind.Float ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1257 case DASTORE : genStoreIndexed(CiKind.Double); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1258 case AASTORE : genStoreIndexed(CiKind.Object); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1259 case BASTORE : genStoreIndexed(CiKind.Byte ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1260 case CASTORE : genStoreIndexed(CiKind.Char ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1261 case SASTORE : genStoreIndexed(CiKind.Short ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1262 case POP : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1263 case POP2 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1264 case DUP : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1265 case DUP_X1 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1266 case DUP_X2 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1267 case DUP2 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1268 case DUP2_X1 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1269 case DUP2_X2 : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1270 case SWAP : stackOp(opcode); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1271 case IADD : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1272 case ISUB : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1273 case IMUL : genArithmeticOp(CiKind.Int, opcode); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1274 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	1275 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	1276 case LADD : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1277 case LSUB : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1278 case LMUL : genArithmeticOp(CiKind.Long, opcode); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1279 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	1280 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	1281 case FADD : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1282 case FSUB : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1283 case FMUL : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1284 case FDIV : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1285 case FREM : genArithmeticOp(CiKind.Float, opcode); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1286 case DADD : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1287 case DSUB : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1288 case DMUL : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1289 case DDIV : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1290 case DREM : genArithmeticOp(CiKind.Double, opcode); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1291 case INEG : genNegateOp(CiKind.Int); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1292 case LNEG : genNegateOp(CiKind.Long); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1293 case FNEG : genNegateOp(CiKind.Float); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1294 case DNEG : genNegateOp(CiKind.Double); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1295 case ISHL : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1296 case ISHR : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1297 case IUSHR : genShiftOp(CiKind.Int, opcode); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1298 case IAND : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1299 case IOR : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1300 case IXOR : genLogicOp(CiKind.Int, opcode); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1301 case LSHL : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1302 case LSHR : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1303 case LUSHR : genShiftOp(CiKind.Long, opcode); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1304 case LAND : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1305 case LOR : // fall through
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1306 case LXOR : genLogicOp(CiKind.Long, opcode); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1307 case IINC : genIncrement(); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1308 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	1309 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	1310 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	1311 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	1312 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	1313 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	1314 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	1315 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	1316 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	1317 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	1318 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	1319 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	1320 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	1321 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	1322 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	1323 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	1324 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	1325 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	1326 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	1327 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	1328 case IFEQ : genIfZero(Condition.EQ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1329 case IFNE : genIfZero(Condition.NE); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1330 case IFLT : genIfZero(Condition.LT); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1331 case IFGE : genIfZero(Condition.GE); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1332 case IFGT : genIfZero(Condition.GT); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1333 case IFLE : genIfZero(Condition.LE); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1334 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	1335 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	1336 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	1337 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	1338 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	1339 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	1340 case IF_ACMPEQ : genIfSame(frameState.peekKind(), Condition.EQ); break;
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1341 case IF_ACMPNE : genIfSame(frameState.peekKind(), Condition.NE); break;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1342 case GOTO : genGoto(s.currentBCI(), s.readBranchDest()); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1343 case JSR : genJsr(s.readBranchDest()); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1344 case RET : genRet(s.readLocalIndex()); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1345 case TABLESWITCH : genTableswitch(); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1346 case LOOKUPSWITCH : genLookupswitch(); break;
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1347 case IRETURN : genReturn(frameState.ipop()); break;
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1348 case LRETURN : genReturn(frameState.lpop()); break;
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1349 case FRETURN : genReturn(frameState.fpop()); break;
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1350 case DRETURN : genReturn(frameState.dpop()); break;
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1351 case ARETURN : genReturn(frameState.apop()); break;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1352 case RETURN : genReturn(null ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1353 case GETSTATIC : cpi = s.readCPI(); genGetStatic(cpi, constantPool().lookupField(cpi, opcode)); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1354 case PUTSTATIC : cpi = s.readCPI(); genPutStatic(cpi, constantPool().lookupField(cpi, opcode)); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1355 case GETFIELD : cpi = s.readCPI(); genGetField(cpi, constantPool().lookupField(cpi, opcode)); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1356 case PUTFIELD : cpi = s.readCPI(); genPutField(cpi, constantPool().lookupField(cpi, opcode)); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1357 case INVOKEVIRTUAL : cpi = s.readCPI(); genInvokeVirtual(constantPool().lookupMethod(cpi, opcode), cpi, constantPool()); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1358 case INVOKESPECIAL : cpi = s.readCPI(); genInvokeSpecial(constantPool().lookupMethod(cpi, opcode), null, cpi, constantPool()); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1359 case INVOKESTATIC : cpi = s.readCPI(); genInvokeStatic(constantPool().lookupMethod(cpi, opcode), cpi, constantPool()); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1360 case INVOKEINTERFACE: cpi = s.readCPI(); genInvokeInterface(constantPool().lookupMethod(cpi, opcode), cpi, constantPool()); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1361 case NEW : genNewInstance(s.readCPI()); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1362 case NEWARRAY : genNewTypeArray(s.readLocalIndex()); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1363 case ANEWARRAY : genNewObjectArray(s.readCPI()); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1364 case ARRAYLENGTH : genArrayLength(); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1365 case ATHROW : genThrow(s.currentBCI()); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1366 case CHECKCAST : genCheckCast(); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1367 case INSTANCEOF : genInstanceOf(); break;
2616 3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1368 case MONITORENTER : genMonitorEnter(frameState.apop(), s.currentBCI()); break;
3558ca7088c0 FrameState and Graphviz changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2615 diff changeset	1369 case MONITOREXIT : genMonitorExit(frameState.apop(), s.currentBCI()); break;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1370 case MULTIANEWARRAY : genNewMultiArray(s.readCPI()); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1371 case IFNULL : genIfNull(Condition.EQ); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1372 case IFNONNULL : genIfNull(Condition.NE); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1373 case GOTO_W : genGoto(s.currentBCI(), s.readFarBranchDest()); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1374 case JSR_W : genJsr(s.readFarBranchDest()); break;
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1375 case BREAKPOINT:
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1376 throw new CiBailout("concurrent setting of breakpoint");
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1377 default:
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1378 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	1379 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1380 // Checkstyle: resume
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1381 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1382
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1383 private void traceInstruction(int bci, BytecodeStream s, int opcode, boolean blockStart) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1384 if (C1XOptions.TraceBytecodeParserLevel >= TRACELEVEL_INSTRUCTIONS && !TTY.isSuppressed()) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1385 StringBuilder sb = new StringBuilder(40);
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1386 sb.append(blockStart ? '+' : '\|');
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1387 if (bci < 10) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1388 sb.append(" ");
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1389 } else if (bci < 100) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1390 sb.append(' ');
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1391 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1392 sb.append(bci).append(": ").append(Bytecodes.nameOf(opcode));
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1393 for (int i = bci + 1; i < s.nextBCI(); ++i) {
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1394 sb.append(' ').append(s.readUByte(i));
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1395 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1396 log.println(sb.toString());
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1397 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1398 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1399
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1400 private void genArrayLength() {
2628 569228710be8 More FrameState work Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2622 diff changeset	1401 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	1402 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1403
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1404 private RiConstantPool constantPool() {
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1405 return constantPool;
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1406 }
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1407
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1408 /**
2592 fec99fc30af1 checkstyle fixes, updated AccessArray + subclasses Lukas Stadler <lukas.stadler@jku.at> parents: 2587 diff changeset	1409 * Adds an exception handler.
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1410 * @param handler the handler to add
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1411 */
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1412 private void addExceptionHandler(ExceptionHandler handler) {
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1413 if (exceptionHandlers == null) {
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1414 exceptionHandlers = new ArrayList<ExceptionHandler>();
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1415 }
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1416 exceptionHandlers.add(handler);
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1417 flags \|= Flag.HasHandler.mask;
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1418 }
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1419
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1420 /**
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1421 * 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	1422 * 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	1423 * 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	1424 * @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	1425 */
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1426 private void addToWorkList(BlockBegin block) {
2705 d669ab61c7c7 Removed IsOnWorklistFlag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2703 diff changeset	1427 if (!isOnWorkList(block)) {
d669ab61c7c7 Removed IsOnWorklistFlag Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2703 diff changeset	1428 markOnWorkList(block);
2566 d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1429 sortIntoWorkList(block);
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1430 }
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1431 }
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1432
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1433 private void sortIntoWorkList(BlockBegin top) {
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1434 // XXX: this is O(n), since the whole list is sorted; a heap could achieve O(nlogn), but
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1435 // would only pay off for large worklists
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1436 if (workList == null) {
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1437 // need to allocate the worklist
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1438 workList = new BlockBegin[5];
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1439 } else if (workListIndex == workList.length) {
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1440 // need to grow the worklist
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1441 BlockBegin[] nworkList = new BlockBegin[workList.length * 3];
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1442 System.arraycopy(workList, 0, nworkList, 0, workList.length);
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1443 workList = nworkList;
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1444 }
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1445 // put the block at the end of the array
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1446 workList[workListIndex++] = top;
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1447 int dfn = top.depthFirstNumber();
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1448 assert dfn >= 0 : top + " does not have a depth first number";
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1449 int i = workListIndex - 2;
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1450 // push top towards the beginning of the array
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1451 for (; i >= 0; i--) {
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1452 BlockBegin b = workList[i];
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1453 if (b.depthFirstNumber() >= dfn) {
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1454 break; // already in the right position
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1455 }
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1456 workList[i + 1] = b; // bubble b down by one
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1457 workList[i] = top; // and overwrite it with top
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1458 }
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1459 }
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1460
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1461 /**
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1462 * 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	1463 * 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	1464 * @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	1465 * in the worklist
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1466 */
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1467 private BlockBegin removeFromWorkList() {
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1468 if (workListIndex == 0) {
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1469 return null;
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1470 }
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1471 // pop the last item off the end
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1472 return workList[--workListIndex];
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1473 }
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1474
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1475 /**
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1476 * Checks whether this graph has any handlers.
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1477 * @return {@code true} if there are any exception handlers
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1478 */
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1479 private boolean hasHandler() {
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1480 return (flags & Flag.HasHandler.mask) != 0;
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1481 }
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1482
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1483 /**
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1484 * Checks whether this graph can contain safepoints.
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1485 */
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1486 private boolean noSafepoints() {
d524ad648049 Finish remove inlining (removed ScopeData), remove JSR support Gilles Duboscq <gilles.duboscq@oracle.com> parents: 2565 diff changeset	1487 return (flags & Flag.NoSafepoints.mask) != 0;
2507 9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1488 }
9ec15d6914ca Pull over of compiler from maxine repository. Thomas Wuerthinger <thomas@wuerthinger.net> parents: diff changeset	1489 }

Mercurial > hg > truffle

annotate graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java @ 2706:5a784215351a