From 92290923097b4ca0dc7ce5b076ad8338543b4802 Mon Sep 17 00:00:00 2001 From: Karol Stasiak Date: Fri, 27 Jan 2023 18:16:25 +0100 Subject: [PATCH] random minor stuff --- src/main/scala/millfork/assembly/z80/ZLine.scala | 2 +- src/main/scala/millfork/node/Node.scala | 4 ++-- src/main/scala/millfork/output/CompiledMemory.scala | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/scala/millfork/assembly/z80/ZLine.scala b/src/main/scala/millfork/assembly/z80/ZLine.scala index 5f87ff51..320e8454 100644 --- a/src/main/scala/millfork/assembly/z80/ZLine.scala +++ b/src/main/scala/millfork/assembly/z80/ZLine.scala @@ -953,7 +953,7 @@ case class ZLine(opcode: ZOpcode.Value, registers: ZRegisters, parameter: Consta if (result.contains("???")) s" ??? (${this.toString.stripPrefix(" ")})" else result } - def readsRegister(r: ZRegister.Value): Boolean = { + def readsRegister(r: ZRegister.Value): Boolean = { // TODO: optimize import ZOpcode._ import ZRegister._ r match { diff --git a/src/main/scala/millfork/node/Node.scala b/src/main/scala/millfork/node/Node.scala index 14d83f6d..42a20da5 100644 --- a/src/main/scala/millfork/node/Node.scala +++ b/src/main/scala/millfork/node/Node.scala @@ -240,8 +240,8 @@ object MosNiceFunctionProperty { case object DoesntConcernD extends NiceFunctionProperty("D") case object DoesntChangeZpRegister extends NiceFunctionProperty("reg") case class SetsSourceOfNZ(sourceOfNZ: SourceOfNZ) extends NiceFunctionProperty(sourceOfNZ + "NZ") - case class SetsXTo(value: Int) extends NiceFunctionProperty("Y=" + value) - case class SetsYTo(value: Int) extends NiceFunctionProperty("Z=" + value) + case class SetsXTo(value: Int) extends NiceFunctionProperty("X=" + value) + case class SetsYTo(value: Int) extends NiceFunctionProperty("Y=" + value) case class SetsATo(value: Int) extends NiceFunctionProperty("A=" + value) case class Bit0OfA(value: Boolean) extends NiceFunctionProperty("A0=" + value) case class Bit7OfA(value: Boolean) extends NiceFunctionProperty("A7=" + value) diff --git a/src/main/scala/millfork/output/CompiledMemory.scala b/src/main/scala/millfork/output/CompiledMemory.scala index fef6fc1f..691e0f7a 100644 --- a/src/main/scala/millfork/output/CompiledMemory.scala +++ b/src/main/scala/millfork/output/CompiledMemory.scala @@ -51,6 +51,7 @@ class MemoryBank(val index: Int, val isBigEndian: Boolean) { def readWord(addrHi: Int, addrLo: Int): Int = readByte(addrLo) + (readByte(addrHi) << 8) + // TODO: use new: val output: Array[Byte] = Array.fill[Byte](1 << 16)(0) val occupied: Array[Boolean] = Array.fill(1 << 16)(false) val initialized: Array[Boolean] = Array.fill(1 << 16)(false)