From 65af26f9629149ec03df5fa3dcccc528aa920c73 Mon Sep 17 00:00:00 2001
From: Leonard2 <hobbax3@gmail.com>
Date: Wed, 14 Sep 2016 12:30:11 +0200
Subject: [PATCH] The VM now properly aborts on critical errors

---
 src/zscript/vm.h        |  8 ++++++++
 src/zscript/vmexec.cpp  | 10 +---------
 src/zscript/vmframe.cpp | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/src/zscript/vm.h b/src/zscript/vm.h
index 52b354028f..31136bba2b 100644
--- a/src/zscript/vm.h
+++ b/src/zscript/vm.h
@@ -156,6 +156,14 @@ enum
 	ATAG_RNG,				// pointer to FRandom
 };
 
+enum EVMAbortException
+{
+	X_READ_NIL,
+	X_WRITE_NIL,
+	X_TOO_MANY_TRIES,
+	X_ARRAY_OUT_OF_BOUNDS,
+};
+
 class VMFunction : public DObject
 {
 	DECLARE_ABSTRACT_CLASS(VMFunction, DObject);
diff --git a/src/zscript/vmexec.cpp b/src/zscript/vmexec.cpp
index 070aeb30a4..454f02d03f 100644
--- a/src/zscript/vmexec.cpp
+++ b/src/zscript/vmexec.cpp
@@ -44,7 +44,7 @@
 #define ASSERTKA(x)		assert(sfunc != NULL && (unsigned)(x) < sfunc->NumKonstA)
 #define ASSERTKS(x)		assert(sfunc != NULL && (unsigned)(x) < sfunc->NumKonstS)
 
-#define THROW(x)
+#define THROW(x)		throw(EVMAbortException(x))
 
 #define CMPJMP(test) \
 	if ((test) == (a & CMP_CHECK)) { \
@@ -54,14 +54,6 @@
 		pc += 1; \
 	}
 
-enum
-{
-	X_READ_NIL,
-	X_WRITE_NIL,
-	X_TOO_MANY_TRIES,
-	X_ARRAY_OUT_OF_BOUNDS
-};
-
 #define GETADDR(a,o,x) \
 	if (a == NULL) { THROW(x); } \
 	ptr = (VM_SBYTE *)a + o
diff --git a/src/zscript/vmframe.cpp b/src/zscript/vmframe.cpp
index c7d9cb87d7..9f8ad7dc01 100644
--- a/src/zscript/vmframe.cpp
+++ b/src/zscript/vmframe.cpp
@@ -407,6 +407,40 @@ int VMFrameStack::Call(VMFunction *func, VMValue *params, int numparams, VMRetur
 		}
 		throw;
 	}
+	catch (EVMAbortException exception)
+	{
+		if (allocated)
+		{
+			PopFrame();
+		}
+		if (trap != nullptr)
+		{
+			*trap = nullptr;
+		}
+
+		Printf("VM execution aborted: ");
+		switch (exception)
+		{
+		case X_READ_NIL:
+			Printf("tried to read from address zero.");
+			break;
+
+		case X_WRITE_NIL:
+			Printf("tried to write to address zero.");
+			break;
+
+		case X_TOO_MANY_TRIES:
+			Printf("too many try-catch blocks.");
+			break;
+
+		case X_ARRAY_OUT_OF_BOUNDS:
+			Printf("array access out of bounds.");
+			break;
+		}
+		Printf("\n");
+
+		return -1;
+	}
 	catch (...)
 	{
 		if (allocated)