Renamed mos6502 to apple2

This commit is contained in:
Will Angenent 2018-05-27 11:05:00 +01:00
parent f95348163d
commit 024eebae61
19 changed files with 75 additions and 68 deletions

4
.gitignore vendored
View File

@ -1,5 +1,5 @@
apple2e apple2
apple2e.test apple2.test
apple2e.rom apple2e.rom
dos33.dsk dos33.dsk
prodos.dsk prodos.dsk

View File

@ -7,14 +7,14 @@ import (
"github.com/hajimehoshi/ebiten" "github.com/hajimehoshi/ebiten"
"mos6502go/audio" "apple2/audio"
"mos6502go/cpu" "apple2/cpu"
"mos6502go/disk" "apple2/disk"
"mos6502go/keyboard" "apple2/keyboard"
"mos6502go/mmu" "apple2/mmu"
"mos6502go/system" "apple2/system"
"mos6502go/utils" "apple2/utils"
"mos6502go/video" "apple2/video"
) )
var showInstructions *bool var showInstructions *bool

View File

@ -1,7 +1,7 @@
package audio package audio
import ( import (
"mos6502go/system" "apple2/system"
) )
func Click() { func Click() {

View File

@ -2,9 +2,10 @@ package audio
import ( import (
"errors" "errors"
"mos6502go/system"
ebiten_audio "github.com/hajimehoshi/ebiten/audio" ebiten_audio "github.com/hajimehoshi/ebiten/audio"
"apple2/system"
) )
var ( var (

View File

@ -5,11 +5,11 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"mos6502go/cpu" "apple2/cpu"
"mos6502go/keyboard" "apple2/keyboard"
"mos6502go/mmu" "apple2/mmu"
"mos6502go/system" "apple2/system"
"mos6502go/video" "apple2/video"
) )
func TestBankSwitching(t *testing.T) { func TestBankSwitching(t *testing.T) {

View File

@ -4,11 +4,11 @@ import (
"fmt" "fmt"
"testing" "testing"
"mos6502go/cpu" "apple2/cpu"
"mos6502go/keyboard" "apple2/keyboard"
"mos6502go/mmu" "apple2/mmu"
"mos6502go/system" "apple2/system"
"mos6502go/video" "apple2/video"
) )
func testBellCycles(delay int) { func testBellCycles(delay int) {

View File

@ -3,9 +3,9 @@ package main
import ( import (
"flag" "flag"
"mos6502go/cpu" "apple2/cpu"
"mos6502go/mmu" "apple2/mmu"
"mos6502go/utils" "apple2/utils"
) )
func main() { func main() {

View File

@ -2,9 +2,10 @@ package cpu
import ( import (
"fmt" "fmt"
"mos6502go/mmu"
"mos6502go/system"
"os" "os"
"apple2/mmu"
"apple2/system"
) )
const ( const (

View File

@ -3,12 +3,13 @@ package cpu_test
import ( import (
"flag" "flag"
"fmt" "fmt"
"mos6502go/cpu"
"mos6502go/keyboard"
"mos6502go/mmu"
"mos6502go/system"
"mos6502go/utils"
"testing" "testing"
"apple2/cpu"
"apple2/keyboard"
"apple2/mmu"
"apple2/system"
"apple2/utils"
) )
func TestCPU(t *testing.T) { func TestCPU(t *testing.T) {

View File

@ -2,8 +2,9 @@ package cpu
import ( import (
"fmt" "fmt"
"mos6502go/mmu"
"strings" "strings"
"apple2/mmu"
) )
func printFlag(p byte, flag uint8, code string) { func printFlag(p byte, flag uint8, code string) {

View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"mos6502go/system" "apple2/system"
) )
const tracksPerDisk = 35 const tracksPerDisk = 35

View File

@ -5,13 +5,13 @@ import (
"testing" "testing"
"time" "time"
"mos6502go/cpu" "apple2/cpu"
"mos6502go/disk" "apple2/disk"
"mos6502go/keyboard" "apple2/keyboard"
"mos6502go/mmu" "apple2/mmu"
"mos6502go/system" "apple2/system"
"mos6502go/utils" "apple2/utils"
"mos6502go/video" "apple2/video"
) )
const dosDiskImage = "dos33.dsk" const dosDiskImage = "dos33.dsk"

View File

@ -5,11 +5,11 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"mos6502go/cpu" "apple2/cpu"
"mos6502go/keyboard" "apple2/keyboard"
"mos6502go/mmu" "apple2/mmu"
"mos6502go/system" "apple2/system"
"mos6502go/video" "apple2/video"
) )
func TestIoBankSwitching(t *testing.T) { func TestIoBankSwitching(t *testing.T) {

View File

@ -3,10 +3,10 @@ package mmu
import ( import (
"fmt" "fmt"
"mos6502go/audio" "apple2/audio"
"mos6502go/disk" "apple2/disk"
"mos6502go/keyboard" "apple2/keyboard"
"mos6502go/system" "apple2/system"
) )
// Adapted from // Adapted from

View File

@ -3,7 +3,8 @@ package mmu
import ( import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"mos6502go/system"
"apple2/system"
) )
const RomPath = "apple2e.rom" const RomPath = "apple2e.rom"

View File

@ -5,13 +5,13 @@ import (
"testing" "testing"
"time" "time"
"mos6502go/cpu" "apple2/cpu"
"mos6502go/disk" "apple2/disk"
"mos6502go/keyboard" "apple2/keyboard"
"mos6502go/mmu" "apple2/mmu"
"mos6502go/system" "apple2/system"
"mos6502go/utils" "apple2/utils"
"mos6502go/video" "apple2/video"
) )
const prodosDiskImage = "prodos.dsk" const prodosDiskImage = "prodos.dsk"

View File

@ -3,13 +3,13 @@ package main
import ( import (
"testing" "testing"
"mos6502go/cpu" "apple2/cpu"
"mos6502go/disk" "apple2/disk"
"mos6502go/keyboard" "apple2/keyboard"
"mos6502go/mmu" "apple2/mmu"
"mos6502go/system" "apple2/system"
"mos6502go/utils" "apple2/utils"
"mos6502go/video" "apple2/video"
) )
const rwtsDosDiskImage = "dos33.dsk" const rwtsDosDiskImage = "dos33.dsk"

View File

@ -5,10 +5,11 @@ import (
"encoding/hex" "encoding/hex"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"mos6502go/cpu"
"mos6502go/system"
"os" "os"
"testing" "testing"
"apple2/cpu"
"apple2/system"
) )
func ReadMemoryFromGzipFile(filename string) (data []byte, err error) { func ReadMemoryFromGzipFile(filename string) (data []byte, err error) {

View File

@ -4,10 +4,11 @@ import (
"fmt" "fmt"
"image" "image"
"image/color" "image/color"
"mos6502go/mmu"
"github.com/hajimehoshi/ebiten" "github.com/hajimehoshi/ebiten"
"github.com/hajimehoshi/ebiten/ebitenutil" "github.com/hajimehoshi/ebiten/ebitenutil"
"apple2/mmu"
) )
const ( const (