fix segfault

callisto-lang · Nov 12, 2024 · a747bd6 · a747bd6
1 parent c352a41
commit a747bd6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/source/backends/rm86.d b/source/backends/rm86.d
@@ -17,6 +17,9 @@ private struct Word {
 	Node[] inlineNodes;
 	bool   error;
 	Type[] params;
+	size_t numReturns;
+
+	int StackEffect() => (-(cast(int) params.length) + (cast(int) numReturns));
 }
 
 private struct RM86Opts {
@@ -279,6 +282,16 @@ class BackendRM86 : CompilerBackend {
 			}
 			else {
 				if (word.raw) {
+					int stackEffect = word.StackEffect() * 8;
+
+					if (stackEffect != 0) {
+						output ~= format("lea ax, [si + %d]\n", stackEffect);
+						output ~= "push ax\n";
+					}
+					else {
+						output ~= "push si\n";
+					}
+
 					output ~= format("call %s\n", node.name);
 				}
 				else {

diff --git a/source/backends/x86_64.d b/source/backends/x86_64.d
@@ -525,21 +525,7 @@ class BackendX86_64 : CompilerBackend {
 					}
 				}
 				else {
-					int stackEffect = word.StackEffect() * 8;
-
-					if (stackEffect != 0) {
-						output ~= format("lea r14, [r15 + %d]\n", stackEffect);
-						output ~= "push r14\n";
-					}
-					else {
-						output ~= "push r15\n";	
-					}
-
 					output ~= format("call __func__%s\n", node.name.Sanitise());
-
-					if (word.error) {
-						output ~= "pop r15\n";
-					}
 				}
 			}