Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2024-09-29 08:57:51 +00:00
Code Issues Projects Releases Wiki Activity

proper name

Browse Source
This commit is contained in:
Irmen de Jong 2020-08-25 00:59:02 +02:00
parent 2e2b8c498e
commit 0f9e167df3
5 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/src/prog8/compiler/target/c64/codegen/AsmGen.kt
View File

@ -517,7 +517,7 @@ internal class AsmGen(private val program: Program,
return fixNameSymbols(name)
}
internal fun loadByteFromPointerIntoA2(pointervar: IdentifierReference): Pair<Boolean, String> {
internal fun loadByteFromPointerIntoA(pointervar: IdentifierReference): Pair<Boolean, String> {
// returns if the pointer is already on the ZP itself or not (in which case SCRATCH_W1 is used as intermediary)
val sourceName = asmIdentifierName(pointervar)
val vardecl = pointervar.targetVarDecl(program.namespace)!!

2
compiler/src/prog8/compiler/target/c64/codegen/ExpressionsAsmGen.kt
View File

@ -145,7 +145,7 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
}
is IdentifierReference -> {
// the identifier is a pointer variable, so read the value from the address in it
asmgen.loadByteFromPointerIntoA2(expr.addressExpression as IdentifierReference)
asmgen.loadByteFromPointerIntoA(expr.addressExpression as IdentifierReference)
asmgen.out(" sta $ESTACK_LO_HEX,x | dex")
}
else -> {

4
compiler/src/prog8/compiler/target/c64/codegen/assignment/AssignmentAsmGen.kt
View File

@ -802,7 +802,7 @@ internal class AssignmentAsmGen(private val program: Program, private val asmgen
} else if (identifier != null) {
when(target.kind) {
TargetStorageKind.VARIABLE -> {
asmgen.loadByteFromPointerIntoA2(identifier)
asmgen.loadByteFromPointerIntoA(identifier)
asmgen.out(" sta ${target.asmVarname}")
}
TargetStorageKind.MEMORY -> {
@ -813,7 +813,7 @@ internal class AssignmentAsmGen(private val program: Program, private val asmgen
throw AssemblyError("no asm gen for assign memory byte $identifier to array ${target.asmVarname} ")
}
TargetStorageKind.REGISTER -> {
asmgen.loadByteFromPointerIntoA2(identifier)
asmgen.loadByteFromPointerIntoA(identifier)
when(target.register!!) {
RegisterOrPair.A -> {}
RegisterOrPair.X -> asmgen.out(" tax")

40
compiler/src/prog8/compiler/target/c64/codegen/assignment/AugmentableAssignmentAsmGen.kt
View File

@ -193,8 +193,8 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
else -> {
println("warning: slow stack evaluation used (1): ${memory.addressExpression::class.simpleName} at ${memory.addressExpression.position}") // TODO optimize...
asmgen.translateExpression(memory.addressExpression)
// TODO buggy?:
asmgen.out(" jsr prog8_lib.read_byte_from_address_on_stack | sta ${C64Zeropage.SCRATCH_B1}")
// the original memory byte's value is now in the scratch B1 location.
when {
valueLv != null -> inplaceModification_byte_litval_to_variable(C64Zeropage.SCRATCH_B1.toHex(), DataType.UBYTE, operator, valueLv.toInt())
ident != null -> inplaceModification_byte_variable_to_variable(C64Zeropage.SCRATCH_B1.toHex(), DataType.UBYTE, operator, ident)
@ -368,7 +368,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
when (operator) {
// note: ** (power) operator requires floats.
"+" -> {
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA2(pointervar)
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA(pointervar)
asmgen.out(" clc | adc $ESTACK_LO_PLUS1_HEX,x")
if(ptrOnZp)
asmgen.out(" sta ($sourceName),y")
@ -376,7 +376,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
asmgen.out(" sta (${C64Zeropage.SCRATCH_W1}),y")
}
"-" -> {
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA2(pointervar)
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA(pointervar)
asmgen.out(" sec | sbc $ESTACK_LO_PLUS1_HEX,x")
if(ptrOnZp)
asmgen.out(" sta ($sourceName),y")
@ -394,7 +394,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
"<<" -> TODO("ubyte asl")
">>" -> TODO("ubyte lsr")
"&" -> {
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA2(pointervar)
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA(pointervar)
asmgen.out(" and $ESTACK_LO_PLUS1_HEX,x")
if(ptrOnZp)
asmgen.out(" sta ($sourceName),y")
@ -402,7 +402,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
asmgen.out(" sta (${C64Zeropage.SCRATCH_W1}),y")
}
"^" -> {
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA2(pointervar)
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA(pointervar)
asmgen.out(" xor $ESTACK_LO_PLUS1_HEX,x")
if(ptrOnZp)
asmgen.out(" sta ($sourceName),y")
@ -410,7 +410,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
asmgen.out(" sta (${C64Zeropage.SCRATCH_W1}),y")
}
"|" -> {
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA2(pointervar)
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA(pointervar)
asmgen.out(" ora $ESTACK_LO_PLUS1_HEX,x")
if(ptrOnZp)
asmgen.out(" sta ($sourceName),y")
@ -427,7 +427,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
when (operator) {
// note: ** (power) operator requires floats.
"+" -> {
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA2(pointervar)
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA(pointervar)
asmgen.out(" clc | adc $otherName")
if(ptrOnZp)
asmgen.out(" sta ($sourceName),y")
@ -435,7 +435,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
asmgen.out(" sta (${C64Zeropage.SCRATCH_W1}),y")
}
"-" -> {
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA2(pointervar)
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA(pointervar)
asmgen.out(" sec | sbc $otherName")
if(ptrOnZp)
asmgen.out(" sta ($sourceName),y")
@ -453,7 +453,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
"<<" -> TODO("ubyte asl")
">>" -> TODO("ubyte lsr")
"&" -> {
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA2(pointervar)
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA(pointervar)
asmgen.out(" and $otherName")
if(ptrOnZp)
asmgen.out(" sta ($sourceName),y")
@ -461,7 +461,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
asmgen.out(" sta (${C64Zeropage.SCRATCH_W1}),y")
}
"^" -> {
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA2(pointervar)
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA(pointervar)
asmgen.out(" xor $otherName")
if(ptrOnZp)
asmgen.out(" sta ($sourceName),y")
@ -469,7 +469,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
asmgen.out(" sta (${C64Zeropage.SCRATCH_W1}),y")
}
"|" -> {
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA2(pointervar)
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA(pointervar)
asmgen.out(" ora $otherName")
if(ptrOnZp)
asmgen.out(" sta ($sourceName),y")
@ -484,7 +484,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
when (operator) {
// note: ** (power) operator requires floats.
"+" -> {
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA2(pointervar)
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA(pointervar)
asmgen.out(" clc | adc #$value")
if(ptrOnZp)
asmgen.out(" sta ($sourceName),y")
@ -492,7 +492,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
asmgen.out(" sta (${C64Zeropage.SCRATCH_W1}),y")
}
"-" -> {
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA2(pointervar)
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA(pointervar)
asmgen.out(" sec | sbc #$value")
if(ptrOnZp)
asmgen.out(" sta ($sourceName),y")
@ -516,7 +516,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
}
"<<" -> {
if (value > 0) {
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA2(pointervar)
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA(pointervar)
repeat(value) { asmgen.out(" asl a") }
if(ptrOnZp)
asmgen.out(" sta ($sourceName),y")
@ -526,7 +526,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
}
">>" -> {
if (value > 0) {
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA2(pointervar)
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA(pointervar)
repeat(value) { asmgen.out(" lsr a") }
if(ptrOnZp)
asmgen.out(" sta ($sourceName),y")
@ -535,7 +535,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
}
}
"&" -> {
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA2(pointervar)
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA(pointervar)
asmgen.out(" and #$value")
if(ptrOnZp)
asmgen.out(" sta ($sourceName),y")
@ -543,7 +543,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
asmgen.out(" sta (${C64Zeropage.SCRATCH_W1}),y")
}
"^" -> {
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA2(pointervar)
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA(pointervar)
asmgen.out(" xor #$value")
if(ptrOnZp)
asmgen.out(" sta ($sourceName),y")
@ -551,7 +551,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
asmgen.out(" sta (${C64Zeropage.SCRATCH_W1}),y")
}
"|" -> {
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA2(pointervar)
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA(pointervar)
asmgen.out(" ora #$value")
if(ptrOnZp)
asmgen.out(" sta ($sourceName),y")
@ -1113,7 +1113,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
sta $addr""")
}
is IdentifierReference -> {
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA2(mem.addressExpression as IdentifierReference)
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA(mem.addressExpression as IdentifierReference)
asmgen.out("""
beq +
lda #1
@ -1187,7 +1187,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
sta $addr""")
}
is IdentifierReference -> {
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA2(memory.addressExpression as IdentifierReference)
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA(memory.addressExpression as IdentifierReference)
asmgen.out(" eor #255")
if(ptrOnZp)
asmgen.out(" sta ($sourceName),y")

18
examples/plasma.p8
View File

@ -71,11 +71,23 @@ main {
}
c2A += 2
c2B -= 3
uword @zp scrptr = screen
for y in 24 downto 0 {
for x in 39 downto 0 {
@(screen) = xbuf[x] + ybuf[y]
screen++
}
@(scrptr) = xbuf[x]
@(scrptr) += ybuf[y]
;@(scrptr) = xbuf[x] + ybuf[y]
; %asm {{
; ldy x
; lda xbuf,y
; ldy y
; clc
; adc ybuf,y
; ldy #0
; sta (scrptr),y
; }}
scrptr++
}
}
}