Mercurial > hg > truffle
changeset 2516:a384fac3fd34
Removed anything OSR-related.
line wrap: on
line diff
--- a/graal/GraalCompiler/src/com/sun/c1x/C1XCompilation.java Wed Apr 27 15:36:29 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/C1XCompilation.java Wed Apr 27 15:49:27 2011 +0200 @@ -53,7 +53,6 @@ public final RiMethod method; public final RiRegisterConfig registerConfig; public final CiStatistics stats; - public final int osrBCI; public final CiAssumptions assumptions = new CiAssumptions(); public final FrameState placeholderState; @@ -84,13 +83,15 @@ * @param stats externally supplied statistics object to be used if not {@code null} */ public C1XCompilation(C1XCompiler compiler, RiMethod method, int osrBCI, CiStatistics stats) { + if (osrBCI != -1) { + throw new CiBailout("No OSR supported"); + } this.parent = currentCompilation.get(); currentCompilation.set(this); this.compiler = compiler; this.target = compiler.target; this.runtime = compiler.runtime; this.method = method; - this.osrBCI = osrBCI; this.stats = stats == null ? new CiStatistics() : stats; this.registerConfig = method == null ? compiler.globalStubRegisterConfig : runtime.getRegisterConfig(method); this.placeholderState = method != null && method.minimalDebugInfo() ? new MutableFrameState(new IRScope(null, null, method, -1), 0, 0, 0) : null; @@ -116,15 +117,6 @@ } /** - * Checks whether this compilation is for an on-stack replacement. - * - * @return {@code true} if this compilation is for an on-stack replacement - */ - public boolean isOsrCompilation() { - return osrBCI >= 0; - } - - /** * Translates a given kind to a canonical architecture kind. * This is an identity function for all but {@link CiKind#Word} * which is translated to {@link CiKind#Int} or {@link CiKind#Long} @@ -146,15 +138,6 @@ } /** - * Gets the frame which describes the layout of the OSR interpreter frame for this method. - * - * @return the OSR frame - */ - public RiOsrFrame getOsrFrame() { - return runtime.getOsrFrame(method, osrBCI); - } - - /** * Records an assumption that the specified type has no finalizable subclasses. * * @param receiverType the type that is assumed to have no finalizable subclasses @@ -171,9 +154,6 @@ */ @Override public String toString() { - if (isOsrCompilation()) { - return "osr-compile @ " + osrBCI + ": " + method; - } return "compile: " + method; } @@ -184,15 +164,10 @@ * @param osrBCI the OSR bytecode index; {@code -1} if this is not an OSR * @return the block map for the specified method */ - public BlockMap getBlockMap(RiMethod method, int osrBCI) { + public BlockMap getBlockMap(RiMethod method) { // PERF: cache the block map for methods that are compiled or inlined often BlockMap map = new BlockMap(method, hir.numberOfBlocks()); - boolean isOsrCompilation = false; - if (osrBCI >= 0) { - map.addEntrypoint(osrBCI, BlockBegin.BlockFlag.OsrEntry); - isOsrCompilation = true; - } - if (!map.build(!isOsrCompilation && C1XOptions.PhiLoopStores)) { + if (!map.build(C1XOptions.PhiLoopStores)) { throw new CiBailout("build of BlockMap failed for " + method); } else { if (compiler.isObserved()) {
--- a/graal/GraalCompiler/src/com/sun/c1x/alloc/LinearScan.java Wed Apr 27 15:36:29 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/alloc/LinearScan.java Wed Apr 27 15:49:27 2011 +0200 @@ -1004,14 +1004,6 @@ // method argument (condition must be equal to handleMethodArguments) return RegisterPriority.None; - } else if (move.operand().isVariableOrRegister() && move.result().isVariableOrRegister()) { - // Move from register to register - if (blockForId(op.id).checkBlockFlag(BlockBegin.BlockFlag.OsrEntry)) { - // special handling of phi-function moves inside osr-entry blocks - // input operand must have a register instead of output operand (leads to better register - // allocation) - return RegisterPriority.ShouldHaveRegister; - } } } @@ -1039,14 +1031,6 @@ return RegisterPriority.MustHaveRegister; } else if (move.operand().isVariableOrRegister() && move.result().isVariableOrRegister()) { - // Move from register to register - if (blockForId(op.id).checkBlockFlag(BlockBegin.BlockFlag.OsrEntry)) { - // special handling of phi-function moves inside osr-entry blocks - // input operand must have a register instead of output operand (leads to better register - // allocation) - return RegisterPriority.MustHaveRegister; - } - // The input operand is not forced to a register (moves from stack to register are allowed), // but it is faster if the input operand is in a register return RegisterPriority.ShouldHaveRegister;
--- a/graal/GraalCompiler/src/com/sun/c1x/debug/CFGPrinter.java Wed Apr 27 15:36:29 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/debug/CFGPrinter.java Wed Apr 27 15:49:27 2011 +0200 @@ -153,9 +153,6 @@ if (block.isStandardEntry()) { out.print("\"std\" "); } - if (block.isOsrEntry()) { - out.print("\"osr\" "); - } if (block.isExceptionEntry()) { out.print("\"ex\" "); }
--- a/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java Wed Apr 27 15:36:29 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java Wed Apr 27 15:49:27 2011 +0200 @@ -119,9 +119,8 @@ BlockBegin startBlock = ir.startBlock; // 2. compute the block map and get the entrypoint(s) - BlockMap blockMap = compilation.getBlockMap(scope.method, compilation.osrBCI); + BlockMap blockMap = compilation.getBlockMap(scope.method); BlockBegin stdEntry = blockMap.get(0); - BlockBegin osrEntry = compilation.osrBCI < 0 ? null : blockMap.get(compilation.osrBCI); pushRootScope(scope, blockMap, startBlock); MutableFrameState initialState = stateAtEntry(rootMethod); startBlock.mergeOrClone(initialState); @@ -138,7 +137,7 @@ rootMethodSynchronizedObject = synchronizedObject(initialState, compilation.method); genMonitorEnter(rootMethodSynchronizedObject, Instruction.SYNCHRONIZATION_ENTRY_BCI); // 4A.2 finish the start block - finishStartBlock(startBlock, stdEntry, osrEntry); + finishStartBlock(startBlock, stdEntry); // 4A.3 setup an exception handler to unlock the root method synchronized object syncHandler = new BlockBegin(Instruction.SYNCHRONIZATION_ENTRY_BCI, ir.nextBlockNumber()); @@ -151,7 +150,7 @@ scopeData.addExceptionHandler(h); } else { // 4B.1 simply finish the start block - finishStartBlock(startBlock, stdEntry, osrEntry); + finishStartBlock(startBlock, stdEntry); } // 5. @@ -159,7 +158,7 @@ if (intrinsic != null) { lastInstr = stdEntry; // 6A.1 the root method is an intrinsic; load the parameters onto the stack and try to inline it - if (C1XOptions.OptIntrinsify && osrEntry == null) { + if (C1XOptions.OptIntrinsify) { // try to inline an Intrinsic node boolean isStatic = Modifier.isStatic(rootMethod.accessFlags()); int argsSize = rootMethod.signature().argumentSlots(!isStatic); @@ -198,19 +197,11 @@ // generate unlocking code if the exception handler is reachable fillSyncHandler(rootMethodSynchronizedObject, syncHandler, false); } - - if (compilation.osrBCI >= 0) { - BlockBegin osrBlock = blockMap.get(compilation.osrBCI); - assert osrBlock.wasVisited(); - if (!osrBlock.stateBefore().stackEmpty()) { - throw new CiBailout("cannot OSR with non-empty stack"); - } - } } - private void finishStartBlock(BlockBegin startBlock, BlockBegin stdEntry, BlockBegin osrEntry) { + private void finishStartBlock(BlockBegin startBlock, BlockBegin stdEntry) { assert curBlock == startBlock; - Base base = new Base(stdEntry, osrEntry); + Base base = new Base(stdEntry); appendWithoutOptimization(base, 0); FrameState stateAfter = curState.immutableCopy(bci()); base.setStateAfter(stateAfter); @@ -1435,7 +1426,7 @@ void pushScope(RiMethod target, BlockBegin continuation) { // prepare callee scope IRScope calleeScope = new IRScope(scope(), curState.immutableCopy(bci()), target, -1); - BlockMap blockMap = compilation.getBlockMap(calleeScope.method, -1); + BlockMap blockMap = compilation.getBlockMap(calleeScope.method); calleeScope.setStoresInLoops(blockMap.getStoresInLoops()); // prepare callee state curState = curState.pushScope(calleeScope); @@ -1941,12 +1932,6 @@ BlockBegin b; while ((b = scopeData.removeFromWorkList()) != null) { if (!b.wasVisited()) { - if (b.isOsrEntry()) { - // this is the OSR entry block, set up edges accordingly - setupOsrEntryBlock(); - // this is no longer the OSR entry block - b.setOsrEntry(false); - } b.setWasVisited(true); // now parse the block killMemoryMap(); @@ -1970,64 +1955,6 @@ scopeData = scopeData.parent; } - private void setupOsrEntryBlock() { - assert compilation.isOsrCompilation(); - - int osrBCI = compilation.osrBCI; - BytecodeStream s = scopeData.stream; - RiOsrFrame frame = compilation.getOsrFrame(); - s.setBCI(osrBCI); - s.next(); // XXX: why go to next bytecode? - - // create a new block to contain the OSR setup code - ir.osrEntryBlock = new BlockBegin(osrBCI, ir.nextBlockNumber()); - ir.osrEntryBlock.setOsrEntry(true); - ir.osrEntryBlock.setDepthFirstNumber(0); - - // get the target block of the OSR - BlockBegin target = scopeData.blockAt(osrBCI); - assert target != null && target.isOsrEntry(); - - MutableFrameState state = target.stateBefore().copy(); - ir.osrEntryBlock.setStateBefore(state); - - killMemoryMap(); - curBlock = ir.osrEntryBlock; - curState = state.copy(); - lastInstr = ir.osrEntryBlock; - - // create the entry instruction which represents the OSR state buffer - // input from interpreter / JIT - Instruction e = new OsrEntry(); - e.setFlag(Value.Flag.NonNull, true); - - for (int i = 0; i < state.localsSize(); i++) { - Value local = state.localAt(i); - Value get; - int offset = frame.getLocalOffset(i); - if (local != null) { - // this is a live local according to compiler - if (local.kind.isObject() && !frame.isLiveObject(i)) { - // the compiler thinks this is live, but not the interpreter - // pretend that it passed null - get = appendConstant(CiConstant.NULL_OBJECT); - } else { - Value oc = appendConstant(CiConstant.forInt(offset)); - get = append(new UnsafeGetRaw(local.kind, e, oc, 0, true)); - } - state.storeLocal(i, get); - } - } - - assert state.callerState() == null; - state.clearLocals(); - // ATTN: assumption: state is not used further below, else add .immutableCopy() - Goto g = new Goto(target, state, false); - append(g); - ir.osrEntryBlock.setEnd(g); - target.mergeOrClone(ir.osrEntryBlock.end().stateAfter()); - } - private BlockEnd iterateBytecodesForBlock(int bci, boolean inliningIntoCurrentBlock) { skipBlock = false; assert curState != null; @@ -2060,11 +1987,6 @@ // read the opcode int opcode = s.currentBC(); - // check for active JSR during OSR compilation - if (compilation.isOsrCompilation() && scope().isTopScope() && scopeData.parsingJsr() && s.currentBCI() == compilation.osrBCI) { - throw new CiBailout("OSR not supported while a JSR is active"); - } - // push an exception object onto the stack if we are parsing an exception handler if (pushException) { FrameState stateBefore = curState.immutableCopy(bci());
--- a/graal/GraalCompiler/src/com/sun/c1x/graph/IR.java Wed Apr 27 15:36:29 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/graph/IR.java Wed Apr 27 15:49:27 2011 +0200 @@ -98,7 +98,7 @@ } private void buildGraph() { - topScope = new IRScope(null, null, compilation.method, compilation.osrBCI); + topScope = new IRScope(null, null, compilation.method, -1); // Graph builder must set the startBlock and the osrEntryBlock new GraphBuilder(compilation, this).build(topScope);
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/Base.java Wed Apr 27 15:36:29 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/ir/Base.java Wed Apr 27 15:49:27 2011 +0200 @@ -36,15 +36,10 @@ /** * Constructs a new Base instruction. * @param standardEntry the standard entrypoint block - * @param osrEntry the OSR entrypoint block */ - public Base(BlockBegin standardEntry, BlockBegin osrEntry) { + public Base(BlockBegin standardEntry) { super(CiKind.Illegal, null, false); - assert osrEntry == null || osrEntry.isOsrEntry(); assert standardEntry.isStandardEntry(); - if (osrEntry != null) { - successors.add(osrEntry); - } successors.add(standardEntry); }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/BlockBegin.java Wed Apr 27 15:36:29 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/ir/BlockBegin.java Wed Apr 27 15:49:27 2011 +0200 @@ -47,7 +47,6 @@ */ public enum BlockFlag { StandardEntry, - OsrEntry, ExceptionEntry, SubroutineEntry, BackwardBranchTarget, @@ -497,14 +496,6 @@ setBlockFlag(BlockFlag.StandardEntry); } - public boolean isOsrEntry() { - return checkBlockFlag(BlockFlag.OsrEntry); - } - - public void setOsrEntry(boolean value) { - setBlockFlag(BlockFlag.OsrEntry, value); - } - public boolean isBackwardBranchTarget() { return checkBlockFlag(BlockFlag.BackwardBranchTarget); } @@ -726,9 +717,6 @@ if (isStandardEntry()) { sb.append('S'); } - if (isOsrEntry()) { - sb.append('O'); - } if (isExceptionEntry()) { sb.append('E'); }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/ComputeLinearScanOrder.java Wed Apr 27 15:36:29 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/ir/ComputeLinearScanOrder.java Wed Apr 27 15:49:27 2011 +0200 @@ -260,7 +260,7 @@ assert isBlockInLoop(loopIdx, cur) : "bit in loop map must be set when block is in work list"; // recursive processing of all predecessors ends when start block of loop is reached - if (cur != loopStart && !cur.checkBlockFlag(BlockBegin.BlockFlag.OsrEntry)) { + if (cur != loopStart) { for (int j = cur.numberOfPreds() - 1; j >= 0; j--) { BlockBegin pred = cur.predAt(j);
--- a/graal/GraalCompiler/src/com/sun/c1x/lir/LIRList.java Wed Apr 27 15:36:29 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/lir/LIRList.java Wed Apr 27 15:49:27 2011 +0200 @@ -422,9 +422,6 @@ if (x.checkBlockFlag(BlockBegin.BlockFlag.StandardEntry)) { TTY.print("std "); } - if (x.checkBlockFlag(BlockBegin.BlockFlag.OsrEntry)) { - TTY.print("osr "); - } if (x.checkBlockFlag(BlockBegin.BlockFlag.ExceptionEntry)) { TTY.print("ex "); }
--- a/src/share/vm/c1x/c1x_CodeInstaller.cpp Wed Apr 27 15:36:29 2011 +0200 +++ b/src/share/vm/c1x/c1x_CodeInstaller.cpp Wed Apr 27 15:49:27 2011 +0200 @@ -1,24 +1,24 @@ -/* - * Copyright (c) 2011, 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. +/* + * Copyright (c) 2011, 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. */ #include "precompiled.hpp"
--- a/src/share/vm/c1x/c1x_CodeInstaller.hpp Wed Apr 27 15:36:29 2011 +0200 +++ b/src/share/vm/c1x/c1x_CodeInstaller.hpp Wed Apr 27 15:49:27 2011 +0200 @@ -1,24 +1,24 @@ -/* - * Copyright (c) 2011, 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. +/* + * Copyright (c) 2011, 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. */ /*
--- a/src/share/vm/c1x/c1x_Compiler.cpp Wed Apr 27 15:36:29 2011 +0200 +++ b/src/share/vm/c1x/c1x_Compiler.cpp Wed Apr 27 15:49:27 2011 +0200 @@ -1,24 +1,24 @@ -/* - * Copyright (c) 2011, 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. +/* + * Copyright (c) 2011, 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. */ #include "precompiled.hpp"
--- a/src/share/vm/c1x/c1x_Compiler.hpp Wed Apr 27 15:36:29 2011 +0200 +++ b/src/share/vm/c1x/c1x_Compiler.hpp Wed Apr 27 15:49:27 2011 +0200 @@ -1,24 +1,24 @@ -/* - * Copyright (c) 2011, 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. +/* + * Copyright (c) 2011, 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. */ #include "compiler/abstractCompiler.hpp"
--- a/src/share/vm/c1x/c1x_JavaAccess.cpp Wed Apr 27 15:36:29 2011 +0200 +++ b/src/share/vm/c1x/c1x_JavaAccess.cpp Wed Apr 27 15:49:27 2011 +0200 @@ -1,24 +1,24 @@ -/* - * Copyright (c) 2011, 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. +/* + * Copyright (c) 2011, 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. */ #include "precompiled.hpp"
--- a/src/share/vm/c1x/c1x_JavaAccess.hpp Wed Apr 27 15:36:29 2011 +0200 +++ b/src/share/vm/c1x/c1x_JavaAccess.hpp Wed Apr 27 15:49:27 2011 +0200 @@ -1,24 +1,24 @@ -/* - * Copyright (c) 2011, 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. +/* + * Copyright (c) 2011, 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. */ void c1x_compute_offsets();
--- a/src/share/vm/c1x/c1x_VMEntries.cpp Wed Apr 27 15:36:29 2011 +0200 +++ b/src/share/vm/c1x/c1x_VMEntries.cpp Wed Apr 27 15:49:27 2011 +0200 @@ -1,24 +1,24 @@ -/* - * Copyright (c) 2011, 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. +/* + * Copyright (c) 2011, 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. */ #include "precompiled.hpp"
--- a/src/share/vm/c1x/c1x_VMEntries.hpp Wed Apr 27 15:36:29 2011 +0200 +++ b/src/share/vm/c1x/c1x_VMEntries.hpp Wed Apr 27 15:49:27 2011 +0200 @@ -1,24 +1,24 @@ -/* - * Copyright (c) 2011, 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. +/* + * Copyright (c) 2011, 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. */ extern JNINativeMethod VMEntries_methods[];
--- a/src/share/vm/c1x/c1x_VMExits.cpp Wed Apr 27 15:36:29 2011 +0200 +++ b/src/share/vm/c1x/c1x_VMExits.cpp Wed Apr 27 15:49:27 2011 +0200 @@ -1,24 +1,24 @@ -/* - * Copyright (c) 2011, 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. +/* + * Copyright (c) 2011, 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. */ #include "precompiled.hpp"
--- a/src/share/vm/c1x/c1x_VMExits.hpp Wed Apr 27 15:36:29 2011 +0200 +++ b/src/share/vm/c1x/c1x_VMExits.hpp Wed Apr 27 15:49:27 2011 +0200 @@ -1,24 +1,24 @@ -/* - * Copyright (c) 2011, 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. +/* + * Copyright (c) 2011, 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. */ class VMExits : public AllStatic {
--- a/src/share/vm/c1x/c1x_VmIds.cpp Wed Apr 27 15:36:29 2011 +0200 +++ b/src/share/vm/c1x/c1x_VmIds.cpp Wed Apr 27 15:49:27 2011 +0200 @@ -1,24 +1,24 @@ -/* - * Copyright (c) 2011, 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. +/* + * Copyright (c) 2011, 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. */ #include "precompiled.hpp"
--- a/src/share/vm/c1x/c1x_VmIds.hpp Wed Apr 27 15:36:29 2011 +0200 +++ b/src/share/vm/c1x/c1x_VmIds.hpp Wed Apr 27 15:49:27 2011 +0200 @@ -1,24 +1,24 @@ -/* - * Copyright (c) 2011, 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. +/* + * Copyright (c) 2011, 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. */ class Thread;