Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2024-07-05 22:29:04 +00:00
Code Issues Projects Releases Wiki Activity

ir: keep correct child node order in blocks

Browse Source
This commit is contained in:
Irmen de Jong 2022-11-24 01:19:15 +01:00
parent 7b6c742178
commit 483f313eda
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
codeGenIntermediate/src/prog8/codegen/intermediate/IRCodeGen.kt
View File

@ -180,14 +180,12 @@ class IRCodeGen(
private fun flattenNestedSubroutines() {
// this moves all nested subroutines up to the block scope.
// also changes the name to be the fully scoped one, so it becomes unique at the top level.
// also moves the start() entrypoint as first subroutine.
val flattenedSubs = mutableListOf<Pair<PtBlock, PtSub>>()
val flattenedAsmSubs = mutableListOf<Pair<PtBlock, PtAsmSub>>()
val removalsSubs = mutableListOf<Pair<PtSub, PtSub>>()
val removalsAsmSubs = mutableListOf<Pair<PtSub, PtAsmSub>>()
val renameSubs = mutableListOf<Pair<PtBlock, PtSub>>()
val renameAsmSubs = mutableListOf<Pair<PtBlock, PtAsmSub>>()
val entrypoint = program.entrypoint()
fun flattenNestedAsmSub(block: PtBlock, parentSub: PtSub, asmsub: PtAsmSub) {
val flattened = PtAsmSub(asmsub.scopedName.joinToString("."),
@ -236,17 +234,8 @@ class IRCodeGen(
renameSubs.forEach { (parent, sub) ->
val renamedSub = PtSub(sub.scopedName.joinToString("."), sub.parameters, sub.returntype, sub.inline, sub.position)
sub.children.forEach { renamedSub.add(it) }
parent.children.remove(sub)
if (sub === entrypoint) {
// entrypoint sub must be first sub
val firstsub = parent.children.withIndex().firstOrNull() { it.value is PtSub || it.value is PtAsmSub }
if(firstsub!=null)
parent.add(firstsub.index, renamedSub)
else
parent.add(renamedSub)
} else {
parent.add(renamedSub)
}
val subindex = parent.children.indexOf(sub)
parent.children[subindex] = renamedSub // keep the order of nodes the same
}
renameAsmSubs.forEach { (parent, sub) ->
val renamedSub = PtAsmSub(sub.scopedName.joinToString("."),
@ -260,8 +249,8 @@ class IRCodeGen(
if(sub.children.isNotEmpty())
renamedSub.add(sub.children.single())
parent.children.remove(sub)
parent.add(renamedSub)
val subindex = parent.children.indexOf(sub)
parent.children[subindex] = renamedSub // keep the order of nodes the same
}
}

3
docs/source/todo.rst
View File

@ -3,9 +3,8 @@ TODO
For next release
^^^^^^^^^^^^^^^^
- ir/vm: check weird asm chunks appearing in block?
- try to get the cx16 adpcm example to output audio
- duplicate diskio for cx16 (get rid of cx16diskio, just copy diskio and tweak everything)
- duplicate diskio for cx16 (get rid of cx16diskio, just copy diskio and tweak everything) + documentation
- get f_seek_w working like in the BASIC program - this needs the changes to diskio.f_open to use suffixes ,p,m
- attempt to fix the expression codegen bug with reused temp vars (github #89)
- AstIdentifiersChecker: can a subroutine really not have the same name as its enclosing block? 64tass problem?