[truffle] Implement ThreadContext and add support to passing it to ops

Author: pmurias

src/vm/jvm/dsl/org/perl6/nqp/dsl/AstBuilder.java

@@ -19,6 +19,7 @@
     Class hllClass();
     Class contextSlotClass();
     Class globalContextClass();
+    Class threadContextClass();
 
     boolean tastToByteCode();
     boolean tastToNode();

src/vm/jvm/dsl/org/perl6/nqp/dsl/Processor.java

@@ -42,6 +42,7 @@ static class AstTypes {
         TypeMirror hllClass;
         TypeMirror contextSlotClass;
         TypeMirror globalContextClass;
+        TypeMirror threadContextClass;
 
         AstTypes(AstBuilder annotation) {
             try {
@@ -109,6 +110,12 @@ static class AstTypes {
             } catch (MirroredTypeException e) {
                 globalContextClass = e.getTypeMirror();
             }
+
+            try {
+                annotation.threadContextClass();
+            } catch (MirroredTypeException e) {
+                threadContextClass = e.getTypeMirror();
+            }
         }
     }
 
@@ -173,6 +180,9 @@ private void writeParams(ExecutableElement executableElement, AstTypes astTypes,
             } else if (paramType.equals(astTypes.globalContextClass)) {
                 writer.append("scope.getGlobalContext()");
                 i--;
+            } else if (paramType.equals(astTypes.threadContextClass)) {
+                writer.append("scope.getThreadContext()");
+                i--;
             } else if (global != null) {
                 writer.append("scope.getGlobalContext()." + param.getSimpleName());
                 i--;
@@ -296,6 +306,8 @@ private void writeArgumentsToByteCode(ExecutableElement executableElement, AstTy
                 i--;
             } else if (paramType.equals(astTypes.globalContextClass)) {
                 i--;
+            } else if (paramType.equals(astTypes.threadContextClass)) {
+                i--;
             } else if (global != null) {
                 i--;
             } else {
@@ -342,6 +354,8 @@ private void writeByteCodeParams(ExecutableElement executableElement, String rea
                 writer.append("scope.getContextSlot()");
             } else if (paramType.equals(astTypes.globalContextClass)) {
                 writer.append("scope.getGlobalContext()");
+            } else if (paramType.equals(astTypes.threadContextClass)) {
+                writer.append("scope.getThreadContext()");
             } else if (global != null) {
                 writer.append("scope.getGlobalContext()." + param.getSimpleName());
             } else {

src/vm/jvm/runtime/org/perl6/nqp/truffle/ByteCodeRunner.java

@@ -69,6 +69,7 @@
     scopeClass = NQPScope.class,
     contextSlotClass = FrameSlot.class,
     globalContextClass = GlobalContext.class,
+    threadContextClass = ThreadContext.class,
     hllClass = HLL.class,
     tastToByteCode = false,
     tastToNode = false,
@@ -85,7 +86,7 @@ protected NQPNode[] byteCodeToNodeArray(ByteCodeReader reader, NQPScope scope) {
         return nodes;
     }
 
-    public void runByteCode(GlobalContext globalContext, DynamicContext context, String input) {
+    public void runByteCode(GlobalContext globalContext, ThreadContext threadContext, DynamicContext context, String input) {
         try {
             FileInputStream stream = new FileInputStream(input);
             FileChannel channel = stream.getChannel();
@@ -104,7 +105,7 @@ public void runByteCode(GlobalContext globalContext, DynamicContext context, Str
             long version = reader.readVersion();
 
             FrameDescriptor frameDescriptor = new FrameDescriptor();
-            RootNode rootNode = new NQPRootNode(null, frameDescriptor, byteCodeToNode(reader, new NQPScopeWithFrame(frameDescriptor, new NQPScopeWithGlobalContext(globalContext))));
+            RootNode rootNode = new NQPRootNode(null, frameDescriptor, byteCodeToNode(reader, new NQPScopeWithFrame(frameDescriptor, new NQPScopeWithGlobalContext(globalContext, threadContext))));
 
             CallTarget callTarget = Truffle.getRuntime().createCallTarget(rootNode);
             callTarget.call(context);

src/vm/jvm/runtime/org/perl6/nqp/truffle/NQPCompUnitScope.java

@@ -74,6 +74,10 @@ public GlobalContext getGlobalContext() {
         return outer.getGlobalContext();
     }
 
+    @Override
+    public ThreadContext getThreadContext() {
+        return outer.getThreadContext();
+    }
 
     @Override
     public FrameSlot getContextSlot() {

src/vm/jvm/runtime/org/perl6/nqp/truffle/NQPScope.java

@@ -64,4 +64,5 @@ public FoundLexical findLexical(String name) {
     public abstract void addCuid(String cuid, NQPCodeRef codeRef);
 
     public abstract GlobalContext getGlobalContext();
+    public abstract ThreadContext getThreadContext();
 }

src/vm/jvm/runtime/org/perl6/nqp/truffle/NQPScopeWithFrame.java

@@ -132,6 +132,11 @@ public GlobalContext getGlobalContext() {
         return outer.getGlobalContext();
     }
 
+    @Override
+    public ThreadContext getThreadContext() {
+        return outer.getThreadContext();
+    }
+
     @Override
     public NQPCodeRef getCuid(String cuid) {
         return outer.getCuid(cuid);

src/vm/jvm/runtime/org/perl6/nqp/truffle/NQPScopeWithGlobalContext.java

@@ -3,22 +3,29 @@
 import com.oracle.truffle.api.frame.FrameSlot;
 import java.util.HashMap;
 import org.perl6.nqp.truffle.GlobalContext;
+import org.perl6.nqp.truffle.ThreadContext;
 import com.oracle.truffle.api.frame.FrameSlot;
 import org.perl6.nqp.truffle.runtime.NQPCodeRef;
 import org.perl6.nqp.truffle.runtime.HLL;
 
 public class NQPScopeWithGlobalContext extends NQPScope {
     GlobalContext globalContext;
+    ThreadContext threadContext;
 
-    public NQPScopeWithGlobalContext(GlobalContext globalContext) {
+    public NQPScopeWithGlobalContext(GlobalContext globalContext, ThreadContext threadContext) {
         this.globalContext = globalContext;
+        this.threadContext = threadContext;
     }
 
     @Override
     public GlobalContext getGlobalContext() {
         return globalContext;
     }
 
+    @Override
+    public ThreadContext getThreadContext() {
+        return threadContext;
+    }
 
     @Override
     public HLL getCurrentHLL() {

src/vm/jvm/runtime/org/perl6/nqp/truffle/ThreadContext.java

@@ -0,0 +1,13 @@
+package org.perl6.nqp.truffle;
+
+public class ThreadContext {
+    /**
+     * Serialization context write barrier disabled depth (anything non-zero
+     * means disabled).
+     */
+    public int scwbDisableDepth = 0;
+
+    public ThreadContext() {
+    }
+}
+

src/vm/jvm/runtime/org/perl6/nqp/truffle/adapters/TruffleCompiler.java

@@ -47,14 +47,15 @@
     hllClass = HLL.class,
     contextSlotClass = FrameSlot.class,
     globalContextClass = GlobalContext.class,
+    threadContextClass = org.perl6.nqp.truffle.ThreadContext.class,
     tastToByteCode = true,
     tastToNode = true,
     byteCodeToNode = false
 )
 abstract class TruffleCompiler {
     public void run(SixModelObject node, ThreadContext tc) {
         FrameDescriptor frameDescriptor = new FrameDescriptor();
-        RootNode rootNode = new NQPRootNode(null, frameDescriptor, tastToNode(node, new NQPScopeWithFrame(frameDescriptor,  new NQPScopeWithGlobalContext(new GlobalContext())), tc));
+        RootNode rootNode = new NQPRootNode(null, frameDescriptor, tastToNode(node, new NQPScopeWithFrame(frameDescriptor,  new NQPScopeWithGlobalContext(new GlobalContext(), new org.perl6.nqp.truffle.ThreadContext())), tc));
 
 
         CallTarget callTarget = Truffle.getRuntime().createCallTarget(rootNode);

src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/expression/NQPCtxlexpadNode.java

@@ -16,8 +16,7 @@ public NQPCtxlexpadNode(NQPNode ctxNode) {
 
     @Override
     public Object execute(VirtualFrame frame) {
-        Object ctx = ctxNode.execute(frame);
-        System.out.println("ctx: " + ctx);
-        return ctx;
+        // TODO - think if we want to do a check here
+        return ctxNode.execute(frame);
     }
 }