6502/millfork
1
0
Fork 0
mirror of https://github.com/KarolS/millfork.git synced 2024-07-05 09:28:54 +00:00
Code Issues Projects Releases Wiki Activity

Allocate all variables in single pass on Z80

Browse Source
This commit is contained in:
Karol Stasiak 2018-07-03 22:34:45 +02:00
parent 4acc040813
commit 3390fe552e
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/scala/millfork/env/Environment.scala vendored
View File

@ -97,6 +97,9 @@ class Environment(val parent: Option[Environment], val prefix: String) {
onEachVariable: (String, Int) => Unit,
pass: Int,
forZpOnly: Boolean): Unit = {
if (forZpOnly && !options.platform.hasZeroPage) {
return
}
val b = get[Type]("byte")
val p = get[Type]("pointer")
val params = nf.fold(List[String]()) { f =>
@ -109,11 +112,11 @@ class Environment(val parent: Option[Environment], val prefix: String) {
Nil
}
}.toSet
def passForAlloc(m: VariableAllocationMethod.Value) = m match {
case VariableAllocationMethod.Zeropage => 1
def passForAlloc(m: VariableAllocationMethod.Value): Int = if (options.platform.hasZeroPage) m match {
case VariableAllocationMethod.Zeropage => 1
case VariableAllocationMethod.Register => 2
case _ => 3
}
} else 3
val toAdd = things.values.flatMap {
case m: UninitializedMemory if passForAlloc(m.alloc) == pass && nf.isDefined == isLocalVariableName(m.name) && !m.name.endsWith(".addr") && maybeGet[Thing](m.name + ".array").isEmpty =>
val vertex = if (options.flag(CompilationFlag.VariableOverlap)) {
@ -132,7 +135,7 @@ class Environment(val parent: Option[Environment], val prefix: String) {
case VariableAllocationMethod.None =>
Nil
case VariableAllocationMethod.Zeropage =>
if (forZpOnly) {
if (forZpOnly || !options.platform.hasZeroPage) {
val addr =
allocators(bank).allocateBytes(mem.banks(bank), callGraph, vertex, options, m.sizeInBytes, initialized = false, writeable = true, location = AllocationLocation.Zeropage)
onEachVariable(m.name, addr)