hare

commit 6d7b8a15f118feda3929ee5fb7296167ee9a30b0
parent 7814b66ddfe6e8a5c23e1f308e759cdae25cb563
Author: Sebastian <sebastian@sebsite.pw>
Date:   Sat,  9 Dec 2023 21:37:44 -0500

haretype: use system architecture

Signed-off-by: Sebastian <sebastian@sebsite.pw>

Diffstat:
M
cmd/haretype/main.ha
 | 
30
++++++++++++++++--------------

1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/cmd/haretype/main.ha b/cmd/haretype/main.ha
@@ -45,11 +45,22 @@ fn typeinfo(
 		else hatype._align)?;
 };
 
+fn str_to_arch(name: str) types::arch = {
+	switch (name) {
+	case "aarch64" =>
+		return types::aarch64;
+	case "riscv64" =>
+		return types::riscv64;
+	case "x86_64" =>
+		return types::x86_64;
+	case =>
+		fmt::fatal("Unsupported architecture", name);
+	};
+};
+
 export fn main() void = {
-	// TODO: use system architecture
-	// Currently this isn't necessary, since all supported CPU targets have
-	// the same int and pointer sizes, but this may be needed in the future.
-	let arch = types::x86_64;
+	let arch = os::arch_name(os::architecture());
+	let arch = str_to_arch(arch);
 
 	const help: []getopt::help = [
 		"prints information about Hare types",
@@ -63,16 +74,7 @@ export fn main() void = {
 		switch (opt.0) {
 		// TODO: tags
 		case 'm' =>
-			arch = switch (opt.1) {
-			case "x86_64" =>
-				yield types::x86_64;
-			case "aarch64" =>
-				yield types::aarch64;
-			case "riscv64" =>
-				yield types::riscv64;
-			case =>
-				fmt::fatal("Unsupported architecture");
-			};
+			arch = str_to_arch(opt.1);
 		case => abort(); // unreachable
 		};
 	};