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

fix typecheck crash on certain byte to word assignments

Browse Source
This commit is contained in:
Irmen de Jong 2023-05-08 23:02:48 +02:00
parent 97df33ab1a
commit 4c8898a639
3 changed files with 21 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
codeGenCpu6502/src/prog8/codegen/cpu6502/assignment/AssignmentAsmGen.kt
View File

@ -2511,14 +2511,24 @@ internal class AssignmentAsmGen(private val program: PtProgram,
}
internal fun assignRegisterByte(target: AsmAssignTarget, register: CpuRegister, signed: Boolean) {
// we make an exception in the type check for assigning something to a register pair AX, AY or XY
// these will be correctly typecasted from a byte to a word value here
if(target.register !in setOf(RegisterOrPair.AX, RegisterOrPair.AY, RegisterOrPair.XY))
require(target.datatype in ByteDatatypes) { "assign target must be byte type ${target.position}"}
val assignAsWord = target.datatype in WordDatatypes
when(target.kind) {
TargetStorageKind.VARIABLE -> {
asmgen.out(" st${register.name.lowercase()} ${target.asmVarname}")
if(assignAsWord) {
if(target.datatype in SignedDatatypes) {
if(register!=CpuRegister.A)
asmgen.out(" t${register.name.lowercase()}a")
asmgen.signExtendAYlsb(if(target.datatype in SignedDatatypes) DataType.BYTE else DataType.UBYTE)
asmgen.out(" sty ${target.asmVarname}+1")
} else {
if(asmgen.isTargetCpu(CpuType.CPU65c02))
asmgen.out(" stz ${target.asmVarname}+1")
else
asmgen.out(" lda #0 | sta ${target.asmVarname}+1")
}
}
}
TargetStorageKind.MEMORY -> {
when(register) {
@ -2529,6 +2539,8 @@ internal class AssignmentAsmGen(private val program: PtProgram,
storeRegisterAInMemoryAddress(target.memory!!)
}
TargetStorageKind.ARRAY -> {
if(assignAsWord)
TODO("assign register as word into Array not yet supported")
if (target.constArrayIndexValue!=null) {
when (register) {
CpuRegister.A -> asmgen.out(" sta ${target.asmVarname}+${target.constArrayIndexValue}")
@ -2690,6 +2702,8 @@ internal class AssignmentAsmGen(private val program: PtProgram,
}
}
TargetStorageKind.STACK -> {
if(assignAsWord)
TODO("assign register as word onto Stack not yet supported")
when(register) {
CpuRegister.A -> asmgen.out(" sta P8ESTACK_LO,x | dex")
CpuRegister.X -> throw AssemblyError("can't use X here")

1
docs/source/todo.rst
View File

@ -3,7 +3,6 @@ TODO
For next minor release
^^^^^^^^^^^^^^^^^^^^^^
- fix crash: uword remainder = seconds_uword % $0003 ==0
- fix VM problem with param passing: void string.copy(".prg", &output_filename + string.length(output_filename))
- try to optimize newexpr a bit more

48
examples/test.p8
View File

@ -5,51 +5,9 @@
main {
sub start() {
str output_filename = "12345678\x00abcdefghij"
void myprint2("hallo", &output_filename+string.length(output_filename))
; ubyte length = string.length(output_filename)
; txt.print_ub(length)
; txt.nl()
; txt.print_uw(&output_filename)
; txt.nl()
; output_filename[2]='!'
; txt.print(output_filename)
; txt.nl()
;
; void string_copy(".prg", &output_filename + string.length(output_filename))
; txt.print(output_filename)
}
sub myprint2(str source1, str source2) {
txt.print(source1)
txt.nl()
txt.print(source2)
txt.nl()
}
sub string_copy(str source, str target) -> ubyte {
; Copy a string to another, overwriting that one.
; Returns the length of the string that was copied.
; Often you don’t have to call this explicitly and can just write string1 = string2
; but this function is useful if you’re dealing with addresses for instance.
txt.print("src=")
txt.print(source)
txt.nl()
txt.print("target=")
txt.print(target)
txt.nl()
ubyte ix
repeat 5 {
ubyte qq=source[ix]
txt.print_ub(qq)
target[ix]=qq
txt.spc()
if qq==0 {
txt.nl()
return ix
}
ix++
}
uword seconds_uword = 1
uword remainder = seconds_uword % $0003 ==0
txt.print_uw(remainder)
}
}