cli/q
Code Issues 1 Pull Requests Activity

Improved mac support

Browse Source
This commit is contained in:
Eduard Urbach
2024-08-12 12:16:01 +02:00
parent 58f010b81a
commit cf52919edc
25 changed files with 119 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/compiler/Result.go
View File

@ -2,16 +2,18 @@ package compiler
import (
"bufio"
"fmt"
"io"
"os"
"runtime"
"git.akyoto.dev/cli/q/src/arch/x64"
"git.akyoto.dev/cli/q/src/asm"
"git.akyoto.dev/cli/q/src/config"
"git.akyoto.dev/cli/q/src/core"
"git.akyoto.dev/cli/q/src/elf"
"git.akyoto.dev/cli/q/src/macho"
"git.akyoto.dev/cli/q/src/os/linux"
"git.akyoto.dev/cli/q/src/os/linux/elf"
"git.akyoto.dev/cli/q/src/os/mac"
"git.akyoto.dev/cli/q/src/os/mac/macho"
)
// Result contains all the compiled functions in a build.
@ -35,11 +37,11 @@ func (r *Result) finalize() ([]byte, []byte) {
sysExit := 0
switch runtime.GOOS {
switch config.TargetOS {
case "linux":
sysExit = linux.Exit
case "darwin":
sysExit = 1 | 0x2000000
case "mac":
sysExit = mac.Exit
}
final.Call("main.main")
@ -47,17 +49,17 @@ func (r *Result) finalize() ([]byte, []byte) {
final.RegisterNumber(asm.MOVE, x64.SyscallInputRegisters[1], 0)
final.Syscall()
final.Label(asm.LABEL, "_crash")
final.RegisterNumber(asm.MOVE, x64.SyscallInputRegisters[0], sysExit)
final.RegisterNumber(asm.MOVE, x64.SyscallInputRegisters[1], 1)
final.Syscall()
// This will place the main function immediately after the entry point
// and also add everything the main function calls recursively.
r.eachFunction(r.Main, map[*core.Function]bool{}, func(f *core.Function) {
final.Merge(f.Assembler)
})
final.Label(asm.LABEL, "_crash")
final.RegisterNumber(asm.MOVE, x64.SyscallInputRegisters[0], sysExit)
final.RegisterNumber(asm.MOVE, x64.SyscallInputRegisters[1], 1)
final.Syscall()
code, data := final.Finalize()
return code, data
}
@ -129,15 +131,15 @@ func (r *Result) WriteFile(path string) error {
func write(writer io.Writer, code []byte, data []byte) error {
buffer := bufio.NewWriter(writer)
switch runtime.GOOS {
case "darwin":
exe := macho.New(code, data)
exe.Write(buffer)
switch config.TargetOS {
case "linux":
exe := elf.New(code, data)
exe.Write(buffer)
case "mac":
exe := macho.New(code, data)
exe.Write(buffer)
default:
panic("unsupported platform")
return fmt.Errorf("unsupported platform '%s'", config.TargetOS)
}
return buffer.Flush()