6502/millfork
1
0
Fork 0
mirror of https://github.com/KarolS/millfork.git synced 2025-02-06 17:30:05 +00:00
Code Issues Projects Releases Wiki Activity

Fix unused object detection

Browse Source
This commit is contained in:
Karol Stasiak 2019-06-25 00:26:52 +02:00
parent d8defaad82
commit 978d97cd7d
2 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/scala/millfork/node/opt/UnusedFunctions.scala
View File

@ -93,13 +93,7 @@ object UnusedFunctions extends NodeOptimization {
def getAllCalledFunctions(c: Constant): List[String] = c match {
case SubbyteConstant(cc, _) => getAllCalledFunctions(cc)
case CompoundConstant(_, l, r) => getAllCalledFunctions(l) ++ getAllCalledFunctions(r)
case MemoryAddressConstant(th) => List(
th.name,
th.name.stripSuffix(".addr"),
th.name.stripSuffix(".hi"),
th.name.stripSuffix(".lo"),
th.name.stripSuffix(".addr.lo"),
th.name.stripSuffix(".addr.hi"))
case MemoryAddressConstant(th) => List(th.name.takeWhile(_ != '.'))
case _ => Nil
}
@ -112,13 +106,7 @@ object UnusedFunctions extends NodeOptimization {
case s: ReturnDispatchStatement =>
getAllCalledFunctions(s.getAllExpressions) ++ getAllCalledFunctions(s.branches.map(_.function))
case s: Statement => getAllCalledFunctions(s.getAllExpressions)
case s: VariableExpression => List(
s.name,
s.name.stripSuffix(".addr"),
s.name.stripSuffix(".hi"),
s.name.stripSuffix(".lo"),
s.name.stripSuffix(".addr.lo"),
s.name.stripSuffix(".addr.hi"))
case s: VariableExpression => List(s.name.takeWhile(_ != '.'))
case s: LiteralExpression => Nil
case HalfWordExpression(param, _) => getAllCalledFunctions(param :: Nil)
case SumExpression(xs, decimal) =>

17
src/main/scala/millfork/node/opt/UnusedLocalVariables.scala
View File

@ -31,25 +31,12 @@ object UnusedLocalVariables extends NodeOptimization {
def getAllReadVariables(c: Constant): List[String] = c match {
case SubbyteConstant(cc, _) => getAllReadVariables(cc)
case CompoundConstant(_, l, r) => getAllReadVariables(l) ++ getAllReadVariables(r)
case MemoryAddressConstant(th) => List(
th.name,
th.name.stripSuffix(".array"),
th.name.stripSuffix(".addr"),
th.name.stripSuffix(".hi"),
th.name.stripSuffix(".lo"),
th.name.stripSuffix(".addr.lo"),
th.name.stripSuffix(".addr.hi"))
case MemoryAddressConstant(th) => List(th.name.takeWhile(_ != '.'))
case _ => Nil
}
def getAllReadVariables(expressions: List[Node]): List[String] = expressions.flatMap {
case s: VariableExpression => List(
s.name,
s.name.stripSuffix(".addr"),
s.name.stripSuffix(".hi"),
s.name.stripSuffix(".lo"),
s.name.stripSuffix(".addr.lo"),
s.name.stripSuffix(".addr.hi"))
case s: VariableExpression => List(s.name.takeWhile(_ != '.'))
case s: LiteralExpression => Nil
case HalfWordExpression(param, _) => getAllReadVariables(param :: Nil)
case SumExpression(xs, _) => getAllReadVariables(xs.map(_._2))