# HG changeset patch # User Josef Eisl # Date 1398240029 -7200 # Node ID 0349e609ca5ee5daa3eaf5984148372ed9ed38e9 # Parent 7e0563f0d2490a9f4f4052df8a8e4fa82c576c31 Rename LIRLoop to BaselineLoop. diff -r 7e0563f0d249 -r 0349e609ca5e graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineControlFlowGraph.java --- a/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineControlFlowGraph.java Tue Apr 22 20:16:38 2014 +0200 +++ b/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineControlFlowGraph.java Wed Apr 23 10:00:29 2014 +0200 @@ -58,21 +58,21 @@ private void computeLoopInformation() { visited = new BitSet(blocks.length); - Deque stack = new ArrayDeque<>(); + Deque stack = new ArrayDeque<>(); for (int i = blocks.length - 1; i >= 0; i--) { BciBlock block = blocks[i]; calcLoop(block, stack); } } - private void calcLoop(BciBlock block, Deque stack) { + private void calcLoop(BciBlock block, Deque stack) { if (visited.get(block.getId())) { return; } visited.set(block.getId()); if (block.isLoopEnd()) { BciBlock loopHeader = getLoopHeader(block); - LIRLoop l = new LIRLoop(stack.peek(), loops.size(), loopHeader); + BaselineLoop l = new BaselineLoop(stack.peek(), loops.size(), loopHeader); loops.add(l); stack.push(l); } diff -r 7e0563f0d249 -r 0349e609ca5e graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineLoop.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineLoop.java Wed Apr 23 10:00:29 2014 +0200 @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2014, 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package com.oracle.graal.baseline; + +import com.oracle.graal.compiler.common.cfg.*; +import com.oracle.graal.java.BciBlockMapping.BciBlock; + +public class BaselineLoop extends Loop { + + protected BaselineLoop(Loop parent, int index, BciBlock header) { + super(parent, index, header); + } + + @Override + public long numBackedges() { + // currently only loops with one backedge are supported + return 1; + } + +} diff -r 7e0563f0d249 -r 0349e609ca5e graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/LIRLoop.java --- a/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/LIRLoop.java Tue Apr 22 20:16:38 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2014, 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package com.oracle.graal.baseline; - -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.java.BciBlockMapping.BciBlock; - -public class LIRLoop extends Loop { - - protected LIRLoop(Loop parent, int index, BciBlock header) { - super(parent, index, header); - } - - @Override - public long numBackedges() { - // currently only loops with one backedge are supported - return 1; - } - -}