Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2025-01-25 12:30:09 +00:00
Code Issues Projects Releases Wiki Activity

IR: implemented rol(), rol2(), ror(), ror2() for split word arrays

Browse Source
This commit is contained in:
Irmen de Jong 2025-01-03 04:50:08 +01:00
parent 4db6859f3f
commit 5d33c93af9
4 changed files with 99 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
codeGenIntermediate/src/prog8/codegen/intermediate/AssignmentGen.kt
View File

@ -119,7 +119,7 @@ internal class AssignmentGen(private val codeGen: IRCodeGen, private val express
origAssign.operator.dropLast(1)
}
}
value = PtBinaryExpression(operator, origAssign.value.type, origAssign.value.position)
value = PtBinaryExpression(operator, origAssign.target.type, origAssign.value.position)
val left: PtExpression = origAssign.target.children.single() as PtExpression
value.add(left)
value.add(origAssign.value)
@ -997,10 +997,14 @@ internal class AssignmentGen(private val codeGen: IRCodeGen, private val express
private fun operatorShiftRightInplace(symbol: String?, array: PtArrayIndexer?, constAddress: Int?, memory: PtMemoryByte?, vmDt: IRDataType, operand: PtExpression, signed: Boolean): IRCodeChunks? {
if(array!=null) {
TODO(">> in array")
if(array.splitWords)
return null // TODO("optimized >> in split word array")
else {
return null // TODO("optimized >> in array")
}
}
if(constAddress==null && memory!=null)
return null // TODO("optimized memory in-place >>"")
return null // TODO("optimized memory in-place >>"")
val result = mutableListOf<IRCodeChunkBase>()
if(codeGen.isOne(operand)) {
@ -1025,7 +1029,11 @@ internal class AssignmentGen(private val codeGen: IRCodeGen, private val express
private fun operatorShiftLeftInplace(symbol: String?, array: PtArrayIndexer?, constAddress: Int?, memory: PtMemoryByte?, vmDt: IRDataType, operand: PtExpression): IRCodeChunks? {
if(array!=null) {
TODO("<< in array")
if(array.splitWords)
return null // TODO("optimized << in split word array")
else {
return null // TODO("optimized << in array")
}
}
if(constAddress==null && memory!=null)
return null // TODO("optimized memory in-place <<"")

22
codeGenIntermediate/src/prog8/codegen/intermediate/BuiltinFuncGen.kt
View File

@ -549,10 +549,24 @@ internal class BuiltinFuncGen(private val codeGen: IRCodeGen, private val exprGe
val index = arr?.index?.asConstInteger()
if(arr!=null && index!=null) {
val variable = arr.variable.name
if(arr.splitWords)
TODO("IR rol/ror on split words array")
val offset = codeGen.program.memsizer.memorySize(arr.type, index)
addInstr(result, IRInstruction(opcodeMemAndReg.first, vmDt, labelSymbol = variable, symbolOffset = offset), null)
if(arr.splitWords) {
result += IRCodeChunk(null, null).also {
when(opcodeMemAndReg.first) {
Opcode.ROXRM, Opcode.RORM -> {
it += IRInstruction(opcodeMemAndReg.first, IRDataType.BYTE, labelSymbol = "${variable}_msb", symbolOffset = index)
it += IRInstruction(opcodeMemAndReg.first, IRDataType.BYTE, labelSymbol = "${variable}_lsb", symbolOffset = index)
}
Opcode.ROXLM, Opcode.ROLM -> {
it += IRInstruction(opcodeMemAndReg.first, IRDataType.BYTE, labelSymbol = "${variable}_lsb", symbolOffset = index)
it += IRInstruction(opcodeMemAndReg.first, IRDataType.BYTE, labelSymbol = "${variable}_msb", symbolOffset = index)
}
else -> throw AssemblyError("wrong rol/ror opcode")
}
}
} else {
val offset = codeGen.program.memsizer.memorySize(arr.type, index)
addInstr(result, IRInstruction(opcodeMemAndReg.first, vmDt, labelSymbol = variable, symbolOffset = offset), null)
}
return ExpressionCodeResult(result, vmDt, -1, -1)
}

5
docs/source/todo.rst
View File

@ -1,6 +1,9 @@
TODO
====
- IR: implement "optimized << in array" / "optimized >> in array"
- IR: implement "optimized << in split word array" / "optimized >> in split word array"
- add paypal donation button as well?
- announce prog8 on the 6502.org site?
@ -47,8 +50,6 @@ IR/VM
-----
- getting it in shape for code generation...: the IR file should be able to encode every detail about a prog8 program (the VM doesn't have to actually be able to run all of it though!)
- add BZ and BNZ instructions? To replace CMPI #0 + Branch?
- fix TODO("IR rol/ror on split words array")
- fix "<< in array" / ">> in array"
- implement fast code paths for TODO("inplace split....
- sometimes source lines end up missing in the output p8ir, for example the first assignment is gone in:
sub start() {

67
examples/test.p8
View File

@ -4,7 +4,72 @@
main {
sub start() {
txt.print_uw(cx16.r0)
uword wv = %01000010_01000010
; expected: $8484 $4242
sys.set_carry()
rol(wv)
txt.print_uwhex(wv, true)
sys.set_carry()
ror(wv)
txt.print_uwhex(wv, true)
txt.nl()
wv = %01000010_01000010
sys.set_carry()
rol2(wv)
txt.print_uwhex(wv, true)
sys.set_carry()
ror2(wv)
txt.print_uwhex(wv, true)
txt.nl()
uword[] @nosplit arr = [ %01000010_01000010 , %01000010_01000010, %01000010_01000010 ]
uword[] @split arrsplit = [ %01000010_01000010 , %01000010_01000010, %01000010_01000010 ]
sys.set_carry()
rol(arr[2])
txt.print_uwhex(arr[2], true)
sys.set_carry()
ror(arr[2])
txt.print_uwhex(arr[2], true)
txt.nl()
sys.set_carry()
rol2(arr[1])
txt.print_uwhex(arr[1], true)
sys.set_carry()
ror2(arr[1])
txt.print_uwhex(arr[1], true)
txt.nl()
sys.set_carry()
rol(arrsplit[2])
txt.print_uwhex(arrsplit[2], true)
sys.set_carry()
ror(arrsplit[2])
txt.print_uwhex(arrsplit[2], true)
txt.nl()
sys.set_carry()
rol2(arrsplit[1])
txt.print_uwhex(arrsplit[1], true)
sys.set_carry()
ror2(arrsplit[1])
txt.print_uwhex(arrsplit[1], true)
txt.nl()
; expected $2468 $1234
arr[2] = $1234
arr[2] <<= 1
txt.print_uwhex(arr[2], true)
arr[2] >>= 1
txt.print_uwhex(arr[2], true)
txt.nl()
arrsplit[2] = $1234
arrsplit[2] <<= 1
txt.print_uwhex(arrsplit[2], true)
arrsplit[2] >>= 1
txt.print_uwhex(arrsplit[2], true)
txt.nl()
}
}