# HG changeset patch # User Roland Schatz # Date 1416488555 -3600 # Node ID 12dbd9a40718430eb71a359309ae77ba7fc3e232 # Parent 7b5106be0f187b791a4d5ef2f255fea629635ca0 Use floating node for casting between metaspace pointers and words. diff -r 7b5106be0f18 -r 12dbd9a40718 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/word/HotSpotWordTypeRewriterPhase.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/word/HotSpotWordTypeRewriterPhase.java Thu Nov 20 14:00:51 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/word/HotSpotWordTypeRewriterPhase.java Thu Nov 20 14:02:35 2014 +0100 @@ -35,7 +35,6 @@ import com.oracle.graal.nodes.calc.*; import com.oracle.graal.nodes.java.*; import com.oracle.graal.nodes.type.*; -import com.oracle.graal.word.nodes.*; import com.oracle.graal.word.phases.*; public class HotSpotWordTypeRewriterPhase extends WordTypeRewriterPhase { @@ -105,19 +104,17 @@ case FROM_POINTER: assert arguments.size() == 1; - WordCastNode ptrToWord = graph.add(WordCastNode.pointerToWord(arguments.get(0), wordKind)); - graph.addBeforeFixed(invoke.asNode(), ptrToWord); - replace(invoke, ptrToWord); + replace(invoke, graph.unique(PointerCastNode.create(StampFactory.forKind(wordKind), arguments.get(0)))); break; case TO_KLASS_POINTER: assert arguments.size() == 1; - replaceToPointerOp(graph, invoke, PointerType.Type, arguments.get(0)); + replace(invoke, graph.unique(PointerCastNode.create(StampFactory.forPointer(PointerType.Type), arguments.get(0)))); break; case TO_METHOD_POINTER: assert arguments.size() == 1; - replaceToPointerOp(graph, invoke, PointerType.Method, arguments.get(0)); + replace(invoke, graph.unique(PointerCastNode.create(StampFactory.forPointer(PointerType.Method), arguments.get(0)))); break; default: @@ -126,12 +123,6 @@ } } - private void replaceToPointerOp(StructuredGraph graph, Invoke invoke, PointerType type, ValueNode word) { - WordCastNode wordToObject = graph.add(WordCastNode.wordToPointer(word, wordKind, type)); - graph.addBeforeFixed(invoke.asNode(), wordToObject); - replace(invoke, wordToObject); - } - private static ValueNode pointerComparisonOp(StructuredGraph graph, HotspotOpcode opcode, ValueNode left, ValueNode right) { assert left.stamp() instanceof PointerStamp && right.stamp() instanceof PointerStamp; assert opcode == POINTER_EQ || opcode == POINTER_NE; diff -r 7b5106be0f18 -r 12dbd9a40718 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/word/PointerCastNode.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/word/PointerCastNode.java Thu Nov 20 14:02:35 2014 +0100 @@ -0,0 +1,61 @@ +/* + * 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.hotspot.word; + +import com.oracle.graal.api.meta.*; +import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.calc.*; +import com.oracle.graal.nodes.spi.*; + +/** + * Cast between Word and metaspace pointers that is introduced by the + * {@link HotSpotWordTypeRewriterPhase}. + */ +@NodeInfo +public class PointerCastNode extends FloatingNode implements LIRLowerable { + + @Input ValueNode input; + + public static PointerCastNode create(Stamp stamp, ValueNode input) { + return new PointerCastNode(stamp, input); + } + + protected PointerCastNode(Stamp stamp, ValueNode input) { + super(stamp); + this.input = input; + } + + public ValueNode getInput() { + return input; + } + + @Override + public void generate(NodeLIRBuilderTool generator) { + Value value = generator.operand(input); + assert value.getLIRKind().equals(generator.getLIRGeneratorTool().getLIRKind(stamp())) : "PointerCastNode shouldn't change the LIRKind"; + + generator.setResult(this, value); + } +} diff -r 7b5106be0f18 -r 12dbd9a40718 graal/com.oracle.graal.word/src/com/oracle/graal/word/nodes/WordCastNode.java --- a/graal/com.oracle.graal.word/src/com/oracle/graal/word/nodes/WordCastNode.java Thu Nov 20 14:00:51 2014 +0100 +++ b/graal/com.oracle.graal.word/src/com/oracle/graal/word/nodes/WordCastNode.java Thu Nov 20 14:02:35 2014 +0100 @@ -40,13 +40,13 @@ @Input ValueNode input; - public static WordCastNode wordToPointer(ValueNode input, Kind wordKind, PointerType type) { + public static WordCastNode wordToObject(ValueNode input, Kind wordKind) { assert input.getKind() == wordKind; - return WordCastNode.create(StampFactory.forPointer(type), input); + return WordCastNode.create(StampFactory.object(), input); } - public static WordCastNode pointerToWord(ValueNode input, Kind wordKind) { - assert input.stamp() instanceof ObjectStamp || input.stamp() instanceof PointerStamp; + public static WordCastNode objectToWord(ValueNode input, Kind wordKind) { + assert input.stamp() instanceof ObjectStamp; return WordCastNode.create(StampFactory.forKind(wordKind), input); } diff -r 7b5106be0f18 -r 12dbd9a40718 graal/com.oracle.graal.word/src/com/oracle/graal/word/phases/WordTypeRewriterPhase.java --- a/graal/com.oracle.graal.word/src/com/oracle/graal/word/phases/WordTypeRewriterPhase.java Thu Nov 20 14:00:51 2014 +0100 +++ b/graal/com.oracle.graal.word/src/com/oracle/graal/word/phases/WordTypeRewriterPhase.java Thu Nov 20 14:02:35 2014 +0100 @@ -277,7 +277,7 @@ case FROM_OBJECT: assert arguments.size() == 1; - WordCastNode objectToWord = graph.add(WordCastNode.pointerToWord(arguments.get(0), wordKind)); + WordCastNode objectToWord = graph.add(WordCastNode.objectToWord(arguments.get(0), wordKind)); graph.addBeforeFixed(invoke.asNode(), objectToWord); replace(invoke, objectToWord); break; @@ -289,7 +289,7 @@ case TO_OBJECT: assert arguments.size() == 1; - WordCastNode wordToObject = graph.add(WordCastNode.wordToPointer(arguments.get(0), wordKind, PointerType.Object)); + WordCastNode wordToObject = graph.add(WordCastNode.wordToObject(arguments.get(0), wordKind)); graph.addBeforeFixed(invoke.asNode(), wordToObject); replace(invoke, wordToObject); break;