fixed a number of bugs related to stack frame interpretation

src/Examples.java

@@ -1,4 +1,4 @@
-import async_example.Delay;
+import async_example.Jokio;
 import async_example.Socket;
 import generator.future.Future;
 import generator.future.Waker;
@@ -84,39 +84,30 @@ public class Examples {
 //        return Future.ret(value);
 //    }
 
-//    public static Future<Void> send(ByteBuffer buffer, Socket socket){
-//        String message = "hello world!\n";
-//        buffer.limit(message.length()).put(message.getBytes(StandardCharsets.UTF_8)).position(0);
-//        var wrote = socket.write_all(buffer).await();
-//        buffer.clear().limit(wrote);
-//        var read = socket.read_all(buffer).await();
-//        System.out.println(new String(buffer.array(), 0, read));
-//
-//        return Future.ret(null);
-//    }
 
-    public static Future<Void> forever(Socket socket){
+    public static Future<Void> test(){
+        for(int i = 0; i < 1000; i ++){
+            Jokio.runtime(Waker.waker()).spawn(echoForever("Message " + i + "\n"));
+        }
+        return Future.ret(null);
+    }
+
+    public static Future<Void> echoForever(String message){
+        try(var socket = Socket.connect(new InetSocketAddress("45.79.112.203", 4242)).await()){
             var buffer = ByteBuffer.allocate(500);
             while(true){
-//            send(buffer, socket).await();
+                buffer.limit(message.length()).put(message.getBytes(StandardCharsets.UTF_8)).position(0);
-            ((Future<?>)new Delay(1000 + buffer.get())).await();
+                var wrote = socket.write_all(buffer).await();
-            System.out.println(socket);
+                buffer.clear().limit(wrote);
+                var read = socket.read_all(buffer).await();
+                System.out.print(new String(buffer.array(), 0, read));
+                buffer.clear();
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return Future.ret(null);
     }
-
-//    public Future<String> awaitTest(int number){
-////        var result = number(10).await()+number(20).await();
-////        Jokio.runtime().await().spawn(awaitTest2(5000));
-//
-//        try(var socket = Socket.connect(new InetSocketAddress("45.79.112.203", 4242)).await()){
-//            forever(socket).await();
-//        } catch (Exception e) {
-//            e.printStackTrace();
-////            throw new RuntimeException(e);
-//        }
-//
-//        return Future.ret("");
-//    }
 
 //    public Future<String> closing(int number){
 //        try(var m = new Meow()){

src/Main.java

@@ -57,7 +57,7 @@ public class Main implements Runnable {
     }
 
     void await(){
-        new Jokio().blocking(Examples.forever(null));
+        new Jokio().blocking(Examples.test());
     }
 
 

src/async_example/Jokio.java

@@ -38,6 +38,10 @@ public class Jokio implements Runnable{
         };
     }
 
+    public static Jokio runtime(Waker waker){
+        return ((Task<?>)waker).runtime();
+    }
+
     private final HashSet<Task<?>> current = new HashSet<>();
     private final Queue<Task<?>> woke = new ArrayDeque<>();
 

src/async_example/Socket.java

@@ -42,7 +42,6 @@ public class Socket implements AutoCloseable{
                         var c = (SocketChannel)key.channel();
                         var w = (Waker)key.attachment();
 
-                        System.out.println(key);
                         if (!key.isValid()) {
                         }
                         if(key.isAcceptable()){

src/generator/future/Future.java

@@ -16,6 +16,10 @@ public interface Future<R> {
         throw new RuntimeException("NO!");
     }
 
+    static Future<Void> ret(){
+        throw new RuntimeException();
+    }
+
     static void yield() {
         throw new RuntimeException("NO!");
     }

src/generator/runtime/Frame.java

@@ -16,7 +16,7 @@ public record Frame(FrameTracker.Type[] locals, FrameTracker.Type[] stack) {
         int slot = 0;
         for (var entry : locals) {
             slot++;
-            if (slot <= loc_off) continue;
+            if (slot <= smb.paramSlotOff) continue;
 
             if (entry.isCategory2_2nd()) continue;
 

src/generator/runtime/FrameTracker.java

@@ -234,13 +234,8 @@ public class FrameTracker {
         }
 
         for (var attr : com.findAttributes(Attributes.stackMapTable())) {
-            var entries = new ArrayList<StackMapFrameInfo>();
             for (var smfi : attr.entries()) {
-                var locals = new ArrayList<>(smfi.locals());
+                stackMapFrames.put(smfi.target(), smfi);
-                for (int i = 0; i < smb.params.length; i++)
-                    locals.removeFirst();
-                entries.add(StackMapFrameInfo.of(smfi.target(), locals, smfi.stack()));
-                stackMapFrames.put(smfi.target(), entries.getLast());
             }
         }
     }
@@ -471,7 +466,6 @@ public class FrameTracker {
     public void encounterLabel(Label l) {
         var tmp = stackMapFrames.get(l);
         if (tmp != null) {
-//            if(tmp.frameType()==252)
             stack.clear();
             locals.clear();
             for( var sl : tmp.stack())
@@ -479,13 +473,6 @@ public class FrameTracker {
 
             for( var sl : tmp.locals())
                 locals.add(Type.verificationType(sl));
-
-//            while(locals.size()>tmp.locals().size())locals.removeLast();
-//            while(locals.size()<tmp.locals().size())locals.add(null);
-//            int slot = 0;
-//            for( var local : tmp.locals()){
-//                locals.set(slot, Type.verificationType(local));
-//            }
         }
     }
 }

src/generator/runtime/SavedStateTracker.java

@@ -25,7 +25,7 @@ public class SavedStateTracker {
         }
 
         var s = new StackState(name, desc);
-        saved.addFirst(s);
+        saved.add(s);
         return s;
     }
 
@@ -51,8 +51,22 @@ public class SavedStateTracker {
         return this;
     }
 
+    public void restore_stack(StateMachineBuilder smb, CodeBuilder cob){
+        for(int i = saved.size()-1; i >= 0; i --){
+            if(saved.get(i) instanceof StackState)
+                restore(smb, cob, saved.get(i));
+        }
+    }
+
+    public void restore_locals(StateMachineBuilder smb, CodeBuilder cob){
+        for(int i = saved.size()-1; i >= 0; i --){
+            if(saved.get(i) instanceof StackState)
+                restore(smb, cob, saved.get(i));
+        }
+    }
+
     public void restore_all(StateMachineBuilder smb, CodeBuilder cob) {
         while(!saved.isEmpty())
-            restore(smb, cob, saved.getFirst());
+            restore(smb, cob, saved.getLast());
     }
 }

src/generator/runtime/future/FutureSMBuilder.java

@@ -45,11 +45,12 @@ public class FutureSMBuilder extends StateMachineBuilder {
             cob.ifThenElse(bcb -> {
                 bcb.swap().aload(0).swap().putfield(smb.CD_this, AWAITING_FIELD_NAME, CD_Future);
 
+
                 var sst = new SavedStateTracker();
+                bcb.storeLocal(TypeKind.REFERENCE, frame.locals().length+2);
                 frame.save_locals(smb, cob, sst,2);
-                bcb.storeLocal(TypeKind.REFERENCE, 2);
                 frame.save_stack(smb, cob, sst,1);
-                bcb.loadLocal(TypeKind.REFERENCE, 2);
+                bcb.loadLocal(TypeKind.REFERENCE, frame.locals().length+2);
                 bcb.areturn().labelBinding(restore_label);
                 sst.restore_all(smb, cob);
 
@@ -118,7 +119,7 @@ public class FutureSMBuilder extends StateMachineBuilder {
 
     @Override
     protected String uniqueName() {
-        return "Fut"+super.uniqueName();
+        return "Fut";
     }
 
     @Override