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

6502: detect zeropage pointers more aggressively

Browse Source
This commit is contained in:
Karol Stasiak 2019-01-04 11:55:35 +01:00
parent bf0da19ab9
commit 25ca2cd6b8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/millfork/node/Node.scala
View File

@ -182,7 +182,7 @@ case class VariableExpression(name: String) extends LhsExpression {
override def replaceVariable(variable: String, actualParam: Expression): Expression = override def replaceVariable(variable: String, actualParam: Expression): Expression =
if (name == variable) actualParam else this if (name == variable) actualParam else this
override def containsVariable(variable: String): Boolean = name == variable override def containsVariable(variable: String): Boolean = name == variable
override def getPointies: Seq[String] = Seq.empty override def getPointies: Seq[String] = if (name.endsWith(".addr.lo")) Seq(name.takeWhile(_ != '.')) else Seq.empty
override def isPure: Boolean = true override def isPure: Boolean = true
override def getAllIdentifiers: Set[String] = Set(name) override def getAllIdentifiers: Set[String] = Set(name)
} }
@ -376,6 +376,8 @@ case class MosAssemblyStatement(opcode: Opcode.Value, addrMode: AddrMode.Value,
case AddrMode.IndexedY | AddrMode.IndexedX | AddrMode.LongIndexedY | AddrMode.IndexedZ | AddrMode.LongIndexedZ | case AddrMode.IndexedY | AddrMode.IndexedX | AddrMode.LongIndexedY | AddrMode.IndexedZ | AddrMode.LongIndexedZ |
AddrMode.ZeroPage | AddrMode.ZeroPageX | AddrMode.ZeroPageY => AddrMode.ZeroPage | AddrMode.ZeroPageX | AddrMode.ZeroPageY =>
expression.getAllIdentifiers.toSeq.map(_.takeWhile(_ != '.')) expression.getAllIdentifiers.toSeq.map(_.takeWhile(_ != '.'))
case AddrMode.Immediate =>
expression.getAllIdentifiers.toSeq.filter(i => !i.contains('.') || i.endsWith(".addr") || i.endsWith(".addr.lo")).map(_.takeWhile(_ != '.'))
case _ => Seq.empty case _ => Seq.empty
} }
} }