moving primitives to separate module, moved some functions as methods of the machine

js-assembler/assemble-expression.rkt

@@ -46,7 +46,7 @@
              (CaptureEnvironment-skip op))]
     
     [(CaptureControl? op)
-     (format "RUNTIME.captureControl(MACHINE, ~a, ~a)"
+     (format "MACHINE.captureControl(~a, ~a)"
              (CaptureControl-skip op)
              (let: ([tag : (U DefaultContinuationPromptTag OpArg)
 			 (CaptureControl-tag op)])

js-assembler/assemble-perform-statement.rkt

@@ -105,7 +105,7 @@ EOF
      "MACHINE.env = MACHINE.env[MACHINE.env.length - 2].slice(0);"]
     
     [(RestoreControl!? op)
-     (format "RUNTIME.restoreControl(MACHINE, ~a);"
+     (format "MACHINE.restoreControl(~a);"
              (let: ([tag : (U DefaultContinuationPromptTag OpArg)
 			 (RestoreControl!-tag op)])
                (cond
@@ -131,11 +131,11 @@ EOF
              (assemble-oparg (SetFrameCallee!-proc op)))]
     
     [(SpliceListIntoStack!? op)
-     (format "RUNTIME.spliceListIntoStack(MACHINE, ~a);"
+     (format "MACHINE.spliceListIntoStack(~a);"
              (assemble-oparg (SpliceListIntoStack!-depth op)))]
 
     [(UnspliceRestFromStack!? op)
-     (format "RUNTIME.unspliceRestFromStack(MACHINE, ~a, ~a);"
+     (format "MACHINE.unspliceRestFromStack(~a, ~a);"
              (assemble-oparg (UnspliceRestFromStack!-depth op))
              (assemble-oparg (UnspliceRestFromStack!-length op)))]
 

js-assembler/assemble.rkt

@@ -51,7 +51,7 @@ for (param in params) {
 }
 EOF
                  )
-        (fprintf op "RUNTIME.trampoline(MACHINE, ~a); })"
+        (fprintf op "MACHINE.trampoline(~a); })"
                  (assemble-label (make-Label (BasicBlock-name (first basic-blocks)))))))
 
 

js-assembler/get-js-vm-implemented-primitives.rkt

@@ -8,7 +8,7 @@
 
 (define-runtime-path js-vm-primitives.js "runtime-src/js-vm-primitives.js")
 
-(define-runtime-path whalesong-primitives.js "runtime-src/runtime.js")
+(define-runtime-path whalesong-primitives.js "runtime-src/baselib-primitives.js")
 
 ;; sort&unique: (listof string) -> (listof string)
 (define (sort&unique names)

js-assembler/get-runtime.rkt

@@ -74,7 +74,8 @@
                 ;; baselib-check has to come after the definitions of types,
                 ;; since it uses the type predicates immediately on init time.
                 baselib-check.js
-                
+
+                baselib-primitives.js
                 runtime.js))
 
 

js-assembler/runtime-src/baselib-functions.js

@@ -129,7 +129,7 @@
                 MACHINE.proc = oldProc;
                 fail(e);
             };
-            plt.runtime.trampoline(MACHINE, v.label);
+            MACHINE.trampoline(v.label);
         };
         return f;
     };
@@ -198,7 +198,7 @@
                 MACHINE.proc = oldProc;
                 fail(e);
             };
-            plt.runtime.trampoline(MACHINE, proc.label);
+            MACHINE.trampoline(proc.label);
         } else {
             fail(plt.baselib.exceptions.makeExnFail(
                 plt.baselib.format.format(

js-assembler/runtime-src/baselib-modules.js

@@ -62,7 +62,7 @@
             if (isInternal) {
                 throw that.label;
             } else {
-                plt.runtime.trampoline(MACHINE, that.label);
+                MACHINE.trampoline(that.label);
             }
         }
     };