update to new retrolib architecture

Author: cornelk

cmd/nesgoemu/main.go

@@ -7,8 +7,8 @@ import (
 	"os"
 
 	"github.com/retroenv/nesgo/pkg/nes"
+	"github.com/retroenv/retrogolib/arch/nes/cartridge"
 	"github.com/retroenv/retrogolib/buildinfo"
-	"github.com/retroenv/retrogolib/nes/cartridge"
 )
 
 type optionFlags struct {

go.mod

@@ -2,7 +2,7 @@ module github.com/retroenv/nesgo
 
 go 1.19
 
-require github.com/retroenv/retrogolib v0.0.0-20230308050250-05304443fd7e
+require github.com/retroenv/retrogolib v0.0.0-20230531002314-647312eaa5e7
 
 require (
 	github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 // indirect

go.sum

@@ -4,5 +4,7 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b h1:GgabKamyOY
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/retroenv/retrogolib v0.0.0-20230308050250-05304443fd7e h1:8xdOsiViIs4/8SpgkxYHE2PVr0NnQyR+mBIBQGwdx9k=
 github.com/retroenv/retrogolib v0.0.0-20230308050250-05304443fd7e/go.mod h1:pMMX8dgBDAwp6JlyHEY6h+6Q6UFc8yzQ1KruSqdf5ZY=
+github.com/retroenv/retrogolib v0.0.0-20230531002314-647312eaa5e7 h1:k6JvKJBpFen4pcomtT7r4YCcMvnDpNaOY8mIoLI1dlc=
+github.com/retroenv/retrogolib v0.0.0-20230531002314-647312eaa5e7/go.mod h1:ZCml4OmbI+OADbH286m94Sg6hBQllIPTBurWv8dl0PU=
 github.com/veandco/go-sdl2 v0.5.0-alpha.4 h1:+XyPktayFrjYA6n3qUWiQDw6jOVJye27q8gmXvnYAHQ=
 github.com/veandco/go-sdl2 v0.5.0-alpha.4/go.mod h1:OROqMhHD43nT4/i9crJukyVecjPNYYuCofep6SNiAjY=

internal/ast/branching.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/retroenv/retrogolib/nes/cpu"
+	"github.com/retroenv/retrogolib/arch/cpu/m6502"
 )
 
 const (
@@ -70,15 +70,15 @@ func NewCall(expr *Identifier, arg any) (Node, error) {
 		return nil, nil // nolint: nilnil
 	}
 
-	if _, ok := cpu.BranchingInstructions[name]; ok {
+	if _, ok := m6502.BranchingInstructions[name]; ok {
 		var destination string
 		if ins, ok := arg.(*Instruction); ok {
 			destination = ins.Name
 		}
 		return NewBranching(name, destination)
 	}
 
-	if _, isInst := cpu.Instructions[name]; isInst {
+	if _, isInst := m6502.Instructions[name]; isInst {
 		i, err := newInstruction(name, arg)
 		if err != nil {
 			return nil, err

internal/ast/instruction.go

@@ -6,8 +6,9 @@ import (
 	"strconv"
 	"strings"
 
-	. "github.com/retroenv/retrogolib/nes/addressing"
-	"github.com/retroenv/retrogolib/nes/cpu"
+	. "github.com/retroenv/retrogolib/addressing"
+	"github.com/retroenv/retrogolib/arch/cpu/m6502"
+	"github.com/retroenv/retrogolib/cpu"
 )
 
 // Instruction is an instruction declaration.
@@ -25,7 +26,7 @@ func newInstruction(name string, arg any) (*Instruction, error) {
 		Name: name,
 	}
 	if arg != nil {
-		info := cpu.Instructions[name]
+		info := m6502.Instructions[name]
 		if info == nil {
 			return nil, fmt.Errorf("missing instruction info for '%s'", name)
 		}

internal/compiler/output.go

@@ -6,8 +6,9 @@ import (
 	"strings"
 
 	"github.com/retroenv/nesgo/internal/ast"
-	. "github.com/retroenv/retrogolib/nes/addressing"
-	"github.com/retroenv/retrogolib/nes/cpu"
+	. "github.com/retroenv/retrogolib/addressing"
+	"github.com/retroenv/retrogolib/arch/cpu/m6502"
+	"github.com/retroenv/retrogolib/cpu"
 )
 
 // TODO refactor to use asmoutput pkg
@@ -114,7 +115,7 @@ func (c *Compiler) outputLineWithComment(comment, format string, a ...any) {
 }
 
 func (c *Compiler) outputInstruction(ins *ast.Instruction) error {
-	info := cpu.Instructions[ins.Name]
+	info := m6502.Instructions[ins.Name]
 
 	switch len(ins.Arguments) {
 	case 0:

internal/testroms/nestest/nestest_test.go

@@ -7,9 +7,9 @@ import (
 	"testing"
 
 	"github.com/retroenv/nesgo/pkg/nes"
+	"github.com/retroenv/retrogolib/arch/cpu/m6502"
+	"github.com/retroenv/retrogolib/arch/nes/cartridge"
 	"github.com/retroenv/retrogolib/assert"
-	"github.com/retroenv/retrogolib/nes/cartridge"
-	"github.com/retroenv/retrogolib/nes/cpu"
 )
 
 func TestNestest(t *testing.T) {
@@ -23,7 +23,7 @@ func TestNestest(t *testing.T) {
 	var buffer bytes.Buffer
 	trace := bufio.NewWriter(&buffer)
 
-	cpu.Isc.Name = "isb"
+	m6502.Isc.Name = "isb"
 
 	options := []nes.Option{
 		nes.WithEmulator(),

pkg/apu/const_translation.go

@@ -2,7 +2,7 @@
 
 package apu
 
-import . "github.com/retroenv/retrogolib/nes/addressing"
+import . "github.com/retroenv/retrogolib/addressing"
 
 // AddressToName maps address constants from address to name.
 var AddressToName = map[uint16]AccessModeConstant{

pkg/bus/bus.go

@@ -2,7 +2,7 @@
 package bus
 
 import (
-	"github.com/retroenv/retrogolib/nes/cartridge"
+	"github.com/retroenv/retrogolib/arch/nes/cartridge"
 )
 
 // Bus contains all NES sub system components.

pkg/bus/mapper.go

@@ -1,6 +1,6 @@
 package bus
 
-import "github.com/retroenv/retrogolib/nes/cartridge"
+import "github.com/retroenv/retrogolib/arch/nes/cartridge"
 
 // MapperState contains the current state of the mapper.
 type MapperState struct {