Merge pull request #36 from soxfox42/main

Fix address operator on struct and struct pointer fields
callisto-lang · Jan 31, 2025 · e1d867f · e1d867f
2 parents a06d606 + f0b31cd
commit e1d867f
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/source/backends/arm64.d b/source/backends/arm64.d
@@ -1101,14 +1101,23 @@ class BackendARM64 : CompilerBackend {
 			if (GlobalExists(name)) {
 				auto var = GetGlobal(name);
 
-				LoadAddress("x9", format("__global_%s", node.func.Sanitise()));
+				LoadAddress("x9", format("__global_%s", name.Sanitise()));
+				if (var.type.ptr) {
+					output ~= "ldr x9, [x9]\n";
+				}
 				output ~= format("add x9, x9, #%d\n", offset);
 				output ~= "str x9, [x19], #8\n";
 			}
 			else if (VariableExists(name)) {
 				auto var = GetVariable(name);
 
-				output ~= format("add x9, x20, #%d\n", var.offset + offset);
+				if (var.type.ptr) {
+					output ~= format("add x9, x20, #%d\n", var.offset);
+					output ~= "ldr x9, [x9]\n";
+					output ~= format("add x9, x9, #%d\n", offset);
+				} else {
+					output ~= format("add x9, x20, #%d\n", var.offset + offset);
+				}
 				output ~= "str x9, [x19], #8\n";
 			}
 			else {