Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2025-02-19 11:31:07 +00:00
Code Issues Projects Releases Wiki Activity

made stackvm source a bit more readable

Browse Source
This commit is contained in:
Irmen de Jong 2018-09-26 01:14:10 +02:00
parent 00baec12ab
commit 0f53f87895
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
compiler/src/prog8/stackvm/StackVm.kt
View File

@ -602,15 +602,23 @@ open class Instruction(val opcode: Opcode,
override fun toString(): String { override fun toString(): String {
val argStr = arg?.toString() ?: "" val argStr = arg?.toString() ?: ""
val opcodesWithVarArgument = setOf(
Opcode.INC_VAR, Opcode.DEC_VAR,
Opcode.SHR_VAR, Opcode.SHL_VAR, Opcode.ROL_VAR, Opcode.ROR_VAR,
Opcode.ROL2_VAR, Opcode.ROR2_VAR, Opcode.POP_VAR, Opcode.PUSH_VAR)
val result = val result =
when { when {
opcode==Opcode.LINE -> "_line ${arg!!.stringvalue}" opcode==Opcode.LINE -> "_line ${arg!!.stringvalue}"
opcode==Opcode.SYSCALL -> { opcode==Opcode.SYSCALL -> {
val syscall = Syscall.values().find { it.callNr==arg!!.numericValue() } val syscall = Syscall.values().find { it.callNr==arg!!.numericValue() }
"syscall $syscall" "syscall $syscall"
} }
callLabel==null -> "${opcode.toString().toLowerCase()} $argStr" opcodesWithVarArgument.contains(opcode) -> {
else -> "${opcode.toString().toLowerCase()} $callLabel $argStr" // opcodes that manipulate a variable
"${opcode.toString().toLowerCase()} ${argStr.substring(1, argStr.length-1)}"
}
callLabel==null -> "${opcode.toString().toLowerCase()} $argStr"
else -> "${opcode.toString().toLowerCase()} $callLabel $argStr"
} }
.trimEnd() .trimEnd()
@ -883,7 +891,7 @@ class Program (val name: String,
out.println("%variables") out.println("%variables")
for (variable in variables) { for (variable in variables) {
val valuestr = variable.value.toString() val valuestr = variable.value.toString()
out.println("${variable.key} ${variable.value.type.toString().toLowerCase()} $valuestr") out.println("${variable.key} ${variable.value.type.toString().toLowerCase()} $valuestr")
} }
out.println("%end_variables") out.println("%end_variables")
out.println("%instructions") out.println("%instructions")