fix Berry - add missing be_pop

Author: openshwprojects

src/berry/be_run.c

@@ -73,23 +73,34 @@ bool berryRun(bvm *vm, const char *prog) {
 }
 
 void berryRunClosure(bvm *vm, int closureId) {
+	//int s1 = Berry_GetStackSizeCurrent();
 	if (!be_getglobal(vm, "run_closure")) {
 		return;
 	}
 	be_pushint(vm, closureId);
 	// call run_closure(closureId)
 	be_call(vm, 1);
+	//int s2 = Berry_GetStackSizeCurrent();
+	be_pop(vm, 2);
+	//int s3 = Berry_GetStackSizeCurrent();
+	//printf("%i %i %i\n", s1, s2, s3);
 }
 void berryRunClosureBytes(bvm *vm, int closureId, byte *data, int len) {
+	//int s1 = Berry_GetStackSizeCurrent();
 	if (!be_getglobal(vm, "run_closure")) {
 		return;
 	}
 	be_pushint(vm, closureId);
 	be_pushbytes(vm, data, len);
 	// call run_closure(closureId)
 	be_call(vm, 2);
+	//int s2 = Berry_GetStackSizeCurrent();
+	be_pop(vm, 3);
+	//int s3 = Berry_GetStackSizeCurrent();
+	//printf("%i %i %i\n", s1, s2, s3);
 }
 void berryRunClosureIntBytes(bvm *vm, int closureId, int x, const byte *data, int len) {
+	//int s1 = Berry_GetStackSizeCurrent();
 	if (!be_getglobal(vm, "run_closure")) {
 		return;
 	}
@@ -98,8 +109,13 @@ void berryRunClosureIntBytes(bvm *vm, int closureId, int x, const byte *data, in
 	be_pushbytes(vm, data, len);
 	// call run_closure(closureId)
 	be_call(vm, 3);
+	//int s2 = Berry_GetStackSizeCurrent();
+	be_pop(vm, 4);
+	//int s3 = Berry_GetStackSizeCurrent();
+	//printf("%i %i %i\n", s1, s2, s3);
 }
 void berryRunClosureIntInt(bvm *vm, int closureId, int x, int y) {
+	//int s1 = Berry_GetStackSizeCurrent();
 	if (!be_getglobal(vm, "run_closure")) {
 		return;
 	}
@@ -108,29 +124,59 @@ void berryRunClosureIntInt(bvm *vm, int closureId, int x, int y) {
 	be_pushint(vm, y);
 	// call run_closure(closureId)
 	be_call(vm, 3);
+	//int s2 = Berry_GetStackSizeCurrent();
+	be_pop(vm, 4);
+	//int s3 = Berry_GetStackSizeCurrent();
+	//printf("%i %i %i\n", s1, s2, s3);
+}
+void berryRunClosureInt(bvm *vm, int closureId, int x) {
+	int s1 = Berry_GetStackSizeCurrent();
+	if (!be_getglobal(vm, "run_closure")) {
+		return;
+	}
+	be_pushint(vm, closureId);
+	be_pushint(vm, x);
+	be_call(vm, 2);
+	//int s2 = Berry_GetStackSizeCurrent();
+	be_pop(vm, 3);
+	//int s3 = Berry_GetStackSizeCurrent();
+	//printf("%i %i %i\n", s1, s2, s3);
 }
 void berryRunClosureStr(bvm *vm, int closureId, const char * x, const char * y) {
+	//int s1 = Berry_GetStackSizeCurrent();
 	if (!be_getglobal(vm, "run_closure")) {
 		return;
 	}
 	// call run_closure(closureId)
 	be_pushint(vm, closureId);
 	be_pushstring(vm, x);
+	//int s2;
 	if (y) {
 		be_pushstring(vm, y);
 		be_call(vm, 3);
+		//s2 = Berry_GetStackSizeCurrent();
+		be_pop(vm, 4);
 	}
 	else {
 		be_call(vm, 2);
+		//s2 = Berry_GetStackSizeCurrent();
+		be_pop(vm, 3);
 	}
+	//int s3 = Berry_GetStackSizeCurrent();
+	//printf("%i %i %i\n", s1, s2, s3);
 }
 void berryRemoveClosure(bvm *vm, int closureId) {
+	//int s1 = Berry_GetStackSizeCurrent();
 	if (!be_getglobal(vm, "remove_closure")) {
 		return;
 	}
 	be_pushint(vm, closureId);
 	// call remove_closure(closureId)
 	be_call(vm, 1);
+	//int s2 = Berry_GetStackSizeCurrent();
+	be_pop(vm, 2);
+	//int s3 = Berry_GetStackSizeCurrent();
+	//printf("%i %i %i\n", s1, s2, s3);
 }
 
 void berryFreeAllClosures(bvm *vm) {

src/cmnds/cmd_berry.c

@@ -86,7 +86,7 @@ void CMD_Berry_RunEventHandlers_IntInt(byte eventCode, int argument, int argumen
 		} else if (t->wait.waitingForEvent == eventCode
 			&& t->wait.waitingForRelation == 'm'
 			&& t->wait.waitingForArgument == argument) {
-			berryRunClosureIntInt(g_vm, t->closureId, argument2, 0);
+			berryRunClosureInt(g_vm, t->closureId, argument2);
 		}
 		t = t->next;
 	}
@@ -463,13 +463,20 @@ void Berry_StopScripts(int id) {
 		t = t->next;
 	}
 }
-int Berry_GetStackSize() {
+int Berry_GetStackSizeTotal() {
 	if (g_vm) {
 		int size = g_vm->stacktop - g_vm->stack;    /* with debug enabled, stack increase may be negative */
 		return size;
 	}
 	return 0;
 }
+int Berry_GetStackSizeCurrent() {
+	if (g_vm) {
+		int size = g_vm->top - g_vm->stack;
+		return size;
+	}
+	return 0;
+}
 
 void Berry_RunThreads(int deltaMS) {
 	int c_sleep, c_run;