Fixed the command-line (Node) version of PCjs

jeffpar · Dec 30, 2014 · 55cb185 · 55cb185
1 parent 3172912
commit 55cb185
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 50 deletions.
diff --git a/modules/pcjs/bin/x86gen.js b/modules/pcjs/bin/x86gen.js
@@ -351,8 +351,8 @@ function genMode(d, w, mrm, sGroup, sRO) {
             break;
         case 4:
             sRegGet = "this.regSP";
-            sRegBTLo = "X86CPU.BACKTRACK.SP_LO";
-            sRegBTHi = "X86CPU.BACKTRACK.SP_HI";
+            sRegBTLo = "X86.BACKTRACK.SP_LO";
+            sRegBTHi = "X86.BACKTRACK.SP_HI";
             break;
         case 5:
             sRegGet = "this.regBP";
@@ -616,8 +616,8 @@ function genMode(d, w, mrm, sGroup, sRO) {
                 break;
             case 4:
                 sModRegGet = "this.regSP";
-                sModRegBTLo = "X86CPU.BACKTRACK.SP_LO";
-                sModRegBTHi = "X86CPU.BACKTRACK.SP_HI";
+                sModRegBTLo = "X86.BACKTRACK.SP_LO";
+                sModRegBTHi = "X86.BACKTRACK.SP_HI";
                 break;
             case 5:
                 sModRegGet = "this.regBP";

diff --git a/modules/pcjs/lib/defines.js b/modules/pcjs/lib/defines.js
@@ -131,6 +131,7 @@ if (typeof module !== 'undefined') {
     global.EAFUNCS = EAFUNCS;
     global.FATARRAYS = FATARRAYS;
     global.TYPEDARRAYS = TYPEDARRAYS;
+    global.BACKTRACK = BACKTRACK;
     global.SAMPLER = SAMPLER;
     /*
      * TODO: When we're "required" by Node, should we return anything via module.exports?

diff --git a/modules/pcjs/lib/x86.js b/modules/pcjs/lib/x86.js
@@ -326,6 +326,13 @@ var X86 = {
     }
 };
 
+if (BACKTRACK) {
+    X86.BACKTRACK = {
+        SP_LO:  0,
+        SP_HI:  0
+    };
+}
+
 /*
  * Some PS flags are stored directly in regPS, hence the "direct" designation.
  */

diff --git a/modules/pcjs/lib/x86cpu.js b/modules/pcjs/lib/x86cpu.js
@@ -429,13 +429,6 @@ X86CPU.PREFETCH = {
     MASK:       0x7             // (X86CPU.PREFETCH.ARRAY - 1)
 };
 
-if (BACKTRACK) {
-    X86CPU.BACKTRACK = {
-        SP_LO:  0,
-        SP_HI:  0
-    };
-}
-
 /**
  * initMemory(aMemBlocks, addrLimit, blockShift, blockLimit, blockMask)
  *