remove StaticPropAccessW and make the existing one wide

y21 · May 5, 2024 · c175698 · c175698
1 parent 44a0255
commit c175698
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/crates/dash_compiler/src/instruction.rs b/crates/dash_compiler/src/instruction.rs
@@ -181,7 +181,8 @@ impl<'cx, 'interner> InstructionBuilder<'cx, 'interner> {
 
     pub fn build_static_prop_access(&mut self, ident: Symbol, preserve_this: bool) -> Result<(), LimitExceededError> {
         let id = self.current_function_mut().cp.add(Constant::Identifier(ident))?;
-        self.write_wide_instr(Instruction::StaticPropAccess, Instruction::StaticPropAccessW, id);
+        self.write_instr(Instruction::StaticPropAccess);
+        self.writew(id);
         self.write(preserve_this.into());
 
         Ok(())

diff --git a/crates/dash_decompiler/src/decompiler.rs b/crates/dash_decompiler/src/decompiler.rs
@@ -210,15 +210,10 @@ impl<'interner, 'buf> FunctionDecompiler<'interner, 'buf> {
                     );
                 }
                 Instruction::StaticPropAccess => {
-                    let b = self.read()?;
+                    let b = self.read_i16()?;
                     let _preserve_this = self.read()?;
                     self.handle_op_instr("staticpropaccess", &[&self.display(&self.constants[b as usize])]);
                 }
-                Instruction::StaticPropAccessW => {
-                    let b = self.read_u16()?;
-                    let _preserve_this = self.read()?;
-                    self.handle_op_instr("staticpropaccessw", &[&self.display(&self.constants[b as usize])]);
-                }
                 Instruction::Ret => {
                     self.read_u16()?; // intentionally ignored
                     self.handle_opless_instr("ret")

diff --git a/crates/dash_middle/src/compiler/instruction.rs b/crates/dash_middle/src/compiler/instruction.rs
@@ -42,7 +42,6 @@ pub enum Instruction {
     JmpFalseP,
     Jmp,
     StaticPropAccess,
-    StaticPropAccessW,
     DynamicPropAccess,
     ArrayLit,
     ArrayLitW,

diff --git a/crates/dash_vm/src/dispatch.rs b/crates/dash_vm/src/dispatch.rs
@@ -1474,7 +1474,7 @@ mod handlers {
     }
 
     pub fn staticpropertyaccess<'sc, 'vm>(mut cx: DispatchContext<'sc, 'vm>) -> Result<Option<HandleResult>, Unrooted> {
-        let id = cx.fetch_and_inc_ip();
+        let id = cx.fetchw_and_inc_ip();
         let ident = cx.identifier_constant(id.into());
 
         let preserve_this = cx.fetch_and_inc_ip() == 1;