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

load profiles from json WIP

Browse Source
This commit is contained in:
minjaesong
2022-10-25 14:39:47 +09:00
parent b5b3be772e
commit 22472e6103
5 changed files with 98 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@ class VM(
val assetsDir: String,
_memsize: Long,
val worldInterface: WorldInterface,
val roms: Array<VMProgramRom?>, // first ROM must contain the BIOS
val roms: Array<VMProgramRom>, // first ROM must contain the BIOS
_peripheralSlots: Int = 8,
) {
@@ -71,9 +71,9 @@ class VM(
peripheralTable[0] = PeripheralEntry(
IOSpace(this),
HW_RESERVE_SIZE,
MMIO_SIZE.toInt() - 256,
64
// HW_RESERVE_SIZE,
// MMIO_SIZE.toInt() - 256,
// 64
)
init()
@@ -231,9 +231,9 @@ class VM(
class PeripheralEntry(
val peripheral: PeriBase? = null,
val memsize: Long = 0,
val mmioSize: Int = 0,
val interruptCount: Int = 0, // max: 4
// val memsize: Long = 0,
// val mmioSize: Int = 0,
// val interruptCount: Int = 0, // max: 4
) {
val type = peripheral?.typestring
}

6
tsvm_core/src/net/torvald/tsvm/vdc/V2kRunTest.kt
View File

@@ -33,9 +33,9 @@ class V2kRunTest : ApplicationAdapter() {
vm.peripheralTable[1] = PeripheralEntry(
gpu,
GraphicsAdapter.VRAM_SIZE,
16,
0
// GraphicsAdapter.VRAM_SIZE,
// 16,
// 0
)
batch = SpriteBatch()

6
tsvm_executable/src/net/torvald/tsvm/AppLoader.java
View File

@@ -14,8 +14,8 @@ public class AppLoader {
public static String appTitle = "tsvm";
public static Lwjgl3ApplicationConfiguration appConfig;
public static int WIDTH = 1280;//1080;//640;
public static int HEIGHT = 960;//436;//480;
public static int WIDTH = 1080;//640;
public static int HEIGHT = 436;//480;
public static void main(String[] args) {
ShaderProgram.pedantic = false;
@@ -62,6 +62,6 @@ public class AppLoader {
pipvm, 160, 140
))));*/
new Lwjgl3Application(new VMGUI(reference, 640, 480), appConfig);
new Lwjgl3Application(new VMGUI(portable, WIDTH, HEIGHT), appConfig);
}
}

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

@@ -4,6 +4,7 @@ import com.badlogic.gdx.ApplicationAdapter
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.graphics.*
import com.badlogic.gdx.graphics.g2d.SpriteBatch
import com.badlogic.gdx.utils.JsonValue
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.Job
import kotlinx.coroutines.cancel
@@ -12,10 +13,7 @@ import net.torvald.terrarum.FlippingSpriteBatch
import net.torvald.terrarum.imagefont.TinyAlphNum
import net.torvald.tsvm.VMEmuExecutableWrapper.Companion.FONT
import net.torvald.tsvm.VMEmuExecutableWrapper.Companion.SQTEX
import net.torvald.tsvm.peripheral.GraphicsAdapter
import net.torvald.tsvm.peripheral.ReferenceGraphicsAdapter2
import net.torvald.tsvm.peripheral.TestDiskDrive
import net.torvald.tsvm.peripheral.TsvmBios
import net.torvald.tsvm.peripheral.*
import java.io.File
import java.util.*
@@ -87,11 +85,11 @@ class VMEmuExecutable(val windowWidth: Int, val windowHeight: Int, var panelsX:
override fun create() {
super.create()
updateFullscreenQuad(AppLoader.WIDTH, AppLoader.HEIGHT)
updateFullscreenQuad(TsvmEmulator.WIDTH, TsvmEmulator.HEIGHT)
batch = SpriteBatch()
fbatch = FlippingSpriteBatch()
camera = OrthographicCamera(AppLoader.WIDTH.toFloat(), AppLoader.HEIGHT.toFloat())
camera = OrthographicCamera(TsvmEmulator.WIDTH.toFloat(), TsvmEmulator.HEIGHT.toFloat())
camera.setToOrtho(true)
camera.update()
batch.projectionMatrix = camera.combined
@@ -128,7 +126,7 @@ class VMEmuExecutable(val windowWidth: Int, val windowHeight: Int, var panelsX:
vm.peripheralTable.getOrNull(1)?.peripheral?.dispose()
val gpu = ReferenceGraphicsAdapter2("./assets", vm)
vm.peripheralTable[1] = PeripheralEntry(gpu, GraphicsAdapter.VRAM_SIZE, 16, 0)
vm.peripheralTable[1] = PeripheralEntry(gpu)//, GraphicsAdapter.VRAM_SIZE, 16, 0)
vm.getPrintStream = { gpu.getPrintStream() }
vm.getErrorStream = { gpu.getErrorStream() }
@@ -139,7 +137,7 @@ class VMEmuExecutable(val windowWidth: Int, val windowHeight: Int, var panelsX:
}
private fun setCameraPosition(newX: Float, newY: Float) {
camera.position.set((-newX + AppLoader.WIDTH / 2), (-newY + AppLoader.HEIGHT / 2), 0f) // deliberate integer division
camera.position.set((-newX + TsvmEmulator.WIDTH / 2), (-newY + TsvmEmulator.HEIGHT / 2), 0f) // deliberate integer division
camera.update()
batch.projectionMatrix = camera.combined
fbatch.projectionMatrix = camera.combined
@@ -371,8 +369,81 @@ class VMEmuExecutable(val windowWidth: Int, val windowHeight: Int, var panelsX:
// actually update the view within the tabs
tabs[menuTabSel].update()
}
/**
* - changing card1 does nothing! -- right now the emulator does not support using a Display Adapter other than the stock one.
* - I still get a display when I missed the card1? -- card1 is substituted with the stock Display Adapter if the entry is missing.
*/
private val defaultProfile = """
"Initial VM": {
"assetsdir":"./assets",
"ramsize":8388608,
"cardslots":8,
"roms":["bios/tsvmbios.js"],
"com1":{"class":"net.torvald.tsvm.peripheral.TestDiskDrive", "args":[0, "disk0/"]},
"com2":{"class":"net.torvald.tsvm.peripheral.HttpModem", "args":[]},
"card4":{"class":"net.torvald.tsvm.peripheral.RamBank", "args":[256]}
}
""".trimIndent()
/**
* You'll want to further init the things using the VM this function returns, such as:
*
* ```
* makeVMfromJson(json.get(NAME)).let{
* initVMemv(it)
* vms[VIEWPORT_INDEX] = VMRunnerInfo(it, NAME)
* }
* ```
*/
private fun makeVMfromJson(json: JsonValue): VM {
val assetsDir = json.getString("assetsdir")
val ramsize = json.getLong("ramsize")
val cardslots = json.getInt("cardslots")
val roms = json.get("roms").iterator().map { VMProgramRom("$assetsDir/${it.asString()}") }.toTypedArray()
val vm = VM(assetsDir, ramsize, TheRealWorld(), roms, cardslots)
// install peripherals
listOf("com1", "com2", "com3", "com4").map { json.get(it) }.forEachIndexed { index, jsonValue ->
jsonValue?.let { deviceInfo ->
val className = deviceInfo.getString("class")
val loadedClass = Class.forName(className)
val argTypes = loadedClass.declaredConstructors[0].parameterTypes
val args = deviceInfo.get("args").allIntoJavaType(argTypes)
val loadedClassConstructor = loadedClass.getConstructor(*argTypes)
val loadedClassInstance = loadedClassConstructor.newInstance(vm, *args)
vm.getIO().blockTransferPorts[index].attachDevice(loadedClassInstance as BlockTransferInterface)
}
}
(2..cardslots).map { it to json.get("card$it") }.forEach { (index, jsonValue) ->
jsonValue?.let { deviceInfo ->
val className = deviceInfo.getString("class")
val loadedClass = Class.forName(className)
val argTypes = loadedClass.declaredConstructors[0].parameterTypes
val args = deviceInfo.get("args").allIntoJavaType(argTypes)
val loadedClassConstructor = loadedClass.getConstructor(*argTypes)
val loadedClassInstance = loadedClassConstructor.newInstance(vm, *args)
val peri = loadedClassInstance as PeriBase
vm.peripheralTable[index] = PeripheralEntry(
peri
)
}
}
return vm
}
private fun JsonValue.allIntoJavaType(argTypes: Array<Class<*>>?): Array<Any> {
TODO("Not yet implemented")
}
}
object EmulatorGuiToolkit {
object Theme {

12
tsvm_executable/src/net/torvald/tsvm/VMGUI.kt
View File

@@ -78,9 +78,9 @@ class VMGUI(val loaderInfo: EmulInstance, val viewportWidth: Int, val viewportHe
vm.peripheralTable[1] = PeripheralEntry(
gpu,
GraphicsAdapter.VRAM_SIZE,
16,
0
// GraphicsAdapter.VRAM_SIZE,
// 16,
// 0
)
vm.getPrintStream = { gpu!!.getPrintStream() }
@@ -102,9 +102,9 @@ class VMGUI(val loaderInfo: EmulInstance, val viewportWidth: Int, val viewportHe
vm.peripheralTable[port] = PeripheralEntry(
loadedClassInstance as PeriBase,
peri.memsize,
peri.mmioSize,
peri.interruptCount
// peri.memsize,
// peri.mmioSize,
// peri.interruptCount
)
}