From 024eebae61c3265689ed7a9dd181761a544888b6 Mon Sep 17 00:00:00 2001 From: Will Angenent Date: Sun, 27 May 2018 11:05:00 +0100 Subject: [PATCH] Renamed mos6502 to apple2 --- .gitignore | 4 ++-- apple2e.go => apple2.go | 16 ++++++++-------- audio/audio.go | 2 +- audio/ebiten.go | 3 ++- bank_switch_test.go | 10 +++++----- bell_test.go | 10 +++++----- cmd/disasm.go | 6 +++--- cpu/cpu.go | 5 +++-- cpu/cpu_test.go | 11 ++++++----- cpu/debug.go | 3 ++- disk/disk.go | 2 +- dos33_boot_test.go | 14 +++++++------- io_test.go | 10 +++++----- mmu/io.go | 8 ++++---- mmu/mmu.go | 3 ++- prodos_boot_test.go | 14 +++++++------- rwts_write_test.go | 14 +++++++------- utils/utils.go | 5 +++-- video/video.go | 3 ++- 19 files changed, 75 insertions(+), 68 deletions(-) rename apple2e.go => apple2.go (95%) diff --git a/.gitignore b/.gitignore index ca274c5..beb724b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -apple2e -apple2e.test +apple2 +apple2.test apple2e.rom dos33.dsk prodos.dsk diff --git a/apple2e.go b/apple2.go similarity index 95% rename from apple2e.go rename to apple2.go index 691c6d6..3075947 100644 --- a/apple2e.go +++ b/apple2.go @@ -7,14 +7,14 @@ import ( "github.com/hajimehoshi/ebiten" - "mos6502go/audio" - "mos6502go/cpu" - "mos6502go/disk" - "mos6502go/keyboard" - "mos6502go/mmu" - "mos6502go/system" - "mos6502go/utils" - "mos6502go/video" + "apple2/audio" + "apple2/cpu" + "apple2/disk" + "apple2/keyboard" + "apple2/mmu" + "apple2/system" + "apple2/utils" + "apple2/video" ) var showInstructions *bool diff --git a/audio/audio.go b/audio/audio.go index 29d2d8e..92e4b31 100644 --- a/audio/audio.go +++ b/audio/audio.go @@ -1,7 +1,7 @@ package audio import ( - "mos6502go/system" + "apple2/system" ) func Click() { diff --git a/audio/ebiten.go b/audio/ebiten.go index 5c116e8..b318890 100644 --- a/audio/ebiten.go +++ b/audio/ebiten.go @@ -2,9 +2,10 @@ package audio import ( "errors" - "mos6502go/system" ebiten_audio "github.com/hajimehoshi/ebiten/audio" + + "apple2/system" ) var ( diff --git a/bank_switch_test.go b/bank_switch_test.go index 3a50fb5..6aae555 100644 --- a/bank_switch_test.go +++ b/bank_switch_test.go @@ -5,11 +5,11 @@ import ( "github.com/stretchr/testify/assert" - "mos6502go/cpu" - "mos6502go/keyboard" - "mos6502go/mmu" - "mos6502go/system" - "mos6502go/video" + "apple2/cpu" + "apple2/keyboard" + "apple2/mmu" + "apple2/system" + "apple2/video" ) func TestBankSwitching(t *testing.T) { diff --git a/bell_test.go b/bell_test.go index 4c41253..bd11736 100644 --- a/bell_test.go +++ b/bell_test.go @@ -4,11 +4,11 @@ import ( "fmt" "testing" - "mos6502go/cpu" - "mos6502go/keyboard" - "mos6502go/mmu" - "mos6502go/system" - "mos6502go/video" + "apple2/cpu" + "apple2/keyboard" + "apple2/mmu" + "apple2/system" + "apple2/video" ) func testBellCycles(delay int) { diff --git a/cmd/disasm.go b/cmd/disasm.go index 0f45bb7..df4063e 100644 --- a/cmd/disasm.go +++ b/cmd/disasm.go @@ -3,9 +3,9 @@ package main import ( "flag" - "mos6502go/cpu" - "mos6502go/mmu" - "mos6502go/utils" + "apple2/cpu" + "apple2/mmu" + "apple2/utils" ) func main() { diff --git a/cpu/cpu.go b/cpu/cpu.go index de4602d..6779091 100644 --- a/cpu/cpu.go +++ b/cpu/cpu.go @@ -2,9 +2,10 @@ package cpu import ( "fmt" - "mos6502go/mmu" - "mos6502go/system" "os" + + "apple2/mmu" + "apple2/system" ) const ( diff --git a/cpu/cpu_test.go b/cpu/cpu_test.go index 07271e7..f3bb813 100644 --- a/cpu/cpu_test.go +++ b/cpu/cpu_test.go @@ -3,12 +3,13 @@ package cpu_test import ( "flag" "fmt" - "mos6502go/cpu" - "mos6502go/keyboard" - "mos6502go/mmu" - "mos6502go/system" - "mos6502go/utils" "testing" + + "apple2/cpu" + "apple2/keyboard" + "apple2/mmu" + "apple2/system" + "apple2/utils" ) func TestCPU(t *testing.T) { diff --git a/cpu/debug.go b/cpu/debug.go index ba35413..7d6b9e9 100644 --- a/cpu/debug.go +++ b/cpu/debug.go @@ -2,8 +2,9 @@ package cpu import ( "fmt" - "mos6502go/mmu" "strings" + + "apple2/mmu" ) func printFlag(p byte, flag uint8, code string) { diff --git a/disk/disk.go b/disk/disk.go index 9e45ee5..bb03a1f 100644 --- a/disk/disk.go +++ b/disk/disk.go @@ -4,7 +4,7 @@ import ( "fmt" "io/ioutil" - "mos6502go/system" + "apple2/system" ) const tracksPerDisk = 35 diff --git a/dos33_boot_test.go b/dos33_boot_test.go index 287e254..e07e38b 100644 --- a/dos33_boot_test.go +++ b/dos33_boot_test.go @@ -5,13 +5,13 @@ import ( "testing" "time" - "mos6502go/cpu" - "mos6502go/disk" - "mos6502go/keyboard" - "mos6502go/mmu" - "mos6502go/system" - "mos6502go/utils" - "mos6502go/video" + "apple2/cpu" + "apple2/disk" + "apple2/keyboard" + "apple2/mmu" + "apple2/system" + "apple2/utils" + "apple2/video" ) const dosDiskImage = "dos33.dsk" diff --git a/io_test.go b/io_test.go index 9d1a160..b95c2cc 100644 --- a/io_test.go +++ b/io_test.go @@ -5,11 +5,11 @@ import ( "github.com/stretchr/testify/assert" - "mos6502go/cpu" - "mos6502go/keyboard" - "mos6502go/mmu" - "mos6502go/system" - "mos6502go/video" + "apple2/cpu" + "apple2/keyboard" + "apple2/mmu" + "apple2/system" + "apple2/video" ) func TestIoBankSwitching(t *testing.T) { diff --git a/mmu/io.go b/mmu/io.go index f07f308..1a102f9 100644 --- a/mmu/io.go +++ b/mmu/io.go @@ -3,10 +3,10 @@ package mmu import ( "fmt" - "mos6502go/audio" - "mos6502go/disk" - "mos6502go/keyboard" - "mos6502go/system" + "apple2/audio" + "apple2/disk" + "apple2/keyboard" + "apple2/system" ) // Adapted from diff --git a/mmu/mmu.go b/mmu/mmu.go index 8cdbbd9..3399bd9 100644 --- a/mmu/mmu.go +++ b/mmu/mmu.go @@ -3,7 +3,8 @@ package mmu import ( "fmt" "io/ioutil" - "mos6502go/system" + + "apple2/system" ) const RomPath = "apple2e.rom" diff --git a/prodos_boot_test.go b/prodos_boot_test.go index 56541b4..022b6ac 100644 --- a/prodos_boot_test.go +++ b/prodos_boot_test.go @@ -5,13 +5,13 @@ import ( "testing" "time" - "mos6502go/cpu" - "mos6502go/disk" - "mos6502go/keyboard" - "mos6502go/mmu" - "mos6502go/system" - "mos6502go/utils" - "mos6502go/video" + "apple2/cpu" + "apple2/disk" + "apple2/keyboard" + "apple2/mmu" + "apple2/system" + "apple2/utils" + "apple2/video" ) const prodosDiskImage = "prodos.dsk" diff --git a/rwts_write_test.go b/rwts_write_test.go index 2a7f426..a3a92a4 100644 --- a/rwts_write_test.go +++ b/rwts_write_test.go @@ -3,13 +3,13 @@ package main import ( "testing" - "mos6502go/cpu" - "mos6502go/disk" - "mos6502go/keyboard" - "mos6502go/mmu" - "mos6502go/system" - "mos6502go/utils" - "mos6502go/video" + "apple2/cpu" + "apple2/disk" + "apple2/keyboard" + "apple2/mmu" + "apple2/system" + "apple2/utils" + "apple2/video" ) const rwtsDosDiskImage = "dos33.dsk" diff --git a/utils/utils.go b/utils/utils.go index 0c54a25..4ebed54 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -5,10 +5,11 @@ import ( "encoding/hex" "fmt" "io/ioutil" - "mos6502go/cpu" - "mos6502go/system" "os" "testing" + + "apple2/cpu" + "apple2/system" ) func ReadMemoryFromGzipFile(filename string) (data []byte, err error) { diff --git a/video/video.go b/video/video.go index 76e28d5..2a8bfef 100644 --- a/video/video.go +++ b/video/video.go @@ -4,10 +4,11 @@ import ( "fmt" "image" "image/color" - "mos6502go/mmu" "github.com/hajimehoshi/ebiten" "github.com/hajimehoshi/ebiten/ebitenutil" + + "apple2/mmu" ) const (