add function pointers

callisto-lang · Jun 6, 2024 · 00cb242 · 00cb242
1 parent 7d6275b
commit 00cb242
Show file tree

Hide file tree

Showing 11 changed files with 134 additions and 26 deletions.
diff --git a/examples/funcPointers.cal b/examples/funcPointers.cal
@@ -0,0 +1,8 @@
+include "cores/select.cal"
+include "std/io.cal"
+
+func sayHello begin
+	"Hello!\n" printstr
+end
+
+&sayHello call
diff --git a/source/app.d b/source/app.d
@@ -8,7 +8,7 @@ import std.process;
 import std.algorithm;
 import callisto.compiler;
 import callisto.language;
-import callisto.optimiser;
+import callisto.codeRemover;
 import callisto.preprocessor;
 import callisto.backends.uxn;
 import callisto.backends.y32;
@@ -270,11 +270,9 @@ int main(string[] args) {
 		return 1;
 	}
 
-	if (optimise) {
-		auto optimiser  = new Optimiser();
-		optimiser.Run(nodes);
-		nodes = optimiser.res;
-	}
+	/*auto codeRemover = new CodeRemover();
+	codeRemover.Run(nodes);
+	nodes = codeRemover.res;*/
 
 	compiler.versions = preproc.versions;
 

diff --git a/source/backends/linux86.d b/source/backends/linux86.d
@@ -743,4 +743,20 @@ class BackendLinux86 : CompilerBackend {
 			output ~= format("extern %s\n", node.func);
 		}
 	}
+
+	override void CompileCall(WordNode node) {
+		output ~= "sub r15, 8\n";
+		output ~= "mov rax, [r15]\n";
+		output ~= "call rax\n";
+	}
+
+	override void CompileFuncAddr(FuncAddrNode node) {
+		if (node.func !in words) {
+			Error(node.error, "Function '%s' doesn't exist");
+		}
+
+		output ~= format("mov rax, __func__%s\n", node.func.Sanitise());
+		output ~= "mov [r15], rax\n";
+		output ~= "add r15, 8\n";
+	}
 }
