Skip to content

Cleaned golangci-lint errors. #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gboncoffee merged 1 commit into from
Mar 27, 2026
+470 −468
Merged

Cleaned golangci-lint errors. #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion assembler/assembler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,9 @@ func Tokenize(fileName string, tokens *[]Token) error {
if err != nil {
return fmt.Errorf(InterCtx.Get("couldn't open file: %v"), err)
}
defer file.Close()
defer func(){
_ = file.Close()
}()

scanner := bufio.NewScanner(file)

Expand Down
20 changes: 10 additions & 10 deletions debugger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ func breakpoint2String(breakpoint Breakpoint) string {
var s strings.Builder
if breakpoint.File != nil {
s.WriteString(*breakpoint.File)
s.WriteString(fmt.Sprintf(":%v ", breakpoint.Line))
fmt.Fprintf(&s, ":%v ", breakpoint.Line)
}
if breakpoint.Label != "" {
s.WriteString(fmt.Sprintf(machine.InterCtx.Get("(Label %v) "), breakpoint.Label))
fmt.Fprintf(&s, machine.InterCtx.Get("(Label %v) "), breakpoint.Label)
}
s.WriteString(fmt.Sprintf("0x%x", breakpoint.Address))
fmt.Fprintf(&s, "0x%x", breakpoint.Address)

return s.String()
}
Expand All @@ -52,16 +52,16 @@ func tokensToString(sym []assembler.DebuggerToken, info *machine.ArchitectureInf
for i, tok := range sym {
var build strings.Builder

build.WriteString(fmt.Sprintf("%v:%v: ", *tok.File, tok.Line))
fmt.Fprintf(&build, "%v:%v: ", *tok.File, tok.Line)
switch info.WordWidth {
case 8:
build.WriteString(fmt.Sprintf("0x%02x: ", tok.Address))
fmt.Fprintf(&build, "0x%02x: ", tok.Address)
case 16:
build.WriteString(fmt.Sprintf("0x%04x: ", tok.Address))
fmt.Fprintf(&build, "0x%04x: ", tok.Address)
case 32:
build.WriteString(fmt.Sprintf("0x%08x: ", tok.Address))
fmt.Fprintf(&build, "0x%08x: ", tok.Address)
default:
build.WriteString(fmt.Sprintf("0x%016x: ", tok.Address))
fmt.Fprintf(&build, "0x%016x: ", tok.Address)
}
if tok.Label != "" {
build.WriteString(tok.Label)
Expand Down Expand Up @@ -289,7 +289,7 @@ func ioCall(m machine.Machine, call *machine.Call, in *bufio.Reader) {
return
}

m.SetMemoryChunk(addr, []uint8(buf))
_ = m.SetMemoryChunk(addr, []uint8(buf))
} else {
addr := call.Arg1
size := call.Arg2
Expand Down Expand Up @@ -592,7 +592,7 @@ func debuggerDump(m machine.Machine, args []string, prog []uint8) {
fmt.Printf(machine.InterCtx.Get("Error while writing to %s: %v\n"), file, err)
}

f.Close()
_ = f.Close()
}

func debuggerRewind(m machine.Machine, prog []uint8) {
Expand Down
10 changes: 5 additions & 5 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"github.com/gboncoffee/egg/machine"
"github.com/gboncoffee/egg/mips"
"github.com/gboncoffee/egg/reduxK"
"github.com/gboncoffee/egg/reduxv"
"github.com/gboncoffee/egg/reduxPia"
"github.com/gboncoffee/egg/reduxv"
"github.com/gboncoffee/egg/riscv"
"github.com/gboncoffee/egg/sagui"
)
Expand Down Expand Up @@ -53,8 +53,8 @@ func runMachine(m machine.Machine) {
size := call.Arg2
buf := make([]uint8, size)
reader := bufio.NewReader(os.Stdin)
io.ReadFull(reader, buf)
m.SetMemoryChunk(addr, buf)
_, _ = io.ReadFull(reader, buf)
_ = m.SetMemoryChunk(addr, buf)
case machine.SYS_WRITE:
addr := call.Arg1
size := call.Arg2
Expand All @@ -73,8 +73,8 @@ func main() {
var m machine.Machine

machine.InterCtx.Init()
machine.InterCtx.AddLocale("pt_BR", brazilian)
machine.InterCtx.AutoSetPreferedLocale()
_ = machine.InterCtx.AddLocale("pt_BR", brazilian)
_ = machine.InterCtx.AutoSetPreferedLocale()
assembler.InterCtx = &machine.InterCtx

log.SetFlags(0)
Expand Down
68 changes: 34 additions & 34 deletions mips/mips.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,11 +208,11 @@ func (m *Mips) execSpecial(rs, rt, rd, shamt, funct uint8) {
// div
case 0x18:
res := rsv64 * rtv64
m.SetRegister(HI, uint64(res>>32))
m.SetRegister(LO, uint64(res&0x00000000ffffffff))
_ = m.SetRegister(HI, uint64(res>>32))
_ = m.SetRegister(LO, uint64(res&0x00000000ffffffff))
case 0x1a:
m.SetRegister(HI, uint64(rsv%rtv))
m.SetRegister(LO, uint64(rsv/rtv))
_ = m.SetRegister(HI, uint64(rsv%rtv))
_ = m.SetRegister(LO, uint64(rsv/rtv))
// mfhi
// mflo
// mthi
Expand All @@ -224,9 +224,9 @@ func (m *Mips) execSpecial(rs, rt, rd, shamt, funct uint8) {
lo, _ := m.GetRegister(LO)
r = int32(lo)
case 0x11:
m.SetRegister(HI, uint64(rsv))
_ = m.SetRegister(HI, uint64(rsv))
case 0x13:
m.SetRegister(LO, uint64(rsv))
_ = m.SetRegister(LO, uint64(rsv))
// movz
// movn
case 0xa:
Expand All @@ -239,7 +239,7 @@ func (m *Mips) execSpecial(rs, rt, rd, shamt, funct uint8) {
}
}

m.SetRegister(uint64(rd), uint64(r))
_ = m.SetRegister(uint64(rd), uint64(r))
}

func (m *Mips) execSpecial2(rs, rd, funct uint8) {
Expand All @@ -256,7 +256,7 @@ func (m *Mips) execSpecial2(rs, rd, funct uint8) {
r = int32(bits.LeadingZeros32(uint32(^rsv)))
}

m.SetRegister(uint64(rd), uint64(r))
_ = m.SetRegister(uint64(rd), uint64(r))
}

func (m *Mips) execSpecial3(rs, rd, shamt, funct uint8) {
Expand All @@ -282,7 +282,7 @@ func (m *Mips) execSpecial3(rs, rd, shamt, funct uint8) {
}
}

m.SetRegister(uint64(rd), uint64(r))
_ = m.SetRegister(uint64(rd), uint64(r))
}

func (m *Mips) execRegimm(rs, shamt uint8, imm uint32) {
Expand Down Expand Up @@ -343,53 +343,53 @@ func (m *Mips) executeBlez(rs uint8, imm uint32) {
func (m *Mips) executeAddi(rs, rt uint8, imm uint32) {
rsv64, _ := m.GetRegister(uint64(rs))
r := int32(rsv64) + int32(imm)
m.SetRegister(uint64(rt), uint64(r))
_ = m.SetRegister(uint64(rt), uint64(r))
}

func (m *Mips) executeAddiu(rs, rt uint8, imm uint32) {
rsv64, _ := m.GetRegister(uint64(rs))
r := uint32(rsv64) + imm
m.SetRegister(uint64(rt), uint64(r))
_ = m.SetRegister(uint64(rt), uint64(r))
}

func (m *Mips) executeAndi(rs, rt uint8, imm uint32) {
rsv64, _ := m.GetRegister(uint64(rs))
r := uint32(rsv64) & imm
m.SetRegister(uint64(rt), uint64(r))
_ = m.SetRegister(uint64(rt), uint64(r))
}

func (m *Mips) executeOri(rs, rt uint8, imm uint32) {
rsv64, _ := m.GetRegister(uint64(rs))
r := uint32(rsv64) | imm
m.SetRegister(uint64(rt), uint64(r))
_ = m.SetRegister(uint64(rt), uint64(r))
}

func (m *Mips) executeXori(rs, rt uint8, imm uint32) {
rsv64, _ := m.GetRegister(uint64(rs))
r := uint32(rsv64) ^ imm
m.SetRegister(uint64(rt), uint64(r))
_ = m.SetRegister(uint64(rt), uint64(r))
}

func (m *Mips) executeSlti(rs, rt uint8, imm uint32) {
rsv64, _ := m.GetRegister(uint64(rs))
if int32(rsv64) < int32(imm) {
m.SetRegister(uint64(rt), 1)
_ = m.SetRegister(uint64(rt), 1)
} else {
m.SetRegister(uint64(rt), 0)
_ = m.SetRegister(uint64(rt), 0)
}
}

func (m *Mips) executeSltiu(rs, rt uint8, imm uint32) {
rsv64, _ := m.GetRegister(uint64(rs))
if uint32(rsv64) < imm {
m.SetRegister(uint64(rt), 1)
_ = m.SetRegister(uint64(rt), 1)
} else {
m.SetRegister(uint64(rt), 0)
_ = m.SetRegister(uint64(rt), 0)
}
}

func (m *Mips) executeLui(rt uint8, imm uint32) {
m.SetRegister(uint64(rt), uint64(imm<<16))
_ = m.SetRegister(uint64(rt), uint64(imm<<16))
}

func (m *Mips) executeJ(imm uint32) {
Expand All @@ -399,7 +399,7 @@ func (m *Mips) executeJ(imm uint32) {
}

func (m *Mips) executeJal(imm uint32) {
m.SetRegister(31, uint64(m.pc+4))
_ = m.SetRegister(31, uint64(m.pc+4))
t := (m.pc + 4) & 0xf0000000
t = t | (imm << 2)
m.pc = t - 4
Expand All @@ -414,14 +414,14 @@ func (m *Mips) executeLb(rs, rt uint8, off uint32) {
sign = (^(sign - 1)) << 8
r := uint64(memb) | sign

m.SetRegister(uint64(rt), r)
_ = m.SetRegister(uint64(rt), r)
}

func (m *Mips) executeLbu(rs, rt uint8, off uint32) {
rsv64, _ := m.GetRegister(uint64(rs))
mem, _ := m.GetMemory(uint64(uint32(rsv64) + off))

m.SetRegister(uint64(rt), uint64(mem))
_ = m.SetRegister(uint64(rt), uint64(mem))
}

func (m *Mips) executeLh(rs, rt uint8, off uint32) {
Expand All @@ -435,7 +435,7 @@ func (m *Mips) executeLh(rs, rt uint8, off uint32) {
sign = (^(sign - 1)) << 16
r := uint64(memb | sign)

m.SetRegister(uint64(rt), r)
_ = m.SetRegister(uint64(rt), r)
}

func (m *Mips) executeLhu(rs, rt uint8, off uint32) {
Expand All @@ -444,7 +444,7 @@ func (m *Mips) executeLhu(rs, rt uint8, off uint32) {
mem := memSlice[0]
mem2 := memSlice[1]

m.SetRegister(uint64(rt), uint64(mem)|(uint64(mem2)<<8))
_ = m.SetRegister(uint64(rt), uint64(mem)|(uint64(mem2)<<8))
}

func (m *Mips) executeLw(rs, rt uint8, off uint32) {
Expand All @@ -455,7 +455,7 @@ func (m *Mips) executeLw(rs, rt uint8, off uint32) {
mem3 := memSlice[2]
mem4 := memSlice[3]

m.SetRegister(uint64(rt), uint64(mem)|(uint64(mem2)<<8)|(uint64(mem3)<<16)|(uint64(mem4)<<24))
_ = m.SetRegister(uint64(rt), uint64(mem)|(uint64(mem2)<<8)|(uint64(mem3)<<16)|(uint64(mem4)<<24))
}

func (m *Mips) executeLwl(rs, rt uint8, off uint32) {
Expand All @@ -465,7 +465,7 @@ func (m *Mips) executeLwl(rs, rt uint8, off uint32) {
mem := memSlice[0]
mem2 := memSlice[1]

m.SetRegister(uint64(rt), ((uint64(mem)|(uint64(mem2)<<8))<<16)|(rtv64&0xffff))
_ = m.SetRegister(uint64(rt), ((uint64(mem)|(uint64(mem2)<<8))<<16)|(rtv64&0xffff))
}

func (m *Mips) executeLwr(rs, rt uint8, off uint32) {
Expand All @@ -475,32 +475,32 @@ func (m *Mips) executeLwr(rs, rt uint8, off uint32) {
mem := memSlice[0]
mem2 := memSlice[1]

m.SetRegister(uint64(rt), (uint64(mem)|(uint64(mem2)<<8))|(rtv64&0xffff0000))
_ = m.SetRegister(uint64(rt), (uint64(mem)|(uint64(mem2)<<8))|(rtv64&0xffff0000))
}

func (m *Mips) executeSb(rs, rt uint8, off uint32) {
rsv64, _ := m.GetRegister(uint64(rs))
rtv64, _ := m.GetRegister(uint64(rt))

m.SetMemory(uint64(uint32(rsv64)+off), uint8(rtv64&0xff))
_ = m.SetMemory(uint64(uint32(rsv64)+off), uint8(rtv64&0xff))
}

func (m *Mips) executeSh(rs, rt uint8, off uint32) {
rsv64, _ := m.GetRegister(uint64(rs))
rtv64, _ := m.GetRegister(uint64(rt))

m.SetMemory(uint64(uint32(rsv64)+off), uint8(rtv64&0xff))
m.SetMemory(uint64(uint32(rsv64)+off)+1, uint8((rtv64&0xff00)>>8))
_ = m.SetMemory(uint64(uint32(rsv64)+off), uint8(rtv64&0xff))
_ = m.SetMemory(uint64(uint32(rsv64)+off)+1, uint8((rtv64&0xff00)>>8))
}

func (m *Mips) executeSw(rs, rt uint8, off uint32) {
rsv64, _ := m.GetRegister(uint64(rs))
rtv64, _ := m.GetRegister(uint64(rt))

m.SetMemory(uint64(uint32(rsv64)+off), uint8(rtv64&0xff))
m.SetMemory(uint64(uint32(rsv64)+off)+1, uint8((rtv64&0xff00)>>8))
m.SetMemory(uint64(uint32(rsv64)+off)+2, uint8((rtv64&0xff0000)>>16))
m.SetMemory(uint64(uint32(rsv64)+off)+3, uint8((rtv64&0xff000000)>>24))
_ = m.SetMemory(uint64(uint32(rsv64)+off), uint8(rtv64&0xff))
_ = m.SetMemory(uint64(uint32(rsv64)+off)+1, uint8((rtv64&0xff00)>>8))
_ = m.SetMemory(uint64(uint32(rsv64)+off)+2, uint8((rtv64&0xff0000)>>16))
_ = m.SetMemory(uint64(uint32(rsv64)+off)+3, uint8((rtv64&0xff000000)>>24))
}

func (m *Mips) execute(i uint32) (*machine.Call, error) {
Expand Down
Loading
Loading