[js] serialize code refs marked as static

Raku · Oct 2, 2015 · d1fcbf0 · d1fcbf0
1 parent 8402ce0
commit d1fcbf0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/src/vm/js/QAST/Compiler.nqp b/src/vm/js/QAST/Compiler.nqp
@@ -724,7 +724,9 @@ class QAST::OperationsJS {
     add_simple_op('deserialize', $T_OBJ, [$T_STR, $T_OBJ, $T_OBJ, $T_OBJ, $T_OBJ], :sideffects);
     add_simple_op('scsetobj', $T_OBJ, [$T_OBJ, $T_INT, $T_OBJ], :sideffects);
     add_simple_op('scgetobj', $T_OBJ, [$T_OBJ, $T_INT], :sideffects);
+    add_simple_op('scsetcode', $T_OBJ, [$T_OBJ, $T_INT, $T_OBJ], :sideffects);
     add_simple_op('setobjsc', $T_OBJ, [$T_OBJ, $T_OBJ], :sideffects);
+    add_simple_op('markcodestatic', $T_OBJ, [$T_OBJ], :sideffects);
 
     # Ops for NFA
 

diff --git a/src/vm/js/nqp-runtime/core.js b/src/vm/js/nqp-runtime/core.js
@@ -458,3 +458,8 @@ op.elems = function(obj) {
     return obj.$$elems();
   }
 };
+
+op.markcodestatic = function(code) {
+  code.isStatic = true;
+  return code;
+};
diff --git a/src/vm/js/nqp-runtime/serialization.js b/src/vm/js/nqp-runtime/serialization.js
@@ -288,7 +288,7 @@ BinaryWriteCursor.prototype.ref = function(ref) {
   else if (ref instanceof CodeRef || typeof ref == 'function') {
     //      console.log("serializing code ref");
     discrim = REFVAR_VM_NULL;
-    if (ref._SC && ref.isStaticCodeRef) {
+    if (ref._SC && ref.isStatic) {
       /* Static code reference. */
       discrim = REFVAR_STATIC_CODEREF;
     }
@@ -352,8 +352,7 @@ BinaryWriteCursor.prototype.ref = function(ref) {
     case REFVAR_CLONED_CODEREF:
       var scId = this.writer.getSCId(ref._SC);
       var idx = ref._SC.root_codes.indexOf(ref);
-      this.I32(scId);
-      this.I32(idx);
+      this.idIdx(scId, idx);
       break;
     default:
       throw 'Serialization Error: Unimplemented object type: ' + discrim;
@@ -673,4 +672,10 @@ op.setobjsc = function(obj, sc) {
   return obj;
 };
 
+op.scsetcode = function(sc, idx, obj) {
+  sc.root_codes[idx] = obj;
+  obj._SC = sc;
+  return obj;
+};
+
 exports.BinaryWriteCursor = BinaryWriteCursor;