fix: restore Reserved1/2/3, remove global opcodes re-added by mistake

Signed-off-by: Abhinav Sharma <abhinavs1920bpl@gmail.com>

Author: abhinavs1920

core/engine/src/vm/code_block.rs

@@ -396,24 +396,6 @@ impl CodeBlock {
             | Instruction::CreateUnmappedArgumentsObject { dst }
             | Instruction::RestParameterInit { dst }
             | Instruction::StoreNewArray { dst } => format!("dst:{dst}"),
-            Instruction::HasRestrictedGlobalProperty { dst, index }
-            | Instruction::CanDeclareGlobalFunction { dst, index }
-            | Instruction::CanDeclareGlobalVar { dst, index } => {
-                format!("dst: {dst}, index: {index}")
-            }
-            Instruction::CreateGlobalFunctionBinding {
-                src,
-                configurable,
-                name_index,
-            } => {
-                format!("src: {src}, configurable: {configurable}, name_index: {name_index}")
-            }
-            Instruction::CreateGlobalVarBinding {
-                configurable,
-                name_index,
-            } => {
-                format!("configurable: {configurable}, name_index: {name_index}")
-            }
             Instruction::Add { lhs, rhs, dst }
             | Instruction::Sub { lhs, rhs, dst }
             | Instruction::Div { lhs, rhs, dst }
@@ -895,7 +877,10 @@ impl CodeBlock {
             | Instruction::AsyncGenerator => String::new(),
             Instruction::AddDisposableResource { value } => format!("value: {value}"),
             Instruction::DisposeResources { count } => format!("count: {count}"),
-            Instruction::Reserved4
+            Instruction::Reserved1
+            | Instruction::Reserved2
+            | Instruction::Reserved3
+            | Instruction::Reserved4
             | Instruction::Reserved5
             | Instruction::Reserved6
             | Instruction::Reserved7
@@ -947,7 +932,9 @@ impl CodeBlock {
             | Instruction::Reserved53
             | Instruction::Reserved54
             | Instruction::Reserved55
-            | Instruction::Reserved56 => unreachable!("Reserved opcodes are unreachable"),
+            | Instruction::Reserved56
+            | Instruction::Reserved57
+            | Instruction::Reserved58 => unreachable!("Reserved opcodes are unreachable"),
         }
     }
 }

core/engine/src/vm/flowgraph/mod.rs

