cli/q
Code Issues 1 Pull Requests Activity

Fixed register allocation on function calls

Browse Source
This commit is contained in:
Eduard Urbach 2025-02-05 22:49:39 +01:00
parent 5d38a4980a
commit 12894dbcc5
Signed by: akyoto
GPG Key ID: C874F672B1AF20C0
5 changed files with 40 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/point/point.q
View File

@ -7,15 +7,15 @@ struct Point {
}
main() {
p := construct()
p := construct(1, 2)
print(p)
delete(p)
}
construct() -> *Point {
construct(x Int, y Int) -> *Point {
p := new(Point)
p.x = 1
p.y = 2
p.x = x
p.y = y
return p
}

33
src/core/CallSafe.go Normal file
View File

@ -0,0 +1,33 @@
package core
import (
"slices"
"git.akyoto.dev/cli/q/src/asm"
"git.akyoto.dev/cli/q/src/cpu"
)
// CallSafe pushes used registers to the stack, executes the call and restores the original register value.
func (f *Function) CallSafe(fn *Function, registers []cpu.Register) {
for _, register := range f.CPU.Output {
f.SaveRegister(register)
}
for _, register := range f.CPU.General {
if f.RegisterIsUsed(register) {
f.Register(asm.PUSH, register)
}
}
f.Call(fn.UniqueName)
for _, register := range slices.Backward(f.CPU.General) {
if f.RegisterIsUsed(register) {
f.Register(asm.POP, register)
}
}
for _, register := range registers {
f.FreeRegister(register)
}
}

30
src/core/CompileCall.go
View File

@ -3,7 +3,6 @@ package core
import (
"fmt"
"git.akyoto.dev/cli/q/src/asm"
"git.akyoto.dev/cli/q/src/errors"
"git.akyoto.dev/cli/q/src/expression"
"git.akyoto.dev/cli/q/src/types"
@ -103,33 +102,6 @@ func (f *Function) CompileCall(root *expression.Expression) (*Function, error) {
}
}
for _, register := range f.CPU.Output[:len(fn.Output)] {
f.SaveRegister(register)
}
for _, register := range f.CPU.General {
if f.RegisterIsUsed(register) {
f.Register(asm.PUSH, register)
}
}
f.Call(fn.UniqueName)
for _, register := range registers {
if register == f.CPU.Output[0] && root.Parent != nil {
continue
}
f.FreeRegister(register)
}
for i := len(f.CPU.General) - 1; i >= 0; i-- {
register := f.CPU.General[i]
if f.RegisterIsUsed(register) {
f.Register(asm.POP, register)
}
}
f.CallSafe(fn, registers)
return fn, nil
}

18
src/core/CompileDelete.go
View File

@ -16,22 +16,6 @@ func (f *Function) CompileDelete(root *expression.Expression) error {
f.SaveRegister(f.CPU.Input[1])
f.RegisterRegister(asm.MOVE, f.CPU.Input[0], variable.Register)
f.RegisterNumber(asm.MOVE, f.CPU.Input[1], int(variable.Type.(*types.Pointer).To.Size()))
for _, register := range f.CPU.General {
if f.RegisterIsUsed(register) {
f.Register(asm.PUSH, register)
}
}
f.Call("mem.free")
for i := len(f.CPU.General) - 1; i >= 0; i-- {
register := f.CPU.General[i]
if f.RegisterIsUsed(register) {
f.Register(asm.POP, register)
}
}
f.CallSafe(f.Functions["mem.free"], f.CPU.Input[:2])
return nil
}

18
src/core/CompileNew.go
View File

@ -12,22 +12,6 @@ func (f *Function) CompileNew(root *expression.Expression) error {
typ := f.Types[structName]
f.SaveRegister(f.CPU.Input[0])
f.RegisterNumber(asm.MOVE, f.CPU.Input[0], typ.Size())
for _, register := range f.CPU.General {
if f.RegisterIsUsed(register) {
f.Register(asm.PUSH, register)
}
}
f.Call("mem.alloc")
for i := len(f.CPU.General) - 1; i >= 0; i-- {
register := f.CPU.General[i]
if f.RegisterIsUsed(register) {
f.Register(asm.POP, register)
}
}
f.CallSafe(f.Functions["mem.alloc"], f.CPU.Input[:1])
return nil
}