RustPython
diff --git a/‎Cargo.lock‎
Lines changed: 2 additions & 0 deletions b/‎Cargo.lock‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎compiler/core/Cargo.toml‎
Lines changed: 2 additions & 0 deletions b/‎compiler/core/Cargo.toml‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎compiler/core/src/opcode.rs‎
Lines changed: 26 additions & 5 deletions b/‎compiler/core/src/opcode.rs‎
Lines changed: 26 additions & 5 deletions
@@ -17,6 +17,8 @@ bitflags = { workspace = true }
 itertools = { workspace = true }
 malachite-bigint = { workspace = true }
 num-complex = { workspace = true }
+num_enum = { workspace = true }
+num-traits = { workspace = true }
 
 lz4_flex = "0.11"
 
 
@@ -1,3 +1,4 @@
+use crate::marshal::MarshalError;
 pub use crate::opcodes::{PseudoOpcode, RealOpcode};
 
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
@@ -6,22 +7,42 @@ pub enum Opcode {
     Pseudo(PseudoOpcode),
 }
 
+impl TryFrom<u16> for Opcode {
+    type Error = MarshalError;
+
+    fn try_from(raw: u16) -> Result<Self, Self::Error> {
+        // Try first pseudo opcode. If not, fallback to real opcode.
+        PseudoOpcode::try_from(raw)
+            .map(Opcode::Pseudo)
+            .or_else(|_| {
+                Self::try_from(u8::try_from(raw).map_err(|_| Self::Error::InvalidBytecode)?)
+            })
+    }
+}
+
+impl TryFrom<u8> for Opcode {
+    type Error = MarshalError;
+
+    fn try_from(raw: u8) -> Result<Self, Self::Error> {
+        // u8 can never be a pseduo.
+        RealOpcode::try_from(raw).map(Opcode::Real)
+    }
+}
+
 macro_rules! impl_try_from {
     ($struct_name:ident, $($t:ty),+ $(,)?) => {
         $(
             impl TryFrom<$t> for $struct_name {
-                type Error = ();
+                type Error = MarshalError;
 
                 fn try_from(raw: $t) -> Result<Self, Self::Error> {
-                    RealOpcode::try_from(raw)
-                        .map(Opcode::Real)
-                        .or_else(|_| PseudoOpcode::try_from(raw).map(Opcode::Pseudo))
+                    Self::try_from(u16::try_from(raw).map_err(|_| Self::Error::InvalidBytecode)?)
                 }
             }
         )+
     };
 }
 
 impl_try_from!(
-    Opcode, i8, i16, i32, i64, i128, isize, u8, u16, u32, u64, u128, usize
+    Opcode, i8, i16, i32, i64, i128, isize, u32, u64, u128, usize
 );