feat: simplify Arg in layout, remove the runvmArg and hash cases

i582 · i582 · commit e748541959da · 2025-10-16T00:57:33.000+04:00
diff --git a/data/continuation_jump.json b/data/continuation_jump.json
@@ -514,7 +514,11 @@
           {
             "type": "simple",
             "name": "flags",
-            "value_types": ["Int"]
+            "value_types": ["Int"],
+            "range": {
+              "min": 0,
+              "max": 511
+            }
           }
         ],
         "registers": []
diff --git a/examples/golang/tasm-go/spec/spec.go b/examples/golang/tasm-go/spec/spec.go
diff --git a/examples/golang/tasm-go/tasm/decompile.go b/examples/golang/tasm-go/tasm/decompile.go
@@ -294,10 +294,6 @@ func loader(instructions []spec.Instruction) loaderFunc {
 					args = append(args, StackRegister{idx: 1})
 				case "minusOne":
 					args = append(args, -1)
-				case "hash":
-					args = append(args, slice.MustLoadUInt(8))
-				case "runvmArg":
-					args = append(args, slice.MustLoadUInt(12))
 				case "refCodeSlice":
 					val, _ := slice.LoadRefCell()
 					args = append(args, decompileCell(val))
diff --git a/gen/schema.json b/gen/schema.json
@@ -457,12 +457,6 @@
         {
           "$ref": "#/definitions/LargeIntArg"
         },
-        {
-          "$ref": "#/definitions/RunvmArg"
-        },
-        {
-          "$ref": "#/definitions/HashArg"
-        },
         {
           "$ref": "#/definitions/MinusOneArg"
         },
@@ -628,28 +622,6 @@
       "required": ["$", "range"],
       "additionalProperties": false
     },
-    "RunvmArg": {
-      "type": "object",
-      "properties": {
-        "$": {
-          "type": "string",
-          "const": "runvmArg"
-        }
-      },
-      "required": ["$"],
-      "additionalProperties": false
-    },
-    "HashArg": {
-      "type": "object",
-      "properties": {
-        "$": {
-          "type": "string",
-          "const": "hash"
-        }
-      },
-      "required": ["$"],
-      "additionalProperties": false
-    },
     "MinusOneArg": {
       "type": "object",
       "properties": {
diff --git a/gen/tvm-specification.json b/gen/tvm-specification.json
@@ -11117,7 +11117,11 @@
             {
               "type": "simple",
               "name": "flags",
-              "value_types": ["Int"]
+              "value_types": ["Int"],
+              "range": {
+                "min": 0,
+                "max": 511
+              }
             }
           ],
           "registers": []
@@ -61271,7 +61275,12 @@
           "$": "simpleArgs",
           "children": [
             {
-              "$": "runvmArg"
+              "$": "uint",
+              "len": 12,
+              "range": {
+                "min": "0",
+                "max": "511"
+              }
             }
           ]
         },
@@ -64647,7 +64656,12 @@
           "$": "simpleArgs",
           "children": [
             {
-              "$": "hash"
+              "$": "uint",
+              "len": 8,
+              "range": {
+                "min": "0",
+                "max": "4"
+              }
             }
           ]
         },
@@ -64725,7 +64739,12 @@
           "$": "simpleArgs",
           "children": [
             {
-              "$": "hash"
+              "$": "uint",
+              "len": 8,
+              "range": {
+                "min": "0",
+                "max": "4"
+              }
             }
           ]
         },
@@ -64803,7 +64822,12 @@
           "$": "simpleArgs",
           "children": [
             {
-              "$": "hash"
+              "$": "uint",
+              "len": 8,
+              "range": {
+                "min": "0",
+                "max": "4"
+              }
             }
           ]
         },
@@ -64886,7 +64910,12 @@
           "$": "simpleArgs",
           "children": [
             {
-              "$": "hash"
+              "$": "uint",
+              "len": 8,
+              "range": {
+                "min": "0",
+                "max": "4"
+              }
             }
           ]
         },
