make function parameters fast again

callisto-lang · Oct 22, 2024 · 49ee1dd · 49ee1dd
1 parent 6cab59a
commit 49ee1dd
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 17 deletions.
diff --git a/examples/tak.cal b/examples/tak.cal
@@ -1,7 +1,7 @@
 include "cores/select.cal"
 include "std/io.cal"
 
-func tak cell x cell y cell z begin
+func tak cell x cell y cell z -> cell res begin
 	if y x < then
 		x 1 - y z tak
 		y 1 - z x tak

diff --git a/source/backends/arm64.d b/source/backends/arm64.d
@@ -582,16 +582,25 @@ class BackendARM64 : CompilerBackend {
 				}
 
 				// copy data to parameters
-				output ~= format("sub x19, x19, #%d\n", paramSize);
-				//output ~= format("sub x9, x19, #%d\n", paramSize);
-				output ~= "mov x9, x19\n";
-				output ~= "mov x10, x20\n";
-				output ~= format("mov x11, #%d\n", paramSize);
-				output ~= "1:\n";
-				output ~= "ldrb w12, [x9], #1\n";
-				output ~= "strb w12, [x10], #1\n";
-				output ~= "subs x11, x11, #1\n";
-				output ~= "bne 1b\n";
+				if (node.params.length > 10) {
+					output ~= format("sub x19, x19, #%d\n", paramSize);
+					//output ~= format("sub x9, x19, #%d\n", paramSize);
+					output ~= "mov x9, x19\n";
+					output ~= "mov x10, x20\n";
+					output ~= format("mov x11, #%d\n", paramSize);
+					output ~= "1:\n";
+					output ~= "ldrb w12, [x9], #1\n";
+					output ~= "strb w12, [x10], #1\n";
+					output ~= "subs x11, x11, #1\n";
+					output ~= "bne 1b\n";
+				}
+				else {
+					foreach_reverse (ref param ; node.params) {
+						auto setNode = new SetNode(node.error);
+						setNode.var  = param;
+						CompileSet(setNode);
+					}
+				}
 			}
 
 			foreach (ref inode ; node.nodes) {
@@ -774,6 +783,10 @@ class BackendARM64 : CompilerBackend {
 			}
 		}
 		else {
+			if (GlobalExists(node.name)) {
+				Error(node.error, "Global '%s' already exists", node.name);
+			}
+
 			Global global;
 			global.type        = GetType(node.varType);
 			global.array       = node.array;

diff --git a/source/backends/lua.d b/source/backends/lua.d
@@ -519,6 +519,10 @@ class BackendLua : CompilerBackend {
 			}
 		}
 		else {
+			if (GlobalExists(node.name)) {
+				Error(node.error, "Global '%s' already exists", node.name);
+			}
+
 			GlobalExtra* extra = new GlobalExtra();
 			extra.addr         = globalStack;
 

diff --git a/source/backends/rm86.d b/source/backends/rm86.d
@@ -615,6 +615,10 @@ class BackendRM86 : CompilerBackend {
 			}
 		}
 		else {
+			if (GlobalExists(node.name)) {
+				Error(node.error, "Global '%s' already exists", node.name);
+			}
+
 			Global global;
 			global.type        = GetType(node.varType);
 			global.array       = node.array;

diff --git a/source/backends/x86_64.d b/source/backends/x86_64.d
@@ -670,11 +670,20 @@ class BackendX86_64 : CompilerBackend {
 				}
 
 				// copy data to parameters
-				output ~= format("sub r15, %d\n", paramSize);
-				output ~= "mov rsi, r15\n";
-				output ~= "mov rdi, rsp\n";
-				output ~= format("mov rcx, %d\n", paramSize);
-				output ~= "rep movsb\n";
+				if (node.params.length > 10) {
+					output ~= format("sub r15, %d\n", paramSize);
+					output ~= "mov rsi, r15\n";
+					output ~= "mov rdi, rsp\n";
+					output ~= format("mov rcx, %d\n", paramSize / 8);
+					output ~= "rep movsq\n";
+				}
+				else {
+					foreach_reverse (ref param ; node.params) {
+						auto setNode = new SetNode(node.error);
+						setNode.var  = param;
+						CompileSet(setNode);
+					}
+				}
 			}
 
 			foreach (ref inode ; node.nodes) {
@@ -868,6 +877,10 @@ class BackendX86_64 : CompilerBackend {
 			}
 		}
 		else {
+			if (GlobalExists(node.name)) {
+				Error(node.error, "Global '%s' already exists", node.name);
+			}
+
 			Global global;
 			global.type        = GetType(node.varType);
 			global.array       = node.array;

diff --git a/std b/std
+45 −45		cores/cpu/arm64.cal
+39 −39		cores/cpu/rm86.cal
+44 −44		cores/cpu/x86_64.cal
+33 −33		cores/cs/lua.cal
+32 −29		cores/os/arm64_linux.cal
+15 −17		cores/os/arm64_osx.cal
+9 −6		cores/os/rm86_dos.cal
+6 −6		cores/os/x86_64_freebsd.cal
+29 −34		cores/os/x86_64_linux.cal
+15 −22		cores/os/x86_64_osx.cal
+29 −29		cores/uxn.cal
+1 −1		std/args.cal
+9 −14		std/array.cal
+1 −3		std/assert.cal
+1 −1		std/conv.cal
+37 −36		std/io.cal
+1 −2		std/nullterm.cal
+14 −6		std/ops.cal
+2 −2		std/random.cal
+4 −4		std/time.cal