Added runtime memory limit check

maccasoft · Apr 16, 2024 · bee9f81 · bee9f81
1 parent ca61f8a
commit bee9f81
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/modules/spin-tools/src/com/maccasoft/propeller/spin1/Spin1Compiler.java b/modules/spin-tools/src/com/maccasoft/propeller/spin1/Spin1Compiler.java
@@ -206,6 +206,10 @@ public Spin1Object compileObject(File rootFile, Node root) {
             }
         }
 
+        tree = buildFrom(objectCompiler);
+
+        errors = objectCompiler.hasErrors();
+
         int stackRequired = 16;
         if (objectCompiler.getScope().hasSymbol("_STACK")) {
             stackRequired = objectCompiler.getScope().getLocalSymbol("_STACK").getNumber().intValue();
@@ -215,19 +219,15 @@ public Spin1Object compileObject(File rootFile, Node root) {
         }
 
         if (stackRequired > 0x2000) {
-            logMessage(new CompilerException(rootFile.getName(), "_STACK and _FREE must sum to under 8k longs."));
+            logMessage(new CompilerException(rootFile.getName(), "_STACK and _FREE must sum to under 8k longs.", null));
         }
         else {
             int requiredSize = object.getSize() + object.getVarSize() + (stackRequired << 2);
             if (requiredSize >= 0x8000) {
-                logMessage(new CompilerException(rootFile.getName(), "object exceeds runtime memory limit by " + ((requiredSize - 0x8000) >> 2) + " longs."));
+                logMessage(new CompilerException(rootFile.getName(), "program exceeds runtime memory limit by " + ((requiredSize - 0x8000) >> 2) + " longs.", null));
             }
         }
 
-        tree = buildFrom(objectCompiler);
-
-        errors = objectCompiler.hasErrors();
-
         messages.addAll(objectCompiler.getMessages());
         for (ObjectInfo info : childObjects) {
             messages.addAll(info.compiler.getMessages());

diff --git a/modules/spin-tools/src/com/maccasoft/propeller/spin2/Spin2Compiler.java b/modules/spin-tools/src/com/maccasoft/propeller/spin2/Spin2Compiler.java
@@ -40,6 +40,7 @@ public class Spin2Compiler extends Compiler {
     protected Spin2Debug debug = new Spin2Debug();
 
     protected Spin2Interpreter interpreter;
+    protected Spin2Debugger debugger;
 
     protected List<ObjectInfo> childObjects = new ArrayList<>();
 
@@ -106,8 +107,8 @@ public Spin2Object compile(File rootFile, Node root) {
             obj.setInterpreter(interpreter);
         }
 
-        if (debugEnabled) {
-            obj.setDebugger(new Spin2Debugger());
+        if (debugger != null) {
+            obj.setDebugger(debugger);
         }
 
         return obj;
@@ -164,20 +165,28 @@ protected Spin2Object compileObject(File rootFile, Node root) {
             }
         }
 
+        int stackFree = 512 * 1024;
+
         if (interpreter != null) {
             interpreter.setVBase((interpreter.getPBase() + object.getSize()) | (objectCompiler.getObjectLinks().size() << 21));
             interpreter.setDBase(interpreter.getPBase() + object.getSize() + object.getVarSize());
             interpreter.setClearLongs(255 + ((object.getVarSize() + 3) / 4));
+            stackFree -= interpreter.getDBase();
         }
 
         if (debugEnabled) {
+            debugger = new Spin2Debugger();
             Spin2Object debugObject = generateDebugData();
             object.setDebugData(debugObject);
+            stackFree -= debugger.getSize() + debugObject.getSize();
         }
 
         tree = buildFrom(objectCompiler);
 
         errors = objectCompiler.hasErrors();
+        if (stackFree < 0) {
+            logMessage(new CompilerException(rootFile.getName(), "program exceeds runtime memory limit by " + Math.abs(stackFree) + " longs.", null));
+        }
 
         messages.addAll(objectCompiler.getMessages());
         for (ObjectInfo info : childObjects) {