curioustorvald/tsvm
1
0
Fork 0
mirror of https://github.com/curioustorvald/tsvm.git synced 2026-06-09 22:54:03 +09:00
Code Issues Packages Projects Releases Wiki Activity

more meaningful init() of the vm

Browse Source
This commit is contained in:
minjaesong
2022-10-29 01:50:34 +09:00
parent d576382567
commit 889df7a593
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tsvm_core/src/net/torvald/tsvm/VM.kt
View File

@@ -75,8 +75,6 @@ class VM(
// MMIO_SIZE.toInt() - 256, // MMIO_SIZE.toInt() - 256,
// 64 // 64
) )
init()
} }
fun killAllContexts() { fun killAllContexts() {

BIN
tsvm_executable/src/net/torvald/terrarum/imagefont/font.tga LFS
View File

Binary file not shown.

6
tsvm_executable/src/net/torvald/tsvm/ProfilesMenu.kt
View File

@@ -52,8 +52,8 @@ class ProfilesMenu(parent: VMEmuExecutable, x: Int, y: Int, w: Int, h: Int) : Em
val isVMrunning = if (theVM != null) !theVM.disposed && theVM.startTime >= 0 else false val isVMrunning = if (theVM != null) !theVM.disposed && theVM.startTime >= 0 else false
val vmViewport = parent.getViewportForTheVM(theVM) val vmViewport = parent.getViewportForTheVM(theVM)
val vmRunStatusText = if (isVMrunning) "Running" else "Idle" val vmRunStatusText = if (isVMrunning) "\u00D2\u00D3" else "\u00D0\u00D1"
val vmViewportText = if (vmViewport != null) "on viewport #${vmViewport+1}" else "hidden" val vmViewportText = if (vmViewport != null) "on viewport #${vmViewport+1}" else "and hidden"
batch.color = colBack batch.color = colBack
it.fillRect(10, 11 + i*2*FONT.H, 228, 26) it.fillRect(10, 11 + i*2*FONT.H, 228, 26)
@@ -61,7 +61,7 @@ class ProfilesMenu(parent: VMEmuExecutable, x: Int, y: Int, w: Int, h: Int) : Em
batch.color = colFore batch.color = colFore
FONT.draw(batch, profileNames[index], 12f, 11f + i*2*FONT.H) FONT.draw(batch, profileNames[index], 12f, 11f + i*2*FONT.H)
batch.color = EmulatorGuiToolkit.Theme.COL_ACTIVE3 batch.color = EmulatorGuiToolkit.Theme.COL_ACTIVE3
FONT.draw(batch, "$vmRunStatusText, $vmViewportText", 12f, 11f+FONT.H + i*2*FONT.H) FONT.draw(batch, "$vmRunStatusText $vmViewportText", 12f, 11f+FONT.H + i*2*FONT.H)
} }

2
tsvm_executable/src/net/torvald/tsvm/VMEmuExecutable.kt
View File

@@ -189,6 +189,8 @@ class VMEmuExecutable(val windowWidth: Int, val windowHeight: Int, var panelsX:
} }
private fun initVMenv(vm: VM) { private fun initVMenv(vm: VM) {
vm.init()
vm.peripheralTable.getOrNull(1)?.peripheral?.dispose() vm.peripheralTable.getOrNull(1)?.peripheral?.dispose()
val gpu = ReferenceGraphicsAdapter2("./assets", vm) val gpu = ReferenceGraphicsAdapter2("./assets", vm)