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

bugfix: non-existing asm function was sometimes called to swap floats

Browse Source
This commit is contained in:
Irmen de Jong 2021-10-08 04:14:43 +02:00
parent b3107cfad0
commit 0204002d9b
2 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/src/prog8/compiler/target/cpu6502/codegen/BuiltinFunctionsAsmGen.kt
View File

@ -888,7 +888,7 @@ internal class BuiltinFunctionsAsmGen(private val program: Program, private val
sta P8ZP_SCRATCH_W2
lda #>(${arrayVarName2}+$index2)
sta P8ZP_SCRATCH_W2+1
jsr floats.swap_floats
jsr floats.func_swap_f
""")
}
else -> throw AssemblyError("invalid aray elt type")
@ -961,7 +961,7 @@ internal class BuiltinFunctionsAsmGen(private val program: Program, private val
sta P8ZP_SCRATCH_W2
bcc +
inc P8ZP_SCRATCH_W2+1
+ jsr floats.swap_floats
+ jsr floats.func_swap_f
""")
}
else -> throw AssemblyError("invalid aray elt type")
@ -1019,7 +1019,7 @@ internal class BuiltinFunctionsAsmGen(private val program: Program, private val
sta P8ZP_SCRATCH_W1
bcc +
inc P8ZP_SCRATCH_W1+1
+ jsr floats.swap_floats
+ jsr floats.func_swap_f
""")
}
else -> throw AssemblyError("invalid aray elt type")
@ -1077,7 +1077,7 @@ internal class BuiltinFunctionsAsmGen(private val program: Program, private val
sta P8ZP_SCRATCH_W2
lda #>(${arrayVarName2}+$index2)
sta P8ZP_SCRATCH_W2+1
jsr floats.swap_floats
jsr floats.func_swap_f
""")
}
else -> throw AssemblyError("invalid aray elt type")

72
examples/test.p8
View File

@ -1,47 +1,47 @@
%import textio
%zeropage dontuse
%import floats
%import test_stack
%zeropage basicsafe
main {
label:
sub start() {
txt.print("hey\n")
%breakpoint
txt.print("hey2\n")
ubyte ub1
ubyte ub2
uword uw1
uword uw2
float fl1
float fl2
ubyte[10] ubarr
uword[10] uwarr
float[10] flarr
; sub2(&label)
; sub2(&label_local)
; sub2(&main.sub2.label_in_sub2)
; uword xx = &label_local
; txt.print_uwhex(xx, true)
; txt.nl()
; xx = &label
; txt.print_uwhex(xx, true)
; txt.nl()
; xx = &main.label
; txt.print_uwhex(xx, true)
; txt.nl()
; xx = &main.sub2.label_in_sub2
; txt.print_uwhex(xx, true)
; txt.nl()
; xx = main.sub2.sub2var
; txt.print_uwhex(xx, true)
; txt.nl()
; xx = &main.start.label_local
; txt.print_uwhex(xx, true)
; txt.nl()
swap(ub1, ub2)
swap(uw1, uw2)
swap(fl1, fl2)
swap(ubarr[1], ubarr[2])
swap(uwarr[1], uwarr[2])
swap(flarr[1], flarr[2])
label_local:
return
ubyte ix1
ubyte ix2
swap(ubarr[ix1], ubarr[ix2])
swap(uwarr[ix1], uwarr[ix2])
swap(flarr[ix1], flarr[ix2])
swap(flarr[ix1], flarr[2])
swap(flarr[2], flarr[ix2])
swap(ubarr[ix1], ubarr[ix1+2])
swap(uwarr[ix1], uwarr[ix1+2])
swap(flarr[ix1], flarr[ix1+2])
uword ptr = $c000
swap(@(ptr+1), @(ptr+2))
swap(@(ptr+ub1), @(ptr+ub2))
test_stack.test()
}
; sub sub2(uword ad) {
; uword sub2var = 42
;
; txt.print_uwhex(ad,true)
; txt.nl()
;label_in_sub2:
; txt.nl()
; }
}