Move opcodes/ into asm dir that uses it

This commit is contained in:
Zellyn Hunter 2018-04-10 22:22:16 -04:00
parent ed5d558dc1
commit 3f60f49bd3
12 changed files with 11 additions and 13 deletions

View File

@ -13,7 +13,7 @@ import (
"github.com/zellyn/go6502/asm/flavors/scma" "github.com/zellyn/go6502/asm/flavors/scma"
"github.com/zellyn/go6502/asm/ihex" "github.com/zellyn/go6502/asm/ihex"
"github.com/zellyn/go6502/asm/lines" "github.com/zellyn/go6502/asm/lines"
"github.com/zellyn/go6502/opcodes" "github.com/zellyn/go6502/asm/opcodes"
) )
var flavorNames = []string{ var flavorNames = []string{

View File

@ -11,7 +11,7 @@ import (
"regexp" "regexp"
"strconv" "strconv"
"github.com/zellyn/go6502/opcodes" "github.com/zellyn/go6502/asm/opcodes"
) )
// Symbols are symbol tables used to convert addresses to names // Symbols are symbol tables used to convert addresses to names

View File

@ -9,7 +9,7 @@ import (
"github.com/zellyn/go6502/asm/flavors/common" "github.com/zellyn/go6502/asm/flavors/common"
"github.com/zellyn/go6502/asm/inst" "github.com/zellyn/go6502/asm/inst"
"github.com/zellyn/go6502/asm/lines" "github.com/zellyn/go6502/asm/lines"
"github.com/zellyn/go6502/opcodes" "github.com/zellyn/go6502/asm/opcodes"
) )
var defaultCMap = [256]byte{ var defaultCMap = [256]byte{

View File

@ -13,7 +13,7 @@ import (
"github.com/zellyn/go6502/asm/flavors" "github.com/zellyn/go6502/asm/flavors"
"github.com/zellyn/go6502/asm/inst" "github.com/zellyn/go6502/asm/inst"
"github.com/zellyn/go6502/asm/lines" "github.com/zellyn/go6502/asm/lines"
"github.com/zellyn/go6502/opcodes" "github.com/zellyn/go6502/asm/opcodes"
) )
const Letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_" const Letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_"

View File

@ -5,7 +5,7 @@ import (
"github.com/zellyn/go6502/asm/context" "github.com/zellyn/go6502/asm/context"
"github.com/zellyn/go6502/asm/inst" "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 // DecodeOp contains the common code that decodes an Opcode, once we

View File

@ -9,7 +9,7 @@ import (
"github.com/zellyn/go6502/asm/flavors/common" "github.com/zellyn/go6502/asm/flavors/common"
"github.com/zellyn/go6502/asm/inst" "github.com/zellyn/go6502/asm/inst"
"github.com/zellyn/go6502/asm/lines" "github.com/zellyn/go6502/asm/lines"
"github.com/zellyn/go6502/opcodes" "github.com/zellyn/go6502/asm/opcodes"
) )
// Merlin implements the Merlin-compatible assembler flavor. // Merlin implements the Merlin-compatible assembler flavor.

View File

@ -8,7 +8,7 @@ import (
"github.com/zellyn/go6502/asm/flavors/common" "github.com/zellyn/go6502/asm/flavors/common"
"github.com/zellyn/go6502/asm/inst" "github.com/zellyn/go6502/asm/inst"
"github.com/zellyn/go6502/asm/lines" "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. // RedBook implements a Redbook-listing-compatible-ish assembler flavor.

View File

@ -8,7 +8,7 @@ import (
"github.com/zellyn/go6502/asm/flavors/common" "github.com/zellyn/go6502/asm/flavors/common"
"github.com/zellyn/go6502/asm/inst" "github.com/zellyn/go6502/asm/inst"
"github.com/zellyn/go6502/asm/lines" "github.com/zellyn/go6502/asm/lines"
"github.com/zellyn/go6502/opcodes" "github.com/zellyn/go6502/asm/opcodes"
) )
// 40 spaces = comment column // 40 spaces = comment column

View File

@ -12,7 +12,7 @@ import (
"github.com/zellyn/go6502/asm/flavors/scma" "github.com/zellyn/go6502/asm/flavors/scma"
"github.com/zellyn/go6502/asm/lines" "github.com/zellyn/go6502/asm/lines"
"github.com/zellyn/go6502/asm/membuf" "github.com/zellyn/go6502/asm/membuf"
"github.com/zellyn/go6502/opcodes" "github.com/zellyn/go6502/asm/opcodes"
) )
// h converts from hex or panics. // h converts from hex or panics.

View File

@ -12,7 +12,7 @@ import (
"github.com/zellyn/go6502/asm/flavors/scma" "github.com/zellyn/go6502/asm/flavors/scma"
"github.com/zellyn/go6502/asm/inst" "github.com/zellyn/go6502/asm/inst"
"github.com/zellyn/go6502/asm/lines" "github.com/zellyn/go6502/asm/lines"
"github.com/zellyn/go6502/opcodes" "github.com/zellyn/go6502/asm/opcodes"
) )
func TestSimpleCommonFunctions(t *testing.T) { func TestSimpleCommonFunctions(t *testing.T) {

View File

@ -1,6 +1,4 @@
/* /*
Package cpu provides routines for emulating a 6502 or 65C02. It also Package cpu provides routines for emulating a 6502 or (in the future) 65C02.
provides data about opcodes that is used by the asm package to
(dis)assemble 6502 assembly language.
*/ */
package cpu package cpu