6502/millfork
1
0
Fork 0
mirror of https://github.com/KarolS/millfork.git synced 2025-01-11 12:29:46 +00:00
Code Issues Projects Releases Wiki Activity

8080: fixed shifting by 0

Browse Source
This commit is contained in:
Karol Stasiak 2018-12-13 23:12:32 +01:00
parent bdd41350a7
commit c1ce4a9283
2 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/scala/millfork/compiler/z80/Z80Shifting.scala
View File

@ -5,7 +5,7 @@ import millfork.assembly.z80.{NoRegisters, ZLine, ZOpcode}
import millfork.compiler.CompilationContext import millfork.compiler.CompilationContext
import millfork.env.NumericConstant import millfork.env.NumericConstant
import millfork.error.ConsoleLogger import millfork.error.ConsoleLogger
import millfork.node.{Expression, LhsExpression, ZRegister} import millfork.node._
import scala.collection.GenTraversableOnce import scala.collection.GenTraversableOnce
@ -14,6 +14,10 @@ import scala.collection.GenTraversableOnce
*/ */
object Z80Shifting { object Z80Shifting {
private def calculateIterationCountPlus1(ctx: CompilationContext, rhs: Expression) = {
Z80ExpressionCompiler.compile8BitTo(ctx, SumExpression(List(false -> rhs, false -> LiteralExpression(1, 1)), false), ZRegister.B)
}
private def fixAfterShiftIfNeeded(extendedOps: Boolean, left: Boolean, i: Long): List[ZLine] = private def fixAfterShiftIfNeeded(extendedOps: Boolean, left: Boolean, i: Long): List[ZLine] =
if (extendedOps || left) { if (extendedOps || left) {
Nil Nil
@ -41,11 +45,12 @@ object Z80Shifting {
l ++ List.tabulate(i.toInt)(_ => op) ++ fixAfterShiftIfNeeded(extendedOps, left, i) l ++ List.tabulate(i.toInt)(_ => op) ++ fixAfterShiftIfNeeded(extendedOps, left, i)
} }
case _ => case _ =>
val calcCount = Z80ExpressionCompiler.compile8BitTo(ctx, rhs, ZRegister.B) val calcCount = calculateIterationCountPlus1(ctx, rhs)
val l = Z80ExpressionCompiler.stashBCIfChanged(ctx, Z80ExpressionCompiler.compileToA(ctx, lhs)) val l = Z80ExpressionCompiler.stashBCIfChanged(ctx, Z80ExpressionCompiler.compileToA(ctx, lhs))
val loopBody = op :: fixAfterShiftIfNeeded(extendedOps, left, 1) val loopBody = op :: fixAfterShiftIfNeeded(extendedOps, left, 1)
val label = ctx.nextLabel("sh") val labelL = ctx.nextLabel("sh")
calcCount ++ l ++ List(ZLine.label(label)) ++ loopBody ++ ZLine.djnz(ctx, label) val labelS = ctx.nextLabel("sh")
calcCount ++ l ++ List(ZLine.jumpR(ctx, labelS), ZLine.label(labelL)) ++ loopBody ++ List(ZLine.label(labelS)) ++ ZLine.djnz(ctx, labelL)
} }
} }
@ -117,11 +122,12 @@ object Z80Shifting {
} }
} }
case _ => case _ =>
val calcCount = Z80ExpressionCompiler.compile8BitTo(ctx, rhs, ZRegister.B) val calcCount = calculateIterationCountPlus1(ctx, rhs)
val l = Z80ExpressionCompiler.stashBCIfChanged(ctx, Z80ExpressionCompiler.compileToA(ctx, lhs)) val l = Z80ExpressionCompiler.stashBCIfChanged(ctx, Z80ExpressionCompiler.compileToA(ctx, lhs))
val loopBody = ZLine.register(op, ZRegister.A) :: fixAfterShiftIfNeeded(extendedOps, left, 1) val loopBody = ZLine.register(op, ZRegister.A) :: fixAfterShiftIfNeeded(extendedOps, left, 1)
val label = ctx.nextLabel("sh") val labelL = ctx.nextLabel("sh")
calcCount ++ l ++ List(ZLine.label(label)) ++ loopBody ++ ZLine.djnz(ctx, label) ++ Z80ExpressionCompiler.storeA(ctx, lhs, signedSource = false) val labelS = ctx.nextLabel("sh")
calcCount ++ l ++ List(ZLine.jumpR(ctx, labelS), ZLine.label(labelL)) ++ loopBody ++ List(ZLine.label(labelS)) ++ ZLine.djnz(ctx, labelL) ++ Z80ExpressionCompiler.storeA(ctx, lhs, signedSource = false)
} }
} }
@ -168,7 +174,7 @@ object Z80Shifting {
} }
} }
case _ => case _ =>
val calcCount = Z80ExpressionCompiler.compile8BitTo(ctx, rhs, ZRegister.B) val calcCount = calculateIterationCountPlus1(ctx, rhs)
val loopBody = val loopBody =
if (extendedOps) { if (extendedOps) {
if (left) { if (left) {
@ -200,8 +206,9 @@ object Z80Shifting {
ZLine.ld8(ZRegister.L, ZRegister.A)) ZLine.ld8(ZRegister.L, ZRegister.A))
} }
} }
val label = ctx.nextLabel("sh") val labelS = ctx.nextLabel("sh")
calcCount ++ l ++ List(ZLine.label(label)) ++ loopBody ++ ZLine.djnz(ctx, label) val labelL = ctx.nextLabel("sh")
calcCount ++ l ++ List(ZLine.jumpR(ctx, labelS), ZLine.label(labelL)) ++ loopBody ++ List(ZLine.label(labelS)) ++ ZLine.djnz(ctx, labelL)
} }
} }
@ -270,9 +277,10 @@ object Z80Shifting {
case Some(NumericConstant(n, _)) => case Some(NumericConstant(n, _)) =>
List.fill(n.toInt)(shiftOne).flatten List.fill(n.toInt)(shiftOne).flatten
case _ => case _ =>
val label = ctx.nextLabel("sh") val calcCount = calculateIterationCountPlus1(ctx, rhs)
val calcCount = Z80ExpressionCompiler.compile8BitTo(ctx, rhs, ZRegister.B) val labelL = ctx.nextLabel("sh")
calcCount ++ List(ZLine.label(label)) ++ shiftOne ++ ZLine.djnz(ctx, label) val labelS = ctx.nextLabel("sh")
calcCount ++ List(ZLine.jumpR(ctx, labelS), ZLine.label(labelL)) ++ shiftOne ++ List(ZLine.label(labelS)) ++ ZLine.djnz(ctx, labelL)
} }
} }

21
src/test/scala/millfork/test/ShiftSuite.scala
View File

@ -102,4 +102,25 @@ class ShiftSuite extends FunSuite with Matchers {
m.readByte(0xc005) should equal(8) m.readByte(0xc005) should equal(8)
} }
} }
test("Zero shifting") {
EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp)("""
| byte output0 @$c000
| byte output1 @$c001
| noinline byte sl(byte input, byte amount) {
| return input << amount
| }
| noinline byte sr(byte input, byte amount) {
| return input >> amount
| }
| void main () {
| output0 = sl(42, 0)
| output1 = sr(42, 0)
| }
| noinline byte b(byte x) { return x }
""".stripMargin){m =>
m.readByte(0xc000) should equal(42)
m.readByte(0xc001) should equal(42)
}
}
} }