Move opcodes/ into asm dir that uses it

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{

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

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{

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_"

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

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.

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.

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

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.

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) {

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