From 3f60f49bd3044b257a9e7ba32e42231b773a4064 Mon Sep 17 00:00:00 2001 From: Zellyn Hunter Date: Tue, 10 Apr 2018 22:22:16 -0400 Subject: [PATCH] Move opcodes/ into asm dir that uses it --- asm/cmd/a2as/a2as.go | 2 +- asm/disasm.go | 2 +- asm/flavors/as65/as65.go | 2 +- asm/flavors/common/base.go | 2 +- asm/flavors/common/decodeop.go | 2 +- asm/flavors/merlin/merlin.go | 2 +- asm/flavors/redbook/redbook.go | 2 +- asm/flavors/scma/scma.go | 2 +- asm/flavors/tests/assemble_test.go | 2 +- asm/flavors/tests/simple_parse_test.go | 2 +- {opcodes => asm/opcodes}/opcodes.go | 0 cpu/doc.go | 4 +--- 12 files changed, 11 insertions(+), 13 deletions(-) rename {opcodes => asm/opcodes}/opcodes.go (100%) diff --git a/asm/cmd/a2as/a2as.go b/asm/cmd/a2as/a2as.go index 11bc163..40cb0cb 100644 --- a/asm/cmd/a2as/a2as.go +++ b/asm/cmd/a2as/a2as.go @@ -13,7 +13,7 @@ import ( "github.com/zellyn/go6502/asm/flavors/scma" "github.com/zellyn/go6502/asm/ihex" "github.com/zellyn/go6502/asm/lines" - "github.com/zellyn/go6502/opcodes" + "github.com/zellyn/go6502/asm/opcodes" ) var flavorNames = []string{ diff --git a/asm/disasm.go b/asm/disasm.go index d148edd..d29cb2e 100644 --- a/asm/disasm.go +++ b/asm/disasm.go @@ -11,7 +11,7 @@ import ( "regexp" "strconv" - "github.com/zellyn/go6502/opcodes" + "github.com/zellyn/go6502/asm/opcodes" ) // Symbols are symbol tables used to convert addresses to names diff --git a/asm/flavors/as65/as65.go b/asm/flavors/as65/as65.go index a988dfb..e01006b 100644 --- a/asm/flavors/as65/as65.go +++ b/asm/flavors/as65/as65.go @@ -9,7 +9,7 @@ import ( "github.com/zellyn/go6502/asm/flavors/common" "github.com/zellyn/go6502/asm/inst" "github.com/zellyn/go6502/asm/lines" - "github.com/zellyn/go6502/opcodes" + "github.com/zellyn/go6502/asm/opcodes" ) var defaultCMap = [256]byte{ diff --git a/asm/flavors/common/base.go b/asm/flavors/common/base.go index 9950378..ca0a4b2 100644 --- a/asm/flavors/common/base.go +++ b/asm/flavors/common/base.go @@ -13,7 +13,7 @@ import ( "github.com/zellyn/go6502/asm/flavors" "github.com/zellyn/go6502/asm/inst" "github.com/zellyn/go6502/asm/lines" - "github.com/zellyn/go6502/opcodes" + "github.com/zellyn/go6502/asm/opcodes" ) const Letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_" diff --git a/asm/flavors/common/decodeop.go b/asm/flavors/common/decodeop.go index ddfb648..26af21b 100644 --- a/asm/flavors/common/decodeop.go +++ b/asm/flavors/common/decodeop.go @@ -5,7 +5,7 @@ import ( "github.com/zellyn/go6502/asm/context" "github.com/zellyn/go6502/asm/inst" - "github.com/zellyn/go6502/opcodes" + "github.com/zellyn/go6502/asm/opcodes" ) // DecodeOp contains the common code that decodes an Opcode, once we diff --git a/asm/flavors/merlin/merlin.go b/asm/flavors/merlin/merlin.go index e90c69d..c67fb75 100644 --- a/asm/flavors/merlin/merlin.go +++ b/asm/flavors/merlin/merlin.go @@ -9,7 +9,7 @@ import ( "github.com/zellyn/go6502/asm/flavors/common" "github.com/zellyn/go6502/asm/inst" "github.com/zellyn/go6502/asm/lines" - "github.com/zellyn/go6502/opcodes" + "github.com/zellyn/go6502/asm/opcodes" ) // Merlin implements the Merlin-compatible assembler flavor. diff --git a/asm/flavors/redbook/redbook.go b/asm/flavors/redbook/redbook.go index d0ff9c0..802316a 100644 --- a/asm/flavors/redbook/redbook.go +++ b/asm/flavors/redbook/redbook.go @@ -8,7 +8,7 @@ import ( "github.com/zellyn/go6502/asm/flavors/common" "github.com/zellyn/go6502/asm/inst" "github.com/zellyn/go6502/asm/lines" - "github.com/zellyn/go6502/opcodes" + "github.com/zellyn/go6502/asm/opcodes" ) // RedBook implements a Redbook-listing-compatible-ish assembler flavor. diff --git a/asm/flavors/scma/scma.go b/asm/flavors/scma/scma.go index 8bd001f..f03ea3b 100644 --- a/asm/flavors/scma/scma.go +++ b/asm/flavors/scma/scma.go @@ -8,7 +8,7 @@ import ( "github.com/zellyn/go6502/asm/flavors/common" "github.com/zellyn/go6502/asm/inst" "github.com/zellyn/go6502/asm/lines" - "github.com/zellyn/go6502/opcodes" + "github.com/zellyn/go6502/asm/opcodes" ) // 40 spaces = comment column diff --git a/asm/flavors/tests/assemble_test.go b/asm/flavors/tests/assemble_test.go index db9fad6..7614a40 100644 --- a/asm/flavors/tests/assemble_test.go +++ b/asm/flavors/tests/assemble_test.go @@ -12,7 +12,7 @@ import ( "github.com/zellyn/go6502/asm/flavors/scma" "github.com/zellyn/go6502/asm/lines" "github.com/zellyn/go6502/asm/membuf" - "github.com/zellyn/go6502/opcodes" + "github.com/zellyn/go6502/asm/opcodes" ) // h converts from hex or panics. diff --git a/asm/flavors/tests/simple_parse_test.go b/asm/flavors/tests/simple_parse_test.go index 0a4c784..d7ec6b4 100644 --- a/asm/flavors/tests/simple_parse_test.go +++ b/asm/flavors/tests/simple_parse_test.go @@ -12,7 +12,7 @@ import ( "github.com/zellyn/go6502/asm/flavors/scma" "github.com/zellyn/go6502/asm/inst" "github.com/zellyn/go6502/asm/lines" - "github.com/zellyn/go6502/opcodes" + "github.com/zellyn/go6502/asm/opcodes" ) func TestSimpleCommonFunctions(t *testing.T) { diff --git a/opcodes/opcodes.go b/asm/opcodes/opcodes.go similarity index 100% rename from opcodes/opcodes.go rename to asm/opcodes/opcodes.go diff --git a/cpu/doc.go b/cpu/doc.go index 78b70b7..de9082f 100644 --- a/cpu/doc.go +++ b/cpu/doc.go @@ -1,6 +1,4 @@ /* -Package cpu provides routines for emulating a 6502 or 65C02. It also -provides data about opcodes that is used by the asm package to -(dis)assemble 6502 assembly language. +Package cpu provides routines for emulating a 6502 or (in the future) 65C02. */ package cpu