internal/load: support additional MOVQ forms

The Go assembler merges MOVD/MOVQ instruction forms. The logic in the
avo instruction loader was discarding the MOVD forms. This diff should
merge them correctly.

Updates mmcloughlin#50

internal/load/load.go

@@ -76,6 +76,9 @@ func (l *Loader) Load() ([]inst.Instruction, error) {
 
 	// Apply list of aliases.
 	for from, to := range aliases {
+		if existing, found := im[from]; found {
+			im[to].Forms = append(im[to].Forms, existing.Forms...)
+		}
 		cpy := *im[to]
 		cpy.Opcode = from
 		cpy.AliasOf = to

tests/fixedbugs/issue50/asm.go

@@ -0,0 +1,21 @@
+// +build ignore
+
+package main
+
+import (
+	. "github.com/mmcloughlin/avo/build"
+)
+
+func main() {
+	TEXT("Issue50", NOSPLIT, "func(x uint32) uint32")
+	Doc(
+		"Issue50 reported that MOVD/MOVQ was missing the r32, xmm form.",
+		"This function deliberately exercises this instruction form.",
+	)
+	x := Load(Param("x"), GP32())
+	xmm := XMM()
+	MOVQ(x, xmm)
+	Store(xmm, ReturnIndex(0))
+	RET()
+	Generate()
+}

tests/fixedbugs/issue50/issue50_test.go

@@ -0,0 +1,15 @@
+package issue50
+
+import (
+	"testing"
+	"testing/quick"
+)
+
+//go:generate go run asm.go -out issue50.s -stubs stub.go
+
+func TestIssue50(t *testing.T) {
+	expect := func(x uint32) uint32 { return x }
+	if err := quick.CheckEqual(Issue50, expect, nil); err != nil {
+		t.Fatal(err)
+	}
+}