vm init/kill function is now public; restored mov player

assets/disk0/tvdos/bin/playmov.js

@@ -0,0 +1,211 @@
+
+let filename = exec_args[1]
+
+const FBUF_SIZE = 560*448
+const MAGIC = [0x1F, 0x54, 0x53, 0x56, 0x4D, 0x4D, 0x4F, 0x56]
+const port = _TVDOS.DRV.FS.SERIAL._toPorts("A")[0]
+
+println("Reading...")
+
+com.sendMessage(port, "DEVRST\x17")
+com.sendMessage(port, `OPENR"${filename}",1`)
+let statusCode = com.getStatusCode(port)
+
+if (statusCode != 0) {
+    printerrln(`No such file (${statusCode})`)
+    return statusCode
+}
+
+com.sendMessage(port, "READ")
+statusCode = com.getStatusCode(port)
+if (statusCode != 0) {
+    printerrln("READ failed with "+statusCode)
+    return statusCode
+}
+
+con.clear(); con.curs_set(0)
+
+let readCount = 0
+
+function readBytes(length) {
+    let ptr = sys.malloc(length)
+    let requiredBlocks = Math.floor((readCount + length) / 4096) - Math.floor(readCount / 4096)
+
+    let completedReads = 0
+
+    //serial.println(`readBytes(${length}); readCount = ${readCount}`)
+
+    for (let bc = 0; bc < requiredBlocks + 1; bc++) {
+        if (completedReads >= length) break
+
+        if (readCount % 4096 == 0) {
+            //serial.println("READ from serial")
+            // pull the actual message
+            sys.poke(-4093 - port, 6);sys.sleep(0) // spinning is required as Graal run is desynced with the Java side
+
+            let blockTransferStatus = ((sys.peek(-4085 - port*2) & 255) | ((sys.peek(-4086 - port*2) & 255) << 8))
+            let thisBlockLen = blockTransferStatus & 4095
+            if (thisBlockLen == 0) thisBlockLen = 4096 // [1, 4096]
+            let hasMore = (blockTransferStatus & 0x8000 != 0)
+
+
+            //serial.println(`block: (${thisBlockLen})[${[...Array(thisBlockLen).keys()].map(k => (sys.peek(-4097 - k) & 255).toString(16).padStart(2,'0')).join()}]`)
+
+            let remaining = Math.min(thisBlockLen, length - completedReads)
+
+            //serial.println(`Pulled a block (${thisBlockLen}); readCount = ${readCount}, completedReads = ${completedReads}, remaining = ${remaining}`)
+
+            // copy from read buffer to designated position
+            sys.memcpy(-4097, ptr + completedReads, remaining)
+
+            // increment readCount properly
+            readCount += remaining
+            completedReads += remaining
+        }
+        else {
+            let padding = readCount % 4096
+            let remaining = length - completedReads
+            let thisBlockLen = Math.min(4096 - padding, length - completedReads)
+
+            //serial.println(`padding = ${padding}; remaining = ${remaining}`)
+
+            //serial.println(`block: (${thisBlockLen})[${[...Array(thisBlockLen).keys()].map(k => (sys.peek(-4097 - padding - k) & 255).toString(16).padStart(2,'0')).join()}]`)
+
+            //serial.println(`Reusing a block (${thisBlockLen}); readCount = ${readCount}, completedReads = ${completedReads}`)
+
+            // copy from read buffer to designated position
+            sys.memcpy(-4097 - padding, ptr + completedReads, thisBlockLen)
+
+            // increment readCount properly
+            readCount += thisBlockLen
+            completedReads += thisBlockLen
+        }
+    }
+
+    //serial.println(`END readBytes(${length}); readCount = ${readCount}\n`)
+
+    return ptr
+}
+
+function readInt() {
+    let b = readBytes(4)
+    let i = (sys.peek(b) & 255) | ((sys.peek(b+1) & 255) << 8) | ((sys.peek(b+2) & 255) << 16) | ((sys.peek(b+3) & 255) << 24)
+
+    //serial.println(`readInt(); bytes: ${sys.peek(b)}, ${sys.peek(b+1)}, ${sys.peek(b+2)}, ${sys.peek(b+3)} = ${i}\n`)
+
+    sys.free(b)
+    return i
+}
+
+function readShort() {
+    let b = readBytes(2)
+    let i = (sys.peek(b) & 255) | ((sys.peek(b+1) & 255) << 8)
+
+    //serial.println(`readShort(); bytes: ${sys.peek(b)}, ${sys.peek(b+1)} = ${i}\n`)
+
+    sys.free(b)
+    return i
+}
+
+
+let magic = readBytes(8)
+let magicMatching = true
+
+// check if magic number matches
+MAGIC.forEach((b,i) => {
+    let testb = sys.peek(magic + i) & 255 // for some reason this must be located here
+    if (testb != b) {
+        magicMatching = false
+    }
+})
+sys.free(magic)
+if (!magicMatching) {
+    println("Not a movie file (MAGIC mismatch)")
+    return 1
+}
+
+
+let width = readShort()
+let height = readShort()
+let fps = readShort(); if (fps == 0) fps = 9999
+
+//fps = 9999
+
+let frameTime = 1.0 / fps
+let frameCount = readInt() % 16777216
+let type = readShort()
+sys.free(readBytes(12)) // skip 12 bytes
+let akku = frameTime
+let framesRendered = 0
+//serial.println(readCount) // must say 18
+//serial.println(`Dim: (${width}x${height}), FPS: ${fps}, Frames: ${frameCount}`)
+
+if (type != 4 && type != 5 && type != 260 && type != 261) {
+    printerrln("Not a type 4/5 mov")
+    return 1
+}
+
+let ipfbuf = sys.malloc(FBUF_SIZE)
+graphics.setGraphicsMode(4)
+
+let fb1 = sys.malloc(FBUF_SIZE)
+let fb2 = sys.malloc(FBUF_SIZE)
+
+let startTime = sys.nanoTime()
+
+let decodefun = (type > 255) ? graphics.decodeIpf2 : graphics.decodeIpf1
+let framesRead = 0
+let breakReadLoop = false
+
+while (framesRendered < frameCount && !breakReadLoop) {
+    let t1 = sys.nanoTime()
+
+    if (akku >= frameTime) {
+
+        let frameUnit = 0 // 0: no decode, 1: normal playback, 2+: skip (n-1) frames
+        while (akku >= frameTime) {
+            akku -= frameTime
+            frameUnit += 1
+        }
+        //frameUnit += 1 // forse set FPS to 9999, comment above WHILE loop and uncomment this line to perform benchmark...?
+
+        if (frameUnit != 0) {
+            // skip frames if necessary
+            while (frameUnit >= 1) {
+                let payloadLen = readInt()
+
+                if (framesRead >= frameCount) {
+                    breakReadLoop = true
+                    break
+                }
+
+                framesRead += 1
+                let gzippedPtr = readBytes(payloadLen)
+                framesRendered += 1
+
+                if (frameUnit == 1) {
+                    gzip.decompFromTo(gzippedPtr, payloadLen, ipfbuf) // should return FBUF_SIZE
+                    decodefun(ipfbuf, -1048577, -1310721, width, height, (type & 255) == 5)
+                }
+
+                sys.free(gzippedPtr)
+                frameUnit -= 1
+            }
+        }
+        else {
+            framesRendered += 1
+        }
+
+    }
+    sys.sleep(1)
+
+    let t2 = sys.nanoTime()
+    akku += (t2 - t1) / 1000000000.0
+}
+let endTime = sys.nanoTime()
+
+sys.free(ipfbuf)
+
+let timeTook = (endTime - startTime) / 1000000000.0
+
+//println(`Actual FPS: ${framesRendered / timeTook}`)

