Add arguments to reset()

index.html

@@ -34,6 +34,21 @@
 
 <nav class="navbar navbar-light bg-light" id="toolbar">
     <div class="form-inline">
+        <div>Program&nbsp</div>
+        <div class="form-check">
+        <input class="form-check-input" type="checkbox" value="" id="context-enabler0" onchange="initModule()" checked>
+        <label class="form-check-label" for="enabled-ctx0">
+            1
+        </label>
+        </div>
+        <div>&nbsp</div>
+        <div class="form-check">
+        <input class="form-check-input" type="checkbox" value="" id="context-enabler1" onchange="initModule()" checked>
+        <label class="form-check-label" for="enabled-ctx1">
+            2
+        </label>
+        </div>
+        <div>&nbsp</div>
         <div>
             <select id="context-selector" onchange="changeContext(this.value)" class="form-control form-control"></select>
         </div>
@@ -225,6 +240,8 @@ <h5 class="card-header">Log</h5>
         output: document.getElementById('output-content'),
         log: document.getElementById('log-content'),
         contextSelector: document.getElementById('context-selector'),
+        contextEnabler0: document.getElementById('context-enabler0'),
+        contextEnabler1: document.getElementById('context-enabler1'),
         fileSelector0: document.getElementById('file-selector0'),
         fileSelector1: document.getElementById('file-selector1'),
         playButton: document.getElementById('play-button'),

js/execution.js

@@ -20,7 +20,22 @@ class Execution {
         Elements.output.innerHTML = '';
         Elements.log.innerHTML = '';
 
-        Module.reset(); // 2, [0, 1]);
+
+        let enable_ctx0 = document.getElementById("context-enabler0").checked;
+        let enable_ctx1 = document.getElementById("context-enabler1").checked;
+        const ctx_list = [];
+        if (enable_ctx0) {ctx_list.push(0)};
+        if (enable_ctx1) {ctx_list.push(1)};
+        console.log("enable list: ", ctx_list);
+        Module.reset(2, ctx_list);
+
+        // Module.reset(); // 2, [0, 1]);
+        // Module.reset(2, [0, 1]);
+        // Module.reset(2, [0]);
+        // Module.reset(2, [1]);
+
+
+
         while (!Module.lockSimulator(100));
         RegisterUtils.init(ctx);
         MemoryUtils.init(ctx);

js/index.js

@@ -94,15 +94,115 @@ async function loadData(fileInput) {
     }
 }
 
