cli/q
Code Issues 1 Pull Requests Activity

Added file scanner

Browse Source
This commit is contained in:
Eduard Urbach
2023-10-30 16:17:41 +01:00
parent 5fe83543fd
commit 8b19989372
10 changed files with 178 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/build/Build.go
View File

@ -4,10 +4,8 @@ import (
"bufio"
"os"
"path/filepath"
"strings"
"git.akyoto.dev/cli/q/src/asm"
"git.akyoto.dev/cli/q/src/directory"
"git.akyoto.dev/cli/q/src/elf"
"git.akyoto.dev/cli/q/src/errors"
"git.akyoto.dev/cli/q/src/linux"
@ -30,42 +28,14 @@ func New(directory string) *Build {
}
}
var (
hello = []byte("Hello\n")
world = []byte("World\n")
)
// Run parses the input files and generates an executable file.
func (build *Build) Run() error {
// err := build.Compile()
code, data, err := build.Compile()
// if err != nil {
// return err
// }
a := asm.Assembler{
Instructions: make([]asm.Instruction, 0, 8),
Verbose: build.Verbose,
if err != nil {
return err
}
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.Write)
a.MoveRegisterNumber(register.Syscall1, 1)
a.MoveRegisterData(register.Syscall2, world)
a.MoveRegisterNumber(register.Syscall3, uint64(len(world)))
a.Syscall()
a.MoveRegisterNumber(register.Syscall0, linux.Exit)
a.MoveRegisterNumber(register.Syscall1, 0)
a.Syscall()
code, data := a.Finalize()
if !build.WriteExecutable {
return nil
}
@ -74,26 +44,54 @@ func (build *Build) Run() error {
}
// Compile compiles all the functions.
func (build *Build) Compile() error {
func (build *Build) Compile() ([]byte, []byte, error) {
stat, err := os.Stat(build.Directory)
if err != nil {
return err
return nil, nil, err
}
if !stat.IsDir() {
return &errors.InvalidDirectory{Path: build.Directory}
return nil, nil, &errors.InvalidDirectory{Path: build.Directory}
}
directory.Walk(build.Directory, func(file string) {
if !strings.HasSuffix(file, ".q") {
return
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)
}
}
log.Info.Println(file)
})
a := asm.New()
return nil
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.