Sancaros/phantasmal-world
1
0
Fork 0
mirror of https://github.com/DaanVandenBosch/phantasmal-world.git synced 2025-04-04 22:58:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added generic instruction argument visitor to ASM analyser.

Browse Source
This commit is contained in:
Daan Vanden Bosch 2021-04-26 20:56:34 +02:00
parent 1f3f888ea1
commit 2c6f9ba680
2 changed files with 92 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/src/commonMain/kotlin/world/phantasmal/lib/asm/BytecodeIr.kt
View File

@ -117,26 +117,23 @@ class Instruction(
*/ */
fun getArgs(paramIndex: Int): List<Arg> { fun getArgs(paramIndex: Int): List<Arg> {
if (paramToArgs == null) { if (paramToArgs == null) {
val paramToArgs: MutableList<MutableList<Arg>> = mutableListOf() val paramToArgs: MutableList<List<Arg>> = mutableListOf()
this.paramToArgs = paramToArgs this.paramToArgs = paramToArgs
if (opcode.stack !== StackInteraction.Pop) { if (opcode.stack !== StackInteraction.Pop) {
for (i in opcode.params.indices) { for (i in opcode.params.indices) {
val param = opcode.params[i] val param = opcode.params[i]
val pArgs = mutableListOf<Arg>()
paramToArgs.add(pArgs)
// Variable length arguments are always last, so we can just gobble up all // Variable length arguments are always last, so we can just gobble up all
// arguments from this point. // arguments from this point.
if (param.varargs) { val pArgs = if (param.varargs) {
check(i == opcode.params.lastIndex) check(i == opcode.params.lastIndex)
args.drop(i)
for (j in i until args.size) {
pArgs.add(args[j])
}
} else { } else {
pArgs.add(args[i]) listOfNotNull(args.getOrNull(i))
} }
paramToArgs.add(pArgs)
} }
} }
} }

129
web/assembly-worker/src/main/kotlin/world/phantasmal/web/assemblyWorker/AsmAnalyser.kt
View File

@ -264,12 +264,12 @@ class AsmAnalyser {
var result = emptyList<AsmRange>() var result = emptyList<AsmRange>()
getInstructionForSrcLoc(lineNo, col)?.inst?.let { inst -> getInstructionForSrcLoc(lineNo, col)?.inst?.let { inst ->
getLabelArguments( visitLabelArguments(
inst, inst,
doCheck = { argSrcLoc -> positionInside(lineNo, col, argSrcLoc.coarse) }, accept = { argSrcLoc -> positionInside(lineNo, col, argSrcLoc.coarse) },
processImmediateArg = { label, _ -> processImmediateArg = { label, _ ->
result = getLabelDefinitionsAndReferences(label, references = false) result = getLabelDefinitionsAndReferences(label, references = false)
false VisitAction.Return
}, },
processStackArg = { labels, _, _ -> processStackArg = { labels, _, _ ->
if (labels.size <= 5) { if (labels.size <= 5) {
@ -278,7 +278,7 @@ class AsmAnalyser {
} }
} }
false VisitAction.Return
}, },
) )
} }
@ -326,12 +326,12 @@ class AsmAnalyser {
} }
} }
} else { } else {
getLabelArguments( visitLabelArguments(
ir.inst, ir.inst,
doCheck = { argSrcLoc -> positionInside(lineNo, col, argSrcLoc.coarse) }, accept = { argSrcLoc -> positionInside(lineNo, col, argSrcLoc.coarse) },
processImmediateArg = { label, _ -> processImmediateArg = { label, _ ->
results.addAll(getLabelDefinitionsAndReferences(label)) results.addAll(getLabelDefinitionsAndReferences(label))
false VisitAction.Return
}, },
processStackArg = { labels, pushInst, _ -> processStackArg = { labels, pushInst, _ ->
// Filter out arg_pushr labels, because register values could be // Filter out arg_pushr labels, because register values could be
@ -343,7 +343,7 @@ class AsmAnalyser {
results.addAll(getLabelDefinitionsAndReferences(labels[0]!!)) results.addAll(getLabelDefinitionsAndReferences(labels[0]!!))
} }
false VisitAction.Return
}, },
) )
} }
@ -412,47 +412,90 @@ class AsmAnalyser {
} }
/** /**
* Returns all labels arguments of [instruction] with their value. * Visits all label arguments of [instruction] with their value.
*/ */
private fun getLabelArguments( private fun visitLabelArguments(
instruction: Instruction, instruction: Instruction,
doCheck: (ArgSrcLoc) -> Boolean, accept: (ArgSrcLoc) -> Boolean,
processImmediateArg: (label: Int, ArgSrcLoc) -> Boolean, processImmediateArg: (label: Int, ArgSrcLoc) -> VisitAction,
processStackArg: (label: ValueSet, Instruction?, ArgSrcLoc) -> Boolean, processStackArg: (label: ValueSet, Instruction?, ArgSrcLoc) -> VisitAction,
) {
visitArgs(
instruction,
processParam = { if (it.type is LabelType) VisitAction.Go else VisitAction.Continue },
processImmediateArg = { arg, srcLoc ->
if (accept(srcLoc)) {
processImmediateArg((arg as IntArg).value, srcLoc)
} else VisitAction.Continue
},
processStackArgSrcLoc = { srcLoc ->
if (accept(srcLoc)) VisitAction.Go
else VisitAction.Continue
},
processStackArg = { value, pushInst, srcLoc ->
processStackArg(value, pushInst, srcLoc)
}
)
}
private enum class VisitAction {
Go, Break, Continue, Return
}
/**
* Visits all arguments of [instruction], including stack arguments.
*/
private fun visitArgs(
instruction: Instruction,
processParam: (Param) -> VisitAction,
processImmediateArg: (Arg, ArgSrcLoc) -> VisitAction,
processStackArgSrcLoc: (ArgSrcLoc) -> VisitAction,
processStackArg: (ValueSet, Instruction?, ArgSrcLoc) -> VisitAction,
) { ) {
loop@
for ((paramIdx, param) in instruction.opcode.params.withIndex()) { for ((paramIdx, param) in instruction.opcode.params.withIndex()) {
if (param.type is LabelType) { when (processParam(param)) {
if (instruction.opcode.stack != StackInteraction.Pop) { VisitAction.Go -> Unit // Keep going.
// Immediate arguments. VisitAction.Break -> break // Same as Stop.
val args = instruction.getArgs(paramIdx) VisitAction.Continue -> continue
val argSrcLocs = instruction.getArgSrcLocs(paramIdx) VisitAction.Return -> return
}
for (i in 0 until min(args.size, argSrcLocs.size)) { if (instruction.opcode.stack !== StackInteraction.Pop) {
val arg = args[i] // Immediate arguments.
val srcLoc = argSrcLocs[i] val args = instruction.getArgs(paramIdx)
val argSrcLocs = instruction.getArgSrcLocs(paramIdx)
if (doCheck(srcLoc)) { for (i in 0 until min(args.size, argSrcLocs.size)) {
val label = (arg as IntArg).value val arg = args[i]
val srcLoc = argSrcLocs[i]
if (!processImmediateArg(label, srcLoc)) { when (processImmediateArg(arg, srcLoc)) {
break@loop VisitAction.Go -> Unit // Keep going.
} VisitAction.Break -> break
} VisitAction.Continue -> continue // Same as Down.
VisitAction.Return -> return
} }
} else { }
// Stack arguments. } else {
val argSrcLocs = instruction.getArgSrcLocs(paramIdx) // Stack arguments.
val argSrcLocs = instruction.getArgSrcLocs(paramIdx)
for ((i, srcLoc) in argSrcLocs.withIndex()) { for ((i, srcLoc) in argSrcLocs.withIndex()) {
if (doCheck(srcLoc)) { when (processStackArgSrcLoc(srcLoc)) {
val (labelValues, pushInstruction) = VisitAction.Go -> Unit // Keep going.
getStackValue(cfg, instruction, argSrcLocs.lastIndex - i) VisitAction.Break -> break
VisitAction.Continue -> continue
VisitAction.Return -> return
}
if (!processStackArg(labelValues, pushInstruction, srcLoc)) { val (labelValues, pushInstruction) =
break@loop getStackValue(cfg, instruction, argSrcLocs.lastIndex - i)
}
} when (processStackArg(labelValues, pushInstruction, srcLoc)) {
VisitAction.Go -> Unit // Keep going.
VisitAction.Break -> break
VisitAction.Continue -> continue // Same as Down.
VisitAction.Return -> return
} }
} }
} }
@ -493,15 +536,15 @@ class AsmAnalyser {
if (references) { if (references) {
if (segment is InstructionSegment) { if (segment is InstructionSegment) {
for (inst in segment.instructions) { for (inst in segment.instructions) {
getLabelArguments( visitLabelArguments(
inst, inst,
doCheck = { true }, accept = { true },
processImmediateArg = { labelArg, argSrcLoc -> processImmediateArg = { labelArg, argSrcLoc ->
if (labelArg == label) { if (labelArg == label) {
results.add(argSrcLoc.precise.toAsmRange()) results.add(argSrcLoc.precise.toAsmRange())
} }
true VisitAction.Go
}, },
processStackArg = { labelArg, pushInst, argSrcLoc -> processStackArg = { labelArg, pushInst, argSrcLoc ->
// Filter out arg_pushr labels, because register values could be // Filter out arg_pushr labels, because register values could be
@ -514,7 +557,7 @@ class AsmAnalyser {
results.add(argSrcLoc.precise.toAsmRange()) results.add(argSrcLoc.precise.toAsmRange())
} }
true VisitAction.Go
}, },
) )
} }