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

more asm for byte writes to memory

Browse Source
This commit is contained in:
Irmen de Jong 2019-07-30 02:49:13 +02:00
parent 3732ab1e62
commit 8cec032e7d
2 changed files with 46 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
compiler/src/prog8/compiler/target/c64/codegen2/AsmGen2.kt
View File

@ -1499,27 +1499,8 @@ internal class AsmGen2(val program: Program,
}
}
target.memoryAddress!=null -> {
val addressExpr = target.memoryAddress.addressExpression
when (addressExpr) {
is NumericLiteralValue -> out(" inx | lda $ESTACK_LO_HEX,x | sta ${addressExpr.number.toHex()}")
is IdentifierReference -> {
val name = asmIdentifierName(addressExpr)
out(" inx | lda $ESTACK_LO_HEX,x | sta $name")
}
else -> {
translateExpression(addressExpr)
out("""
inx
lda $ESTACK_LO_HEX,x
ldy $ESTACK_LO_HEX,x
sta (+) +1
sty (+) +2
inx
lda $ESTACK_LO_HEX,x
+ sta ${65535.toHex()} ; modified
""")
}
}
out(" inx | ldy $ESTACK_LO_HEX,x")
storeRegisterInMemoryAddress(Register.Y, target.memoryAddress)
}
target.arrayindexed!=null -> {
TODO("put result in arrayindexed $target")
@ -1698,32 +1679,7 @@ internal class AsmGen2(val program: Program,
}
}
target.memoryAddress!=null -> {
val addressExpr = target.memoryAddress.addressExpression
val addressLv = addressExpr as? NumericLiteralValue
val registerName = register.name.toLowerCase()
when {
addressLv != null -> out(" st$registerName ${addressLv.number.toHex()}")
addressExpr is IdentifierReference -> {
val targetName = asmIdentifierName(addressExpr)
out(" st$registerName $targetName")
}
else -> {
translateExpression(addressExpr)
when (register) {
Register.A -> out(" tay")
Register.X -> throw AssemblyError("can't use X register here")
Register.Y -> {}
}
out("""
inx
lda $ESTACK_LO_HEX,x
sta (+) +1
lda $ESTACK_HI_HEX,x
sta (+) +2
+ sty ${65535.toHex()} ; modified
""")
}
}
storeRegisterInMemoryAddress(register, target.memoryAddress)
}
targetArrayIdx!=null -> {
val index = targetArrayIdx.arrayspec.index
@ -1790,6 +1746,37 @@ internal class AsmGen2(val program: Program,
}
}
private fun storeRegisterInMemoryAddress(register: Register, memoryAddress: DirectMemoryWrite) {
val addressExpr = memoryAddress.addressExpression
val addressLv = addressExpr as? NumericLiteralValue
val registerName = register.name.toLowerCase()
when {
addressLv != null -> out(" st$registerName ${addressLv.number.toHex()}")
addressExpr is IdentifierReference -> {
val targetName = asmIdentifierName(addressExpr)
out(" st$registerName $targetName")
}
else -> {
saveRegister(register)
translateExpression(addressExpr)
restoreRegister(register)
when (register) {
Register.A -> out(" tay")
Register.X -> throw AssemblyError("can't use X register here")
Register.Y -> {}
}
out("""
inx
lda $ESTACK_LO_HEX,x
sta (+) +1
lda $ESTACK_HI_HEX,x
sta (+) +2
+ sty ${65535.toHex()} ; modified
""")
}
}
}
private fun assignFromWordConstant(target: AssignTarget, word: Int) {
val targetIdent = target.identifier
val targetArrayIdx = target.arrayindexed
@ -1836,7 +1823,8 @@ internal class AsmGen2(val program: Program,
out(" lda #${byte.toHex()} | sta $targetName ")
}
target.memoryAddress!=null -> {
TODO("assign byte $byte to memory ${target.memoryAddress}")
out(" ldy #${byte.toHex()}")
storeRegisterInMemoryAddress(Register.Y, target.memoryAddress)
}
targetArrayIdx!=null -> {
val index = targetArrayIdx.arrayspec.index
@ -1913,7 +1901,8 @@ internal class AsmGen2(val program: Program,
""")
}
target.memoryAddress!=null -> {
TODO("assign memory byte at $address to memory ${target.memoryAddress}")
out(" ldy ${address.toHex()}")
storeRegisterInMemoryAddress(Register.Y, target.memoryAddress)
}
targetArrayIdx!=null -> {
val index = targetArrayIdx.arrayspec.index
@ -1946,7 +1935,8 @@ internal class AsmGen2(val program: Program,
""")
}
target.memoryAddress!=null -> {
TODO("assign memory byte $sourceName to memoyr ${target.memoryAddress}")
out(" ldy $sourceName")
storeRegisterInMemoryAddress(Register.Y, target.memoryAddress)
}
targetArrayIdx!=null -> {
val index = targetArrayIdx.arrayspec.index

10
examples/test.p8
View File

@ -4,13 +4,15 @@
main {
ubyte abc
sub start() {
byte[4] barray=2
uword[4] uwarray=50000
word[4] warray=-500
float[4] rotatedx=0.0
A=abc
if A>0
Y=abc ; @todo gets prefixed with anon1_ but should not be because is found in other scope...
}
}