Made native target actually work

cmd/fsplc/main.go

@@ -11,6 +11,7 @@ import "git.tebibyte.media/sashakoshka/fspl/llvm"
 import "git.tebibyte.media/sashakoshka/fspl/parser"
 import "git.tebibyte.media/sashakoshka/fspl/analyzer"
 import "git.tebibyte.media/sashakoshka/fspl/generator"
+import "git.tebibyte.media/sashakoshka/fspl/generator/native"
 
 type Compiler struct {
 	Output       string
@@ -51,7 +52,7 @@ func (this *Compiler) Compile (inputs []string) error {
 	err := semanticTree.Analyze(syntaxTree)
 	if err != nil { return err }
 
-	module, err := generator.NativeTarget().Generate(semanticTree)
+	module, err := native.NativeTarget().Generate(semanticTree)
 	if err != nil { return err }
 
 	if this.Output == "" {

generator/generator.go

@@ -16,15 +16,6 @@ type Target struct {
 	Arch string
 }
 
-// NativeTarget returns a target describing the current system.
-func NativeTarget () Target {
-	// FIXME
-	return Target {
-		WordSize: 64,
-		Arch: "x86",
-	}
-}
-
 type generator struct {
 	target       Target
 	tree         analyzer.Tree

generator/native/native.go

@@ -0,0 +1,8 @@
+package native
+
+import "git.tebibyte.media/sashakoshka/fspl/generator"
+
+// NativeTarget returns a target describing the current system.
+func NativeTarget () Target {
+	return nativeTarget()
+}

generator/native/native_386.go

@@ -0,0 +1,10 @@
+package native
+
+import "git.tebibyte.media/sashakoshka/fspl/generator"
+
+func nativeTarget () generator.Target {
+	return generator.Target {
+		WordSize: 32,
+		Arch: "i386",
+	}
+}

generator/native/native_amd64.go

@@ -0,0 +1,10 @@
+package native
+
+import "git.tebibyte.media/sashakoshka/fspl/generator"
+
+func nativeTarget () generator.Target {
+	return generator.Target {
+		WordSize: 64,
+		Arch: "x86_64",
+	}
+}

generator/native/native_amd64p32.go

@@ -0,0 +1,11 @@
+package native
+
+import "git.tebibyte.media/sashakoshka/fspl/generator"
+
+func nativeTarget () generator.Target {
+	// this may not be accurate, can't find info online about amd64p32
+	return generator.Target {
+		WordSize: 32,
+		Arch: "x86",
+	}
+}

generator/native/native_arm.go

@@ -0,0 +1,10 @@
+package native
+
+import "git.tebibyte.media/sashakoshka/fspl/generator"
+
+func nativeTarget () generator.Target {
+	return generator.Target {
+		WordSize: 32,
+		Arch: "arm",
+	}
+}

generator/native/native_arm64.go

@@ -0,0 +1,10 @@
+package native
+
+import "git.tebibyte.media/sashakoshka/fspl/generator"
+
+func nativeTarget () generator.Target {
+	return generator.Target {
+		WordSize: 64,
+		Arch: "aarch64",
+	}
+}

generator/native/native_arm64be.go

@@ -0,0 +1,10 @@
+package native
+
+import "git.tebibyte.media/sashakoshka/fspl/generator"
+
+func nativeTarget () generator.Target {
+	return generator.Target {
+		WordSize: 64,
+		Arch: "aarch64_be",
+	}
+}

generator/native/native_armbe.go

@@ -0,0 +1,10 @@
+package native
+
+import "git.tebibyte.media/sashakoshka/fspl/generator"
+
+func nativeTarget () generator.Target {
+	return generator.Target {
+		WordSize: 32,
+		Arch: "armeb",
+	}
+}

generator/native/native_mips.go

@@ -0,0 +1,10 @@
+package native
+
+import "git.tebibyte.media/sashakoshka/fspl/generator"
+
+func nativeTarget () generator.Target {
+	return generator.Target {
+		WordSize: 32,
+		Arch: "mips",
+	}
+}

generator/native/native_mips64.go

@@ -0,0 +1,10 @@
+package native
+
+import "git.tebibyte.media/sashakoshka/fspl/generator"
+
+func nativeTarget () generator.Target {
+	return generator.Target {
+		WordSize: 64,
+		Arch: "mips64",
+	}
+}

generator/native/native_mips64le.go

@@ -0,0 +1,10 @@
+package native
+
+import "git.tebibyte.media/sashakoshka/fspl/generator"
+
+func nativeTarget () generator.Target {
+	return generator.Target {
+		WordSize: 64,
+		Arch: "mips64el",
+	}
+}

generator/native/native_mipsle.go

@@ -0,0 +1,10 @@
+package native
+
+import "git.tebibyte.media/sashakoshka/fspl/generator"
+
+func nativeTarget () generator.Target {
+	return generator.Target {
+		WordSize: 32,
+		Arch: "mipsel",
+	}
+}

generator/native/native_ppc.go

@@ -0,0 +1,10 @@
+package native
+
+import "git.tebibyte.media/sashakoshka/fspl/generator"
+
+func nativeTarget () generator.Target {
+	return generator.Target {
+		WordSize: 32,
+		Arch: "ppc32",
+	}
+}

generator/native/native_ppc64.go

@@ -0,0 +1,10 @@
+package native
+
+import "git.tebibyte.media/sashakoshka/fspl/generator"
+
+func nativeTarget () generator.Target {
+	return generator.Target {
+		WordSize: 64,
+		Arch: "ppc64",
+	}
+}

generator/native/native_ppc64le.go

@@ -0,0 +1,10 @@
+package native
+
+import "git.tebibyte.media/sashakoshka/fspl/generator"
+
+func nativeTarget () generator.Target {
+	return generator.Target {
+		WordSize: 64,
+		Arch: "ppc64le",
+	}
+}

generator/native/native_riscv.go

@@ -0,0 +1,10 @@
+package native
+
+import "git.tebibyte.media/sashakoshka/fspl/generator"
+
+func nativeTarget () generator.Target {
+	return generator.Target {
+		WordSize: 32,
+		Arch: "riscv32",
+	}
+}

generator/native/native_sparc.go

@@ -0,0 +1,10 @@
+package native
+
+import "git.tebibyte.media/sashakoshka/fspl/generator"
+
+func nativeTarget () generator.Target {
+	return generator.Target {
+		WordSize: 32,
+		Arch: "sparc",
+	}
+}

generator/native/native_sparc64.go

@@ -0,0 +1,10 @@
+package native
+
+import "git.tebibyte.media/sashakoshka/fspl/generator"
+
+func nativeTarget () generator.Target {
+	return generator.Target {
+		WordSize: 64,
+		Arch: "sparcv9",
+	}
+}

generator/native/native_wasm.go

@@ -0,0 +1,12 @@
+package native
+
+import "git.tebibyte.media/sashakoshka/fspl/generator"
+
+func nativeTarget () generator.Target {
+	// FIXME: golang doesn't discern between 32/64 bit wasm so we assume 64
+	// bit here
+	return generator.Target {
+		WordSize: 64,
+		Arch: "wasm64",
+	}
+}

generator/type.go

@@ -2,6 +2,7 @@ package generator
 
 import "fmt"
 import "errors"
+import "strings"
 import "git.tebibyte.media/sashakoshka/fspl/llvm"
 import "git.tebibyte.media/sashakoshka/fspl/entity"
 
@@ -69,7 +70,7 @@ func (this *generator) generateTypeFloat (ty *entity.TypeFloat) (llvm.Type, erro
 	case 32: kind = llvm.FloatKindFloat
 	case 64: kind = llvm.FloatKindDouble
 	case 80:
-		if this.target.Arch == "x86" {
+		if strings.HasPrefix(this.target.Arch, "x86") {
 			kind = llvm.FloatKindX86_FP80
 		} else {
 			return nil, errors.New(fmt.Sprintln (
@@ -77,7 +78,7 @@ func (this *generator) generateTypeFloat (ty *entity.TypeFloat) (llvm.Type, erro
 				this.target.Arch))
 		}
 	case 128:
-		if this.target.Arch == "PowerPC" {
+		if strings.HasPrefix(this.target.Arch, "ppc") {
 			kind = llvm.FloatKindPPC_FP128
 		} else {
 			kind = llvm.FloatKindFP128