fisk 2.1.0 → 2.2.0

data/lib/fisk/instructions/sha256msg2.rb

@@ -3,57 +3,55 @@
 class Fisk
   module Instructions
     # Instruction SHA256MSG2
-    forms = []
-    operands = []
-    encodings = []
+    SHA256MSG2 = Instruction.new("SHA256MSG2", [
     # sha256msg2: xmm, xmm
-    operands << OPERAND_TYPES[23]
-    operands << OPERAND_TYPES[24]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[23],
+        OPERAND_TYPES[24],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               false,
               0,
               operands[0].rex_value,
               0,
-              operands[1].rex_value)
-        add_opcode buffer, 0x0F, 0
-        add_opcode buffer, 0x38, 0
-        add_opcode buffer, 0xCD, 0
-        add_modrm(buffer, operands,
+              operands[1].rex_value) +
+            add_opcode(buffer, 0x0F, 0) +
+            add_opcode(buffer, 0x38, 0) +
+            add_opcode(buffer, 0xCD, 0) +
+            add_modrm(buffer,
               3,
               operands[0].op_value,
-              operands[1].op_value)
-      end
-
-      def bytesize; 4; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[1].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # sha256msg2: xmm, m128
-    operands << OPERAND_TYPES[23]
-    operands << OPERAND_TYPES[25]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[23],
+        OPERAND_TYPES[25],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               false,
               0,
               operands[0].rex_value,
               operands[1].rex_value,
-              operands[1].rex_value)
-        add_opcode buffer, 0x0F, 0
-        add_opcode buffer, 0x38, 0
-        add_opcode buffer, 0xCD, 0
-        add_modrm(buffer, operands,
+              operands[1].rex_value) +
+            add_opcode(buffer, 0x0F, 0) +
+            add_opcode(buffer, 0x38, 0) +
+            add_opcode(buffer, 0xCD, 0) +
+            add_modrm(buffer,
               0,
               operands[0].op_value,
-              operands[1].op_value)
-      end
-
-      def bytesize; 4; end
-    }.new
-    forms << Form.new(operands, encodings)
-    SHA256MSG2 = Instruction.new("SHA256MSG2", forms)
+              operands[1].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
+    ].freeze).freeze
   end
 end

data/lib/fisk/instructions/sha256rnds2.rb

@@ -3,59 +3,57 @@
 class Fisk
   module Instructions
     # Instruction SHA256RNDS2
-    forms = []
-    operands = []
-    encodings = []
+    SHA256RNDS2 = Instruction.new("SHA256RNDS2", [
     # sha256rnds2: xmm, xmm, xmm0
-    operands << OPERAND_TYPES[23]
-    operands << OPERAND_TYPES[24]
-    operands << OPERAND_TYPES[29]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[23],
+        OPERAND_TYPES[24],
+        OPERAND_TYPES[29],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               false,
               0,
               operands[0].rex_value,
               0,
-              operands[1].rex_value)
-        add_opcode buffer, 0x0F, 0
-        add_opcode buffer, 0x38, 0
-        add_opcode buffer, 0xCB, 0
-        add_modrm(buffer, operands,
+              operands[1].rex_value) +
+            add_opcode(buffer, 0x0F, 0) +
+            add_opcode(buffer, 0x38, 0) +
+            add_opcode(buffer, 0xCB, 0) +
+            add_modrm(buffer,
               3,
               operands[0].op_value,
-              operands[1].op_value)
-      end
-
-      def bytesize; 4; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[1].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # sha256rnds2: xmm, m128, xmm0
-    operands << OPERAND_TYPES[23]
-    operands << OPERAND_TYPES[25]
-    operands << OPERAND_TYPES[29]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[23],
+        OPERAND_TYPES[25],
+        OPERAND_TYPES[29],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               false,
               0,
               operands[0].rex_value,
               operands[1].rex_value,
-              operands[1].rex_value)
-        add_opcode buffer, 0x0F, 0
-        add_opcode buffer, 0x38, 0
-        add_opcode buffer, 0xCB, 0
-        add_modrm(buffer, operands,
+              operands[1].rex_value) +
+            add_opcode(buffer, 0x0F, 0) +
+            add_opcode(buffer, 0x38, 0) +
+            add_opcode(buffer, 0xCB, 0) +
+            add_modrm(buffer,
               0,
               operands[0].op_value,
-              operands[1].op_value)
-      end
-
-      def bytesize; 4; end
-    }.new
-    forms << Form.new(operands, encodings)
-    SHA256RNDS2 = Instruction.new("SHA256RNDS2", forms)
+              operands[1].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
+    ].freeze).freeze
   end
 end

