start at some basic passes

internal/gen/build.go

@@ -16,7 +16,7 @@ func (b *build) Generate(is []inst.Instruction) ([]byte, error) {
 	b.Printf("package build\n\n")
 
 	b.Printf("import (\n")
-	b.Printf("\t\"%s\"\n", pkg)
+	b.Printf("\t\"%s/operand\"\n", pkg)
 	b.Printf("\t\"%s/x86\"\n", pkg)
 	b.Printf(")\n\n")
 

internal/gen/ctors.go

@@ -42,7 +42,7 @@ func (c *ctors) instruction(i inst.Instruction) {
 
 	c.Printf("func %s(%s) (*avo.Instruction, error) {\n", i.Opcode, s.ParameterList())
 	c.checkargs(i, s)
-	c.Printf("\treturn &avo.Instruction{Opcode: %#v, Operands: %s}, nil\n", i.Opcode, s.ParameterSlice())
+	c.Printf("\treturn &%s, nil\n", construct(i, s))
 	c.Printf("}\n\n")
 }
 
@@ -72,6 +72,19 @@ func (c *ctors) doc(i inst.Instruction) []string {
 	return lines
 }
 
+func construct(i inst.Instruction, s signature) string {
+	buf := bytes.NewBuffer(nil)
+	fmt.Fprintf(buf, "avo.Instruction{\n")
+	fmt.Fprintf(buf, "\tOpcode: %#v,\n", i.Opcode)
+	fmt.Fprintf(buf, "\tOperands: %s,\n", s.ParameterSlice())
+	if i.IsBranch() {
+		fmt.Fprintf(buf, "\tIsBranch: true,\n")
+		fmt.Fprintf(buf, "\tIsConditional: %#v,\n", i.IsConditionalBranch())
+	}
+	fmt.Fprintf(buf, "}")
+	return buf.String()
+}
+
 func (c *ctors) checkargs(i inst.Instruction, s signature) {
 	if i.IsNiladic() {
 		return

internal/gen/signature.go

@@ -9,6 +9,9 @@ import (
 	"github.com/mmcloughlin/avo/internal/inst"
 )
 
+// operandType
+const operandType = "operand.Op"
+
 // signature provides access to details about the signature of an instruction function.
 type signature interface {
 	ParameterList() string
@@ -21,11 +24,11 @@ type signature interface {
 // argslist is the signature for a function with the given named parameters.
 type argslist []string
 
-func (a argslist) ParameterList() string      { return strings.Join(a, ", ") + " avo.Operand" }
+func (a argslist) ParameterList() string      { return strings.Join(a, ", ") + " " + operandType }
 func (a argslist) Arguments() string          { return strings.Join(a, ", ") }
 func (a argslist) ParameterName(i int) string { return a[i] }
 func (a argslist) ParameterSlice() string {
-	return fmt.Sprintf("[]avo.Operand{%s}", strings.Join(a, ", "))
+	return fmt.Sprintf("[]%s{%s}", operandType, strings.Join(a, ", "))
 }
 func (a argslist) Length() string { return strconv.Itoa(len(a)) }
 
@@ -34,7 +37,7 @@ type variadic struct {
 	name string
 }
 
-func (v variadic) ParameterList() string      { return v.name + " ...avo.Operand" }
+func (v variadic) ParameterList() string      { return v.name + " ..." + operandType }
 func (v variadic) Arguments() string          { return v.name + "..." }
 func (v variadic) ParameterName(i int) string { return fmt.Sprintf("%s[%d]", v.name, i) }
 func (v variadic) ParameterSlice() string     { return v.name }