feat: simplify Args in layout, remove xchgArgs case

Author: i582

gen/tvm-specification.json

@@ -68260,11 +68260,25 @@
         "checkLen": 8,
         "skipLen": 16,
         "args": {
-          "$": "xchgArgs",
-          "range": {
-            "min": "1",
-            "max": "16"
-          }
+          "$": "simpleArgs",
+          "children": [
+            {
+              "$": "stack",
+              "len": 4,
+              "range": {
+                "min": "1",
+                "max": "15"
+              }
+            },
+            {
+              "$": "stack",
+              "len": 4,
+              "range": {
+                "min": "0",
+                "max": "15"
+              }
+            }
+          ]
         },
         "exec": "exec_xchg",
         "kind": "fixed",

src/instructions/instructions.ts

@@ -76,7 +76,7 @@ export const hash: hash = {$: "hash"}
 export type setcpArg = {$: "setcpArg", range: range}
 export const setcpArg: setcpArg = {$: "setcpArg", range: range(-15n, 239n)}
 
-export type args = simpleArgs | xchgArgs | dictpush
+export type args = simpleArgs | dictpush
 
 export type simpleArgs = {$: "simpleArgs", children: arg[]}
 export const seq = (...args: arg[]): simpleArgs => ({$: "simpleArgs", children: args})
@@ -1477,7 +1477,7 @@ export const instructions: Record<string, Opcode> = {
 
     XCHG_0I_LONG: cat("stack", mkfixedn(0x11, 8, 8, seq(stack2(8, 1n)), `exec_xchg0_l`)),
     XCHG_0I: cat("stack", mkfixedrangen(0x02, 0x10, 8, 4, seq(stack2(4, 1n)), `exec_xchg0`)),
-    XCHG_IJ: cat("stack", mkfixedn(0x10, 8, 8, xchgArgs, `exec_xchg`)),
+    XCHG_IJ: cat("stack", mkfixedn(0x10, 8, 8, seq(stack2(4, 1n), stack(4)), `exec_xchg`)),
     XCHG_1I: cat("stack", mkfixedrangen(0x12, 0x20, 8, 4, seq(s1, stack2(4, 2n)), `exec_xchg1`)),
 
     // special case: opcode with holes

src/instructions/tlb.ts

@@ -173,12 +173,12 @@ export function generateTlb(
         }
     }
 
-    if (instruction.args.$ === "simpleArgs") {
+    if (name === "XCHG_IJ") {
+        result += "i: (## 4) j: (## 4) { 1 <= i } { i + 1 <= j }"
+    } else if (instruction.args.$ === "simpleArgs") {
         for (const arg of instruction.args.children) {
             generateArg(arg)
         }
-    } else if (instruction.args.$ === "xchgArgs") {
-        result += "i: (## 4) j: (## 4) { 1 <= i } { i + 1 <= j }"
     } else if (instruction.args.$ === "dictpush") {
         result += "d: ^Cell key_len: (## 10)"
     }

validity/input-instr-signature.ts

@@ -40,8 +40,6 @@ const generateArgs = (opcode: Opcode): string[] => {
             return args.children.map(arg => generateArg(arg))
         case "dictpush":
             return ["19", "[0 => {} 2 => {}]"]
-        case "xchgArgs":
-            return ["s1", "s1"]
     }
 }