data/lib/fisk/instructions/shl.rb

@@ -3,573 +3,549 @@
 class Fisk
   module Instructions
     # Instruction SHL
-    forms = []
-    operands = []
-    encodings = []
+    SHL = Instruction.new("SHL", [
     # shlb: r8, 1
-    operands << OPERAND_TYPES[2]
-    operands << OPERAND_TYPES[55]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[2],
+        OPERAND_TYPES[55],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               false,
               0,
               0,
               0,
-              operands[0].rex_value)
-        add_opcode buffer, 0xD0, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xD0, 0) +
+            add_modrm(buffer,
               3,
               4,
-              operands[0].op_value)
-      end
-
-      def bytesize; 2; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # shlb: r8, imm8
-    operands << OPERAND_TYPES[2]
-    operands << OPERAND_TYPES[1]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[2],
+        OPERAND_TYPES[1],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               false,
               0,
               0,
               0,
-              operands[0].rex_value)
-        add_opcode buffer, 0xC0, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xC0, 0) +
+            add_modrm(buffer,
               3,
               4,
-              operands[0].op_value)
-        add_immediate buffer, operands[1].op_value, 1
-      end
-
-      def bytesize; 3; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value, operands) +
+            add_immediate(buffer, operands[1].op_value, 1) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # shlb: r8, cl
-    operands << OPERAND_TYPES[2]
-    operands << OPERAND_TYPES[56]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[2],
+        OPERAND_TYPES[56],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               false,
               0,
               0,
               0,
-              operands[0].rex_value)
-        add_opcode buffer, 0xD2, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xD2, 0) +
+            add_modrm(buffer,
               3,
               4,
-              operands[0].op_value)
-      end
-
-      def bytesize; 2; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # shlw: r16, 1
-    operands << OPERAND_TYPES[7]
-    operands << OPERAND_TYPES[55]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_prefix buffer, operands, 0x66, false
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[7],
+        OPERAND_TYPES[55],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_prefix(buffer, operands, 0x66, false) +
+            add_rex(buffer, operands,
               false,
               0,
               0,
               0,
-              operands[0].rex_value)
-        add_opcode buffer, 0xD1, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xD1, 0) +
+            add_modrm(buffer,
               3,
               4,
-              operands[0].op_value)
-      end
-
-      def bytesize; 2; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # shlw: r16, imm8
-    operands << OPERAND_TYPES[7]
-    operands << OPERAND_TYPES[1]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_prefix buffer, operands, 0x66, false
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[7],
+        OPERAND_TYPES[1],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_prefix(buffer, operands, 0x66, false) +
+            add_rex(buffer, operands,
               false,
               0,
               0,
               0,
-              operands[0].rex_value)
-        add_opcode buffer, 0xC1, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xC1, 0) +
+            add_modrm(buffer,
               3,
               4,
-              operands[0].op_value)
-        add_immediate buffer, operands[1].op_value, 1
-      end
-
-      def bytesize; 3; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value, operands) +
+            add_immediate(buffer, operands[1].op_value, 1) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # shlw: r16, cl
-    operands << OPERAND_TYPES[7]
-    operands << OPERAND_TYPES[56]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_prefix buffer, operands, 0x66, false
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[7],
+        OPERAND_TYPES[56],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_prefix(buffer, operands, 0x66, false) +
+            add_rex(buffer, operands,
               false,
               0,
               0,
               0,
-              operands[0].rex_value)
-        add_opcode buffer, 0xD3, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xD3, 0) +
+            add_modrm(buffer,
               3,
               4,
-              operands[0].op_value)
-      end
-
-      def bytesize; 2; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # shll: r32, 1
-    operands << OPERAND_TYPES[12]
-    operands << OPERAND_TYPES[55]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[12],
+        OPERAND_TYPES[55],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               false,
               0,
               0,
               0,
-              operands[0].rex_value)
-        add_opcode buffer, 0xD1, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xD1, 0) +
+            add_modrm(buffer,
               3,
               4,
-              operands[0].op_value)
-      end
-
-      def bytesize; 2; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # shll: r32, imm8
-    operands << OPERAND_TYPES[12]
-    operands << OPERAND_TYPES[1]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[12],
+        OPERAND_TYPES[1],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               false,
               0,
               0,
               0,
