WIP INCLUDE OPERANDKINDS FOR EXTENDED GRAMMAR

MarijnS95 · MarijnS95 · commit 3e55be3315b3 · 2025-10-13T00:11:20.000+02:00
diff --git a/autogen/external/SPIRV-Headers b/autogen/external/SPIRV-Headers
@@ -1 +1 @@
-Subproject commit 09913f088a1197aba4aefd300a876b2ebbaa3391
+Subproject commit 372b0a34cbe2ad2c1493004e1e2a3fc8715af928
diff --git a/autogen/src/header.rs b/autogen/src/header.rs
@@ -400,5 +400,7 @@ pub fn gen_opcodes(op: &str, grammar: &structs::ExtInstSetGrammar, comment: &str
         })
         .collect::<Vec<_>>();
 
+    dbg!(&grammar.operand_kinds);
+
     generate_enum(&op, &variants, comment)
 }
diff --git a/autogen/src/structs.rs b/autogen/src/structs.rs
@@ -79,6 +79,8 @@ pub struct ExtInstSetGrammar {
     pub version: Option<u32>,
     pub revision: u32,
     pub instructions: Vec<Instruction>,
+    #[serde(default)]
+    pub operand_kinds: Vec<OperandKind>,
 }
 
 fn num_or_hex<'de, D: de::Deserializer<'de>>(d: D) -> result::Result<u32, D::Error> {
@@ -92,7 +94,8 @@ fn num_or_hex<'de, D: de::Deserializer<'de>>(d: D) -> result::Result<u32, D::Err
         }
 
         fn visit_str<E: de::Error>(self, value: &str) -> result::Result<Self::Value, E> {
-            Ok(u32::from_str_radix(&value[2..], 16).unwrap())
+            let hex = value.strip_prefix("0x").unwrap();
+            Ok(u32::from_str_radix(hex, 16).unwrap())
         }
 
         fn visit_u64<E: de::Error>(self, value: u64) -> result::Result<Self::Value, E> {

Original file line number	Diff line number	Diff line change
`@@ -400,5 +400,7 @@ pub fn gen_opcodes(op: &str, grammar: &structs::ExtInstSetGrammar, comment: &str`
`400`	`400`	`})`
`401`	`401`	`.collect::<Vec<_>>();`
`402`	`402`
	`403`	`+ dbg!(&grammar.operand_kinds);`
	`404`	`+`
`403`	`405`	`generate_enum(&op, &variants, comment)`
`404`	`406`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,8 @@ pub struct ExtInstSetGrammar {`
`79`	`79`	`pub version: Option<u32>,`
`80`	`80`	`pub revision: u32,`
`81`	`81`	`pub instructions: Vec<Instruction>,`
	`82`	`+ #[serde(default)]`
	`83`	`+ pub operand_kinds: Vec<OperandKind>,`
`82`	`84`	`}`
`83`	`85`
`84`	`86`	`fn num_or_hex<'de, D: de::Deserializer<'de>>(d: D) -> result::Result<u32, D::Error> {`
`@@ -92,7 +94,8 @@ fn num_or_hex<'de, D: de::Deserializer<'de>>(d: D) -> result::Result<u32, D::Err`
`92`	`94`	`}`
`93`	`95`
`94`	`96`	`fn visit_str<E: de::Error>(self, value: &str) -> result::Result<Self::Value, E> {`
`95`		`- Ok(u32::from_str_radix(&value[2..], 16).unwrap())`
	`97`	`+ let hex = value.strip_prefix("0x").unwrap();`
	`98`	`+ Ok(u32::from_str_radix(hex, 16).unwrap())`
`96`	`99`	`}`
`97`	`100`
`98`	`101`	`fn visit_u64<E: de::Error>(self, value: u64) -> result::Result<Self::Value, E> {`