From 07136a46d914e86796da5974cb39ebef84ed1d5f Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Sat, 24 Apr 2021 09:46:15 +0900
Subject: [PATCH] RESET button works now

---
 assets/bios/tandemport.js               |  2 +-
 src/net/torvald/tsvm/VMGUI.kt           | 14 +++++++-------
 src/net/torvald/tsvm/VMRunnerFactory.kt | 11 +++++++++--
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/assets/bios/tandemport.js b/assets/bios/tandemport.js
index b488a4b..09e8359 100644
--- a/assets/bios/tandemport.js
+++ b/assets/bios/tandemport.js
@@ -27,7 +27,7 @@ con.mvaddch(y+1,1+x*8+7-b,imgc[(imgh[y][x]>>b&1)<<1|imgl[y][x]>>b&1])
 con.move(8,1+(40-t.length>>1))
 print(t)
 // wait arbitrary time
-for (let b=0;b<system.maxmem()*10;b++) {
+for (let b=0;b<333333;b++) {
     sys.poke(0,(Math.random()*255)|0)
     sys.poke(0,0)
 }
diff --git a/src/net/torvald/tsvm/VMGUI.kt b/src/net/torvald/tsvm/VMGUI.kt
index 94319c6..1955eb0 100644
--- a/src/net/torvald/tsvm/VMGUI.kt
+++ b/src/net/torvald/tsvm/VMGUI.kt
@@ -54,6 +54,10 @@ class VMGUI(val loaderInfo: EmulInstance) : ApplicationAdapter() {
         batch.projectionMatrix = camera.combined
 
 
+        init()
+    }
+
+    private fun init() {
         val loadedClass = Class.forName(loaderInfo.display)
         val loadedClassConstructor = loadedClass.getConstructor(vm::class.java)
         val loadedClassInstance = loadedClassConstructor.newInstance(vm)
@@ -87,12 +91,11 @@ class VMGUI(val loaderInfo: EmulInstance) : ApplicationAdapter() {
     private var rebootRequested = false
 
     private fun reboot() {
+        vmRunner.close()
         coroutineJob.cancel("reboot requested")
 
-        vmRunner = VMRunnerFactory(vm, "js")
-        coroutineJob = GlobalScope.launch {
-            vmRunner.executeCommand(vm.roms[0]!!.readAll())
-        }
+        vm.init()
+        init()
     }
 
     private var updateAkku = 0.0
@@ -121,12 +124,9 @@ class VMGUI(val loaderInfo: EmulInstance) : ApplicationAdapter() {
         renderGame(dt)
     }
 
-    private var latch = true
-
     private fun updateGame(delta: Float) {
         if (!vm.resetDown && rebootRequested) {
             reboot()
-            vm.init()
             rebootRequested = false
         }
 
diff --git a/src/net/torvald/tsvm/VMRunnerFactory.kt b/src/net/torvald/tsvm/VMRunnerFactory.kt
index 900cb6c..a4af1f3 100644
--- a/src/net/torvald/tsvm/VMRunnerFactory.kt
+++ b/src/net/torvald/tsvm/VMRunnerFactory.kt
@@ -8,10 +8,9 @@ import java.io.FileReader
 import javax.script.ScriptEngineManager
 
 abstract class VMRunner(val extension: String) {
-
     abstract suspend fun executeCommand(command: String)
     abstract suspend fun evalGlobal(command: String)
-
+    abstract fun close()
 }
 
 object VMRunnerFactory {
@@ -41,6 +40,10 @@ object VMRunnerFactory {
                     override suspend fun evalGlobal(command: String) {
                         TODO("Not yet implemented")
                     }
+
+                    override fun close() {
+                        TODO("Not yet implemented")
+                    }
                 }
             }
             "js" -> {
@@ -84,6 +87,10 @@ object VMRunnerFactory {
                     override suspend fun evalGlobal(command: String) {
                         context.eval("js", "\"use strict\";" + sanitiseJS(command))
                     }
+
+                    override fun close() {
+                        context.close(true)
+                    }
                 }
             }
             else -> throw UnsupportedOperationException("Unsupported script extension: $extension")