Fixed incorrect division results

This commit is contained in:
2025-02-22 12:54:23 +01:00
parent 7598411c8f
commit c088697446
11 changed files with 150 additions and 94 deletions

View File

@ -35,7 +35,7 @@ func (f *Function) CompileAssign(node *ast.Assign) error {
}
if left.Token.Kind == token.Separator && right.Token.Kind == token.Div {
return f.CompileAssignDivision(node)
return f.CompileAssignDivision(node.Expression)
}
if !ast.IsFunctionCall(right) {

View File

@ -2,30 +2,60 @@ package core
import (
"git.akyoto.dev/cli/q/src/asm"
"git.akyoto.dev/cli/q/src/ast"
"git.akyoto.dev/cli/q/src/errors"
"git.akyoto.dev/cli/q/src/expression"
"git.akyoto.dev/cli/q/src/scope"
"git.akyoto.dev/cli/q/src/token"
"git.akyoto.dev/cli/q/src/types"
"git.akyoto.dev/cli/q/src/x86"
)
// CompileAssignDivision compiles an assign statement that has quotient and remainder on the left side and division on the right.
func (f *Function) CompileAssignDivision(node *ast.Assign) error {
left := node.Expression.Children[0]
right := node.Expression.Children[1]
func (f *Function) CompileAssignDivision(expr *expression.Expression) error {
var (
left = expr.Children[0]
right = expr.Children[1]
quotientVariable *scope.Variable
remainderVariable *scope.Variable
err error
)
quotient := left.Children[0]
name := quotient.Token.Text(f.File.Bytes)
quotientVariable := f.VariableByName(name)
if expr.Token.Kind == token.Define {
quotientVariable, err = f.Define(left.Children[0])
if quotientVariable == nil {
return errors.New(&errors.UnknownIdentifier{Name: name}, f.File, quotient.Token.Position)
}
if err != nil {
return err
}
remainder := left.Children[1]
name = remainder.Token.Text(f.File.Bytes)
remainderVariable := f.VariableByName(name)
remainderVariable, err = f.Define(left.Children[1])
if remainderVariable == nil {
return errors.New(&errors.UnknownIdentifier{Name: name}, f.File, remainder.Token.Position)
if err != nil {
return err
}
quotientVariable.Type = types.Int
remainderVariable.Type = types.Int
f.AddVariable(quotientVariable)
f.AddVariable(remainderVariable)
} else {
quotient := left.Children[0]
name := quotient.Token.Text(f.File.Bytes)
quotientVariable = f.VariableByName(name)
if quotientVariable == nil {
return errors.New(&errors.UnknownIdentifier{Name: name}, f.File, quotient.Token.Position)
}
remainder := left.Children[1]
name = remainder.Token.Text(f.File.Bytes)
remainderVariable = f.VariableByName(name)
if remainderVariable == nil {
return errors.New(&errors.UnknownIdentifier{Name: name}, f.File, remainder.Token.Position)
}
defer f.UseVariable(quotientVariable)
defer f.UseVariable(remainderVariable)
}
dividend := right.Children[0]
@ -38,9 +68,7 @@ func (f *Function) CompileAssignDivision(node *ast.Assign) error {
divisor := right.Children[1]
err = f.Execute(right.Token, dividendRegister, divisor)
f.RegisterRegister(asm.MOVE, quotientVariable.Register, x86.RAX)
f.UseVariable(quotientVariable)
f.RegisterRegister(asm.MOVE, remainderVariable.Register, x86.RDX)
f.UseVariable(remainderVariable)
if isTemporary {
f.FreeRegister(dividendRegister)

View File

@ -5,6 +5,7 @@ import (
"git.akyoto.dev/cli/q/src/ast"
"git.akyoto.dev/cli/q/src/errors"
"git.akyoto.dev/cli/q/src/expression"
"git.akyoto.dev/cli/q/src/token"
)
// CompileDefinition compiles a variable definition.
@ -34,6 +35,10 @@ func (f *Function) CompileDefinition(node *ast.Define) error {
return nil
}
if left.Token.Kind == token.Separator && right.Token.Kind == token.Div {
return f.CompileAssignDivision(node.Expression)
}
if !ast.IsFunctionCall(right) {
return errors.New(errors.NotImplemented, f.File, node.Expression.Token.Position)
}

View File

@ -25,7 +25,10 @@ func (f *Function) ExecuteRegisterNumber(operation token.Token, register cpu.Reg
f.RegisterNumber(asm.MUL, register, number)
case token.Div, token.DivAssign:
f.SaveRegister(x86.RAX)
if register != x86.RAX {
f.SaveRegister(x86.RAX)
}
f.SaveRegister(x86.RDX)
tmp := f.NewRegister()
f.RegisterNumber(asm.MOVE, tmp, number)

View File

@ -25,7 +25,10 @@ func (f *Function) ExecuteRegisterRegister(operation token.Token, register cpu.R
f.RegisterRegister(asm.MUL, register, operand)
case token.Div, token.DivAssign:
f.SaveRegister(x86.RAX)
if register != x86.RAX {
f.SaveRegister(x86.RAX)
}
f.SaveRegister(x86.RDX)
f.RegisterRegister(asm.DIV, register, operand)