Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2025-02-05 09:33:46 +00:00
Code Issues Projects Releases Wiki Activity

explicit integer type check for @R0-R15 parameters

Browse Source 
avoids weird type inconsistency for boolean parameters that would get aliased as unsigned byte instead invisibly
This commit is contained in:
Irmen de Jong 2024-12-10 23:19:41 +01:00
parent b7afda781a
commit f8aaa2d13c
3 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/src/prog8/compiler/astprocessing/AstPreprocessor.kt
View File

@ -232,9 +232,13 @@ class AstPreprocessor(val program: Program,
.filter { it.name !in namesInSub && it.name !in existingAliases }
.forEach {
if (it.registerOrPair in Cx16VirtualRegisters) {
val regname = it.registerOrPair!!.asScopedNameVirtualReg(it.type)
var alias = Alias(it.name, IdentifierReference(regname, it.position), it.position)
mods += IAstModification.InsertFirst(alias, subroutine)
if(it.type.isInteger) {
val regname = it.registerOrPair!!.asScopedNameVirtualReg(it.type)
var alias = Alias(it.name, IdentifierReference(regname, it.position), it.position)
mods += IAstModification.InsertFirst(alias, subroutine)
} else {
errors.err("using R0-R15 as register param requires integer type", it.position)
}
} else
errors.err("can only use R0-R15 as register param for normal subroutines", it.position)
}

22
compiler/test/ast/TestAstChecks.kt
View File

@ -350,4 +350,26 @@ main {
errors.warnings[0] shouldContain "footgun"
errors.warnings[1] shouldContain "footgun"
}
test("reg params R0-R15 cannot be used for non integer types") {
val src="""
main {
sub func(bool flag @R1) {
if flag
return
}
extsub ${'$'}2000 = extok(bool flag @R0)
sub start() {
func(true)
extok(true)
}
}"""
val errors = ErrorReporterForTests(keepMessagesAfterReporting = true)
compileText(C64Target(), false, src, writeAssembly = false, errors = errors) shouldBe null
errors.errors.size shouldBe 1
errors.warnings.size shouldBe 0
errors.errors[0] shouldContain "requires integer type"
}
})

40
examples/test.p8
View File

@ -3,37 +3,15 @@
%option no_sysinit
main {
sub func(bool flag @R1) {
if flag
return
}
extsub $2000 = extok(bool flag @R0)
sub start() {
cx16.r0 = (cx16.r0 & $a000) | $0055
cx16.r0 = (cx16.r0 | $a000) ^ $0055
cx16.r0 = (cx16.r0 ^ $a000) & $0055
cx16.r0 = (cx16.r1 & $a000)
cx16.r0 = (cx16.r1 | $a000)
cx16.r0 = (cx16.r1 ^ $a000)
; these are optimized already:
cx16.r0 = (cx16.r0 & $a000)
cx16.r0 = (cx16.r0 | $a000)
cx16.r0 = (cx16.r0 ^ $a000)
/*
sys.set_irqd()
cx16.VERA_IEN = 1 ; only vsync irqs
repeat {
while (cx16.VERA_ISR & 1)==0 {
; wait for vsync
}
cx16.VERA_ISR = 1 ; clear vsync irq status
palette.set_color(6, $ff0)
repeat 2000 {
cx16.r0++
}
palette.set_color(6, $00f)
}
*/
func(true)
extok(true)
}
}