6502/millfork
1
0
Fork 0
mirror of https://github.com/KarolS/millfork.git synced 2025-04-04 22:29:32 +00:00
Code Issues Projects Releases Wiki Activity

mapValues is lazy what the fuck

Browse Source
This commit is contained in:
Karol Stasiak 2019-06-28 16:24:49 +02:00
parent 4d59edbe51
commit 3d68d4f990
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/millfork/assembly/mos/opt/FlowAnalyzer.scala
View File

@ -55,7 +55,7 @@ object FlowAnalyzer {
case _ => Some(code.flatMap {
case AssemblyLine0(op, _, MemoryAddressConstant(Label(l))) if op != Opcode.LABEL => Some(l)
case _ => None
}.groupBy(identity).mapValues(_.size))
}.groupBy(identity).mapValues(_.size).view.force)
}
val holder = new FlowHolder(forwardFlow, reverseFlow)
code.zipWithIndex.map{ case (line, i) => FlowInfo(holder, i, labelMap) -> line}

2
src/main/scala/millfork/assembly/mos/opt/VariableLifetime.scala
View File

@ -23,7 +23,7 @@ object VariableLifetime {
val labelMap = code.zipWithIndex.flatMap(a => a._1.parameter match {
case MemoryAddressConstant(Label(l)) => List(l -> a._2)
case _ => Nil
}).groupBy(_._1).mapValues(_.map(_._2).toSet)
}).groupBy(_._1).mapValues(_.map(_._2).toSet).view.force
while (changed) {
changed = false

2
src/main/scala/millfork/assembly/z80/opt/FlowAnalyzer.scala
View File

@ -49,7 +49,7 @@ object FlowAnalyzer {
case _ => Some(code.flatMap {
case ZLine0(op, _, MemoryAddressConstant(Label(l))) if op != ZOpcode.LABEL => Some(l)
case _ => None
}.groupBy(identity).mapValues(_.size))
}.groupBy(identity).mapValues(_.size).view.force)
}
val holder = new FlowHolder(forwardFlow, reverseFlow)
code.zipWithIndex.map{ case (line, i) => FlowInfo(holder, i, labelMap) -> line}

8
src/main/scala/millfork/assembly/z80/opt/ReverseFlowAnalyzer.scala
View File

@ -128,8 +128,8 @@ case class CpuImportance(a: Importance = UnknownImportance,
case ZRegister.IYH => this.copy(iyh = Important)
case ZRegister.IYL => this.copy(iyl = Important)
case ZRegister.IX => this.copy(ixh = Important, ixl = Important)
case ZRegister.MEM_IX_D => this.copy(ixh = Important, ixl = Important, memIx = if (offset < 0) memIx.mapValues(_ => Important) else memIx + (offset -> Important))
case ZRegister.MEM_IY_D => this.copy(iyh = Important, iyl = Important, memIy = if (offset < 0) memIy.mapValues(_ => Important) else memIy + (offset -> Important))
case ZRegister.MEM_IX_D => this.copy(ixh = Important, ixl = Important, memIx = if (offset < 0) memIx.mapValues(_ => Important).view.force else memIx + (offset -> Important))
case ZRegister.MEM_IY_D => this.copy(iyh = Important, iyl = Important, memIy = if (offset < 0) memIy.mapValues(_ => Important).view.force else memIy + (offset -> Important))
case ZRegister.IY | ZRegister.MEM_IY_D => this.copy(iyh = Important, iyl = Important)
case _ => this
}
@ -153,9 +153,9 @@ case class CpuImportance(a: Importance = UnknownImportance,
case ZRegister.IXL => this.copy(ixl = Unimportant)
case ZRegister.IYH => this.copy(iyh = Unimportant)
case ZRegister.IYL => this.copy(iyl = Unimportant)
case ZRegister.IX => this.copy(ixh = Unimportant, ixl = Unimportant, memIx = memIx.mapValues(_ => Unimportant))
case ZRegister.IX => this.copy(ixh = Unimportant, ixl = Unimportant, memIx = memIx.mapValues(_ => Unimportant).view.force)
case ZRegister.MEM_IX_D => this.copy(ixh = Important, ixl = Important, memIx = if (offset < 0) Map() else memIx + (offset -> Unimportant))
case ZRegister.IY => this.copy(iyh = Important, iyl = Important, memIy = memIy.mapValues(_ => Unimportant))
case ZRegister.IY => this.copy(iyh = Important, iyl = Important, memIy = memIy.mapValues(_ => Unimportant).view.force)
case ZRegister.MEM_IY_D => this.copy(iyh = Important, iyl = Important, memIy = if (offset < 0) Map() else memIy + (offset -> Unimportant))
case _ => this
}

