fix reproducibility bug and regenerate

internal/inst/types.go

@@ -40,6 +40,13 @@ func (i Instruction) IsConditionalBranch() bool {
 	return i.IsBranch() && i.Opcode != "JMP"
 }
 
+// Clone the instruction.
+func (i Instruction) Clone() Instruction {
+	c := i
+	c.Forms = i.Forms.Clone()
+	return c
+}
+
 // Forms is a collection of instruction forms.
 type Forms []Form
 
@@ -78,6 +85,15 @@ func (fs Forms) IsNiladic() bool {
 	return len(a) == 1 && a[0] == 0
 }
 
+// Clone the instruction forms.
+func (fs Forms) Clone() Forms {
+	cs := make(Forms, 0, len(fs))
+	for _, f := range fs {
+		cs = append(cs, f.Clone())
+	}
+	return cs
+}
+
 // Form specifies one accepted set of operands for an instruction.
 type Form struct {
 	// Instruction sets this instruction form requires.

internal/load/load.go

@@ -126,17 +126,14 @@ func (l *Loader) Load() ([]inst.Instruction, error) {
 	// Convert to a slice. Sort instructions and forms for reproducibility.
 	is := make([]inst.Instruction, 0, len(im))
 	for _, i := range im {
+		sortforms(i.Forms)
 		is = append(is, *i)
 	}
 
 	sort.Slice(is, func(i, j int) bool {
 		return is[i].Opcode < is[j].Opcode
 	})
 
-	for _, i := range im {
-		sortforms(i.Forms)
-	}
-
 	return is, nil
 }
 
@@ -834,7 +831,6 @@ func vexevex(fs []inst.Form) ([]inst.Form, error) {
 		}
 
 		if group[0].EncodingType != inst.EncodingTypeVEX || group[1].EncodingType != inst.EncodingTypeEVEX {
-			fmt.Println(group)
 			return nil, errors.New("expected pair of VEX/EVEX encoded forms")
 		}
 

internal/opcodesextra/instructions.go

@@ -11,9 +11,16 @@ var sets = [][]*inst.Instruction{
 
 // Instructions returns a list of extras to add to the instructions database.
 func Instructions() []*inst.Instruction {
+	// Concatenate and clone the instruction lists.  It can be convenient for
+	// forms lists and other data structures to be shared in the curated lists,
+	// but we want to return distinct copies here to avoid subtle bugs in
+	// consumers.
 	var is []*inst.Instruction
 	for _, set := range sets {
-		is = append(is, set...)
+		for _, i := range set {
+			c := i.Clone()
+			is = append(is, &c)
+		}
 	}
 	return is
 }