tsvm_core/src/net/torvald/tsvm/VMSetupBroker.kt

@@ -0,0 +1,64 @@
+package net.torvald.tsvm
+
+import com.badlogic.gdx.utils.GdxRuntimeException
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
+import net.torvald.tsvm.peripheral.GraphicsAdapter
+import net.torvald.tsvm.peripheral.ReferenceGraphicsAdapter2
+
+/**
+ * Created by minjaesong on 2022-12-15.
+ */
+object VMSetupBroker {
+
+    /**
+     * Standard function to start a VM.
+     *
+     * @param vm VM to initialise
+     * @param gpu Display device to attach
+     * @param vmRunners Hashmap on the host of VMs that holds the instances of the VMRunners for the given VM. Key: Int(VM's identifier), value: [net.torvald.tsvm.VMRunner]
+     * @param coroutineJobs Hashmap on the host of VMs that holds the coroutine-job object for the currently running VM-instance. Key: Int(VM's identifier), value: [kotlinx.coroutines.Job]
+     */
+    fun initVMenv(vm: VM, gpu: GraphicsAdapter, vmRunners: HashMap<Int, VMRunner>, coroutineJobs: HashMap<Int, Job>) {
+        vm.init()
+
+        try {
+            vm.peripheralTable.getOrNull(1)?.peripheral?.dispose()
+        }
+        catch (_: GdxRuntimeException) {} // pixmap already disposed
+
+        vm.peripheralTable[1] = PeripheralEntry(gpu)//, GraphicsAdapter.VRAM_SIZE, 16, 0)
+
+        vm.getPrintStream = { gpu.getPrintStream() }
+        vm.getErrorStream = { gpu.getErrorStream() }
+        vm.getInputStream = { gpu.getInputStream() }
+
+        vmRunners[vm.id] = VMRunnerFactory(vm.assetsDir, vm, "js")
+        coroutineJobs[vm.id] = GlobalScope.launch { vmRunners[vm.id]?.executeCommand(vm.roms[0]!!.readAll()) }
+    }
+
+    /**
+     * Standard function to stop a VM. The VM will be in "ready" state for the next initialisation.
+     *
+     * @param vm VM to initialise
+     * @param vmRunners Hashmap on the host of VMs that holds the instances of the VMRunners for the given VM. Key: Int(VM's identifier), value: [net.torvald.tsvm.VMRunner]
+     * @param coroutineJobs Hashmap on the host of VMs that holds the coroutine-job object for the currently running VM-instance. Key: Int(VM's identifier), value: [kotlinx.coroutines.Job]
+     */
+    fun killVMenv(vm: VM, vmRunners: HashMap<Int, VMRunner>, coroutineJobs: HashMap<Int, Job>) {
+        vm.park()
+
+        for (i in 1 until vm.peripheralTable.size) {
+            vm.peripheralTable[i].peripheral?.dispose()
+        }
+
+        vm.getPrintStream = { TODO() }
+        vm.getErrorStream = { TODO() }
+        vm.getInputStream = { TODO() }
+
+        vmRunners[vm.id]?.close()
+        coroutineJobs[vm.id]?.cancel("VM kill command received")
+    }
+
+}

