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

fixes

Browse Source
This commit is contained in:
Irmen de Jong 2019-07-29 02:47:01 +02:00
parent 8e8c112ff0
commit 3aea32551b
2 changed files with 33 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -699,7 +699,8 @@ internal class AsmGen2(val program: Program,
stack==true -> TODO("param on stack")
statusflag!=null -> {
if (statusflag == Statusflag.Pc) {
// TODO this param needs to be set last right before the jsr
// this param needs to be set last, right before the jsr
// for now, this is already enforced on the subroutine definition by the Ast Checker
when(value) {
is NumericLiteralValue -> {
val carrySet = value.number.toInt() != 0
@ -788,9 +789,9 @@ internal class AsmGen2(val program: Program,
}
is IdentifierReference -> {
val sourceName = asmIdentifierName(value)
if (register == RegisterOrPair.AX) out(" lda #<$sourceName | ldx #>$sourceName")
else if (register == RegisterOrPair.AY) out(" lda #<$sourceName | ldy #>$sourceName")
else if (register == RegisterOrPair.XY) out(" ldx #<$sourceName | ldy #>$sourceName")
if (register == RegisterOrPair.AX) out(" lda $sourceName | ldx $sourceName+1")
else if (register == RegisterOrPair.AY) out(" lda $sourceName | ldy $sourceName+1")
else if (register == RegisterOrPair.XY) out(" ldx $sourceName | ldy $sourceName+1")
}
else -> {
translateExpression(value)
@ -1032,7 +1033,6 @@ internal class AsmGen2(val program: Program,
DataType.UBYTE, DataType.BYTE -> assignFromByteVariable(assign.target, assign.value as IdentifierReference)
DataType.UWORD, DataType.WORD -> assignFromWordVariable(assign.target, assign.value as IdentifierReference)
DataType.FLOAT -> assignFromFloatVariable(assign.target, assign.value as IdentifierReference)
in StringDatatypes -> TODO("str assignment")
else -> throw AssemblyError("unsupported assignment target type $type")
}
}
@ -1214,7 +1214,8 @@ internal class AsmGen2(val program: Program,
}
private fun translateExpression(expr: AddressOf) {
TODO("take address of; $expr")
val name = asmIdentifierName(expr.identifier)
out(" lda #<$name | sta $ESTACK_LO_HEX,x | lda #>$name | sta $ESTACK_HI_HEX,x | dex")
}
private fun translateExpression(expr: DirectMemoryRead) {
@ -1454,11 +1455,26 @@ internal class AsmGen2(val program: Program,
}
}
target.memoryAddress!=null -> {
val address = target.memoryAddress.addressExpression
if(address is NumericLiteralValue) {
out(" inx | lda $ESTACK_LO_HEX,x | sta ${address.number.toHex()}")
} else {
TODO("put result in memory $target")
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
""")
}
}
}
target.arrayindexed!=null -> {
@ -1652,8 +1668,7 @@ internal class AsmGen2(val program: Program,
when (register) {
Register.A -> out(" tay")
Register.X -> throw AssemblyError("can't use X register here")
Register.Y -> {
}
Register.Y -> {}
}
out("""
inx

53
examples/test.p8
View File

@ -5,54 +5,11 @@
~ main {
sub start() {
ubyte zz
uword target = 4444
@($d020) = A
@($d020) = A+4
@(target) = A+4
@(target+4) = A+4
carry(0, 0)
carry(1, 1)
A=0
carry(2, A)
A=1
carry(3, A)
zz=0
carry(4, zz)
zz=122
carry(5, zz)
carry(6, zz-122)
carry(7, zz+34)
ubyte endX = X
if endX == 255
c64scr.print("\n\nstack x ok!\n")
else
c64scr.print("\n\nerror: stack x != 255 !\n")
; ubyte bb = @($d020)+4
; ubyte bb2 = @($d020+A)+4
;
; subje(55)
; subje(@($d020+bb))
; subje(A)
; subje(bb)
; subje(bb+43)
}
asmsub carry(byte offset @Y, ubyte cc @Pc) {
%asm {{
bcc +
lda #1
sta $0400,y
rts
+
lda #0
sta $0400,y
rts
}}
}
sub subje(ubyte arg) {
A=arg
}
}