Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2024-12-24 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

fixed bug in assembly optimizer removing too many instructions

Browse Source
This commit is contained in:
Irmen de Jong 2022-01-28 15:19:08 +01:00
parent 7b3cd71085
commit 1815cb1bc3
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
codeGenCpu6502/src/prog8/codegen/cpu6502/AsmOptimizer.kt
View File

@ -64,6 +64,10 @@ fun optimizeAssembly(lines: MutableList<String>, machine: IMachineDefinition, pr
return numberOfOptimizations return numberOfOptimizations
} }
private fun String.isBranch() = this.startsWith("b")
private fun String.isStoreReg() = this.startsWith("sta") || this.startsWith("sty") || this.startsWith("stx")
private fun String.isLoadReg() = this.startsWith("lda") || this.startsWith("ldy") || this.startsWith("ldx")
private class Modification(val lineIndex: Int, val remove: Boolean, val replacement: String?) private class Modification(val lineIndex: Int, val remove: Boolean, val replacement: String?)
private fun apply(modifications: List<Modification>, lines: MutableList<String>) { private fun apply(modifications: List<Modification>, lines: MutableList<String>) {
@ -196,9 +200,9 @@ private fun optimizeSameAssignments(linesByFourteen: List<List<IndexedValue<Stri
sta A1 sta A1
sty A2 sty A2
*/ */
if(first.startsWith("st") && second.startsWith("st") if(first.isStoreReg() && second.isStoreReg()
&& third.startsWith("ld") && fourth.startsWith("ld") && third.isLoadReg() && fourth.isLoadReg()
&& fifth.startsWith("st") && sixth.startsWith("st")) { && fifth.isStoreReg() && sixth.isStoreReg()) {
val reg1 = first[2] val reg1 = first[2]
val reg2 = second[2] val reg2 = second[2]
val reg3 = third[2] val reg3 = third[2]
@ -227,8 +231,8 @@ private fun optimizeSameAssignments(linesByFourteen: List<List<IndexedValue<Stri
lda A1 ; can be removed lda A1 ; can be removed
ldy A2 ; can be removed if not followed by a branch instuction ldy A2 ; can be removed if not followed by a branch instuction
*/ */
if(!overlappingMods && first.startsWith("st") && second.startsWith("st") if(!overlappingMods && first.isStoreReg() && second.isStoreReg()
&& third.startsWith("ld") && fourth.startsWith("ld")) { && third.isLoadReg() && fourth.isLoadReg()) {
val reg1 = first[2] val reg1 = first[2]
val reg2 = second[2] val reg2 = second[2]
val reg3 = third[2] val reg3 = third[2]
@ -254,8 +258,8 @@ private fun optimizeSameAssignments(linesByFourteen: List<List<IndexedValue<Stri
sty A2 sty A2
lda A1 ; can be removed if not followed by a branch instruction lda A1 ; can be removed if not followed by a branch instruction
*/ */
if(!overlappingMods && first.startsWith("st") && second.startsWith("st") if(!overlappingMods && first.isStoreReg() && second.isStoreReg()
&& third.startsWith("ld") && !fourth.startsWith("b")) { && third.isLoadReg() && !fourth.isBranch()) {
val reg1 = first[2] val reg1 = first[2]
val reg3 = third[2] val reg3 = third[2]
if(reg1==reg3) { if(reg1==reg3) {
@ -276,7 +280,7 @@ private fun optimizeSameAssignments(linesByFourteen: List<List<IndexedValue<Stri
ldy A1 ; make tay ldy A1 ; make tay
sta A1 ; remove sta A1 ; remove
*/ */
if(!overlappingMods && first.startsWith("sta") && second.startsWith("ld") if(!overlappingMods && first.startsWith("sta") && second.isLoadReg()
&& third.startsWith("sta") && second.length>4) { && third.startsWith("sta") && second.length>4) {
val firstvalue = first.substring(4) val firstvalue = first.substring(4)
val secondvalue = second.substring(4) val secondvalue = second.substring(4)
@ -296,7 +300,7 @@ private fun optimizeSameAssignments(linesByFourteen: List<List<IndexedValue<Stri
sta A sta A
sta A sta A
*/ */
if(!overlappingMods && first.startsWith("st") && second.startsWith("st")) { if(!overlappingMods && first.isStoreReg() && second.isStoreReg()) {
if(first[2]==second[2]) { if(first[2]==second[2]) {
val firstvalue = first.substring(4) val firstvalue = first.substring(4)
val secondvalue = second.substring(4) val secondvalue = second.substring(4)
@ -333,7 +337,7 @@ private fun optimizeStoreLoadSame(linesByFour: List<List<IndexedValue<String>>>,
) { ) {
val third = lines[3].value.trimStart() val third = lines[3].value.trimStart()
val attemptRemove = val attemptRemove =
if(third.startsWith("b")) { if(third.isBranch()) {
// a branch instruction follows, we can only remove the load instruction if // a branch instruction follows, we can only remove the load instruction if
// another load instruction of the same register precedes the store instruction // another load instruction of the same register precedes the store instruction
// (otherwise wrong cpu flags are used) // (otherwise wrong cpu flags are used)