fix(xsnap): bounds checking in release builds

- chore: update moddable sdk to get stack overflow updates - feat: mxBoundsCheck (makefiles) based on Feb 12 xsnap update Moddable-OpenSource/agoric@8b127bc
Agoric · Feb 23, 2021 · c36f040 · c36f040
1 parent df02134
commit c36f040
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 24 deletions.
diff --git a/packages/xsnap/makefiles/lin/xsnap.mk b/packages/xsnap/makefiles/lin/xsnap.mk
@@ -41,9 +41,9 @@ C_OPTIONS += \
 	-Wno-misleading-indentation \
 	-Wno-implicit-fallthrough
 ifeq ($(GOAL),debug)
-	C_OPTIONS += -g -O0 -Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -DmxDebug=1
+	C_OPTIONS += -DmxDebug=1 -g -O0 -Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter
 else
-	C_OPTIONS += -O3
+	C_OPTIONS += -DmxBoundsCheck=1 -O3
 endif
 
 LIBRARIES = -ldl -lm -lpthread

diff --git a/packages/xsnap/makefiles/mac/xsnap.mk b/packages/xsnap/makefiles/mac/xsnap.mk
@@ -44,9 +44,9 @@ ifneq ("x$(SDKROOT)", "x")
 	C_OPTIONS += -isysroot $(SDKROOT)
 endif
 ifeq ($(GOAL),debug)
-	C_OPTIONS += -g -O0 -Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -DmxDebug=1
+	C_OPTIONS += -DmxDebug=1 -g -O0 -Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter
 else
-	C_OPTIONS += -O3
+	C_OPTIONS += -DmxBoundsCheck=1 -O3
 endif
 
 LIBRARIES = -framework CoreServices

diff --git a/packages/xsnap/makefiles/win/xsnap.mak b/packages/xsnap/makefiles/win/xsnap.mak
@@ -43,6 +43,7 @@ C_OPTIONS = $(C_OPTIONS) \
 !ELSE
 C_OPTIONS = $(C_OPTIONS) \
 	/D NDEBUG \
+	/D mxBoundsCheck=1 \
 	/Fp$(TMP_DIR_RLS)\ \
 	/O2 \
 	/W0

diff --git a/packages/xsnap/moddable b/packages/xsnap/moddable
diff --git a/packages/xsnap/src/xsnap.c b/packages/xsnap/src/xsnap.c
@@ -969,39 +969,61 @@ void fx_setTimer(txMachine* the, txNumber interval, txBoolean repeat)
 
 void fx_setTimerCallback(txJob* job)
 {
-	txMachine* the = job->the;
-	fxBeginHost(the);
+	xsMachine* the = job->the;
+	xsBeginHost(the);
 	{
 		mxTry(the) {
-			/* THIS */
-			mxPushUndefined();
-			/* FUNCTION */
-			mxPush(job->function);
-			mxCall();
-			mxPush(job->argument);
-			/* ARGC */
-			mxRunCount(1);
-			mxPop();
+			xsCallFunction1(job->function, xsUndefined, job->argument);
 		}
 		mxCatch(the) {
 			fprintf(stderr, "exception in setTimerCallback: %s\n", xsToString(xsException));
 		}
 	}
-	fxEndHost(the);
+	xsEndHost(the);
 }
 
 /* PLATFORM */
 
 void fxAbort(txMachine* the, int status)
 {
-	if (status == XS_NOT_ENOUGH_MEMORY_EXIT)
-		mxUnknownError("not enough memory");
-	else if (status == XS_STACK_OVERFLOW_EXIT)
-		mxUnknownError("stack overflow");
-	else if (status == XS_TOO_MUCH_COMPUTATION_EXIT)
+	switch (status) {
+		case XS_STACK_OVERFLOW_EXIT:
+			xsLog("stack overflow\n");
+#ifdef mxDebug
+			fxDebugger(the, (char *)__FILE__, __LINE__);
+#endif
+			fxExitToHost(the);
+			break;
+	case XS_NOT_ENOUGH_MEMORY_EXIT:
+		xsLog("memory full\n");
+#ifdef mxDebug
+		fxDebugger(the, (char *)__FILE__, __LINE__);
+#endif
 		fxExitToHost(the);
-	else
+		break;
+	case XS_NO_MORE_KEYS_EXIT:
+		xsLog("not enough keys\n");
+#ifdef mxDebug
+		fxDebugger(the, (char *)__FILE__, __LINE__);
+#endif
+		fxExitToHost(the);
+		break;
+	case XS_TOO_MUCH_COMPUTATION_EXIT:
+		xsLog("too much computation\n");
+#ifdef mxDebug
+		fxDebugger(the, (char *)__FILE__, __LINE__);
+#endif
+		fxExitToHost(the);
+		break;
+	case XS_UNHANDLED_EXCEPTION_EXIT:
+	case XS_UNHANDLED_REJECTION_EXIT:
+		xsLog("%s\n", xsToString(xsException));
+		xsException = xsUndefined;
+		break;
+	default:
 		c_exit(status);
+		break;
+	}
 }
 
 void fxCreateMachinePlatform(txMachine* the)
@@ -1062,7 +1084,6 @@ void fxRunLoop(txMachine* the)
 			else {
 				*address = job->next;
 				c_free(job);
-
 			}
 		}
 	}