Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2025-11-23 14:17:51 +00:00
Code Issues Projects Releases Wiki Activity

strings can no longer be assigned by-value. Use strings.copy() instead. Fixes #189

Browse Source
This commit is contained in:
Irmen de Jong
2025-10-31 19:12:16 +01:00
parent b1e07f3fdb
commit b02a8ed954
18 changed files with 113 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -666,21 +666,8 @@ internal class AssignmentAsmGen(
returnDt?.isByteOrBool==true -> assignRegisterByte(target, CpuRegister.A, returnDt.isSigned, false) // function's byte result is in A
returnDt?.isWord==true -> assignRegisterpairWord(target, RegisterOrPair.AY) // function's word result is in AY
returnDt==BaseDataType.STR -> {
val targetDt = target.datatype
when {
targetDt.isString -> {
asmgen.out("""
tax
lda #<${target.asmVarname}
sta P8ZP_SCRATCH_W1
lda #>${target.asmVarname}
sta P8ZP_SCRATCH_W1+1
txa
jsr prog8_lib.strcpy""")
}
targetDt.isUnsignedWord -> assignRegisterpairWord(target, RegisterOrPair.AY)
else -> throw AssemblyError("str return value type mismatch with target")
}
if (target.datatype.isUnsignedWord) assignRegisterpairWord(target, RegisterOrPair.AY)
else throw AssemblyError("str return value type mismatch with target")
}
returnDt== BaseDataType.LONG -> {
// longs are in R14:R15 (r14=lsw, r15=msw)
@@ -3467,31 +3454,16 @@ $endLabel""")
}
private fun assignVariableString(target: AsmAssignTarget, varName: String) {
when(target.kind) {
TargetStorageKind.VARIABLE -> {
when {
target.datatype.isUnsignedWord -> {
asmgen.out("""
lda #<$varName
ldy #>$varName
sta ${target.asmVarname}
sty ${target.asmVarname}+1""")
}
target.datatype.isString || target.datatype.isUnsignedByteArray || target.datatype.isByteArray -> {
asmgen.out("""
lda #<${target.asmVarname}
ldy #>${target.asmVarname}
sta P8ZP_SCRATCH_W1
sty P8ZP_SCRATCH_W1+1
lda #<$varName
ldy #>$varName
jsr prog8_lib.strcpy""")
}
else -> throw AssemblyError("assign string to incompatible variable type")
}
}
else -> throw AssemblyError("string-assign to weird target")
if (target.kind == TargetStorageKind.VARIABLE) {
if (target.datatype.isUnsignedWord) {
asmgen.out("""
lda #<$varName
ldy #>$varName
sta ${target.asmVarname}
sty ${target.asmVarname}+1""")
} else throw AssemblyError("assign string to incompatible variable type ${target.position}")
}
else throw AssemblyError("string-assign to weird target ${target.position}")
}
private fun assignVariableLong(target: AsmAssignTarget, varName: String, sourceDt: DataType) {