Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2025-02-27 03:29:22 +00:00
Code Issues Projects Releases Wiki Activity

scan all asmsubs to see if another subroutine is referenced. Fixes #153

Browse Source
This commit is contained in:
Irmen de Jong 2024-10-07 20:39:49 +02:00
parent a088ee56b0
commit 7c69d38588
3 changed files with 51 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
compiler/test/TestOptimization.kt
View File

@ -47,6 +47,30 @@ class TestOptimization: FunSpec({
}
}
test("scan all asmsubs to see if another subroutine is referenced") {
val src="""
main {
sub foo() {
cx16.r0++
}
asmsub baz() {
%asm{{
jsr p8s_foo
}}
}
asmsub bar() {
%asm{{
inx
jmp p8s_foo
}}
}
sub start() {
bar()
}
}"""
compileText(C64Target(), true, src) shouldNotBe null
}
test("don't remove empty subroutine if it's referenced") {
val sourcecode = """
main {

18
compilerAst/src/prog8/compiler/CallGraph.kt
View File

@ -162,20 +162,22 @@ class CallGraph(private val program: Program) : IAstVisitor {
fun unused(sub: Subroutine): Boolean {
if(sub in usedSubroutines)
return false
val asm = nameInAssemblyCode(sub.name, listOf("p8s_", ""))
if(asm!=null) {
val asms = nameInAssemblyCode(sub.name, listOf("p8s_", ""))
if(asms.isEmpty())
return true
val allUnused = asms.all { asm->
// check that the asm block that calls us, is inside a subroutine that is unused or not
val containingSub = asm.definingSubroutine
return if(containingSub != null && containingSub !== sub)
if(containingSub != null && containingSub !== sub)
unused(containingSub)
else
false
}
return true
return allUnused
}
fun unused(block: Block): Boolean {
return block !in usedBlocks && nameInAssemblyCode(block.name, listOf("p8b_", ""))==null
return block !in usedBlocks && nameInAssemblyCode(block.name, listOf("p8b_", "")).isEmpty()
}
fun unused(decl: VarDecl): Boolean {
@ -198,13 +200,13 @@ class CallGraph(private val program: Program) : IAstVisitor {
}
private val prefixes = listOf("p8b_", "p8v_", "p8s_", "p8c_", "p8l_", "p8_", "")
private fun nameInAssemblyCode(name: String, knownAsmPrefixes: List<String> = emptyList()): InlineAssembly? {
private fun nameInAssemblyCode(name: String, knownAsmPrefixes: List<String> = emptyList()): List<InlineAssembly> {
if(knownAsmPrefixes.isNotEmpty())
return allAssemblyNodes.firstOrNull {
return allAssemblyNodes.filter {
knownAsmPrefixes.any { prefix -> prefix+name in it.names }
}
return allAssemblyNodes.firstOrNull {
return allAssemblyNodes.filter {
prefixes.any { prefix -> prefix+name in it.names }
}
}

23
examples/test.p8
View File

@ -1,8 +1,19 @@
%import textio
%zeropage basicsafe
main {
sub foo() { foo() }
sub bar() -> ubyte { return bar() }
sub start() { }
sub foo() {
cx16.r0++
}
asmsub baz() {
%asm{{
jsr p8s_foo
}}
}
asmsub bar() {
%asm{{
inx
jmp p8s_foo
}}
}
sub start() {
bar()
}
}