patch moveto stack

2015-04-02 17:52:19 +03:00
parent 6e9d5ebe78
commit 8552dd60ae
1 changed files with 20 additions and 2 deletions
@@ -570,10 +570,28 @@ public abstract class StackValue {
                int size = this.type.getSize();
                if (size == 1) {
                    v.swap();
-                } else if (size == 2) {
+                }
+                else if (size == 2) {
                    v.dupX2();
                    v.pop();
-                } else {
+                }
+                else {
+                    throw new UnsupportedOperationException("don't know how to move type " + type + " to top of stack");
+                }
+
+                coerceTo(type, v);
+            }
+            else if (depth == 2) {
+                int size = this.type.getSize();
+                if (size == 1) {
+                    v.dup2X1();
+                    v.pop2();
+                }
+                else if (size == 2) {
+                    v.dup2X2();
+                    v.pop2();
+                }
+                else {
                    throw new UnsupportedOperationException("don't know how to move type " + type + " to top of stack");
                }