Improved separation of concerns

src/build/z/AddLabel.go

@@ -0,0 +1,8 @@
+package z
+
+import "git.akyoto.dev/cli/q/src/build/asm"
+
+func (f *Compiler) AddLabel(label string) {
+	f.Assembler.Label(asm.LABEL, label)
+	f.postInstruction()
+}

src/build/z/Call.go

@@ -0,0 +1,7 @@
+package z
+
+func (f *Compiler) Call(label string) {
+	f.Assembler.Call(label)
+	f.CurrentScope().Use(f.CPU.Output[0])
+	f.postInstruction()
+}

src/build/z/Comment.go

@@ -0,0 +1,8 @@
+package z
+
+import "fmt"
+
+func (f *Compiler) Comment(format string, args ...any) {
+	f.Assembler.Comment(fmt.Sprintf(format, args...))
+	f.postInstruction()
+}

src/build/z/Compiler.go

@@ -0,0 +1,15 @@
+package z
+
+import (
+	"git.akyoto.dev/cli/q/src/build/asm"
+	"git.akyoto.dev/cli/q/src/build/cpu"
+	"git.akyoto.dev/cli/q/src/build/scope"
+)
+
+// Compiler is a register usage aware assembler.
+type Compiler struct {
+	scope.Stack
+	Assembler       asm.Assembler
+	CPU             cpu.CPU
+	RegisterHistory []uint64
+}

src/build/z/Jump.go

@@ -0,0 +1,8 @@
+package z
+
+import "git.akyoto.dev/cli/q/src/build/asm"
+
+func (f *Compiler) Jump(mnemonic asm.Mnemonic, label string) {
+	f.Assembler.Label(mnemonic, label)
+	f.postInstruction()
+}

src/build/z/MemoryNumber.go

@@ -0,0 +1,8 @@
+package z
+
+import "git.akyoto.dev/cli/q/src/build/asm"
+
+func (f *Compiler) MemoryNumber(mnemonic asm.Mnemonic, a asm.Memory, b int) {
+	f.Assembler.MemoryNumber(mnemonic, a, b)
+	f.postInstruction()
+}

src/build/z/Register.go

@@ -0,0 +1,16 @@
+package z
+
+import (
+	"git.akyoto.dev/cli/q/src/build/asm"
+	"git.akyoto.dev/cli/q/src/build/cpu"
+)
+
+func (f *Compiler) Register(mnemonic asm.Mnemonic, a cpu.Register) {
+	f.Assembler.Register(mnemonic, a)
+
+	if mnemonic == asm.POP {
+		f.CurrentScope().Use(a)
+	}
+
+	f.postInstruction()
+}

src/build/z/RegisterLabel.go

@@ -0,0 +1,20 @@
+package z
+
+import (
+	"git.akyoto.dev/cli/q/src/build/asm"
+	"git.akyoto.dev/cli/q/src/build/cpu"
+)
+
+func (f *Compiler) RegisterLabel(mnemonic asm.Mnemonic, register cpu.Register, label string) {
+	if f.CurrentScope().IsUsed(register) && isDestructive(mnemonic) {
+		f.SaveRegister(register)
+	}
+
+	f.Assembler.RegisterLabel(mnemonic, register, label)
+
+	if mnemonic == asm.MOVE {
+		f.CurrentScope().Use(register)
+	}
+
+	f.postInstruction()
+}

src/build/z/RegisterNumber.go

@@ -0,0 +1,20 @@
+package z
+
+import (
+	"git.akyoto.dev/cli/q/src/build/asm"
+	"git.akyoto.dev/cli/q/src/build/cpu"
+)
+
+func (f *Compiler) RegisterNumber(mnemonic asm.Mnemonic, a cpu.Register, b int) {
+	if f.CurrentScope().IsUsed(a) && isDestructive(mnemonic) {
+		f.SaveRegister(a)
+	}
+
+	f.Assembler.RegisterNumber(mnemonic, a, b)
+
+	if mnemonic == asm.MOVE {
+		f.CurrentScope().Use(a)
+	}
+
+	f.postInstruction()
+}

src/build/z/RegisterRegister.go

@@ -0,0 +1,24 @@
+package z
+
+import (
+	"git.akyoto.dev/cli/q/src/build/asm"
+	"git.akyoto.dev/cli/q/src/build/cpu"
+)
+
+func (f *Compiler) RegisterRegister(mnemonic asm.Mnemonic, a cpu.Register, b cpu.Register) {
+	if mnemonic == asm.MOVE && a == b {
+		return
+	}
+
+	if f.CurrentScope().IsUsed(a) && isDestructive(mnemonic) {
+		f.SaveRegister(a)
+	}
+
+	f.Assembler.RegisterRegister(mnemonic, a, b)
+
+	if mnemonic == asm.MOVE {
+		f.CurrentScope().Use(a)
+	}
+
+	f.postInstruction()
+}

src/build/z/Return.go

@@ -0,0 +1,6 @@
+package z
+
+func (f *Compiler) Return() {
+	f.Assembler.Return()
+	f.postInstruction()
+}

src/build/z/SaveRegister.go

@@ -0,0 +1,30 @@
+package z
+
+import (
+	"git.akyoto.dev/cli/q/src/build/asm"
+	"git.akyoto.dev/cli/q/src/build/cpu"
+)
+
+// SaveRegister attempts to move a variable occupying this register to another register.
+func (f *Compiler) SaveRegister(register cpu.Register) {
+	if !f.CurrentScope().IsUsed(register) {
+		return
+	}
+
+	for _, general := range f.CPU.General {
+		if register == general {
+			return
+		}
+	}
+
+	variable := f.VariableByRegister(register)
+
+	if variable == nil || variable.Alive == 0 {
+		return
+	}
+
+	newRegister := f.CurrentScope().MustFindFree(f.CPU.General)
+	f.CurrentScope().Reserve(newRegister)
+	f.RegisterRegister(asm.MOVE, newRegister, register)
+	variable.Register = newRegister
+}

src/build/z/Syscall.go

@@ -0,0 +1,7 @@
+package z
+
+func (f *Compiler) Syscall() {
+	f.Assembler.Syscall()
+	f.CurrentScope().Use(f.CPU.Output[0])
+	f.postInstruction()
+}

src/build/z/isDestructive.go

@@ -0,0 +1,12 @@
+package z
+
+import "git.akyoto.dev/cli/q/src/build/asm"
+
+func isDestructive(mnemonic asm.Mnemonic) bool {
+	switch mnemonic {
+	case asm.MOVE, asm.ADD, asm.SUB, asm.MUL, asm.DIV:
+		return true
+	default:
+		return false
+	}
+}

src/build/z/postInstruction.go

@@ -0,0 +1,11 @@
+package z
+
+import "git.akyoto.dev/cli/q/src/build/config"
+
+func (f *Compiler) postInstruction() {
+	if !config.Assembler {
+		return
+	}
+
+	f.RegisterHistory = append(f.RegisterHistory, f.CurrentScope().Used)
+}