+let prev_ctx_list = [0, 1];
+
+async function initModule() {
+
+    let enable_ctx0 = document.getElementById("context-enabler0").checked;
+    let enable_ctx1 = document.getElementById("context-enabler1").checked;
+    console.log("program 0 enabled: ", enable_ctx0);
+    console.log("program 1 enabled: ", enable_ctx1);
+
+    // TODO: add module reset when
+    const ctx_list = []; // [0]
+    if (enable_ctx0) {ctx_list.push(0)};
+    if (enable_ctx1) {ctx_list.push(1)};
+    Module.reset(2, ctx_list);
+
+
+
+
+
+
+    let cur_ctx = document.getElementById("context-selector").value;
+    if (prev_ctx_list.length == ctx_list.length) {
+        // same ctx list, no modification
+
+    } else if (prev_ctx_list.length > ctx_list.length) {
+        // disabled selected ctx, clean frontend
+        let diff_ctx = prev_ctx_list.filter(item => !ctx_list.includes(item))[0];
+        if (diff_ctx == cur_ctx) {
+            // Output 
+            Elements.output.innerHTML = "";
+            Elements.log.innerHTML = "";
+
+            // Reg
+            Elements.generalReg.innerHTML = "";
+            Elements.specialReg.innerHTML = "";
+            Elements.floatReg.innerHTML = "";
+            Elements.doubleReg.innerHTML = "";
+
+            // Insn
+            Elements.userTextContent.innerHTML = "";
+            Elements.kernelTextContent.innerHTML = "";
+            Elements.kernelTextContainer.innerHTML = "";
+
+            // Mem
+            Elements.userData.innerHTML = "";
+            Elements.kernelData.innerHTML = "";
+            Elements.kernelDataContainer.innerHTML = "";
+            Elements.stack.innerHTML = "";            
+        }
+
+    } else {
+        // enabled selected ctx, update frontend
+        let diff_ctx = ctx_list.filter(item => !prev_ctx_list.includes(item))[0];
+        if (diff_ctx == cur_ctx) {
+            if (Module.lockSimulator(100)) {
+                updateStdOut(cur_ctx);
+                updateStdErr(cur_ctx);
+                RegisterUtils.init(cur_ctx);
+                MemoryUtils.init(cur_ctx);
+                InstructionUtils.update(cur_ctx);
+
+                Module.unlockSimulator();
+            }
+        }
+
+    }
+    prev_ctx_list = ctx_list.slice();
+}
+
 async function changeContext(ctx) {
+
+    var ctx_enabled = false;
+    if (ctx == 0) ctx_enabled = document.getElementById("context-enabler0").checked;
+    else if (ctx == 1) ctx_enabled = document.getElementById("context-enabler1").checked;
+
+    // If the ctx is not enabled, clean the front end
+    if (!ctx_enabled) {
+        // Output 
+        Elements.output.innerHTML = "";
+        Elements.log.innerHTML = "";
+
+        // Reg
+        Elements.generalReg.innerHTML = "";
+        Elements.specialReg.innerHTML = "";
+        Elements.floatReg.innerHTML = "";
+        Elements.doubleReg.innerHTML = "";
+
+        // Insn
+        Elements.userTextContent.innerHTML = "";
+        Elements.kernelTextContent.innerHTML = "";
+        Elements.kernelTextContainer.innerHTML = "";
+
+        // Mem
+        Elements.userData.innerHTML = "";
+        Elements.kernelData.innerHTML = "";
+        Elements.kernelDataContainer.innerHTML = "";
+        Elements.stack.innerHTML = "";
+    }
+
     console.log("change ctx from ", Execution.ctx, " to ", ctx);
     Execution.ctx = ctx;
     console.log("current ctx: ", Execution.ctx);
 
     // Module.pause();
     // Execution.playing = false;
     // Elements.playButton.innerHTML = "Continue";
-    if (Module.lockSimulator(100)) {
+
+
+    if (ctx_enabled && Module.lockSimulator(100)) {
         updateStdOut(Execution.ctx);
         updateStdErr(Execution.ctx);
         // RegisterUtils.update(Execution.ctx);

spim/spim.cpp

@@ -259,13 +259,30 @@ val getSpecialRegVals(int ctx) {
   return val(typed_memory_view(9, specialRegs));
 }
 
-void reset_sim() { // unsigned int max_contexts, val active_contexts) {
+// void reset_sim() { // unsigned int max_contexts, val active_contexts) {
+//     /* std::vector<unsigned int> arr = emscripten::vecFromJSArray<unsigned int>(active_contexts); */
+//     /* std::set<unsigned int> s(arr.begin(), arr.end()); */
+//     /* std::set<unsigned int> s({0, 1}); */
+
+//     /* reset(2, s); */
+//     start_simulator(2, std::set<unsigned int>{0, 1});
+// }
+
+
+void reset_sim(unsigned int max_contexts, const emscripten::val& arr) { // unsigned int max_contexts, val active_contexts) {
     /* std::vector<unsigned int> arr = emscripten::vecFromJSArray<unsigned int>(active_contexts); */
     /* std::set<unsigned int> s(arr.begin(), arr.end()); */
     /* std::set<unsigned int> s({0, 1}); */
+    std::set<unsigned int> ctx_set;
+
+    for (size_t i = 0; i < arr["length"].as<size_t>(); i++) {
+        ctx_set.insert(arr[i].as<unsigned int>());
+    }
 
     /* reset(2, s); */
-    start_simulator(2, std::set<unsigned int>{0, 1});
+    // start_simulator(max_contexts, std::set<unsigned int>{0, 1});
+    start_simulator(max_contexts, ctx_set);
+
 }
 
 EMSCRIPTEN_BINDINGS(simulationSettings) { function("setDelay", &setDelay); }