Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2024-09-07 03:54:27 +00:00
Code Issues Projects Releases Wiki Activity

added missing in-place bitwise operator code

Browse Source
This commit is contained in:
Irmen de Jong 2020-08-25 22:26:05 +02:00
parent 19705196d6
commit 256781bba5
2 changed files with 58 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -212,8 +212,8 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
println("*** TODO optimize simple inplace array assignment ${target.array} $operator= $value") println("*** TODO optimize simple inplace array assignment ${target.array} $operator= $value")
assignmentAsmGen.translateNormalAssignment(target.origAssign) // TODO get rid of this fallback for the most common cases here assignmentAsmGen.translateNormalAssignment(target.origAssign) // TODO get rid of this fallback for the most common cases here
} }
TargetStorageKind.REGISTER -> TODO() TargetStorageKind.REGISTER -> TODO("reg")
TargetStorageKind.STACK -> TODO() TargetStorageKind.STACK -> TODO("stack")
} }
} }
@ -402,7 +402,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
} }
"^" -> { "^" -> {
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA(pointervar) val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA(pointervar)
asmgen.out(" xor P8ESTACK_LO+1,x") asmgen.out(" eor P8ESTACK_LO+1,x")
if(ptrOnZp) if(ptrOnZp)
asmgen.out(" sta ($sourceName),y") asmgen.out(" sta ($sourceName),y")
else else
@ -461,7 +461,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
} }
"^" -> { "^" -> {
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA(pointervar) val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA(pointervar)
asmgen.out(" xor $otherName") asmgen.out(" eor $otherName")
if(ptrOnZp) if(ptrOnZp)
asmgen.out(" sta ($sourceName),y") asmgen.out(" sta ($sourceName),y")
else else
@ -543,7 +543,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
} }
"^" -> { "^" -> {
val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA(pointervar) val (ptrOnZp, sourceName) = asmgen.loadByteFromPointerIntoA(pointervar)
asmgen.out(" xor #$value") asmgen.out(" eor #$value")
if(ptrOnZp) if(ptrOnZp)
asmgen.out(" sta ($sourceName),y") asmgen.out(" sta ($sourceName),y")
else else
@ -564,7 +564,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
private fun inplaceModification_word_litval_to_variable(name: String, dt: DataType, operator: String, value: Int) { private fun inplaceModification_word_litval_to_variable(name: String, dt: DataType, operator: String, value: Int) {
when (operator) { when (operator) {
// note: ** (power) operator requires floats. // note: ** (power) operator requires floats.
// TODO use the + and - optimizations in the expression asm code as well. // TODO use these + and - optimizations in the expressionAsmGenerator as well.
"+" -> { "+" -> {
when { when {
value<0x0100 -> asmgen.out(""" value<0x0100 -> asmgen.out("""
@ -614,7 +614,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
} }
} }
"*" -> { "*" -> {
// TODO what about the optimized routines? // TODO what about the optimized mul_5 etc routines?
asmgen.out(""" asmgen.out("""
lda $name lda $name
sta P8ZP_SCRATCH_W1 sta P8ZP_SCRATCH_W1
@ -656,22 +656,25 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
} }
"&" -> { "&" -> {
when { when {
value and 255 == 0 -> TODO("only high byte") value == 0 -> asmgen.out(" lda #0 | sta $name | sta $name+1")
value < 0x0100 -> TODO("only low byte") value and 255 == 0 -> asmgen.out(" lda #0 | sta $name | lda $name+1 | and #>$value | sta $name+1")
value < 0x0100 -> asmgen.out(" lda $name | and #$value | sta $name | lda #0 | sta $name+1")
else -> asmgen.out(" lda $name | and #<$value | sta $name | lda $name+1 | and #>$value | sta $name+1") else -> asmgen.out(" lda $name | and #<$value | sta $name | lda $name+1 | and #>$value | sta $name+1")
} }
} }
"^" -> { "^" -> {
when { when {
value and 255 == 0 -> TODO("only high byte") value == 0 -> {}
value < 0x0100 -> TODO("only low byte") value and 255 == 0 -> asmgen.out(" lda $name+1 | eor #>$value | sta $name+1")
else -> asmgen.out(" lda $name | xor #<$value | sta $name | lda $name+1 | xor #>$value | sta $name+1") value < 0x0100 -> asmgen.out(" lda $name | eor #$value | sta $name")
else -> asmgen.out(" lda $name | eor #<$value | sta $name | lda $name+1 | eor #>$value | sta $name+1")
} }
} }
"|" -> { "|" -> {
when { when {
value and 255 == 0 -> TODO("only high byte") value == 0 -> {}
value < 0x0100 -> TODO("only low byte") value and 255 == 0 -> asmgen.out(" lda $name+1 | ora #>$value | sta $name+1")
value < 0x0100 -> asmgen.out(" lda $name | ora #$value | sta $name")
else -> asmgen.out(" lda $name | ora #<$value | sta $name | lda $name+1 | ora #>$value | sta $name+1") else -> asmgen.out(" lda $name | ora #<$value | sta $name | lda $name+1 | ora #>$value | sta $name+1")
} }
} }
@ -755,7 +758,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
} }
"<<", ">>" -> throw AssemblyError("shift by a word value not supported, max is a byte") "<<", ">>" -> throw AssemblyError("shift by a word value not supported, max is a byte")
"&" -> asmgen.out(" lda $name | and $otherName | sta $name | lda $name+1 | and $otherName+1 | sta $name+1") "&" -> asmgen.out(" lda $name | and $otherName | sta $name | lda $name+1 | and $otherName+1 | sta $name+1")
"^" -> asmgen.out(" lda $name | xor $otherName | sta $name | lda $name+1 | xor $otherName+1 | sta $name+1") "^" -> asmgen.out(" lda $name | eor $otherName | sta $name | lda $name+1 | eor $otherName+1 | sta $name+1")
"|" -> asmgen.out(" lda $name | ora $otherName | sta $name | lda $name+1 | ora $otherName+1 | sta $name+1") "|" -> asmgen.out(" lda $name | ora $otherName | sta $name | lda $name+1 | ora $otherName+1 | sta $name+1")
else -> throw AssemblyError("invalid operator for in-place modification $operator") else -> throw AssemblyError("invalid operator for in-place modification $operator")
} }
@ -857,7 +860,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
} }
"<<", ">>" -> throw AssemblyError("shift by a word value not supported, max is a byte") "<<", ">>" -> throw AssemblyError("shift by a word value not supported, max is a byte")
"&" -> asmgen.out(" lda $name | and P8ESTACK_LO+1,x | sta $name | lda $name+1 | and P8ESTACK_HI+1,x | sta $name+1") "&" -> asmgen.out(" lda $name | and P8ESTACK_LO+1,x | sta $name | lda $name+1 | and P8ESTACK_HI+1,x | sta $name+1")
"^" -> asmgen.out(" lda $name | xor P8ESTACK_LO+1,x | sta $name | lda $name+1 | xor P8ESTACK_HI+1,x | sta $name+1") "^" -> asmgen.out(" lda $name | eor P8ESTACK_LO+1,x | sta $name | lda $name+1 | eor P8ESTACK_HI+1,x | sta $name+1")
"|" -> asmgen.out(" lda $name | ora P8ESTACK_LO+1,x | sta $name | lda $name+1 | ora P8ESTACK_HI+1,x | sta $name+1") "|" -> asmgen.out(" lda $name | ora P8ESTACK_LO+1,x | sta $name | lda $name+1 | ora P8ESTACK_HI+1,x | sta $name+1")
else -> throw AssemblyError("invalid operator for in-place modification $operator") else -> throw AssemblyError("invalid operator for in-place modification $operator")
} }
@ -923,7 +926,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
} }
} }
"&" -> asmgen.out(" lda $name | and P8ESTACK_LO+1,x | sta $name") "&" -> asmgen.out(" lda $name | and P8ESTACK_LO+1,x | sta $name")
"^" -> asmgen.out(" lda $name | xor P8ESTACK_LO+1,x | sta $name") "^" -> asmgen.out(" lda $name | eor P8ESTACK_LO+1,x | sta $name")
"|" -> asmgen.out(" lda $name | ora P8ESTACK_LO+1,x | sta $name") "|" -> asmgen.out(" lda $name | ora P8ESTACK_LO+1,x | sta $name")
else -> throw AssemblyError("invalid operator for in-place modification $operator") else -> throw AssemblyError("invalid operator for in-place modification $operator")
} }
@ -969,7 +972,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
} }
} }
"&" -> asmgen.out(" lda $name | and $otherName | sta $name") "&" -> asmgen.out(" lda $name | and $otherName | sta $name")
"^" -> asmgen.out(" lda $name | xor $otherName | sta $name") "^" -> asmgen.out(" lda $name | eor $otherName | sta $name")
"|" -> asmgen.out(" lda $name | ora $otherName | sta $name") "|" -> asmgen.out(" lda $name | ora $otherName | sta $name")
"and" -> asmgen.out(""" "and" -> asmgen.out("""
lda $name lda $name
@ -999,7 +1002,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
"+" -> asmgen.out(" lda $name | clc | adc #$value | sta $name") "+" -> asmgen.out(" lda $name | clc | adc #$value | sta $name")
"-" -> asmgen.out(" lda $name | sec | sbc #$value | sta $name") "-" -> asmgen.out(" lda $name | sec | sbc #$value | sta $name")
"*" -> { "*" -> {
// TODO what about the optimized routines? // TODO what about the optimized mul_5 etc routines?
TODO("$dt mul $name *= $value") TODO("$dt mul $name *= $value")
// asmgen.out(" jsr prog8_lib.mul_byte") // the optimized routines should have been checked earlier // asmgen.out(" jsr prog8_lib.mul_byte") // the optimized routines should have been checked earlier
} }
@ -1039,7 +1042,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
} }
} }
"&" -> asmgen.out(" lda $name | and #$value | sta $name") "&" -> asmgen.out(" lda $name | and #$value | sta $name")
"^" -> asmgen.out(" lda $name | xor #$value | sta $name") "^" -> asmgen.out(" lda $name | eor #$value | sta $name")
"|" -> asmgen.out(" lda $name | ora #$value | sta $name") "|" -> asmgen.out(" lda $name | ora #$value | sta $name")
else -> throw AssemblyError("invalid operator for in-place modification $operator") else -> throw AssemblyError("invalid operator for in-place modification $operator")
} }
@ -1135,11 +1138,9 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
} }
} }
} }
TargetStorageKind.ARRAY -> { TargetStorageKind.ARRAY -> TODO("in-place not of ubyte array")
TODO("in-place not of ubyte array") TargetStorageKind.REGISTER -> TODO("reg")
} TargetStorageKind.STACK -> TODO("stack")
TargetStorageKind.REGISTER -> TODO()
TargetStorageKind.STACK -> TODO()
} }
} }
DataType.UWORD -> { DataType.UWORD -> {
@ -1157,8 +1158,8 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
} }
TargetStorageKind.MEMORY -> throw AssemblyError("no asm gen for uword-memory not") TargetStorageKind.MEMORY -> throw AssemblyError("no asm gen for uword-memory not")
TargetStorageKind.ARRAY -> TODO("in-place not of uword array") TargetStorageKind.ARRAY -> TODO("in-place not of uword array")
TargetStorageKind.REGISTER -> TODO() TargetStorageKind.REGISTER -> TODO("reg")
TargetStorageKind.STACK -> TODO() TargetStorageKind.STACK -> TODO("stack")
} }
} }
else -> throw AssemblyError("boolean-not of invalid type") else -> throw AssemblyError("boolean-not of invalid type")
@ -1204,11 +1205,9 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
} }
} }
} }
TargetStorageKind.ARRAY -> { TargetStorageKind.ARRAY -> TODO("in-place invert ubyte array")
TODO("in-place invert ubyte array") TargetStorageKind.REGISTER -> TODO("reg")
} TargetStorageKind.STACK -> TODO("stack")
TargetStorageKind.REGISTER -> TODO()
TargetStorageKind.STACK -> TODO()
} }
} }
DataType.UWORD -> { DataType.UWORD -> {
@ -1224,8 +1223,8 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
} }
TargetStorageKind.MEMORY -> throw AssemblyError("no asm gen for uword-memory invert") TargetStorageKind.MEMORY -> throw AssemblyError("no asm gen for uword-memory invert")
TargetStorageKind.ARRAY -> TODO("in-place invert uword array") TargetStorageKind.ARRAY -> TODO("in-place invert uword array")
TargetStorageKind.REGISTER -> TODO() TargetStorageKind.REGISTER -> TODO("reg")
TargetStorageKind.STACK -> TODO() TargetStorageKind.STACK -> TODO("stack")
} }
} }
else -> throw AssemblyError("invert of invalid type") else -> throw AssemblyError("invert of invalid type")
@ -1245,8 +1244,8 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
} }
TargetStorageKind.MEMORY -> throw AssemblyError("can't in-place negate memory ubyte") TargetStorageKind.MEMORY -> throw AssemblyError("can't in-place negate memory ubyte")
TargetStorageKind.ARRAY -> TODO("in-place negate byte array") TargetStorageKind.ARRAY -> TODO("in-place negate byte array")
TargetStorageKind.REGISTER -> TODO() TargetStorageKind.REGISTER -> TODO("reg")
TargetStorageKind.STACK -> TODO() TargetStorageKind.STACK -> TODO("stack")
} }
} }
DataType.WORD -> { DataType.WORD -> {
@ -1263,8 +1262,8 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
} }
TargetStorageKind.ARRAY -> TODO("in-place negate word array") TargetStorageKind.ARRAY -> TODO("in-place negate word array")
TargetStorageKind.MEMORY -> throw AssemblyError("no asm gen for word memory negate") TargetStorageKind.MEMORY -> throw AssemblyError("no asm gen for word memory negate")
TargetStorageKind.REGISTER -> TODO() TargetStorageKind.REGISTER -> TODO("reg")
TargetStorageKind.STACK -> TODO() TargetStorageKind.STACK -> TODO("stack")
} }
} }
DataType.FLOAT -> { DataType.FLOAT -> {
@ -1284,8 +1283,8 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
} }
TargetStorageKind.ARRAY -> TODO("in-place negate float array") TargetStorageKind.ARRAY -> TODO("in-place negate float array")
TargetStorageKind.MEMORY -> throw AssemblyError("no asm gen for float memory negate") TargetStorageKind.MEMORY -> throw AssemblyError("no asm gen for float memory negate")
TargetStorageKind.REGISTER -> TODO() TargetStorageKind.REGISTER -> TODO("reg")
TargetStorageKind.STACK -> TODO() TargetStorageKind.STACK -> TODO("stack")
} }
} }
else -> throw AssemblyError("negate of invalid type") else -> throw AssemblyError("negate of invalid type")

22
examples/test.p8
View File

@ -5,11 +5,27 @@ main {
sub start() { sub start() {
str tekst = "the quick brown fox" uword xx = $ef34
c64scr.print_uw(strlen("aapje")) xx &= $00f0
c64scr.print_uwhex(xx, 1)
c64.CHROUT('\n') c64.CHROUT('\n')
c64scr.print_uw(strlen(tekst)) xx |= $000f
c64scr.print_uwhex(xx, 1)
c64.CHROUT('\n')
xx ^= $0011
c64scr.print_uwhex(xx, 1)
c64.CHROUT('\n')
xx = $ef34
xx &= $f000
c64scr.print_uwhex(xx, 1)
c64.CHROUT('\n')
xx |= $0f00
c64scr.print_uwhex(xx, 1)
c64.CHROUT('\n')
xx ^= $1100
c64scr.print_uwhex(xx, 1)
c64.CHROUT('\n') c64.CHROUT('\n')
} }
} }