GabrielTofvesson/Microcode
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for switching between program-memory and micro-memory

Browse Source
This commit is contained in:
GabrielTofvesson 2019-04-08 22:03:33 +02:00
parent b240f29efa
commit cdc60b86d1
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
weaver.kt
View File

@ -103,7 +103,7 @@ class MachineState {
} }
} }
inline fun error(message: String){ fun error(message: String){
System.err.println(message) System.err.println(message)
println("Usage:\n\tkotlin WeaverKt [machineCodeFile] [outputFile]\nor\n\tkotlin WeaverKt [machineCodeFile] [inputState] [outputFile]") println("Usage:\n\tkotlin WeaverKt [machineCodeFile] [outputFile]\nor\n\tkotlin WeaverKt [machineCodeFile] [inputState] [outputFile]")
System.exit(1) System.exit(1)
@ -129,31 +129,39 @@ fun main(args: Array<String>){
} }
val weaveData = weaveFile.readText().replace("\r", "").split("\n").toTypedArray() val weaveData = weaveFile.readText().replace("\r", "").split("\n").toTypedArray()
var index = 0
var weaveUCode = false var weaveUCode = false
var pIndex = 0
var uIndex = 0
fun index()= if(weaveUCode) uIndex else pIndex
fun iIdx() {
if(weaveUCode) ++uIndex
else ++pIndex
}
fun sIdx(value: Int){
if(weaveUCode) uIndex = value
else pIndex = value
}
for(rawValue in weaveData){ for(rawValue in weaveData){
val value = rawValue.replace(" ", "").replace("\t", "") val value = rawValue.replace(" ", "").replace("\t", "")
if(value.length == 0 || value.startsWith("#")) continue if(value.length == 0 || value.startsWith("#")) continue
else if((weaveUCode && index >= state.microMemory.size) || (!weaveUCode && index >= state.programMemory.size)) error("Program memory out of bounds! Did you pass too much data?") else if((weaveUCode && index() >= state.microMemory.size) || (!weaveUCode && index() >= state.programMemory.size)) error("Program memory out of bounds! Did you pass too much data?")
else if(value.startsWith("@")){ else if(value.startsWith("@")){
if(value == "@u"){ if(value == "@u") weaveUCode = true
weaveUCode = true else if(value == "@p") weaveUCode = false
index = 0 else if(value.startsWith("@0x")) sIdx(Integer.parseInt(value.substring(3), 16))
else sIdx(Integer.parseInt(value.substring(1), 10))
} continue
else if(value.startsWith("@0x")) index = Integer.parseInt(value.substring(3), 16)
else index = Integer.parseInt(value.substring(1), 10)
--index
} }
else if((weaveUCode && value.length != 7) || (!weaveUCode && value.length != 4)) error("Cannot weave data of bad length: $value") else if((weaveUCode && value.length != 7) || (!weaveUCode && value.length != 4)) error("Cannot weave data of bad length: $value")
else try{ else try{
if(weaveUCode) state.microMemory[index] = Integer.parseInt(value, 16) if(weaveUCode) state.microMemory[index()] = Integer.parseInt(value, 16)
else state.programMemory[index] = Integer.parseInt(value, 16).toShort() else state.programMemory[index()] = Integer.parseInt(value, 16).toShort()
}catch(e: NumberFormatException){ }catch(e: NumberFormatException){
error("Cannot weave non-hex data: $value") error("Cannot weave non-hex data: $value")
} }
++index iIdx()
} }
val outputFile = if(args.size == 3) File(args[2]) else File(args[1]) val outputFile = if(args.size == 3) File(args[2]) else File(args[1])