From a414feedec2fe4d24e2e8713275f54d489e43464 Mon Sep 17 00:00:00 2001
From: Karol Stasiak <karol.m.stasiak@gmail.com>
Date: Fri, 9 Mar 2018 16:31:49 +0100
Subject: [PATCH] Fixed object allocation fixes, assembly output improvements

---
 src/main/scala/millfork/env/Environment.scala    | 12 ++++++++++++
 .../scala/millfork/error/ErrorReporting.scala    |  2 ++
 src/main/scala/millfork/output/Assembler.scala   | 16 ++++++++++++----
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/main/scala/millfork/env/Environment.scala b/src/main/scala/millfork/env/Environment.scala
index e923d4a7..555a5c13 100644
--- a/src/main/scala/millfork/env/Environment.scala
+++ b/src/main/scala/millfork/env/Environment.scala
@@ -68,6 +68,18 @@ class Environment(val parent: Option[Environment], val prefix: String) {
     case _ => Nil
   }.toList
 
+  def getAllFixedAddressObjects: List[(Int, Int)] = {
+    things.values.flatMap {
+      case RelativeArray(_, NumericConstant(addr, _), size) =>
+        List(addr.toInt -> size)
+      case RelativeVariable(_, NumericConstant(addr, _), typ, _) =>
+        List(addr.toInt -> typ.size)
+      case f: NormalFunction =>
+        f.environment.getAllFixedAddressObjects
+      case _ => Nil
+    }.toList
+  }
+
   def allocateVariables(nf: Option[NormalFunction], mem: MemoryBank, callGraph: CallGraph, allocator: VariableAllocator, options: CompilationOptions, onEachVariable: (String, Int) => Unit): Unit = {
     val b = get[Type]("byte")
     val p = get[Type]("pointer")
diff --git a/src/main/scala/millfork/error/ErrorReporting.scala b/src/main/scala/millfork/error/ErrorReporting.scala
index 41e8d71d..72ce01ea 100644
--- a/src/main/scala/millfork/error/ErrorReporting.scala
+++ b/src/main/scala/millfork/error/ErrorReporting.scala
@@ -31,6 +31,7 @@ object ErrorReporting {
     flushOutput()
   }
 
+  @inline
   private def flushOutput(): Unit = {
     System.out.flush()
     System.err.flush()
@@ -55,6 +56,7 @@ object ErrorReporting {
     hasErrors = true
     println("FATAL: " + f(position) + msg)
     flushOutput()
+    System.exit(1)
     throw new RuntimeException(msg)
   }
 
diff --git a/src/main/scala/millfork/output/Assembler.scala b/src/main/scala/millfork/output/Assembler.scala
index 0e7207bb..c8e90fab 100644
--- a/src/main/scala/millfork/output/Assembler.scala
+++ b/src/main/scala/millfork/output/Assembler.scala
@@ -89,8 +89,7 @@ class Assembler(private val program: Program, private val rootEnv: Environment)
           }
         } catch {
           case e: StackOverflowError =>
-            e.printStackTrace()
-            ErrorReporting.fatal("Stack overflow")
+            ErrorReporting.fatal("Stack overflow " + c)
         }
       case HalfWordConstant(cc, true) => deepConstResolve(cc).>>>(8).&(0xff)
       case HalfWordConstant(cc, false) => deepConstResolve(cc).&(0xff)
@@ -212,13 +211,15 @@ class Assembler(private val program: Program, private val rootEnv: Environment)
         assembly.append(name)
         for (item <- items) {
           writeByte(0, index, item)
-          assembly.append("    !byte " + item)
           bank0.occupied(index) = true
           bank0.initialized(index) = true
           bank0.writeable(index) = true
           bank0.readable(index) = true
           index += 1
         }
+        items.grouped(16).foreach {group =>
+          assembly.append("    !byte " + group.mkString(", "))
+        }
         initializedVariablesSize += items.length
       case InitializedArray(name, Some(_), items) => ???
       case f: NormalFunction if f.address.isDefined =>
@@ -268,9 +269,11 @@ class Assembler(private val program: Program, private val rootEnv: Environment)
         assembly.append(name)
         for (item <- items) {
           writeByte(0, index, item)
-          assembly.append("    !byte " + item)
           index += 1
         }
+        items.grouped(16).foreach {group =>
+          assembly.append("    !byte " + group.mkString(", "))
+        }
         initializedVariablesSize += items.length
         justAfterCode = index
       case m@InitializedMemoryVariable(name, None, typ, value) =>
@@ -289,6 +292,11 @@ class Assembler(private val program: Program, private val rootEnv: Environment)
         justAfterCode = index
       case _ =>
     }
+    env.getAllFixedAddressObjects.foreach {
+      case (addr, size) =>
+        println(addr)
+        for(i <- 0 until size) bank0.occupied(addr + i) = true
+    }
     val variableAllocator = platform.variableAllocator
     variableAllocator.notifyAboutEndOfCode(justAfterCode)
     env.allocateVariables(None, bank0, callGraph, variableAllocator, options, labelMap.put)