Mercurial > hg > truffle

changeset 6488:b3a75a3d9e1b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed more XIR remnants
author Doug Simon <doug.simon@oracle.com>
date Tue, 02 Oct 2012 16:48:54 +0200
parents 967a8fa8f210
children 1f0edd29cc66
files graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/TargetDescription.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/LIRGeneratorTool.java
diffstat 3 files changed, 5 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/TargetDescription.java	Tue Oct 02 16:09:06 2012 +0200
+++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/TargetDescription.java	Tue Oct 02 16:48:54 2012 +0200
@@ -91,20 +91,13 @@
      */
     public final boolean debugInfoDoubleWordsInSecondSlot;
 
-    /**
-     * Temporary flag to distinguish between the semantics necessary for HotSpot and Maxine.
-     */
-    // TODO This should go away when XIR goes away, and the logic be part of the VM-specific lowering.
-    public final boolean invokeSnippetAfterArguments;
-
     public TargetDescription(Architecture arch,
              boolean isMP,
              int stackAlignment,
              int pageSize,
              int cacheAlignment,
              boolean inlineObjects,
-             boolean debugInfoDoubleWordsInSecondSlot,
-             boolean invokeSnippetAfterArguments) {
+             boolean debugInfoDoubleWordsInSecondSlot) {
         this.arch = arch;
         this.pageSize = pageSize;
         this.isMP = isMP;
@@ -119,7 +112,6 @@
         this.cacheAlignment = cacheAlignment;
         this.inlineObjects = inlineObjects;
         this.debugInfoDoubleWordsInSecondSlot = debugInfoDoubleWordsInSecondSlot;
-        this.invokeSnippetAfterArguments = invokeSnippetAfterArguments;
     }
 
     /**
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java	Tue Oct 02 16:09:06 2012 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java	Tue Oct 02 16:48:54 2012 +0200
@@ -107,7 +107,7 @@
         if (target == null) {
             final int wordSize = 8;
             final int stackFrameAlignment = 16;
-            target = new TargetDescription(new AMD64(), true, stackFrameAlignment, config.vmPageSize, wordSize, true, true, true);
+            target = new TargetDescription(new AMD64(), true, stackFrameAlignment, config.vmPageSize, wordSize, true, true);
         }
 
         return target;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/LIRGeneratorTool.java	Tue Oct 02 16:09:06 2012 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/LIRGeneratorTool.java	Tue Oct 02 16:48:54 2012 +0200
@@ -99,14 +99,12 @@
     public abstract void visitMerge(MergeNode i);
     public abstract void visitEndNode(EndNode i);
     public abstract void visitLoopEnd(LoopEndNode i);
-    public abstract void visitSafepointNode(SafepointNode i);
-    public abstract void visitBreakpointNode(BreakpointNode i);
 
     public abstract void visitCompareAndSwap(CompareAndSwapNode i);
 
-    // Functionality that is currently implemented in XIR.
-    // Some of these methods will go away when lowering is done via snippets in the front end.
-    // The remainder will define the contract a runtime specific backend must provide.
+    // These methods define the contract a runtime specific backend must provide.
     public abstract void visitExceptionObject(ExceptionObjectNode i);
     public abstract void visitReturn(ReturnNode i);
+    public abstract void visitSafepointNode(SafepointNode i);
+    public abstract void visitBreakpointNode(BreakpointNode i);
 }