-              operands[0].rex_value)
-        add_opcode buffer, 0xC1, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xC1, 0) +
+            add_modrm(buffer,
               3,
               4,
-              operands[0].op_value)
-        add_immediate buffer, operands[1].op_value, 1
-      end
-
-      def bytesize; 3; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value, operands) +
+            add_immediate(buffer, operands[1].op_value, 1) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # shll: r32, cl
-    operands << OPERAND_TYPES[12]
-    operands << OPERAND_TYPES[56]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[12],
+        OPERAND_TYPES[56],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               false,
               0,
               0,
               0,
-              operands[0].rex_value)
-        add_opcode buffer, 0xD3, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xD3, 0) +
+            add_modrm(buffer,
               3,
               4,
-              operands[0].op_value)
-      end
-
-      def bytesize; 2; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # shlq: r64, 1
-    operands << OPERAND_TYPES[16]
-    operands << OPERAND_TYPES[55]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[16],
+        OPERAND_TYPES[55],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               true,
               1,
               0,
               0,
-              operands[0].rex_value)
-        add_opcode buffer, 0xD1, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xD1, 0) +
+            add_modrm(buffer,
               3,
               4,
-              operands[0].op_value)
-      end
-
-      def bytesize; 3; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # shlq: r64, imm8
-    operands << OPERAND_TYPES[16]
-    operands << OPERAND_TYPES[1]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[16],
+        OPERAND_TYPES[1],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               true,
               1,
               0,
               0,
-              operands[0].rex_value)
-        add_opcode buffer, 0xC1, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xC1, 0) +
+            add_modrm(buffer,
               3,
               4,
-              operands[0].op_value)
-        add_immediate buffer, operands[1].op_value, 1
-      end
-
-      def bytesize; 4; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value, operands) +
+            add_immediate(buffer, operands[1].op_value, 1) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # shlq: r64, cl
-    operands << OPERAND_TYPES[16]
-    operands << OPERAND_TYPES[56]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[16],
+        OPERAND_TYPES[56],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               true,
               1,
               0,
               0,
-              operands[0].rex_value)
-        add_opcode buffer, 0xD3, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xD3, 0) +
+            add_modrm(buffer,
               3,
               4,
-              operands[0].op_value)
-      end
-
-      def bytesize; 3; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # shlb: m8, 1
-    operands << OPERAND_TYPES[19]
-    operands << OPERAND_TYPES[55]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[19],
+        OPERAND_TYPES[55],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               false,
               0,
               0,
               operands[0].rex_value,
-              operands[0].rex_value)
-        add_opcode buffer, 0xD0, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xD0, 0) +
+            add_modrm(buffer,
               0,
               4,
-              operands[0].op_value)
-      end
-
-      def bytesize; 2; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # shlb: m8, imm8
-    operands << OPERAND_TYPES[19]
-    operands << OPERAND_TYPES[1]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[19],
+        OPERAND_TYPES[1],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               false,
               0,
               0,
               operands[0].rex_value,
-              operands[0].rex_value)
-        add_opcode buffer, 0xC0, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xC0, 0) +
+            add_modrm(buffer,
               0,
               4,
-              operands[0].op_value)
-        add_immediate buffer, operands[1].op_value, 1
-      end
-
-      def bytesize; 3; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value, operands) +
+            add_immediate(buffer, operands[1].op_value, 1) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # shlb: m8, cl
-    operands << OPERAND_TYPES[19]
-    operands << OPERAND_TYPES[56]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[19],
+        OPERAND_TYPES[56],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               false,
               0,
               0,
               operands[0].rex_value,
