6502/millfork
1
0
Fork 0
mirror of https://github.com/KarolS/millfork.git synced 2025-02-24 10:28:57 +00:00
Code Issues Projects Releases Wiki Activity

Fixed not compiling code

Browse Source
This commit is contained in:
Karol Stasiak 2018-12-16 22:59:58 +01:00
parent acf9db80d3
commit 4fb786522d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -307,7 +307,7 @@ abstract class AbstractAssembler[T <: AbstractCode](private val program: Program
if (options.flag(CompilationFlag.LUnixRelocatableCode)) { if (options.flag(CompilationFlag.LUnixRelocatableCode)) {
env.allThings.things.foreach { env.allThings.things.foreach {
case (_, m@UninitializedMemoryVariable(name, typ, _, _, _)) if name.endsWith(".addr") || env.maybeGet[Thing](name + ".array").isDefined => case (_, m@UninitializedMemoryVariable(name, typ, _, _, _, _)) if name.endsWith(".addr") || env.maybeGet[Thing](name + ".array").isDefined =>
val isUsed = compiledFunctions.values.exists{ val isUsed = compiledFunctions.values.exists{
case NormalCompiledFunction(_, code, _, _) => code.exists(_.parameter.isRelatedTo(m)) case NormalCompiledFunction(_, code, _, _) => code.exists(_.parameter.isRelatedTo(m))
case _ => false case _ => false
@ -367,7 +367,7 @@ abstract class AbstractAssembler[T <: AbstractCode](private val program: Program
} }
initializedVariablesSize += items.length initializedVariablesSize += items.length
justAfterCode += bank -> index justAfterCode += bank -> index
case m@InitializedMemoryVariable(name, None, typ, value, _, alignment) => case m@InitializedMemoryVariable(name, None, typ, value, _, alignment, _) =>
val bank = m.bank(options) val bank = m.bank(options)
val bank0 = mem.banks(bank) val bank0 = mem.banks(bank)
var index = codeAllocators(bank).allocateBytes(bank0, options, typ.size, initialized = true, writeable = true, location = AllocationLocation.High, alignment = alignment) var index = codeAllocators(bank).allocateBytes(bank0, options, typ.size, initialized = true, writeable = true, location = AllocationLocation.High, alignment = alignment)