6502/millfork
1
0
Fork 0
mirror of https://github.com/KarolS/millfork.git synced 2025-04-05 13:37:25 +00:00
Code Issues Projects Releases Wiki Activity

Fixes for pointee incrementing and decimal addition

Browse Source
This commit is contained in:
Karol Stasiak 2018-02-25 00:45:25 +01:00
parent 8d482ca8bf
commit fa56d31cb4
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/scala/millfork/compiler/BuiltIns.scala
View File

@ -98,6 +98,9 @@ object BuiltIns {
def insertBeforeLast(item: AssemblyLine, list: List[AssemblyLine]): List[AssemblyLine] = list match {
case Nil => Nil
case last :: cld :: Nil if cld.opcode == CLD => item :: last :: cld :: Nil
case last :: cld :: dex :: txs :: Nil if cld.opcode == CLD && dex.opcode == DEX && txs.opcode == TXS => item :: last :: cld :: dex :: txs :: Nil
case last :: cld :: inx :: txs :: Nil if cld.opcode == CLD && inx.opcode == INX && txs.opcode == TXS => item :: last :: cld :: inx :: txs :: Nil
case last :: dex :: txs :: Nil if dex.opcode == DEX && txs.opcode == TXS => item :: last :: dex :: txs :: Nil
case last :: inx :: txs :: Nil if inx.opcode == INX && txs.opcode == TXS => item :: last :: inx :: txs :: Nil
case last :: Nil => item :: last :: Nil
@ -555,15 +558,23 @@ object BuiltIns {
}
val env = ctx.env
val b = env.get[Type]("byte")
val lhsIsDirectlyIncrementable = v match {
case _:VariableExpression => true
case IndexedExpression(pointy, _) => env.getPointy(pointy) match {
case _:ConstantPointy => true
case _:VariablePointy => false
}
case _ => false
}
env.eval(addend) match {
case Some(NumericConstant(0, _)) => Nil
case Some(NumericConstant(1, _)) if !decimal => if (subtract) {
case Some(NumericConstant(1, _)) if lhsIsDirectlyIncrementable && !decimal => if (subtract) {
simpleOperation(DEC, ctx, v, IndexChoice.RequireX, preserveA = false, commutative = true)
} else {
simpleOperation(INC, ctx, v, IndexChoice.RequireX, preserveA = false, commutative = true)
}
// TODO: compile +=2 to two INCs
case Some(NumericConstant(-1, _)) if !decimal => if (subtract) {
case Some(NumericConstant(-1, _)) if lhsIsDirectlyIncrementable && !decimal => if (subtract) {
simpleOperation(INC, ctx, v, IndexChoice.RequireX, preserveA = false, commutative = true)
} else {
simpleOperation(DEC, ctx, v, IndexChoice.RequireX, preserveA = false, commutative = true)

22
src/test/scala/millfork/test/ByteDecimalMathSuite.scala
View File

@ -1,6 +1,6 @@
package millfork.test
import millfork.test.emu.{EmuBenchmarkRun, EmuUnoptimizedRun}
import millfork.test.emu.{EmuBenchmarkRun, EmuOptimizedRun, EmuUnoptimizedRun}
import org.scalatest.{FunSuite, Matchers}
/**
@ -228,4 +228,24 @@ class ByteDecimalMathSuite extends FunSuite with Matchers {
toDecimal(m.readWord(0xc000)) should equal((i * j) % 100)
}
}
test("Decimal comparison") {
// CMP#0 shouldn't be elided after a decimal operation.
// Currently no emulator used for testing can catch that.
EmuBenchmarkRun(
"""
| byte output @$c000
| void main () {
| init()
| if output +' 1 == 0 {
| output = $22
| }
| output +'= 1
| }
| void init() { output = $99 }
""".stripMargin
) { m =>
m.readByte(0xc000) should equal(0x23)
}
}
}