2
src/main/scala/millfork/assembly/z80/opt/StackVariableLifetime.scala
View File

@ -26,7 +26,7 @@ object StackVariableLifetime {
val labelMap = codeWithFlow.zipWithIndex.flatMap(a => a._1._2.parameter match {
case MemoryAddressConstant(Label(l)) => List(l -> a._2)
case _ => Nil
}).groupBy(_._1).mapValues(_.map(_._2).toSet)
}).groupBy(_._1).mapValues(_.map(_._2).toSet).view.force
while (changed) {
changed = false

2
src/main/scala/millfork/assembly/z80/opt/VariableLifetime.scala
View File

@ -164,7 +164,7 @@ object VariableLifetime {
val labelMap = code.zipWithIndex.flatMap(a => a._1.parameter match {
case MemoryAddressConstant(Label(l)) => List(l -> a._2)
case _ => Nil
}).groupBy(_._1).mapValues(_.map(_._2).toSet)
}).groupBy(_._1).mapValues(_.map(_._2).toSet).view.force
while (changed) {
changed = false

4
src/main/scala/millfork/output/AbstractAssembler.scala
View File

@ -311,8 +311,8 @@ abstract class AbstractAssembler[T <: AbstractCode](private val program: Program
case _ =>
}
val codeAllocators = platform.codeAllocators.mapValues(new VariableAllocator(Nil, _))
var justAfterCode = platform.codeAllocators.mapValues(a => a.startAt)
val codeAllocators = platform.codeAllocators.mapValues(new VariableAllocator(Nil, _)).view.force
var justAfterCode = platform.codeAllocators.mapValues(a => a.startAt).view.force
val sortedCompilerFunctions = compiledFunctions.toList.sortBy { case (name, cf) => if (name == "main") 0 -> "" else cf.orderKey }
sortedCompilerFunctions.filterNot(o => unusedRuntimeObjects(o._1)).foreach {

4
src/main/scala/millfork/output/Deduplicate.scala
View File

@ -86,7 +86,7 @@ abstract class Deduplicate[T <: AbstractCode](env: Environment, options: Compila
x <- set
y <- set
if x != y
} yield x & y).forall(_ == false)).toSeq.map(_.groupBy(chunk => renumerateLabels(chunk.code, temporary = true)).filter(_._2.size >= 2).mapValues(_.toSeq)).filter(_.nonEmpty).map { map =>
} yield x & y).forall(_ == false)).toSeq.map(_.groupBy(chunk => renumerateLabels(chunk.code, temporary = true)).filter(_._2.size >= 2).mapValues(_.toSeq).view.force).filter(_.nonEmpty).map { map =>
map.foldLeft(0) {
(sum, entry) =>
val chunkSize = entry._2.head.codeSizeInBytes
@ -314,7 +314,7 @@ abstract class Deduplicate[T <: AbstractCode](env: Environment, options: Compila
case (name, NormalCompiledFunction(segment, code, false, alignment)) => Some((segment, name, Right(CodeAndAlignment(code, alignment)))) // TODO
case (name, RedirectedFunction(segment, target, 0)) => Some((segment, name, Left(target))) // TODO
case _ => None
}.groupBy(_._1).mapValues(_.map { case (_, name, code) => name -> code }.toMap)
}.groupBy(_._1).mapValues(_.map { case (_, name, code) => name -> code }.toMap).view.force
}
def actualCode(functionName: String, functionCode: List[T]): List[T]