@@ -367,12 +367,7 @@ impl CodeBlock {
                 | Instruction::CheckReturn
                 | Instruction::BindThisValue { .. }
                 | Instruction::CreateMappedArgumentsObject { .. }
-                | Instruction::CreateUnmappedArgumentsObject { .. }
-                | Instruction::HasRestrictedGlobalProperty { .. }
-                | Instruction::CanDeclareGlobalFunction { .. }
-                | Instruction::CanDeclareGlobalVar { .. }
-                | Instruction::CreateGlobalFunctionBinding { .. }
-                | Instruction::CreateGlobalVarBinding { .. } => {
+                | Instruction::CreateUnmappedArgumentsObject { .. } => {
                     graph.add_node(previous_pc, NodeShape::None, label.into(), Color::None);
                     graph.add_edge(previous_pc, pc, None, Color::None, EdgeStyle::Line);
                 }
@@ -387,7 +382,10 @@ impl CodeBlock {
                     let label = format!("DisposeResources count: {count}");
                     graph.add_node(previous_pc, NodeShape::None, label.into(), Color::None);
                 }
-                Instruction::Reserved4
+                Instruction::Reserved1
+                | Instruction::Reserved2
+                | Instruction::Reserved3
+                | Instruction::Reserved4
                 | Instruction::Reserved5
                 | Instruction::Reserved6
                 | Instruction::Reserved7
@@ -439,7 +437,9 @@ impl CodeBlock {
                 | Instruction::Reserved53
                 | Instruction::Reserved54
                 | Instruction::Reserved55
-                | Instruction::Reserved56 => unreachable!("Reserved opcodes are unreachable"),
+                | Instruction::Reserved56
+                | Instruction::Reserved57
+                | Instruction::Reserved58 => unreachable!("Reserved opcodes are unreachable"),
             }
         }
 

core/engine/src/vm/opcode/global.rs

@@ -25,7 +25,6 @@ mod environment;
 mod function;
 mod generator;
 mod get;
-mod global;
 mod iteration;
 mod meta;
 mod new;
@@ -71,8 +70,6 @@ pub(crate) use generator::*;
 #[doc(inline)]
 pub(crate) use get::*;
 #[doc(inline)]
-pub(crate) use global::*;
-#[doc(inline)]
 pub(crate) use iteration::*;
 #[doc(inline)]
 pub(crate) use meta::*;
@@ -2145,56 +2142,6 @@ generate_opcodes! {
     ///   - Output: dst
     CreateUnmappedArgumentsObject { dst: RegisterOperand },
 
-    /// Performs [`HasRestrictedGlobalProperty ( N )`][spec]
-    ///
-    /// - Operands:
-    ///   - index: `VaryingOperand`
-    /// - Registers:
-    ///   - Output: dst
-    ///
-    /// [spec]: https://tc39.es/ecma262/#sec-hasrestrictedglobalproperty
-    HasRestrictedGlobalProperty { dst: RegisterOperand, index: IndexOperand },
-
-    /// Performs [`CanDeclareGlobalFunction ( N )`][spec]
-    ///
-    /// - Operands:
-    ///   - index: `VaryingOperand`
-    /// - Registers:
-    ///   - Output: dst
-    ///
-    /// [spec]: https://tc39.es/ecma262/#sec-candeclareglobalfunction
-    CanDeclareGlobalFunction { dst: RegisterOperand, index: IndexOperand },
-
-    /// Performs [`CanDeclareGlobalVar ( N )`][spec]
-    ///
-    /// - Operands:
-    ///   - index: `VaryingOperand`
-    /// - Registers:
-    ///   - Output: dst
-    ///
-    /// [spec]: https://tc39.es/ecma262/#sec-candeclareglobalvar
-    CanDeclareGlobalVar { dst: RegisterOperand, index: IndexOperand },
-
-    /// Performs [`CreateGlobalFunctionBinding ( N, V, D )`][spec]
-    ///
-    /// - Operands:
-    ///   - configurable: `bool`
-    ///   - name_index: `VaryingOperand`
-    /// - Registers:
-    ///   - Input: src
-    ///
-    /// [spec]: https://tc39.es/ecma262/#sec-createglobalfunctionbinding
-    CreateGlobalFunctionBinding { src: RegisterOperand, configurable: IndexOperand, name_index: IndexOperand },
-
-    /// Performs [`CreateGlobalVarBinding ( N, V, D )`][spec]
-    ///
-    /// - Operands:
-    ///   - configurable: `bool`
-    ///   - name_index: `VaryingOperand`
-    ///
-    /// [spec]: https://tc39.es/ecma262/#sec-createglobalvarbinding
-    CreateGlobalVarBinding { configurable: IndexOperand, name_index: IndexOperand },
-
     /// Add a disposable resource to the disposal stack.
     ///
     /// This opcode implements the AddDisposableResource abstract operation.
@@ -2213,6 +2160,12 @@ generate_opcodes! {
     /// - Stack: **=>**
     DisposeResources { count: IndexOperand },
     /// Reserved [`Opcode`].
+    Reserved1 => Reserved,
+    /// Reserved [`Opcode`].
+    Reserved2 => Reserved,
+    /// Reserved [`Opcode`].
+    Reserved3 => Reserved,
+    /// Reserved [`Opcode`].
     Reserved4 => Reserved,
     /// Reserved [`Opcode`].
     Reserved5 => Reserved,
@@ -2318,4 +2271,8 @@ generate_opcodes! {
     Reserved55 => Reserved,
     /// Reserved [`Opcode`].
     Reserved56 => Reserved,
+    /// Reserved [`Opcode`].
+    Reserved57 => Reserved,
+    /// Reserved [`Opcode`].
+    Reserved58 => Reserved,
 }