Mercurial > hg > truffle

changeset 10964:9024b2eb8434

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
try to fix HSAIL and PTX FrameMap problems
author twisti
date Sun, 04 Aug 2013 12:27:59 -0700
parents af543b1e42b7
children 19648527ec72
files graal/com.oracle.graal.lir.hsail/src/com/oracle/graal/lir/hsail/HSAILFrameMap.java graal/com.oracle.graal.lir.ptx/src/com/oracle/graal/lir/ptx/PTXFrameMap.java
diffstat 2 files changed, 14 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.lir.hsail/src/com/oracle/graal/lir/hsail/HSAILFrameMap.java	Sun Aug 04 11:54:55 2013 -0700
+++ b/graal/com.oracle.graal.lir.hsail/src/com/oracle/graal/lir/hsail/HSAILFrameMap.java	Sun Aug 04 12:27:59 2013 -0700
@@ -43,21 +43,21 @@
 
     @Override
     public int totalFrameSize() {
-        // FIXME this is amd64 code
-        return frameSize() + returnAddressSize();
+        // FIXME return some sane values
+        return frameSize();
     }
 
     @Override
     public int currentFrameSize() {
-        // FIXME this is amd64 code
-        return alignFrameSize(outgoingSize + spillSize - returnAddressSize());
+        // FIXME return some sane values
+        return alignFrameSize(outgoingSize + spillSize);
     }
 
     @Override
     protected int alignFrameSize(int size) {
-        // FIXME this is amd64 code
-        int x = size + returnAddressSize() + (target.stackAlignment - 1);
-        return (x / target.stackAlignment) * target.stackAlignment - returnAddressSize();
+        // FIXME return some sane values
+        int x = size + (target.stackAlignment - 1);
+        return (x / target.stackAlignment) * target.stackAlignment;
     }
 
     @Override
--- a/graal/com.oracle.graal.lir.ptx/src/com/oracle/graal/lir/ptx/PTXFrameMap.java	Sun Aug 04 11:54:55 2013 -0700
+++ b/graal/com.oracle.graal.lir.ptx/src/com/oracle/graal/lir/ptx/PTXFrameMap.java	Sun Aug 04 12:27:59 2013 -0700
@@ -43,21 +43,21 @@
 
     @Override
     public int totalFrameSize() {
-        // FIXME this is amd64 code
-        return frameSize() + returnAddressSize();
+        // FIXME return some sane values
+        return frameSize();
     }
 
     @Override
     public int currentFrameSize() {
-        // FIXME this is amd64 code
-        return alignFrameSize(outgoingSize + spillSize - returnAddressSize());
+        // FIXME return some sane values
+        return alignFrameSize(outgoingSize + spillSize);
     }
 
     @Override
     protected int alignFrameSize(int size) {
-        // FIXME this is amd64 code
-        int x = size + returnAddressSize() + (target.stackAlignment - 1);
-        return (x / target.stackAlignment) * target.stackAlignment - returnAddressSize();
+        // FIXME return some sane values
+        int x = size + (target.stackAlignment - 1);
+        return (x / target.stackAlignment) * target.stackAlignment;
     }
 
     @Override