diff --git a/src/instructions/instructions.ts b/src/instructions/instructions.ts
@@ -7,8 +7,6 @@ export type arg =
     | plduzArg
     | tinyInt
     | largeInt
-    | runvmArg
-    | hash
     | minusOne
     | s1
     | setcpArg
@@ -62,12 +60,6 @@ export const s1: s1 = {$: "s1"}
 export type minusOne = {$: "minusOne"}
 export const minusOne: minusOne = {$: "minusOne"}
 
-export type runvmArg = {$: "runvmArg"}
-export const runvmArg: runvmArg = {$: "runvmArg"}
-
-export type hash = {$: "hash"}
-export const hash: hash = {$: "hash"}
-
 // special case: [-15, 239]
 export type setcpArg = {$: "setcpArg", range: range}
 export const setcpArg: setcpArg = {$: "setcpArg", range: range(-15n, 239n)}
@@ -565,6 +557,7 @@ const uint7 = uint(7, uint7range)
 const uint8 = uint(8, uint8range)
 const uint11 = uint(11, uint11range)
 const uint14 = uint(14, uint14range)
+const hash = uint(8, {min: 0n, max: 4n})
 
 export const instructions: Record<string, Opcode> = {
     PUSHNAN: cat("int_const", mksimple(0x83ff, 16, `exec_push_nan`)),
@@ -1368,7 +1361,7 @@ export const instructions: Record<string, Opcode> = {
     SAVEALTCTR: cat("continuation_change", mkfixedrangen(0xedb0, 0xedb8, 16, 4, seq(control), `exec_savealt_ctr`)),
     SAVEBOTHCTR: cat("continuation_change", mkfixedrangen(0xedc0, 0xedc8, 16, 4, seq(control), `exec_saveboth_ctr`)),
 
-    RUNVM: version(4, cat("continuation_jump", mkfixedn(0xdb4, 12, 12, seq(runvmArg), `exec_runvm`))),
+    RUNVM: version(4, cat("continuation_jump", mkfixedn(0xdb4, 12, 12, seq(uint(12, {min: 0n, max: 511n})), `exec_runvm`))),
 
     // special case: numeric
     "2SWAP": cat("stack", mksimple(0x5a, 8, `exec_2swap`)),
diff --git a/src/instructions/tlb.ts b/src/instructions/tlb.ts
@@ -127,10 +127,6 @@ export function generateTlb(
                 result += `${name}: ^Cell `
                 break
             }
-            case "runvmArg": {
-                result += "flags: (## 12)"
-                break
-            }
             case "delta": {
                 generateArg(arg.arg)
                 break
@@ -147,11 +143,6 @@ export function generateTlb(
                 result += "len: (## 5) data: (int (8 * l + 19))"
                 break
             }
-            case "hash": {
-                const name = variableNameGenerator() ?? "i"
-                result += `${name}: (## 8)`
-                break
-            }
             case "minusOne": {
                 const name = variableNameGenerator()
                 result += `${name}: (## 4) `
diff --git a/src/types/specification-schema.ts b/src/types/specification-schema.ts
@@ -403,8 +403,6 @@ export type Arg =
     | PlduzArg
     | TinyIntArg
     | LargeIntArg
-    | RunvmArg
-    | HashArg
     | MinusOneArg
     | S1Arg
     | SetcpArg
@@ -488,14 +486,6 @@ export interface LargeIntArg {
     range: ArgRange
 }
 
-export interface RunvmArg {
-    $: "runvmArg"
-}
-
-export interface HashArg {
-    $: "hash"
-}
-
 export interface MinusOneArg {
     $: "minusOne"
 }
diff --git a/validity/input-instr-signature.ts b/validity/input-instr-signature.ts
@@ -90,8 +90,6 @@ const generateArg = (arg: arg): string => {
             return `boc{${DEFAULT_CODE_SLICE}}`
         case "slice":
             return DEFAULT_SLICE
-        case "hash":
-            return "1"
         case "s1":
             return "s1"
         case "plduzArg":

Original file line number	Diff line number	Diff line change
`@@ -514,7 +514,11 @@`
`514`	`514`	`{`
`515`	`515`	`"type": "simple",`
`516`	`516`	`"name": "flags",`
`517`		`- "value_types": ["Int"]`
	`517`	`+ "value_types": ["Int"],`
	`518`	`+ "range": {`
	`519`	`+ "min": 0,`
	`520`	`+ "max": 511`
	`521`	`+ }`
`518`	`522`	`}`
`519`	`523`	`],`
`520`	`524`	`"registers": []`
Original file line number	Diff line number	Diff line change
`@@ -11117,7 +11117,11 @@`
`11117`	`11117`	`{`
`11118`	`11118`	`"type": "simple",`
`11119`	`11119`	`"name": "flags",`
`11120`		`- "value_types": ["Int"]`
	`11120`	`+ "value_types": ["Int"],`
	`11121`	`+ "range": {`
	`11122`	`+ "min": 0,`
	`11123`	`+ "max": 511`
	`11124`	`+ }`
`11121`	`11125`	`}`
`11122`	`11126`	`],`
`11123`	`11127`	`"registers": []`
`@@ -61271,7 +61275,12 @@`
`61271`	`61275`	`"$": "simpleArgs",`
`61272`	`61276`	`"children": [`
`61273`	`61277`	`{`
`61274`		`- "$": "runvmArg"`
	`61278`	`+ "$": "uint",`
	`61279`	`+ "len": 12,`
	`61280`	`+ "range": {`
	`61281`	`+ "min": "0",`
	`61282`	`+ "max": "511"`
	`61283`	`+ }`
`61275`	`61284`	`}`
`61276`	`61285`	`]`
`61277`	`61286`	`},`
`@@ -64647,7 +64656,12 @@`
`64647`	`64656`	`"$": "simpleArgs",`
`64648`	`64657`	`"children": [`
`64649`	`64658`	`{`
`64650`		`- "$": "hash"`
	`64659`	`+ "$": "uint",`
	`64660`	`+ "len": 8,`
	`64661`	`+ "range": {`
	`64662`	`+ "min": "0",`
	`64663`	`+ "max": "4"`
	`64664`	`+ }`
`64651`	`64665`	`}`
`64652`	`64666`	`]`
`64653`	`64667`	`},`
`@@ -64725,7 +64739,12 @@`
`64725`	`64739`	`"$": "simpleArgs",`
`64726`	`64740`	`"children": [`
`64727`	`64741`	`{`
`64728`		`- "$": "hash"`
	`64742`	`+ "$": "uint",`
	`64743`	`+ "len": 8,`
	`64744`	`+ "range": {`
	`64745`	`+ "min": "0",`
	`64746`	`+ "max": "4"`
	`64747`	`+ }`
`64729`	`64748`	`}`
`64730`	`64749`	`]`
`64731`	`64750`	`},`
`@@ -64803,7 +64822,12 @@`
`64803`	`64822`	`"$": "simpleArgs",`
`64804`	`64823`	`"children": [`
`64805`	`64824`	`{`
`64806`		`- "$": "hash"`
	`64825`	`+ "$": "uint",`
	`64826`	`+ "len": 8,`
	`64827`	`+ "range": {`
	`64828`	`+ "min": "0",`
	`64829`	`+ "max": "4"`
	`64830`	`+ }`
`64807`	`64831`	`}`
`64808`	`64832`	`]`
`64809`	`64833`	`},`
`@@ -64886,7 +64910,12 @@`
`64886`	`64910`	`"$": "simpleArgs",`
`64887`	`64911`	`"children": [`
`64888`	`64912`	`{`
`64889`		`- "$": "hash"`
	`64913`	`+ "$": "uint",`
	`64914`	`+ "len": 8,`
	`64915`	`+ "range": {`
	`64916`	`+ "min": "0",`
	`64917`	`+ "max": "4"`
	`64918`	`+ }`
`64890`	`64919`	`}`
`64891`	`64920`	`]`
`64892`	`64921`	`},`