Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2024-12-25 23:29:55 +00:00
Code Issues Projects Releases Wiki Activity

code generator: add a return (RTS) to empty subroutines. Fixes #67

Browse Source
This commit is contained in:
Irmen de Jong 2021-10-20 22:36:13 +02:00
parent 41e40cad03
commit 85956b5828
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/src/prog8/compiler/BeforeAsmGenerationAstChanger.kt
View File

@ -120,13 +120,13 @@ internal class BeforeAsmGenerationAstChanger(val program: Program, val errors: I
// and if an assembly block doesn't contain a rts/rti, and some other situations. // and if an assembly block doesn't contain a rts/rti, and some other situations.
val mods = mutableListOf<IAstModification>() val mods = mutableListOf<IAstModification>()
val returnStmt = Return(null, subroutine.position) val returnStmt = Return(null, subroutine.position)
if (subroutine.asmAddress == null if (subroutine.asmAddress == null && !subroutine.inline) {
&& !subroutine.inline if(subroutine.statements.isEmpty() ||
&& subroutine.statements.isNotEmpty() (subroutine.amountOfRtsInAsm() == 0
&& subroutine.amountOfRtsInAsm() == 0
&& subroutine.statements.lastOrNull { it !is VarDecl } !is Return && subroutine.statements.lastOrNull { it !is VarDecl } !is Return
&& subroutine.statements.last() !is Subroutine) { && subroutine.statements.last() !is Subroutine)) {
mods += IAstModification.InsertLast(returnStmt, subroutine) mods += IAstModification.InsertLast(returnStmt, subroutine)
}
} }
// precede a subroutine with a return to avoid falling through into the subroutine from code above it // precede a subroutine with a return to avoid falling through into the subroutine from code above it