tsvm_executable/src/net/torvald/tsvm/VMEmuExecutable.kt

@@ -191,37 +191,12 @@ class VMEmuExecutable(val windowWidth: Int, val windowHeight: Int, var panelsX:
     }
 
     internal fun initVMenv(vm: VM) {
-        vm.init()
-
-        try {
-            vm.peripheralTable.getOrNull(1)?.peripheral?.dispose()
-        }
-        catch (_: GdxRuntimeException) {}
-
         val gpu = ReferenceGraphicsAdapter2("./assets", vm)
-        vm.peripheralTable[1] = PeripheralEntry(gpu)//, GraphicsAdapter.VRAM_SIZE, 16, 0)
-
-        vm.getPrintStream = { gpu.getPrintStream() }
-        vm.getErrorStream = { gpu.getErrorStream() }
-        vm.getInputStream = { gpu.getInputStream() }
-
-        vmRunners[vm.id] = VMRunnerFactory(vm.assetsDir, vm, "js")
-        coroutineJobs[vm.id] = GlobalScope.launch { vmRunners[vm.id]?.executeCommand(vm.roms[0]!!.readAll()) }
+        VMSetupBroker.initVMenv(vm, gpu, vmRunners, coroutineJobs)
     }
 
     internal fun killVMenv(vm: VM) {
-        vm.park()
-
-        for (i in 1 until vm.peripheralTable.size) {
-            vm.peripheralTable[i].peripheral?.dispose()
-        }
-
-        vm.getPrintStream = { TODO() }
-        vm.getErrorStream = { TODO() }
-        vm.getInputStream = { TODO() }
-
-        vmRunners[vm.id]?.close()
-        coroutineJobs[vm.id]?.cancel("VM kill command received")
+        VMSetupBroker.killVMenv(vm, vmRunners, coroutineJobs)
     }
 
     private fun setCameraPosition(newX: Float, newY: Float) {