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

Don't emit labels for inlined functions

Browse Source
This commit is contained in:
Karol Stasiak
2017-12-20 09:54:32 +01:00
parent 5c2832f4f3
commit d9e0ad168a
1 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/scala/millfork/output/Assembler.scala
View File

@@ -185,22 +185,31 @@ class Assembler(private val program: Program, private val rootEnv: Environment)
case InitializedArray(name, Some(_), items) => ???
case f: NormalFunction if f.address.isDefined =>
var index = f.address.get.asInstanceOf[NumericConstant].value.toInt
val code = compiledFunctions(f.name)
if (code.nonEmpty) {
labelMap(f.name) = index
index = outputFunction(compiledFunctions(f.name), index, assembly, options)
index = outputFunction(code, index, assembly, options)
}
case _ =>
}
var index = platform.org
env.allPreallocatables.foreach {
case f: NormalFunction if f.address.isEmpty && f.name == "main" =>
val code = compiledFunctions(f.name)
if (code.nonEmpty) {
labelMap(f.name) = index
index = outputFunction(compiledFunctions(f.name), index, assembly, options)
index = outputFunction(code, index, assembly, options)
}
case _ =>
}
env.allPreallocatables.foreach {
case f: NormalFunction if f.address.isEmpty && f.name != "main" =>
val code = compiledFunctions(f.name)
if (code.nonEmpty) {
labelMap(f.name) = index
index = outputFunction(compiledFunctions(f.name), index, assembly, options)
index = outputFunction(code, index, assembly, options)
}
case _ =>
}
env.allPreallocatables.foreach {