Skip to content

avm2: Remove pushshort op #23491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Lord-McSweeney merged 2 commits into from
Apr 19, 2026
+8 −29
Merged

avm2: Remove pushshort op #23491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a1c1b4
avm2: Merge `Op::PushShort` with `Op::PushInt`
Lord-McSweeney Apr 19, 2026
c466fe4
avm2: Improve use of valid_unsigned and valid_integer in optimizer
Lord-McSweeney Apr 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions core/src/avm2/activation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,6 @@ impl<'a, 'gc> Activation<'a, 'gc> {
Op::PushInt { value } => self.op_push_int(*value),
Op::PushNamespace { namespace } => self.op_push_namespace(*namespace),
Op::PushNull => self.op_push_null(),
Op::PushShort { value } => self.op_push_short(*value),
Op::PushString { string } => self.op_push_string(*string),
Op::PushTrue => self.op_push_true(),
Op::PushUint { value } => self.op_push_uint(*value),
Expand Down Expand Up @@ -981,11 +980,6 @@ impl<'a, 'gc> Activation<'a, 'gc> {
Ok(())
}

fn op_push_short(&mut self, value: i16) -> Result<(), Error<'gc>> {
self.push_stack(value);
Ok(())
}

fn op_push_string(&mut self, string: AvmAtom<'gc>) -> Result<(), Error<'gc>> {
self.push_stack(string);
Ok(())
Expand Down
5 changes: 0 additions & 5 deletions core/src/avm2/op.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,9 +268,6 @@ pub enum Op<'gc> {
},
PushNull,
PushScope,
PushShort {
value: i16,
},
PushString {
string: AvmAtom<'gc>,
},
Expand Down Expand Up @@ -369,7 +366,6 @@ impl Op<'_> {
| Op::PushInt { .. }
| Op::PushNamespace { .. }
| Op::PushNull
| Op::PushShort { .. }
| Op::PushString { .. }
| Op::PushTrue
| Op::PushUint { .. }
Expand Down Expand Up @@ -407,7 +403,6 @@ impl Op<'_> {
| Op::PushNull
| Op::PushDouble { .. }
| Op::PushInt { .. }
| Op::PushShort { .. }
| Op::PushUint { .. }
| Op::GetLocal { .. }
| Op::Dup
Expand Down
18 changes: 3 additions & 15 deletions core/src/avm2/optimizer/type_aware.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -901,31 +901,19 @@ fn abstract_interpret_ops<'gc>(
Op::PushUndefined => {
stack.push_class(activation, types.void)?;
}
Op::PushShort { value } => {
Op::PushInt { value } => {
let mut new_value = OptValue::of_type(types.int);
new_value.contains_valid_integer = true;
if value >= 0 {
new_value.contains_valid_unsigned = true;
}
stack.push(activation, new_value)?;
}
Op::PushInt { value } => {
let mut new_value = OptValue::of_type(types.int);
if value < -(1 << 28) || value >= (1 << 28) {
// will be coerced to Number
} else {
new_value.contains_valid_integer = true;
if value >= 0 {
new_value.contains_valid_unsigned = true;
}
}
stack.push(activation, new_value)?;
}
Op::PushUint { value } => {
let mut new_value = OptValue::of_type(types.uint);
if value < (1 << 28) {
new_value.contains_valid_unsigned = true;
if value <= (i32::MAX as u32) {
new_value.contains_valid_integer = true;
new_value.contains_valid_unsigned = true;
}
stack.push(activation, new_value)?;
}
Expand Down
8 changes: 5 additions & 3 deletions core/src/avm2/verify.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,8 +693,8 @@ fn translate_op<'gc>(
}

let op = match op {
AbcOp::PushByte { value } => Op::PushShort {
value: value as i8 as i16,
AbcOp::PushByte { value } => Op::PushInt {
value: value as i8 as i32,
},
AbcOp::PushDouble { value } => {
let value = translation_unit.pool_double_or_err(activation, value)?;
Expand All @@ -714,7 +714,9 @@ fn translate_op<'gc>(
}
AbcOp::PushNaN => Op::PushDouble { value: f64::NAN },
AbcOp::PushNull => Op::PushNull,
AbcOp::PushShort { value } => Op::PushShort { value },
AbcOp::PushShort { value } => Op::PushInt {
value: value as i32,
},
AbcOp::PushString { value } => {
let string = translation_unit.pool_string_or_err(value, activation)?;

Expand Down
Loading