Update wasmi_ir2 (#1659)

* update ReturnSpan field type

* update BranchTable[Span] len_targets type

* add TryFrom<u32> for Memory

Author: Robbepop

crates/ir2/build/isa.rs

@@ -407,7 +407,7 @@ fn add_control_ops(isa: &mut Isa) {
         )),
         Op::from(GenericOp::new(
             Ident::ReturnSpan,
-            [Field::new(Ident::Values, FieldTy::SlotSpan)],
+            [Field::new(Ident::Values, FieldTy::BoundedSlotSpan)],
         )),
         Op::from(GenericOp::new(
             Ident::Branch,
@@ -417,14 +417,14 @@ fn add_control_ops(isa: &mut Isa) {
             Ident::BranchTable,
             [
                 Field::new(Ident::Index, FieldTy::Slot),
-                Field::new(Ident::LenTargets, FieldTy::U16),
+                Field::new(Ident::LenTargets, FieldTy::U32),
             ],
         )),
         Op::from(GenericOp::new(
             Ident::BranchTableSpan,
             [
                 Field::new(Ident::Index, FieldTy::Slot),
-                Field::new(Ident::LenTargets, FieldTy::U16),
+                Field::new(Ident::LenTargets, FieldTy::U32),
                 Field::new(Ident::Values, FieldTy::SlotSpan),
                 Field::new(Ident::LenValues, FieldTy::U16),
             ],

crates/ir2/src/error.rs

@@ -9,6 +9,10 @@ pub enum Error {
     BranchOffsetOutOfBounds,
     /// Encountered when trying to create a [`BlockFuel`](crate::BlockFuel) from an out of bounds integer.
     BlockFuelOutOfBounds,
+    /// Encountered when trying to create a [`Memory`] from an out of bounds integer.
+    ///
+    /// [`Memory`]: crate::index::Memory
+    MemoryIndexOutOfBounds,
 }
 
 impl fmt::Display for Error {
@@ -17,6 +21,7 @@ impl fmt::Display for Error {
             Self::StackSlotOutOfBounds => "stack slot out of bounds",
             Self::BranchOffsetOutOfBounds => "branch offset out of bounds",
             Self::BlockFuelOutOfBounds => "block fuel out of bounds",
+            Self::MemoryIndexOutOfBounds => "memory index out of bounds",
         };
         f.write_str(s)
     }

crates/ir2/src/index.rs

@@ -62,6 +62,16 @@ macro_rules! define_index {
 }
 for_each_index!(define_index);
 
+impl TryFrom<u32> for Memory {
+    type Error = Error;
+
+    fn try_from(index: u32) -> Result<Self, Self::Error> {
+        u16::try_from(index)
+            .map_err(|_| Error::MemoryIndexOutOfBounds)
+            .map(Self::from)
+    }
+}
+
 impl TryFrom<u32> for Slot {
     type Error = Error;