fluencelabs/asmble
1
0
Fork 0
mirror of https://github.com/fluencelabs/asmble synced 2025-04-25 14:52:21 +00:00
Code Issues Projects Releases Wiki Activity

Minor cleanup of fix #4 for stack injection

Browse Source
This commit is contained in:
Chad Retz 2017-04-23 18:04:12 -05:00
parent 7cffd74670
commit 706c76a5cd
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/kotlin/asmble/compile/jvm/InsnReworker.kt
View File

@ -120,8 +120,7 @@ open class InsnReworker {
var insideOfBlocks = 0 var insideOfBlocks = 0
for ((amountChanged, insnIndex) in stackManips.asReversed()) { for ((amountChanged, insnIndex) in stackManips.asReversed()) {
// We have to skip inner blocks because we don't want to inject inside of there // We have to skip inner blocks because we don't want to inject inside of there
val isEnd = insns[insnIndex] == Node.Instr.End if (insns[insnIndex] == Node.Instr.End) {
if (isEnd) {
insideOfBlocks++ insideOfBlocks++
ctx.trace { "Found end, not injecting until before $insideOfBlocks more block start(s)" } ctx.trace { "Found end, not injecting until before $insideOfBlocks more block start(s)" }
continue continue
@ -130,15 +129,16 @@ open class InsnReworker {
// When we reach the top of a block, we need to decrement out inside count and // When we reach the top of a block, we need to decrement out inside count and
// if we are at 0, add the result of said block if necessary to the count. // if we are at 0, add the result of said block if necessary to the count.
if (insideOfBlocks > 0) { if (insideOfBlocks > 0) {
val (isBlock, blockStackDiff) = insns[insnIndex].let { // If it's not a block, just ignore it
val blockStackDiff = insns[insnIndex].let {
when (it) { when (it) {
is Node.Instr.Block -> true to if (it.type == null) 0 else 1 is Node.Instr.Block -> if (it.type == null) 0 else 1
is Node.Instr.Loop -> true to 0 is Node.Instr.Loop -> 0
is Node.Instr.If -> true to if (it.type == null) -1 else 0 is Node.Instr.If -> if (it.type == null) -1 else 0
else -> false to 0 else -> null
} }
} }
if (isBlock) { if (blockStackDiff != null) {
insideOfBlocks-- insideOfBlocks--
ctx.trace { "Found block begin, number of blocks we're still inside: $insideOfBlocks" } ctx.trace { "Found block begin, number of blocks we're still inside: $insideOfBlocks" }
// We're back on our block, change the count // We're back on our block, change the count