From 42e718d6d33469bc5d27f07bc87c48ef9cfa910d Mon Sep 17 00:00:00 2001 From: SpookyDervish <78246495+SpookyDervish@users.noreply.github.com> Date: Tue, 2 Sep 2025 19:43:48 +1000 Subject: [PATCH] starting work on math instructions and added support for negative numbers and maybe floats --- generators/x86_64.py | 102 ++++++++++++++++++++++++++++++++++++++++--- out | Bin 4680 -> 4664 bytes out.asm | 19 +++----- test2.grnd | 9 ++-- tokenizer.py | 29 +++++++++--- 5 files changed, 127 insertions(+), 32 deletions(-) diff --git a/generators/x86_64.py b/generators/x86_64.py index 1dca390..8393558 100644 --- a/generators/x86_64.py +++ b/generators/x86_64.py @@ -24,19 +24,24 @@ class X86_64Generator(Generator): self.stack_size -= 1 def get_variable(self, var_name: str, reg: str): + var = self.variables.get(var_name, None) try: self.push( - f"QWORD [rsp + {(self.stack_size - self.variables.get(var_name, None)['stack_loc'] - 1) * 8}]" + f"QWORD [rsp + {(self.stack_size - var['stack_loc'] - 1) * 8}]" ) except TypeError: # variable doesnt exist traceback(self.code, "NameError", f"\"{var_name}\" is not defined.") self.pop(reg) + return var["type"] def get_var_pos(self, var_name: str): return (self.stack_size - self.variables.get(var_name)['stack_loc'] - 1) * 8 - def create_variable(self, var_name: str, starting_value): - new_var = {"stack_loc": (self.stack_size), "type": type(starting_value)} + def create_variable(self, var_name: str, starting_value, var_type: Any = None): + if var_type == None: + var_type = type(starting_value) + + new_var = {"stack_loc": (self.stack_size), "type": var_type} if type(starting_value) == NumberNode: self.lines.append(f"mov rax, {starting_value.value}\n\t") self.push("rax") @@ -44,6 +49,8 @@ class X86_64Generator(Generator): self.get_variable(starting_value.var_name, "rax") #self.lines.append(f"mov QWORD [rsp + {var_pos}], rax\n\t") self.push("rax") + elif type(starting_value) == str: + self.push(starting_value) self.variables[var_name] = new_var def change_variable(self, var_name: str, new_value): @@ -57,6 +64,9 @@ class X86_64Generator(Generator): self.get_variable(new_value.var_name, "rax") self.lines.append(f"mov QWORD [rsp + {var_pos}], rax\n\t") + elif type(new_value) == str: # we're changing a variable to the value of a register + self.lines.append(f"mov QWORD [rsp + {var_pos}], {new_value}\n\t") + def generate_InstructionNode(self, node: InstructionNode): if node.instruction == "end": if len(node.arguments) == 0: # example: "end" @@ -64,7 +74,7 @@ class X86_64Generator(Generator): elif len(node.arguments) > 1: # example: "end 1 1" traceback(self.code, "TypeError", "end expects only 1 argument.") if not type(node.arguments[0]) in [NumberNode, VarRefNode]: # example: "end true" - traceback(self.code, "TypeError", f"end expects an integer, not {type(node.arguments[0])}") + traceback(self.code, "TypeError", f"end expects an integer, not {node.arguments[0]}") self.lines.append("mov rax, 60\n\t") if isinstance(node.arguments[0], NumberNode): @@ -80,7 +90,7 @@ class X86_64Generator(Generator): elif len(node.arguments) > 2: # example: "set &hi 0 123" traceback(self.code, "TypeError", "set expects only 2 arguments.") if not isinstance(node.arguments[0], VarPointerNode): - traceback(self.code, "TypeError", f"the first argument of set should be a variable pointer, not \"{type(node.arguments[0])}\"") + traceback(self.code, "TypeError", f"the first argument of set should be a variable pointer, not \"{node.arguments[0]}\"") if type(node.arguments[1]) not in [NumberNode, VarRefNode]: traceback(self.code, "TypeError", f"variables can't be of type \"{type(node.arguments[1])}\"") @@ -91,7 +101,87 @@ class X86_64Generator(Generator): else: # modify the existing one self.change_variable(node.arguments[0].var_name, node.arguments[1]) - + elif node.instruction == "add": + if len(node.arguments) < 3: # example: "add" or "add 1" or "add 1 2" + traceback(self.code, "TypeError", "add expects atleast 3 arguments.") + elif len(node.arguments) > 3: # example: "add 1 2 3 4" + traceback(self.code, "TypeError", "add expects only 3 arguments.") + elif type(node.arguments[2]) != VarPointerNode: + traceback(self.code, "TypeError", f"the destination of the add command must be a variable pointer, not \"{node.arguments[2]}\"") + + # bro this entire god damn instruction is just error handling 😔 + number1_type = None + number2_type = None + arg2 = "rbx" + + if isinstance(node.arguments[0], NumberNode): + number1_type = NumberNode + #arg1 = node.arguments[0].value + self.lines.append(f"mov rax, {node.arguments[0].value}\n\t") + elif isinstance(node.arguments[0], VarRefNode): + number1_type = self.get_variable(node.arguments[0].var_name, "rax") + else: + traceback(self.code, "TypeError", f"expected a variable reference or number for argument 1 of add, got {node.arguments[0]}") + if isinstance(node.arguments[1], NumberNode): + number2_type = NumberNode + arg2 = node.arguments[1].value + #self.lines.append(f"mov rbx, {node.arguments[1].value}\n\t") + elif isinstance(node.arguments[1], VarRefNode): + number2_type = self.get_variable(node.arguments[1].var_name, "rbx") + else: + traceback(self.code, "TypeError", f"expected a variable reference or number for argument 2 of add, got {node.arguments[1]}") + + # TODO: numbers can be added to numbers, but numbers cant be added to strings. but strings can be added to strings, etc... + if number1_type not in [NumberNode] or number2_type not in [NumberNode]: + traceback(self.code, "TypeError", f"Unsupported operation \"add\" for \"{node.arguments[0]}\" and \"{node.arguments[1]}\".") + + self.lines.append(f"add rax, {arg2}\n\t") + + if self.variables.get(node.arguments[2].var_name, None) == None: # we need to create a variable for the destination + self.create_variable(node.arguments[2].var_name, "rax", NumberNode) + else: + self.change_variable(node.arguments[2].var_name, "rax") + elif node.instruction == "subtract": + if len(node.arguments) < 3: # example: "subtract" or "subtract 1" or "subtract 1 2" + traceback(self.code, "TypeError", "subtract expects atleast 3 arguments.") + elif len(node.arguments) > 3: # example: "subtract 1 2 3 4" + traceback(self.code, "TypeError", "subtract expects only 3 arguments.") + elif type(node.arguments[2]) != VarPointerNode: + traceback(self.code, "TypeError", f"the destination of the subtract command must be a variable pointer, not \"{node.arguments[2]}\"") + + # bro this entire god damn instruction is just error handling 😔 + number1_type = None + number2_type = None + arg2 = "rbx" + + if isinstance(node.arguments[0], NumberNode): + number1_type = NumberNode + #arg1 = node.arguments[0].value + self.lines.append(f"mov rax, {node.arguments[0].value}\n\t") + elif isinstance(node.arguments[0], VarRefNode): + number1_type = self.get_variable(node.arguments[0].var_name, "rax") + else: + traceback(self.code, "TypeError", f"expected a variable reference or number for argument 1 of subtract, got {node.arguments[0]}") + if isinstance(node.arguments[1], NumberNode): + number2_type = NumberNode + arg2 = node.arguments[1].value + #self.lines.append(f"mov rbx, {node.arguments[1].value}\n\t") + elif isinstance(node.arguments[1], VarRefNode): + number2_type = self.get_variable(node.arguments[1].var_name, "rbx") + else: + traceback(self.code, "TypeError", f"expected a variable reference or number for argument 2 of subtract, got {node.arguments[1]}") + + print(number1_type, number2_type) + if number1_type not in [NumberNode] or number2_type not in [NumberNode]: + traceback(self.code, "TypeError", f"Unsupported operation \"subtract\" for \"{node.arguments[0]}\" and \"{node.arguments[1]}\".") + + self.lines.append(f"sub rax, {arg2}\n\t") + + if self.variables.get(node.arguments[2].var_name, None) == None: # we need to create a variable for the destination + self.create_variable(node.arguments[2].var_name, "rax", NumberNode) + else: + self.change_variable(node.arguments[2].var_name, "rax") + else: self.lines.append("; FUCK\n\t") #raise NotImplementedError(f"A generate method hasn't been made for the \"{node.instruction}\" instruction.") \ No newline at end of file diff --git a/out b/out index 19e868773aea551c1a0a7df3c3b93d44e9d7de0f..07603fffc5c895ae87fa85a9c24e0fa94d70fa17 100644 GIT binary patch delta 83 zcmX@1vO{Hp2Gb9LiCTG_vJ4O)yK!LxKW_?<6Y$?eCBmcm!0*Y50_vMx1(X>%V2UO# al$hKhD8Z;Od7+>^