Improved variable lifetime tracking

src/build/Execute.go

@@ -4,6 +4,7 @@ import (
 	"strconv"
 
 	"git.akyoto.dev/cli/q/src/build/asm"
+	"git.akyoto.dev/cli/q/src/build/config"
 	"git.akyoto.dev/cli/q/src/build/cpu"
 	"git.akyoto.dev/cli/q/src/build/expression"
 	"git.akyoto.dev/cli/q/src/build/token"
@@ -12,6 +13,10 @@ import (
 
 // Execute executes an operation on a register with a value operand.
 func (f *Function) Execute(operation token.Token, register cpu.Register, value *expression.Expression) error {
+	if config.Verbose {
+		f.Logf("execute: %s on register %s with value %s", operation.Text(), register, value)
+	}
+
 	if value.IsLeaf() {
 		return f.ExecuteLeaf(operation, register, value.Token)
 	}
@@ -122,6 +127,10 @@ func (f *Function) ExecuteRegisterRegister(operation token.Token, destination cp
 
 // ExpressionToRegister moves the result of an expression into the given register.
 func (f *Function) ExpressionToRegister(root *expression.Expression, register cpu.Register) error {
+	if config.Verbose {
+		f.Logf("%s to register %s", root, register)
+	}
+
 	operation := root.Token
 
 	if root.IsLeaf() {

src/build/Function.go

@@ -1,6 +1,8 @@
 package build
 
 import (
+	"fmt"
+
 	"git.akyoto.dev/cli/q/src/build/config"
 	"git.akyoto.dev/cli/q/src/build/expression"
 	"git.akyoto.dev/cli/q/src/build/fs"
@@ -44,6 +46,10 @@ func (f *Function) CompileTokens(body token.List) error {
 			instruction := body[start:i]
 
 			if config.Verbose {
+				f.Logf("compiling: %s", instruction)
+			}
+
+			if config.Assembler {
 				f.debug = append(f.debug, debug{
 					position: len(f.assembler.Instructions),
 					source:   instruction,
@@ -108,6 +114,11 @@ func (f *Function) CompileInstruction(line token.List) error {
 	}
 }
 
+// Logf formats a message for verbose output.
+func (f *Function) Logf(format string, data ...any) {
+	fmt.Printf("[%s @ %d] %s\n", f, len(f.assembler.Instructions), fmt.Sprintf(format, data...))
+}
+
 // String returns the function name.
 func (f *Function) String() string {
 	return f.Name

src/build/FunctionCall.go

@@ -1,6 +1,7 @@
 package build
 
 import (
+	"git.akyoto.dev/cli/q/src/build/config"
 	"git.akyoto.dev/cli/q/src/build/cpu"
 	"git.akyoto.dev/cli/q/src/build/expression"
 )
@@ -28,6 +29,10 @@ func (f *Function) CompileFunctionCall(expr *expression.Expression) error {
 
 	err := f.ExpressionsToRegisters(parameters, registers)
 
+	if config.Verbose {
+		f.Logf("call: %s", funcName)
+	}
+
 	if isSyscall {
 		f.assembler.Syscall()
 	} else {

src/build/SaveRegister.go

@@ -2,6 +2,7 @@ package build
 
 import (
 	"git.akyoto.dev/cli/q/src/build/asm"
+	"git.akyoto.dev/cli/q/src/build/config"
 	"git.akyoto.dev/cli/q/src/build/cpu"
 )
 
@@ -20,7 +21,7 @@ func (f *Function) SaveRegister(register cpu.Register) {
 		}
 	}
 
-	if variable == nil || variable.UsesRemaining == 0 {
+	if variable == nil || variable.Alive == 0 {
 		return
 	}
 
@@ -30,6 +31,10 @@ func (f *Function) SaveRegister(register cpu.Register) {
 		panic("no free registers")
 	}
 
+	if config.Verbose {
+		f.Logf("moving %s from %s to %s (alive: %d)", variable.Name, variable.Register, newRegister, variable.Alive)
+	}
+
 	f.assembler.RegisterRegister(asm.MOVE, newRegister, register)
 	f.cpu.Free(register)
 	f.cpu.Use(newRegister)

src/build/Variable.go

@@ -6,7 +6,7 @@ import (
 
 // Variable represents a variable in a function.
 type Variable struct {
-	Name          string
-	Register      cpu.Register
-	UsesRemaining int
+	Name     string
+	Register cpu.Register
+	Alive    int
 }

src/build/VariableDefinition.go

@@ -1,6 +1,7 @@
 package build
 
 import (
+	"git.akyoto.dev/cli/q/src/build/config"
 	"git.akyoto.dev/cli/q/src/build/expression"
 	"git.akyoto.dev/cli/q/src/build/token"
 	"git.akyoto.dev/cli/q/src/errors"
@@ -18,6 +19,12 @@ func (f *Function) CompileVariableDefinition(expr *expression.Expression) error
 		return errors.New(&errors.VariableAlreadyExists{Name: name}, f.File, expr.Children[0].Token.Position)
 	}
 
+	uses := countIdentifier(f.Body, name) - 1
+
+	if uses == 0 {
+		return errors.New(&errors.UnusedVariable{Name: name}, f.File, expr.Children[0].Token.Position)
+	}
+
 	reg, exists := f.cpu.FindFree(f.cpu.General)
 
 	if !exists {
@@ -30,30 +37,40 @@ func (f *Function) CompileVariableDefinition(expr *expression.Expression) error
 		return err
 	}
 
-	variable := &Variable{
+	f.addVariable(&Variable{
 		Name:     name,
 		Register: reg,
-	}
+		Alive:    uses,
+	})
 
-	f.addVariable(variable)
-	f.useVariable(variable)
 	return nil
 }
 
 func (f *Function) addVariable(variable *Variable) {
-	variable.UsesRemaining = countIdentifier(f.Body, variable.Name)
+	if config.Verbose {
+		f.Logf("%s occupies %s (alive: %d)", variable.Name, variable.Register, variable.Alive)
+	}
+
 	f.variables[variable.Name] = variable
 	f.cpu.Use(variable.Register)
 }
 
 func (f *Function) useVariable(variable *Variable) {
-	variable.UsesRemaining--
+	variable.Alive--
 
-	if variable.UsesRemaining < 0 {
+	if config.Verbose {
+		f.Logf("%s occupying %s was used (alive: %d)", variable.Name, variable.Register, variable.Alive)
+	}
+
+	if variable.Alive < 0 {
 		panic("incorrect number of variable use calls")
 	}
 
-	if variable.UsesRemaining == 0 {
+	if variable.Alive == 0 {
+		if config.Verbose {
+			f.Logf("%s is no longer used, free register: %s", variable.Name, variable.Register)
+		}
+
 		f.cpu.Free(variable.Register)
 	}
 }

src/build/config/config.go

@@ -8,5 +8,6 @@ const (
 )
 
 var (
-	Verbose = false
+	Assembler = false
+	Verbose   = false
 )

src/build/scan.go

@@ -260,7 +260,18 @@ func scanFile(path string, functions chan<- *Function) error {
 			if len(tokens) == 1 {
 				name := tokens[0].Text()
 				register := x64.CallRegisters[len(function.variables)]
-				variable := &Variable{Name: name, Register: register}
+				uses := countIdentifier(function.Body, name)
+
+				if uses == 0 {
+					return errors.New(&errors.UnusedVariable{Name: name}, file, tokens[0].Position)
+				}
+
+				variable := &Variable{
+					Name:     name,
+					Register: register,
+					Alive:    uses,
+				}
+
 				function.addVariable(variable)
 				return nil
 			}