# HG changeset patch # User Josef Eisl # Date 1413993886 -7200 # Node ID 115c9fac75427c75322bce9832ff6f1fc747694f # Parent 448be95baef8f8c6784de07fff834f92ba123df1 Move FrameMapBuilderImpl to com.oracle.graal.lir. diff -r 448be95baef8 -r 115c9fac7542 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/FrameMapBuilderImpl.java --- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/FrameMapBuilderImpl.java Wed Oct 22 17:51:08 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,68 +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.compiler.gen; - -import java.util.*; - -import com.oracle.graal.api.code.*; -import com.oracle.graal.api.meta.*; -import com.oracle.graal.compiler.target.*; -import com.oracle.graal.lir.*; - -public class FrameMapBuilderImpl implements FrameMapBuilder { - - private final FrameMap frameMap; - private final RegisterConfig registerConfig; - - public FrameMapBuilderImpl(Backend backend, RegisterConfig registerConfig) { - CodeCacheProvider codeCache = backend.getCodeCache(); - this.registerConfig = registerConfig == null ? codeCache.getRegisterConfig() : registerConfig; - this.frameMap = backend.newFrameMap(this); - } - - public StackSlot allocateSpillSlot(LIRKind kind) { - return frameMap.allocateSpillSlot(kind); - } - - public StackSlot allocateStackSlots(int slots, BitSet objects, List outObjectStackSlots) { - return frameMap.allocateStackSlots(slots, objects, outObjectStackSlots); - } - - public RegisterConfig getRegisterConfig() { - return registerConfig; - } - - public void freeSpillSlot(StackSlot slot) { - frameMap.freeSpillSlot(slot); - } - - public void callsMethod(CallingConvention cc) { - frameMap.callsMethod(cc); - } - - public FrameMap buildFrameMap() { - frameMap.finish(); - return frameMap; - } - -} \ No newline at end of file diff -r 448be95baef8 -r 115c9fac7542 graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java --- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java Wed Oct 22 17:51:08 2014 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java Wed Oct 22 18:04:46 2014 +0200 @@ -67,7 +67,7 @@ @Override public FrameMapBuilder newFrameMapBuilder(RegisterConfig registerConfig) { - return new FrameMapBuilderImpl(this, registerConfig); + return new FrameMapBuilderImpl(this::newFrameMap, getCodeCache(), registerConfig); } @Override diff -r 448be95baef8 -r 115c9fac7542 graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java --- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java Wed Oct 22 17:51:08 2014 +0200 +++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java Wed Oct 22 18:04:46 2014 +0200 @@ -52,7 +52,6 @@ import com.oracle.graal.compiler.common.*; import com.oracle.graal.compiler.common.cfg.*; import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.compiler.gen.*; import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.Scope; import com.oracle.graal.gpu.*; @@ -386,7 +385,7 @@ @Override public FrameMapBuilder newFrameMapBuilder(RegisterConfig registerConfig) { - return new FrameMapBuilderImpl(this, registerConfig); + return new FrameMapBuilderImpl(this::newFrameMap, getCodeCache(), registerConfig); } /** diff -r 448be95baef8 -r 115c9fac7542 graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotBackend.java --- a/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotBackend.java Wed Oct 22 17:51:08 2014 +0200 +++ b/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotBackend.java Wed Oct 22 18:04:46 2014 +0200 @@ -38,7 +38,6 @@ import com.oracle.graal.asm.ptx.*; import com.oracle.graal.compiler.common.*; import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.compiler.gen.*; import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.Scope; import com.oracle.graal.gpu.*; @@ -158,7 +157,7 @@ @Override public FrameMapBuilder newFrameMapBuilder(RegisterConfig registerConfig) { - return new FrameMapBuilderImpl(this, registerConfig); + return new FrameMapBuilderImpl(this::newFrameMap, getCodeCache(), registerConfig); } @Override diff -r 448be95baef8 -r 115c9fac7542 graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java --- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java Wed Oct 22 17:51:08 2014 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java Wed Oct 22 18:04:46 2014 +0200 @@ -44,7 +44,6 @@ import com.oracle.graal.asm.sparc.SPARCMacroAssembler.RestoreWindow; import com.oracle.graal.asm.sparc.SPARCMacroAssembler.Setx; import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.compiler.gen.*; import com.oracle.graal.hotspot.*; import com.oracle.graal.hotspot.meta.HotSpotCodeCacheProvider.MarkId; import com.oracle.graal.hotspot.meta.*; @@ -74,7 +73,7 @@ @Override public FrameMapBuilder newFrameMapBuilder(RegisterConfig registerConfig) { - return new FrameMapBuilderImpl(this, registerConfig); + return new FrameMapBuilderImpl(this::newFrameMap, getCodeCache(), registerConfig); } @Override diff -r 448be95baef8 -r 115c9fac7542 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/FrameMapBuilderImpl.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/FrameMapBuilderImpl.java Wed Oct 22 18:04:46 2014 +0200 @@ -0,0 +1,73 @@ +/* + * 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.lir; + +import java.util.*; + +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; + +/** + * A simple forwarder to {@link FrameMap}. + */ +public class FrameMapBuilderImpl implements FrameMapBuilder { + + @FunctionalInterface + public interface FrameMapFactory { + FrameMap newFrameMap(FrameMapBuilder frameMapBuilder); + } + + private final FrameMap frameMap; + private final RegisterConfig registerConfig; + + public FrameMapBuilderImpl(FrameMapFactory factory, CodeCacheProvider codeCache, RegisterConfig registerConfig) { + this.registerConfig = registerConfig == null ? codeCache.getRegisterConfig() : registerConfig; + this.frameMap = factory.newFrameMap(this); + } + + public StackSlot allocateSpillSlot(LIRKind kind) { + return frameMap.allocateSpillSlot(kind); + } + + public StackSlot allocateStackSlots(int slots, BitSet objects, List outObjectStackSlots) { + return frameMap.allocateStackSlots(slots, objects, outObjectStackSlots); + } + + public RegisterConfig getRegisterConfig() { + return registerConfig; + } + + public void freeSpillSlot(StackSlot slot) { + frameMap.freeSpillSlot(slot); + } + + public void callsMethod(CallingConvention cc) { + frameMap.callsMethod(cc); + } + + public FrameMap buildFrameMap() { + frameMap.finish(); + return frameMap; + } + +} \ No newline at end of file