Skip to content

Rework how dangerous nodes are handled #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TarCV wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Rework how dangerous nodes are handled #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
124d0b1
Update to latest Kotlin
TarCV Apr 18, 2020
1bf2c11
Bot commands should not be converted to literal nodes
TarCV Apr 18, 2020
9bc2c2f
Inline LiteralNode-like dangerous nodes
TarCV Apr 19, 2020
c935a66
Also allow inlines when all arguments are known
TarCV Apr 19, 2020
be4c48a
Refactor hasNonStackDeps property
TarCV Apr 20, 2020
7787ea5
Rework how dangerous nodes are handled
TarCV Apr 20, 2020
079ad2c
Avoid double semicolons
TarCV Apr 20, 2020
52a9b70
Reenable convertNodeToText assertions
TarCV Apr 21, 2020
801d1ca
Fix tests and hasNonStackDeps for If*GotoNodes
TarCV Apr 22, 2020
a10bf77
Merge branch 'master' of github.com:TarCV/debotc into detect-stack-er…
TarCV Apr 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/commonMain/kotlin/com/github/tarcv/zandronum/debotc/BotCommand.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.github.tarcv.zandronum.debotc

import com.github.tarcv.zandronum.debotc.BaseNode.HasNonStackDeps.NON_STACK_DEPS
import com.github.tarcv.zandronum.debotc.BotCommandReturnType.*
import com.github.tarcv.zandronum.debotc.StackChangingNode.AddsTo.*
import com.github.tarcv.zandronum.debotc.StackChangingNode.ArgumentHolder
Expand Down Expand Up @@ -124,7 +125,7 @@ enum class BotCommand(
RETURNVAL_VOID -> DONT_PUSHES_TO_STACK
}

return FunctionNode(readableName, args, addsTo)
return FunctionNode(readableName, args, addsTo, NON_STACK_DEPS)
}
}

Expand Down
114 changes: 69 additions & 45 deletions src/commonMain/kotlin/com/github/tarcv/zandronum/debotc/DataHeaders.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.github.tarcv.zandronum.debotc

