Added assembler merging

src/build/Build.go

@@ -5,12 +5,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"git.akyoto.dev/cli/q/src/asm"
 	"git.akyoto.dev/cli/q/src/elf"
 	"git.akyoto.dev/cli/q/src/errors"
-	"git.akyoto.dev/cli/q/src/linux"
-	"git.akyoto.dev/cli/q/src/log"
-	"git.akyoto.dev/cli/q/src/register"
 )
 
 // Build describes a compiler build.
@@ -30,7 +26,17 @@ func New(directory string) *Build {
 
 // Run parses the input files and generates an executable file.
 func (build *Build) Run() error {
-	code, data, err := build.Compile()
+	stat, err := os.Stat(build.Directory)
+
+	if err != nil {
+		return err
+	}
+
+	if !stat.IsDir() {
+		return &errors.InvalidDirectory{Path: build.Directory}
+	}
+
+	functions, err := build.Compile()
 
 	if err != nil {
 		return err
@@ -40,60 +46,10 @@ func (build *Build) Run() error {
 		return nil
 	}
 
+	code, data := build.Finalize(functions)
 	return writeToDisk(build.Executable(), code, data)
 }
 
-// Compile compiles all the functions.
-func (build *Build) Compile() ([]byte, []byte, error) {
-	stat, err := os.Stat(build.Directory)
-
-	if err != nil {
-		return nil, nil, err
-	}
-
-	if !stat.IsDir() {
-		return nil, nil, &errors.InvalidDirectory{Path: build.Directory}
-	}
-
-	functions, errors := Scan(build.Directory)
-
-	for functions != nil || errors != nil {
-		select {
-		case err, ok := <-errors:
-			if !ok {
-				errors = nil
-				continue
-			}
-
-			log.Info.Println(err)
-
-		case function, ok := <-functions:
-			if !ok {
-				functions = nil
-				continue
-			}
-
-			log.Info.Println(function)
-		}
-	}
-
-	a := asm.New()
-
-	hello := []byte("Hello\n")
-	a.MoveRegisterNumber(register.Syscall0, linux.Write)
-	a.MoveRegisterNumber(register.Syscall1, 1)
-	a.MoveRegisterData(register.Syscall2, hello)
-	a.MoveRegisterNumber(register.Syscall3, uint64(len(hello)))
-	a.Syscall()
-
-	a.MoveRegisterNumber(register.Syscall0, linux.Exit)
-	a.MoveRegisterNumber(register.Syscall1, 0)
-	a.Syscall()
-
-	code, data := a.Finalize(build.Verbose)
-	return code, data, nil
-}
-
 // Executable returns the path to the executable.
 func (build *Build) Executable() string {
 	return filepath.Join(build.Directory, filepath.Base(build.Directory))