Mercurial > hg > truffle

diff graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotNodeLIRGenerator.java @ 14843:dd75a505f1b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove currentBlock from NodeLIRGenerator.
author Josef Eisl <josef.eisl@jku.at>
date Wed, 26 Mar 2014 13:15:08 +0100
parents f2e61bf2a2d8
children fbae9be45c95
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotNodeLIRGenerator.java	Wed Mar 26 12:14:08 2014 +0100
+++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotNodeLIRGenerator.java	Wed Mar 26 13:15:08 2014 +0100
@@ -57,8 +57,8 @@
  */
 public class AMD64HotSpotNodeLIRGenerator extends AMD64NodeLIRGenerator implements HotSpotNodeLIRGenerator {
 
-    public AMD64HotSpotNodeLIRGenerator(StructuredGraph graph, CallingConvention cc, LIRGenerationResult res, LIRGenerator gen) {
-        super(graph, cc, res, gen);
+    public AMD64HotSpotNodeLIRGenerator(StructuredGraph graph, LIRGenerationResult res, LIRGenerator gen) {
+        super(graph, res, gen);
     }
 
     private AMD64HotSpotLIRGenerator getGen() {
@@ -82,7 +82,7 @@
     @Override
     protected void emitPrologue(StructuredGraph graph) {
 
-        CallingConvention incomingArguments = getCallingConvention();
+        CallingConvention incomingArguments = gen.getCallingConvention();
 
         Value[] params = new Value[incomingArguments.getArgumentCount() + 1];
         for (int i = 0; i < params.length - 1; i++) {
@@ -98,7 +98,7 @@
 
         emitIncomingValues(params);
 
-        setSaveRbp(((AMD64HotSpotLIRGenerator) gen).new SaveRbp(new NoOp(currentBlock, res.getLIR().getLIRforBlock(currentBlock).size())));
+        setSaveRbp(((AMD64HotSpotLIRGenerator) gen).new SaveRbp(new NoOp(gen.getCurrentBlock(), res.getLIR().getLIRforBlock(gen.getCurrentBlock()).size())));
         append(getSaveRbp().placeholder);
 
         for (ParameterNode param : graph.getNodes(ParameterNode.class)) {