import com.github.tarcv.zandronum.debotc.BaseNode.HasNonStackDeps.NON_STACK_DEPS
import com.github.tarcv.zandronum.debotc.StackChangingNode.AddsTo.*
import com.github.tarcv.zandronum.debotc.StackChangingNode.ArgumentHolder.Companion.createNormalStackArgument
import com.github.tarcv.zandronum.debotc.StackChangingNode.Companion.consumesNormalStack
Expand Down Expand Up @@ -235,85 +236,113 @@ enum class DataHeaders(requiredArgs: Int = 0)
DH_ASSIGNGLOBALVAR(1) {
override fun processAndCreateNode(command: Command, vmState: VmState): BaseNode {
vmState.defineGlobalVariable(command.arguments[0])
return CustomStackConsumingNode(1, DONT_PUSHES_TO_STACK) { stackArgs -> "\$global${command.arguments[0]} = ${stackArgs[0]};" }
return CustomStackConsumingNode(1, DONT_PUSHES_TO_STACK, NON_STACK_DEPS) { stackArgs ->
"\$global${command.arguments[0]} = ${stackArgs[0]}"
}
}
},
DH_ADDGLOBALVAR(1) {
override fun processAndCreateNode(command: Command, vmState: VmState): BaseNode {
vmState.defineGlobalVariable(command.arguments[0])
return CustomStackConsumingNode(1, DONT_PUSHES_TO_STACK) { stackArgs -> "\$global${command.arguments[0]} += ${stackArgs[0]};" }
return CustomStackConsumingNode(1, DONT_PUSHES_TO_STACK, NON_STACK_DEPS) { stackArgs ->
"\$global${command.arguments[0]} += ${stackArgs[0]}"
}
}
},
DH_SUBGLOBALVAR(1) {
override fun processAndCreateNode(command: Command, vmState: VmState): BaseNode {
vmState.defineGlobalVariable(command.arguments[0])
return CustomStackConsumingNode(1, DONT_PUSHES_TO_STACK) { stackArgs -> "\$global${command.arguments[0]} -= ${stackArgs[0]};" }
return CustomStackConsumingNode(1, DONT_PUSHES_TO_STACK, NON_STACK_DEPS) { stackArgs ->
"\$global${command.arguments[0]} -= ${stackArgs[0]}"
}
}
},
DH_MULGLOBALVAR(1) {
override fun processAndCreateNode(command: Command, vmState: VmState): BaseNode {
vmState.defineGlobalVariable(command.arguments[0])
return CustomStackConsumingNode(1, DONT_PUSHES_TO_STACK) { stackArgs -> "\$global${command.arguments[0]} *= ${stackArgs[0]};" }
return CustomStackConsumingNode(1, DONT_PUSHES_TO_STACK, NON_STACK_DEPS) { stackArgs ->
"\$global${command.arguments[0]} *= ${stackArgs[0]}"
}
}
},
DH_DIVGLOBALVAR(1) {
override fun processAndCreateNode(command: Command, vmState: VmState): BaseNode {
vmState.defineGlobalVariable(command.arguments[0])
return CustomStackConsumingNode(1, DONT_PUSHES_TO_STACK) { stackArgs -> "\$global${command.arguments[0]} /= ${stackArgs[0]};" }
return CustomStackConsumingNode(1, DONT_PUSHES_TO_STACK, NON_STACK_DEPS) { stackArgs ->
"\$global${command.arguments[0]} /= ${stackArgs[0]}"
}
}
},
DH_MODGLOBALVAR(1) {
override fun processAndCreateNode(command: Command, vmState: VmState): BaseNode {
vmState.defineGlobalVariable(command.arguments[0])
return CustomStackConsumingNode(1, DONT_PUSHES_TO_STACK) { stackArgs -> "\$global${command.arguments[0]} %= ${stackArgs[0]};" }
return CustomStackConsumingNode(1, DONT_PUSHES_TO_STACK, NON_STACK_DEPS) { stackArgs ->
"\$global${command.arguments[0]} %= ${stackArgs[0]}"
}
}
},
DH_INCLOCALVAR(1) {
override fun processAndCreateNode(command: Command, vmState: VmState): BaseNode {
vmState.defineStateVariable(command.arguments[0])
return CustomStackConsumingNode(0, DONT_PUSHES_TO_STACK) { "\$local${command.arguments[0]}++;" }
return CustomStackConsumingNode(0, DONT_PUSHES_TO_STACK, NON_STACK_DEPS) {
"\$local${command.arguments[0]}++"
}
}
},
DH_DECLOCALVAR(1) {
override fun processAndCreateNode(command: Command, vmState: VmState): BaseNode {
vmState.defineStateVariable(command.arguments[0])
return CustomStackConsumingNode(0, DONT_PUSHES_TO_STACK) { "\$local${command.arguments[0]}--;" }
return CustomStackConsumingNode(0, DONT_PUSHES_TO_STACK, NON_STACK_DEPS) {
"\$local${command.arguments[0]}--"
}
}
},
DH_ASSIGNLOCALVAR(1) {
override fun processAndCreateNode(command: Command, vmState: VmState): BaseNode {
vmState.defineStateVariable(command.arguments[0])
return CustomStackConsumingNode(1, DONT_PUSHES_TO_STACK) { stackArgs -> "\$local${command.arguments[0]} = ${stackArgs[0]};" }
return CustomStackConsumingNode(1, DONT_PUSHES_TO_STACK, NON_STACK_DEPS) { stackArgs ->
"\$local${command.arguments[0]} = ${stackArgs[0]}"
}
}
},
DH_ADDLOCALVAR(1) {
override fun processAndCreateNode(command: Command, vmState: VmState): BaseNode {
vmState.defineStateVariable(command.arguments[0])
return CustomStackConsumingNode(1, DONT_PUSHES_TO_STACK) { stackArgs -> "\$local${command.arguments[0]} += ${stackArgs[0]};" }
return CustomStackConsumingNode(1, DONT_PUSHES_TO_STACK, NON_STACK_DEPS) { stackArgs ->
"\$local${command.arguments[0]} += ${stackArgs[0]}"
}
}
},
DH_SUBLOCALVAR(1) {
override fun processAndCreateNode(command: Command, vmState: VmState): BaseNode {
vmState.defineStateVariable(command.arguments[0])
return CustomStackConsumingNode(1, DONT_PUSHES_TO_STACK) { stackArgs -> "\$local${command.arguments[0]} -= ${stackArgs[0]};" }
return CustomStackConsumingNode(1, DONT_PUSHES_TO_STACK, NON_STACK_DEPS) { stackArgs ->
"\$local${command.arguments[0]} -= ${stackArgs[0]}"
}
}
},
DH_MULLOCALVAR(1) {
override fun processAndCreateNode(command: Command, vmState: VmState): BaseNode {
vmState.defineStateVariable(command.arguments[0])
return CustomStackConsumingNode(1, DONT_PUSHES_TO_STACK) { stackArgs -> "\$local${command.arguments[0]} *= ${stackArgs[0]};" }
return CustomStackConsumingNode(1, DONT_PUSHES_TO_STACK, NON_STACK_DEPS) { stackArgs ->
"\$local${command.arguments[0]} *= ${stackArgs[0]}"
}
}
},
DH_DIVLOCALVAR(1) {
override fun processAndCreateNode(command: Command, vmState: VmState): BaseNode {
vmState.defineStateVariable(command.arguments[0])
return CustomStackConsumingNode(1, DONT_PUSHES_TO_STACK) { stackArgs -> "\$local${command.arguments[0]} /= ${stackArgs[0]};" }
return CustomStackConsumingNode(1, DONT_PUSHES_TO_STACK, NON_STACK_DEPS) { stackArgs ->
"\$local${command.arguments[0]} /= ${stackArgs[0]}"
}
}
},
DH_MODLOCALVAR(1) {
override fun processAndCreateNode(command: Command, vmState: VmState): BaseNode {
vmState.defineStateVariable(command.arguments[0])
return CustomStackConsumingNode(1, DONT_PUSHES_TO_STACK) { stackArgs -> "\$local${command.arguments[0]} %= ${stackArgs[0]};" }
return CustomStackConsumingNode(1, DONT_PUSHES_TO_STACK, NON_STACK_DEPS) { stackArgs ->
"\$local${command.arguments[0]} %= ${stackArgs[0]}"
}
}
},
DH_CASEGOTO(2) {
Expand All @@ -332,64 +361,64 @@ enum class DataHeaders(requiredArgs: Int = 0)
},
DH_INCGLOBALARRAY(1) {
override fun processAndCreateNode(command: Command, vmState: VmState): BaseNode {
return CustomStackConsumingNode(1, DONT_PUSHES_TO_STACK) { stackArgs ->
return CustomStackConsumingNode(1, DONT_PUSHES_TO_STACK, NON_STACK_DEPS) { stackArgs ->
vmState.defineGlobalArray(command.arguments[0])
"\$globalArray${command.arguments[0]}[${stackArgs[0]}]++;"
"\$globalArray${command.arguments[0]}[${stackArgs[0]}]++"
}
}
},
DH_DECGLOBALARRAY(1) {
override fun processAndCreateNode(command: Command, vmState: VmState): BaseNode {
return CustomStackConsumingNode(1, DONT_PUSHES_TO_STACK) { stackArgs ->
return CustomStackConsumingNode(1, DONT_PUSHES_TO_STACK, NON_STACK_DEPS) { stackArgs ->
vmState.defineGlobalArray(command.arguments[0])
"\$globalArray${command.arguments[0]}[${stackArgs[0]}]--;" }
"\$globalArray${command.arguments[0]}[${stackArgs[0]}]--" }
}
},
DH_ASSIGNGLOBALARRAY(1) {
override fun processAndCreateNode(command: Command, vmState: VmState): BaseNode {
return CustomStackConsumingNode(2, DONT_PUSHES_TO_STACK) { stackArgs ->
return CustomStackConsumingNode(2, DONT_PUSHES_TO_STACK, NON_STACK_DEPS) { stackArgs ->
vmState.defineGlobalArray(command.arguments[0])
"\$globalArray${command.arguments[0]}[${stackArgs[0]}] = ${stackArgs[1]};" }
"\$globalArray${command.arguments[0]}[${stackArgs[0]}] = ${stackArgs[1]}" }
}
},
DH_ADDGLOBALARRAY(1) {
override fun processAndCreateNode(command: Command, vmState: VmState): BaseNode {
return CustomStackConsumingNode(2, DONT_PUSHES_TO_STACK) { stackArgs ->
return CustomStackConsumingNode(2, DONT_PUSHES_TO_STACK, NON_STACK_DEPS) { stackArgs ->
vmState.defineGlobalArray(command.arguments[0])
"\$globalArray${command.arguments[0]}[${stackArgs[0]}] += ${stackArgs[1]};" }
"\$globalArray${command.arguments[0]}[${stackArgs[0]}] += ${stackArgs[1]}" }
}
},
DH_SUBGLOBALARRAY(1) {
override fun processAndCreateNode(command: Command, vmState: VmState): BaseNode {
return CustomStackConsumingNode(2, DONT_PUSHES_TO_STACK) { stackArgs ->
return CustomStackConsumingNode(2, DONT_PUSHES_TO_STACK, NON_STACK_DEPS) { stackArgs ->
vmState.defineGlobalArray(command.arguments[0])
"\$globalArray${command.arguments[0]}[${stackArgs[0]}] -= ${stackArgs[1]};" }
"\$globalArray${command.arguments[0]}[${stackArgs[0]}] -= ${stackArgs[1]}" }
}
},
DH_MULGLOBALARRAY(1) {
override fun processAndCreateNode(command: Command, vmState: VmState): BaseNode {
return CustomStackConsumingNode(2, DONT_PUSHES_TO_STACK) { stackArgs ->
return CustomStackConsumingNode(2, DONT_PUSHES_TO_STACK, NON_STACK_DEPS) { stackArgs ->
vmState.defineGlobalArray(command.arguments[0])
"\$globalArray${command.arguments[0]}[${stackArgs[0]}] *= ${stackArgs[1]};" }
"\$globalArray${command.arguments[0]}[${stackArgs[0]}] *= ${stackArgs[1]}" }
}
},
DH_DIVGLOBALARRAY(1) {
override fun processAndCreateNode(command: Command, vmState: VmState): BaseNode {
return CustomStackConsumingNode(2, DONT_PUSHES_TO_STACK) { stackArgs ->
return CustomStackConsumingNode(2, DONT_PUSHES_TO_STACK, NON_STACK_DEPS) { stackArgs ->
vmState.defineGlobalArray(command.arguments[0])
"\$globalArray${command.arguments[0]}[${stackArgs[0]}] /= ${stackArgs[1]};" }
"\$globalArray${command.arguments[0]}[${stackArgs[0]}] /= ${stackArgs[1]}" }
}
},
DH_MODGLOBALARRAY(1) {
override fun processAndCreateNode(command: Command, vmState: VmState): BaseNode {
return CustomStackConsumingNode(2, DONT_PUSHES_TO_STACK) { stackArgs ->
return CustomStackConsumingNode(2, DONT_PUSHES_TO_STACK, NON_STACK_DEPS) { stackArgs ->
vmState.defineGlobalArray(command.arguments[0])
"\$globalArray${command.arguments[0]}[${stackArgs[0]}] %= ${stackArgs[1]};" }
"\$globalArray${command.arguments[0]}[${stackArgs[0]}] %= ${stackArgs[1]}" }
}
},
DH_PUSHGLOBALARRAY(1) {
override fun processAndCreateNode(command: Command, vmState: VmState): BaseNode {
return CustomStackConsumingNode(1, ADDS_TO_NORMAL_STACK) { stackArgs ->
return CustomStackConsumingNode(1, ADDS_TO_NORMAL_STACK, NON_STACK_DEPS) { stackArgs ->
vmState.defineGlobalArray(command.arguments[0])
"\$globalArray${command.arguments[0]}[${stackArgs[0]}]" }
}
Expand All @@ -399,33 +428,28 @@ enum class DataHeaders(requiredArgs: Int = 0)
return object : StackChangingNode(
consumesNormalStack(2),
arrayOf(
ReturnPrototype(ADDS_TO_NORMAL_STACK, {arguments -> "${arguments[1]}"}),
ReturnPrototype(ADDS_TO_NORMAL_STACK, {arguments -> "${arguments[0]}"})
ReturnPrototype(ADDS_TO_NORMAL_STACK) { arguments -> "${arguments[1]}"},
ReturnPrototype(ADDS_TO_NORMAL_STACK) { arguments -> "${arguments[0]}"}
)
) {
override val asText: String
get() = "(swap last stack items)"
}
) {}
}
},
DH_DUP{
override fun processAndCreateNode(command: Command, vmState: VmState): BaseNode {
return object : StackChangingNode(
consumesNormalStack(1),
arrayOf(
ReturnPrototype(ADDS_TO_NORMAL_STACK, {arguments -> "${arguments[0]}"}),
ReturnPrototype(ADDS_TO_NORMAL_STACK, {arguments -> "${arguments[0]}"})
ReturnPrototype(ADDS_TO_NORMAL_STACK) { arguments -> "${arguments[0]}"},
ReturnPrototype(ADDS_TO_NORMAL_STACK) { arguments -> "${arguments[0]}"}
)

) {
override val asText: String
get() = "(duplicate stack item)"
}
) {}
}
},
DH_ARRAYSET{
override fun processAndCreateNode(command: Command, vmState: VmState): BaseNode {
return FunctionNode("memset", consumesNormalStack(3), DONT_PUSHES_TO_STACK)
return FunctionNode("memset", consumesNormalStack(3), DONT_PUSHES_TO_STACK,
NON_STACK_DEPS)
}
},

Expand All @@ -439,5 +463,5 @@ enum class DataHeaders(requiredArgs: Int = 0)
}

private fun dropFromStack(): BaseNode {
return DropStackNode("// item dropped from stack")
return DropStackNode()
}
Loading