diff --git a/source/backends/rm86.d b/source/backends/rm86.d
@@ -156,7 +156,7 @@ class BackendRM86 : CompilerBackend {
 		output ~= "ret\n";
 
 		foreach (name, var ; globals) {
-			output ~= format("__global_%s: times %d db 0\n", name, var.Size());
+			output ~= format("__global_%s: times %d db 0\n", name.Sanitise(), var.Size());
 		}
 
 		foreach (i, ref array ; arrays) {
@@ -652,4 +652,20 @@ class BackendRM86 : CompilerBackend {
 		word.raw         = node.raw;
 		words[node.func] = word;
 	}
+
+	override void CompileCall(WordNode node) {
+		output ~= "sub si, 2\n";
+		output ~= "mov ax, [si]\n";
+		output ~= "call ax\n";
+	}
+
+	override void CompileFuncAddr(FuncAddrNode node) {
+		if (node.func !in words) {
+			Error(node.error, "Function '%s' doesn't exist");
+		}
+
+		output ~= format("mov ax, __func__%s\n", node.func.Sanitise());
+		output ~= "mov [si], ax\n";
+		output ~= "add si, 2\n";
+	}
 }
diff --git a/source/backends/uxn.d b/source/backends/uxn.d
@@ -160,7 +160,7 @@ class BackendUXN : CompilerBackend {
 		output ~= "JMP2r\n";
 
 		foreach (name, var ; globals) {
-			output ~= format("@global_%s", name);
+			output ~= format("@global_%s", name.Sanitise());
 
 			foreach (i ; 0 .. var.Size()) {
 				output ~= " #00";
@@ -226,6 +226,10 @@ class BackendUXN : CompilerBackend {
 	}
 
 	override void CompileInteger(IntegerNode node) {
+		if (node.value > 0xFFFF) {
+			Error(node.error, "Value is too big for 16-bit target");
+		}
+
 		output ~= format("#%.4x\n", node.value);
 	}
 
@@ -637,4 +641,16 @@ class BackendUXN : CompilerBackend {
 		word.raw         = node.raw;
 		words[node.func] = word;
 	}
+
+	override void CompileCall(WordNode node) {
+		output ~= "JSR2\n";
+	}
+
+	override void CompileFuncAddr(FuncAddrNode node) {
+		if (node.func !in words) {
+			Error(node.error, "Function '%s' doesn't exist");
+		}
+
+		output ~= format(";func__%s\n", node.func.Sanitise());
+	}
 }
diff --git a/source/backends/y32.d b/source/backends/y32.d
@@ -272,4 +272,12 @@ class BackendY32 : CompilerBackend {
 	override void CompileExtern(ExternNode node) {
 		assert(0);
 	}
+
+	override void CompileCall(WordNode node) {
+		assert(0);
+	}
+
+	override void CompileFuncAddr(FuncAddrNode node) {
+		assert(0);
+	}
 }
diff --git a/source/optimiser.d → source/codeRemover.d b/source/optimiser.d → source/codeRemover.d
@@ -1,21 +1,22 @@
-module callisto.optimiser;
+module callisto.codeRemover;
 
 import std.stdio;
 import std.format;
 import std.algorithm;
 import callisto.error;
 import callisto.parser;
 
-class OptimiserError : Exception {
+class CodeRemoverError : Exception {
 	this() {
 		super("", "", 0);
 	}
 }
 
-class Optimiser {
+class CodeRemover {
 	Node[]         res;
 	string[]       usedFunctions;
 	Node[][string] functions;
+	string[]       funcStack;
 
 	this() {
 
@@ -24,7 +25,7 @@ class Optimiser {
 	final void Error(Char, A...)(ErrorInfo error, in Char[] fmt, A args) {
 		ErrorBegin(error);
 		stderr.writeln(format(fmt, args));
-		throw new OptimiserError();
+		throw new CodeRemoverError();
 	}
 
 	void FindFunctions(Node[] nodes) {
@@ -39,7 +40,13 @@ class Optimiser {
 						continue;
 					}
 
+					if (funcStack.canFind(node.name)) {
+						return;
+					}
+
+					funcStack ~= node.name;
 					FindFunctions(functions[node.name]);
+					funcStack = funcStack[0 .. $ - 1];
 					break;
 				}
 				case NodeType.If: {

diff --git a/source/compiler.d b/source/compiler.d
@@ -45,6 +45,8 @@ class CompilerBackend {
 	abstract void CompileUnion(UnionNode node);
 	abstract void CompileAlias(AliasNode node);
 	abstract void CompileExtern(ExternNode node);
+	abstract void CompileCall(WordNode node);
+	abstract void CompileFuncAddr(FuncAddrNode node);
 
 	final void Error(Char, A...)(ErrorInfo error, in Char[] fmt, A args) {
 		ErrorBegin(error);
@@ -81,9 +83,10 @@ class Compiler {
 				auto node = cast(WordNode) inode;
 
 				switch (node.name) {
-					case "return":   backend.CompileReturn(node); break;
+					case "return":   backend.CompileReturn(node);   break;
 					case "continue": backend.CompileContinue(node); break;
-					case "break":    backend.CompileBreak(node); break;
+					case "break":    backend.CompileBreak(node);    break;
+					case "call":     backend.CompileCall(node);     break;
 					case "error":    backend.Error(node.error, "Error thrown by code"); break;
 					default:         backend.CompileWord(node);
 				}
@@ -159,14 +162,15 @@ class Compiler {
 				}
 				break;
 			}
-			case NodeType.Array:  backend.CompileArray(cast(ArrayNode) inode); break;
-			case NodeType.String: backend.CompileString(cast(StringNode) inode); break;
-			case NodeType.Struct: backend.CompileStruct(cast(StructNode) inode); break;
-			case NodeType.Const:  backend.CompileConst(cast(ConstNode) inode); break;
-			case NodeType.Enum:   backend.CompileEnum(cast(EnumNode) inode); break;
-			case NodeType.Union:  backend.CompileUnion(cast(UnionNode) inode); break;
-			case NodeType.Alias:  backend.CompileAlias(cast(AliasNode) inode); break;
-			case NodeType.Extern: backend.CompileExtern(cast(ExternNode) inode); break;
+			case NodeType.Array:    backend.CompileArray(cast(ArrayNode) inode); break;
+			case NodeType.String:   backend.CompileString(cast(StringNode) inode); break;
+			case NodeType.Struct:   backend.CompileStruct(cast(StructNode) inode); break;
+			case NodeType.Const:    backend.CompileConst(cast(ConstNode) inode); break;
+			case NodeType.Enum:     backend.CompileEnum(cast(EnumNode) inode); break;
+			case NodeType.Union:    backend.CompileUnion(cast(UnionNode) inode); break;
+			case NodeType.Alias:    backend.CompileAlias(cast(AliasNode) inode); break;
+			case NodeType.Extern:   backend.CompileExtern(cast(ExternNode) inode); break;
+			case NodeType.FuncAddr: backend.CompileFuncAddr(cast(FuncAddrNode) inode); break;
 			default: {
 				backend.Error(inode.error, "Unimplemented node '%s'", inode.type);
 			}

diff --git a/source/lexer.d b/source/lexer.d
@@ -14,7 +14,8 @@ enum TokenType {
 	String,
 	Identifier,
 	LSquare,
-	RSquare
+	RSquare,
+	Ampersand
 }
 
 struct Token {
@@ -202,6 +203,11 @@ class Lexer {
 						col = 0;
 						break;
 					}
+					case '&': {
+						AddReading();
+						AddToken(TokenType.Ampersand);
+						break;
+					}
 					case '\'': {
 						Next();
 						char ch = code[i];

diff --git a/source/optimise.d b/source/optimise.d
@@ -0,0 +1,5 @@
+module callisto.optimise;
+
+class Optimiser {
+
+}
diff --git a/source/parser.d b/source/parser.d
@@ -29,7 +29,8 @@ enum NodeType {
 	Restrict,
 	Union,
 	Alias,
-	Extern
+	Extern,
+	FuncAddr
 }
 
 class Node {
@@ -410,6 +411,17 @@ class ExternNode : Node {
 	override string toString() => format("extern %s%s", raw? "" : "raw ", func);
 }
 
+class FuncAddrNode : Node {
+	string func;
+
+	this(ErrorInfo perror) {
+		type  = NodeType.FuncAddr;
+		error = perror;
+	}
+
+	override string toString() => format("&%s", func);
+}
+
 class ParserError : Exception {
 	this() {
 		super("", "", 0);
@@ -958,6 +970,17 @@ class Parser {
 		return ret;
 	}
 
+	Node ParseFuncAddr() {
+		auto ret = new FuncAddrNode(GetError());
+		parsing  = NodeType.FuncAddr;
+
+		Next();
+		Expect(TokenType.Identifier);
+		ret.func = tokens[i].contents;
+
+		return ret;
+	}
+
 	Node ParseStatement() {
 		switch (tokens[i].type) {
 			case TokenType.Integer: {
@@ -985,8 +1008,9 @@ class Parser {
 					default: return new WordNode(GetError(), tokens[i].contents);
 				}
 			}
-			case TokenType.LSquare: return ParseArray();
-			case TokenType.String:  return ParseString();
+			case TokenType.LSquare:   return ParseArray();
+			case TokenType.String:    return ParseString();
+			case TokenType.Ampersand: return ParseFuncAddr();
 			default: {
 				Error("Unexpected %s", tokens[i].type);
 			}