-              operands[0].rex_value)
-        add_opcode buffer, 0xD2, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xD2, 0) +
+            add_modrm(buffer,
               0,
               4,
-              operands[0].op_value)
-      end
-
-      def bytesize; 2; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # shlw: m16, 1
-    operands << OPERAND_TYPES[20]
-    operands << OPERAND_TYPES[55]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_prefix buffer, operands, 0x66, false
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[20],
+        OPERAND_TYPES[55],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_prefix(buffer, operands, 0x66, false) +
+            add_rex(buffer, operands,
               false,
               0,
               0,
               operands[0].rex_value,
-              operands[0].rex_value)
-        add_opcode buffer, 0xD1, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xD1, 0) +
+            add_modrm(buffer,
               0,
               4,
-              operands[0].op_value)
-      end
-
-      def bytesize; 2; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # shlw: m16, imm8
-    operands << OPERAND_TYPES[20]
-    operands << OPERAND_TYPES[1]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_prefix buffer, operands, 0x66, false
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[20],
+        OPERAND_TYPES[1],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_prefix(buffer, operands, 0x66, false) +
+            add_rex(buffer, operands,
               false,
               0,
               0,
               operands[0].rex_value,
-              operands[0].rex_value)
-        add_opcode buffer, 0xC1, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xC1, 0) +
+            add_modrm(buffer,
               0,
               4,
-              operands[0].op_value)
-        add_immediate buffer, operands[1].op_value, 1
-      end
-
-      def bytesize; 3; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value, operands) +
+            add_immediate(buffer, operands[1].op_value, 1) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # shlw: m16, cl
-    operands << OPERAND_TYPES[20]
-    operands << OPERAND_TYPES[56]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_prefix buffer, operands, 0x66, false
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[20],
+        OPERAND_TYPES[56],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_prefix(buffer, operands, 0x66, false) +
+            add_rex(buffer, operands,
               false,
               0,
               0,
               operands[0].rex_value,
-              operands[0].rex_value)
-        add_opcode buffer, 0xD3, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xD3, 0) +
+            add_modrm(buffer,
               0,
               4,
-              operands[0].op_value)
-      end
-
-      def bytesize; 2; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # shll: m32, 1
-    operands << OPERAND_TYPES[21]
-    operands << OPERAND_TYPES[55]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[21],
+        OPERAND_TYPES[55],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               false,
               0,
               0,
               operands[0].rex_value,
-              operands[0].rex_value)
-        add_opcode buffer, 0xD1, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xD1, 0) +
+            add_modrm(buffer,
               0,
               4,
-              operands[0].op_value)
-      end
-
-      def bytesize; 2; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # shll: m32, imm8
-    operands << OPERAND_TYPES[21]
-    operands << OPERAND_TYPES[1]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[21],
+        OPERAND_TYPES[1],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               false,
               0,
               0,
               operands[0].rex_value,
-              operands[0].rex_value)
-        add_opcode buffer, 0xC1, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xC1, 0) +
+            add_modrm(buffer,
               0,
               4,
-              operands[0].op_value)
-        add_immediate buffer, operands[1].op_value, 1
-      end
-
-      def bytesize; 3; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value, operands) +
+            add_immediate(buffer, operands[1].op_value, 1) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # shll: m32, cl
-    operands << OPERAND_TYPES[21]
-    operands << OPERAND_TYPES[56]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[21],
+        OPERAND_TYPES[56],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               false,
               0,
               0,
               operands[0].rex_value,
-              operands[0].rex_value)
-        add_opcode buffer, 0xD3, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xD3, 0) +
+            add_modrm(buffer,
               0,
               4,
-              operands[0].op_value)
-      end
-
-      def bytesize; 2; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # shlq: m64, 1
-    operands << OPERAND_TYPES[22]
-    operands << OPERAND_TYPES[55]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[22],
+        OPERAND_TYPES[55],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               true,
               1,
               0,
               operands[0].rex_value,
-              operands[0].rex_value)
-        add_opcode buffer, 0xD1, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xD1, 0) +
+            add_modrm(buffer,
               0,
               4,
-              operands[0].op_value)
-      end
-
-      def bytesize; 3; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # shlq: m64, imm8
-    operands << OPERAND_TYPES[22]
-    operands << OPERAND_TYPES[1]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[22],
+        OPERAND_TYPES[1],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               true,
               1,
               0,
               operands[0].rex_value,
-              operands[0].rex_value)
-        add_opcode buffer, 0xC1, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xC1, 0) +
+            add_modrm(buffer,
               0,
               4,
-              operands[0].op_value)
-        add_immediate buffer, operands[1].op_value, 1
-      end
-
-      def bytesize; 4; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value, operands) +
+            add_immediate(buffer, operands[1].op_value, 1) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # shlq: m64, cl
-    operands << OPERAND_TYPES[22]
-    operands << OPERAND_TYPES[56]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[22],
+        OPERAND_TYPES[56],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               true,
               1,
               0,
               operands[0].rex_value,
-              operands[0].rex_value)
-        add_opcode buffer, 0xD3, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xD3, 0) +
+            add_modrm(buffer,
               0,
               4,
-              operands[0].op_value)
-      end
-
-      def bytesize; 3; end
-    }.new
-    forms << Form.new(operands, encodings)
-    SHL = Instruction.new("SHL", forms)
+              operands[0].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
+    ].freeze).freeze
   end
 end