cli/q
Code Issues 1 Pull Requests Activity

Improved formatting of load and store commands

Browse Source
This commit is contained in:
Eduard Urbach 2025-02-16 19:29:22 +01:00
parent c633f94d29
commit dc3ba6504f
Signed by: akyoto
GPG Key ID: C874F672B1AF20C0
4 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/asm/Memory.go
View File

@ -1,6 +1,12 @@
package asm
import "git.akyoto.dev/cli/q/src/cpu"
import (
"fmt"
"math"
"strings"
"git.akyoto.dev/cli/q/src/cpu"
)
type Memory struct {
Base cpu.Register
@ -8,3 +14,29 @@ type Memory struct {
OffsetRegister cpu.Register
Length byte
}
// Format returns a human readable version.
func (mem *Memory) Format(custom string) string {
tmp := strings.Builder{}
tmp.WriteString("[")
tmp.WriteString(fmt.Sprint(mem.Base))
if mem.OffsetRegister != math.MaxUint8 {
tmp.WriteString("+")
tmp.WriteString(fmt.Sprint(mem.OffsetRegister))
}
if mem.Offset != 0 {
if mem.Offset > 0 {
tmp.WriteString("+")
}
tmp.WriteString(fmt.Sprint(mem.Offset))
}
tmp.WriteString("], ")
tmp.WriteString(custom)
tmp.WriteString(", ")
tmp.WriteString(fmt.Sprint(mem.Length))
return tmp.String()
}

11
src/asm/MemoryLabel.go
View File

@ -1,10 +1,5 @@
package asm
import (
"fmt"
"math"
)
// MemoryLabel operates with a memory address and a number.
type MemoryLabel struct {
Label string
@ -13,11 +8,7 @@ type MemoryLabel struct {
// String returns a human readable version.
func (data *MemoryLabel) String() string {
if data.Address.OffsetRegister == math.MaxUint8 {
return fmt.Sprintf("%dB [%s+%d], %s", data.Address.Length, data.Address.Base, data.Address.Offset, data.Label)
}
return fmt.Sprintf("%dB [%s+%s+%d], %s", data.Address.Length, data.Address.Base, data.Address.OffsetRegister, data.Address.Offset, data.Label)
return data.Address.Format(data.Label)
}
// MemoryLabel adds an instruction with a memory address and a label.

7
src/asm/MemoryNumber.go
View File

@ -2,7 +2,6 @@ package asm
import (
"fmt"
"math"
)
// MemoryNumber operates with a memory address and a number.
@ -13,11 +12,7 @@ type MemoryNumber struct {
// String returns a human readable version.
func (data *MemoryNumber) String() string {
if data.Address.OffsetRegister == math.MaxUint8 {
return fmt.Sprintf("%dB [%s+%d], %d", data.Address.Length, data.Address.Base, data.Address.Offset, data.Number)
}
return fmt.Sprintf("%dB [%s+%s+%d], %d", data.Address.Length, data.Address.Base, data.Address.OffsetRegister, data.Address.Offset, data.Number)
return data.Address.Format(fmt.Sprint(data.Number))
}
// MemoryNumber adds an instruction with a memory address and a number.

7
src/asm/MemoryRegister.go
View File

@ -2,7 +2,6 @@ package asm
import (
"fmt"
"math"
"git.akyoto.dev/cli/q/src/cpu"
)
@ -15,11 +14,7 @@ type MemoryRegister struct {
// String returns a human readable version.
func (data *MemoryRegister) String() string {
if data.Address.OffsetRegister == math.MaxUint8 {
return fmt.Sprintf("%dB [%s+%d], %s", data.Address.Length, data.Address.Base, data.Address.Offset, data.Register)
}
return fmt.Sprintf("%dB [%s+%s+%d], %s", data.Address.Length, data.Address.Base, data.Address.OffsetRegister, data.Address.Offset, data.Register)
return data.Address.Format(fmt.Sprint(data.Register))
}
// MemoryRegister adds an instruction with a memory address and a number.