From 8e34c67f1148a167bf9d155efe9ee43984f04f55 Mon Sep 17 00:00:00 2001 From: Ian Gulliver Date: Thu, 18 Nov 2021 17:44:40 -1000 Subject: [PATCH] Move go.mod to top level --- assembler/go.mod | 11 --------- assembler/test.yaml | 7 ------ go.mod | 9 ++++++++ assembler/go.sum => go.sum | 2 -- vm/go.mod | 8 ------- vm/go.sum | 4 ---- vm/state_test.go | 47 -------------------------------------- 7 files changed, 9 insertions(+), 79 deletions(-) delete mode 100644 assembler/go.mod delete mode 100644 assembler/test.yaml create mode 100644 go.mod rename assembler/go.sum => go.sum (75%) delete mode 100644 vm/go.mod delete mode 100644 vm/go.sum delete mode 100644 vm/state_test.go diff --git a/assembler/go.mod b/assembler/go.mod deleted file mode 100644 index 50c97a3..0000000 --- a/assembler/go.mod +++ /dev/null @@ -1,11 +0,0 @@ -module github.com/firestuff/subcoding/assembler - -go 1.17 - -require ( - github.com/firestuff/subcoding/vm v0.0.0-20211119013410-6de2e87342fa - github.com/pkg/errors v0.9.1 - gopkg.in/yaml.v2 v2.4.0 -) - -require github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 // indirect diff --git a/assembler/test.yaml b/assembler/test.yaml deleted file mode 100644 index e2735ce..0000000 --- a/assembler/test.yaml +++ /dev/null @@ -1,7 +0,0 @@ -functions: -- - [add, f0, 1] - - [call, +1] - - [ltu, f0, 3] - - [jmpt, -3] - -- - [add, g0, 1] diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..2a19dbd --- /dev/null +++ b/go.mod @@ -0,0 +1,9 @@ +module github.com/firestuff/subcoding + +go 1.17 + +require ( + github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 + github.com/pkg/errors v0.9.1 + gopkg.in/yaml.v2 v2.4.0 +) diff --git a/assembler/go.sum b/go.sum similarity index 75% rename from assembler/go.sum rename to go.sum index bc61fed..88b1459 100644 --- a/assembler/go.sum +++ b/go.sum @@ -1,5 +1,3 @@ -github.com/firestuff/subcoding/vm v0.0.0-20211119013410-6de2e87342fa h1:xx9ht6+TpFa19jx954x5+4koxcyxQHRbxItLnzPv6ug= -github.com/firestuff/subcoding/vm v0.0.0-20211119013410-6de2e87342fa/go.mod h1:s02/Ta9wsxRR9W5Uom7LoQEu4bpFQfJdhaIHaXzN0IY= github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 h1:EnfXoSqDfSNJv0VBNqY/88RNnhSGYkrHaO0mmFGbVsc= github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40/go.mod h1:vy1vK6wD6j7xX6O6hXe621WabdtNkou2h7uRtTfRMyg= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= diff --git a/vm/go.mod b/vm/go.mod deleted file mode 100644 index 9e7c757..0000000 --- a/vm/go.mod +++ /dev/null @@ -1,8 +0,0 @@ -module github.com/firestuff/subcoding/vm - -go 1.17 - -require ( - github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 // indirect - github.com/pkg/errors v0.9.1 // indirect -) diff --git a/vm/go.sum b/vm/go.sum deleted file mode 100644 index 73752d9..0000000 --- a/vm/go.sum +++ /dev/null @@ -1,4 +0,0 @@ -github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 h1:EnfXoSqDfSNJv0VBNqY/88RNnhSGYkrHaO0mmFGbVsc= -github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40/go.mod h1:vy1vK6wD6j7xX6O6hXe621WabdtNkou2h7uRtTfRMyg= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= diff --git a/vm/state_test.go b/vm/state_test.go deleted file mode 100644 index c23d147..0000000 --- a/vm/state_test.go +++ /dev/null @@ -1,47 +0,0 @@ -package vm - -import "encoding/hex" -import "strings" -import "testing" - -func TestFirst(t *testing.T) { - asm := [][]string{ - []string{ - "0000020000000000010000000000000000000000000000000000000000000001", - "0000000100000000000000000000000000000001000000000000000000000000", - "0000030100000000010000000000000000000000000000000000000000000003", - "000004010000000000000000fffffffffffffffd000000000000000000000000", - }, - []string{ - "0000020000000000020000000000000000000000000000000000000000000001", - }, - } - - functionByteCode := [][]byte{} - - for _, fnc := range asm { - fncString := strings.Join(fnc, "") - - byteCode, err := hex.DecodeString(fncString) - if err != nil { - t.Fatal(err) - } - - functionByteCode = append(functionByteCode, byteCode) - } - - state, err := NewStateFromByteCode(functionByteCode) - if err != nil { - t.Fatal(err) - } - - state.Execute() - - if state.err != nil { - t.Fatal(state) - } - - if state.globalMemory.mustReadUnsigned(0) != 3 { - t.Fatal(state.globalMemory.mustReadUnsigned(0)) - } -}