Skip to content

chore: Cleanup swf parsing #3194

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
merged 6 commits into from
Feb 28, 2021
Merged

chore: Cleanup swf parsing #3194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d17f9e9
swf: Make avm2 Reader operate directly with byte slices
madsmtm Feb 10, 2021
0094bb4
swf: Deduplicate different read methods
madsmtm Feb 10, 2021
1a674f7
swf: Clean up a few imports
madsmtm Feb 11, 2021
1fb25d5
swf: Change read_tag_with_code to take an already parsed tag
madsmtm Feb 11, 2021
52075ba
swf: Make a few functions const
madsmtm Feb 11, 2021
f24accc
swf: Remove unused encoding from avm1::read::Reader
madsmtm Feb 20, 2021
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
18 changes: 2 additions & 16 deletions core/src/avm1/activation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1460,7 +1460,7 @@ impl<'a, 'gc, 'gc_context> Activation<'a, 'gc, 'gc_context> {
) -> Result<FrameControl<'gc>, Error<'gc>> {
let val = self.context.avm1.pop();
if val.as_bool(self.current_swf_version()) {
self.seek(jump_offset, reader, data)?;
reader.seek(data.as_ref(), jump_offset);
}
Ok(FrameControl::Continue)
}
Expand Down Expand Up @@ -1543,7 +1543,7 @@ impl<'a, 'gc, 'gc_context> Activation<'a, 'gc, 'gc_context> {
reader: &mut Reader<'b>,
data: &'b SwfSlice,
) -> Result<FrameControl<'gc>, Error<'gc>> {
self.seek(jump_offset, reader, data)?;
reader.seek(data.as_ref(), jump_offset);
Ok(FrameControl::Continue)
}

Expand Down Expand Up @@ -3008,18 +3008,4 @@ impl<'a, 'gc, 'gc_context> Activation<'a, 'gc, 'gc_context> {
Ok(FrameControl::Continue)
}
}

fn seek<'b>(
&self,
jump_offset: i16,
reader: &mut Reader<'b>,
data: &'b SwfSlice,
) -> Result<(), Error<'gc>> {
let slice = data.movie.data();
let mut pos = reader.get_ref().as_ptr() as usize - slice.as_ptr() as usize;
pos = (pos as isize + isize::from(jump_offset)) as usize;
pos = pos.min(slice.len());
*reader.get_mut() = &slice[pos as usize..];
Ok(())
}
}
146 changes: 81 additions & 65 deletions core/src/avm2/activation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ use crate::avm2::{value, Avm2, Error};
use crate::context::UpdateContext;
use gc_arena::{Gc, GcCell, MutationContext};
use smallvec::SmallVec;
use std::io::Cursor;
use swf::avm2::read::Reader;
use swf::avm2::types::{
Class as AbcClass, Index, Method as AbcMethod, Multiname as AbcMultiname,
Expand Down Expand Up @@ -507,10 +506,11 @@ impl<'a, 'gc, 'gc_context> Activation<'a, 'gc, 'gc_context> {
let body: Result<_, Error> = method
.body()
.ok_or_else(|| "Cannot execute non-native method without body".into());
let mut read = Reader::new(Cursor::new(body?.code.as_ref()));
let body = body?;
let mut reader = Reader::new(&body.code);

loop {
let result = self.do_next_opcode(method, &mut read);
let result = self.do_next_opcode(method, &mut reader, &body.code);
match result {
Ok(FrameControl::Return(value)) => break Ok(value),
Ok(FrameControl::Continue) => {}
Expand All @@ -520,10 +520,11 @@ impl<'a, 'gc, 'gc_context> Activation<'a, 'gc, 'gc_context> {
}

/// Run a single action from a given action reader.
fn do_next_opcode(
fn do_next_opcode<'b>(
&mut self,
method: Gc<'gc, BytecodeMethod<'gc>>,
reader: &mut Reader<Cursor<&[u8]>>,
reader: &mut Reader<'b>,
full_data: &'b [u8],
) -> Result<FrameControl<'gc>, Error> {
if self.context.update_start.elapsed() >= self.context.max_execution_duration {
return Err(
Expand Down Expand Up @@ -635,21 +636,21 @@ impl<'a, 'gc, 'gc_context> Activation<'a, 'gc, 'gc_context> {
Op::SubtractI => self.op_subtract_i(),
Op::Swap => self.op_swap(),
Op::URShift => self.op_urshift(),
Op::Jump { offset } => self.op_jump(offset, reader),
Op::IfTrue { offset } => self.op_if_true(offset, reader),
Op::IfFalse { offset } => self.op_if_false(offset, reader),
Op::IfStrictEq { offset } => self.op_if_strict_eq(offset, reader),
Op::IfStrictNe { offset } => self.op_if_strict_ne(offset, reader),
Op::IfEq { offset } => self.op_if_eq(offset, reader),
Op::IfNe { offset } => self.op_if_ne(offset, reader),
Op::IfGe { offset } => self.op_if_ge(offset, reader),
Op::IfGt { offset } => self.op_if_gt(offset, reader),
Op::IfLe { offset } => self.op_if_le(offset, reader),
Op::IfLt { offset } => self.op_if_lt(offset, reader),
Op::IfNge { offset } => self.op_if_nge(offset, reader),
Op::IfNgt { offset } => self.op_if_ngt(offset, reader),
Op::IfNle { offset } => self.op_if_nle(offset, reader),
Op::IfNlt { offset } => self.op_if_nlt(offset, reader),
Op::Jump { offset } => self.op_jump(offset, reader, full_data),
Op::IfTrue { offset } => self.op_if_true(offset, reader, full_data),
Op::IfFalse { offset } => self.op_if_false(offset, reader, full_data),
Op::IfStrictEq { offset } => self.op_if_strict_eq(offset, reader, full_data),
Op::IfStrictNe { offset } => self.op_if_strict_ne(offset, reader, full_data),
Op::IfEq { offset } => self.op_if_eq(offset, reader, full_data),
Op::IfNe { offset } => self.op_if_ne(offset, reader, full_data),
Op::IfGe { offset } => self.op_if_ge(offset, reader, full_data),
Op::IfGt { offset } => self.op_if_gt(offset, reader, full_data),
Op::IfLe { offset } => self.op_if_le(offset, reader, full_data),
Op::IfLt { offset } => self.op_if_lt(offset, reader, full_data),
Op::IfNge { offset } => self.op_if_nge(offset, reader, full_data),
Op::IfNgt { offset } => self.op_if_ngt(offset, reader, full_data),
Op::IfNle { offset } => self.op_if_nle(offset, reader, full_data),
Op::IfNlt { offset } => self.op_if_nlt(offset, reader, full_data),
Op::StrictEquals => self.op_strict_equals(),
Op::Equals => self.op_equals(),
Op::GreaterEquals => self.op_greater_equals(),
Expand Down Expand Up @@ -1834,219 +1835,234 @@ impl<'a, 'gc, 'gc_context> Activation<'a, 'gc, 'gc_context> {
Ok(FrameControl::Continue)
}

fn op_jump(
fn op_jump<'b>(
&mut self,
offset: i32,
reader: &mut Reader<Cursor<&[u8]>>,
reader: &mut Reader<'b>,
full_data: &'b [u8],
) -> Result<FrameControl<'gc>, Error> {
reader.seek(offset as i64)?;
reader.seek(full_data, offset);

Ok(FrameControl::Continue)
}

fn op_if_true(
fn op_if_true<'b>(
&mut self,
offset: i32,
reader: &mut Reader<Cursor<&[u8]>>,
reader: &mut Reader<'b>,
full_data: &'b [u8],
) -> Result<FrameControl<'gc>, Error> {
let value = self.context.avm2.pop().coerce_to_boolean();

if value {
reader.seek(offset as i64)?;
reader.seek(full_data, offset);
}

Ok(FrameControl::Continue)
}

fn op_if_false(
fn op_if_false<'b>(
&mut self,
offset: i32,
reader: &mut Reader<Cursor<&[u8]>>,
reader: &mut Reader<'b>,
full_data: &'b [u8],
) -> Result<FrameControl<'gc>, Error> {
let value = self.context.avm2.pop().coerce_to_boolean();

if !value {
reader.seek(offset as i64)?;
reader.seek(full_data, offset);
}

Ok(FrameControl::Continue)
}

fn op_if_strict_eq(
fn op_if_strict_eq<'b>(
&mut self,
offset: i32,
reader: &mut Reader<Cursor<&[u8]>>,
reader: &mut Reader<'b>,
full_data: &'b [u8],
) -> Result<FrameControl<'gc>, Error> {
let value2 = self.context.avm2.pop();
let value1 = self.context.avm2.pop();

if value1 == value2 {
reader.seek(offset as i64)?;
reader.seek(full_data, offset);
}

Ok(FrameControl::Continue)
}

fn op_if_strict_ne(
fn op_if_strict_ne<'b>(
&mut self,
offset: i32,
reader: &mut Reader<Cursor<&[u8]>>,
reader: &mut Reader<'b>,
full_data: &'b [u8],
) -> Result<FrameControl<'gc>, Error> {
let value2 = self.context.avm2.pop();
let value1 = self.context.avm2.pop();

if value1 != value2 {
reader.seek(offset as i64)?;
reader.seek(full_data, offset);
}

Ok(FrameControl::Continue)
}

fn op_if_eq(
fn op_if_eq<'b>(
&mut self,
offset: i32,
reader: &mut Reader<Cursor<&[u8]>>,
reader: &mut Reader<'b>,
full_data: &'b [u8],
) -> Result<FrameControl<'gc>, Error> {
let value2 = self.context.avm2.pop();
let value1 = self.context.avm2.pop();

if value1.abstract_eq(&value2, self)? {
reader.seek(offset as i64)?;
reader.seek(full_data, offset);
}

Ok(FrameControl::Continue)
}

fn op_if_ne(
fn op_if_ne<'b>(
&mut self,
offset: i32,
reader: &mut Reader<Cursor<&[u8]>>,
reader: &mut Reader<'b>,
full_data: &'b [u8],
) -> Result<FrameControl<'gc>, Error> {
let value2 = self.context.avm2.pop();
let value1 = self.context.avm2.pop();

if !value1.abstract_eq(&value2, self)? {
reader.seek(offset as i64)?;
reader.seek(full_data, offset);
}

Ok(FrameControl::Continue)
}

fn op_if_ge(
fn op_if_ge<'b>(
&mut self,
offset: i32,
reader: &mut Reader<Cursor<&[u8]>>,
reader: &mut Reader<'b>,
full_data: &'b [u8],
) -> Result<FrameControl<'gc>, Error> {
let value2 = self.context.avm2.pop();
let value1 = self.context.avm2.pop();

if value1.abstract_lt(&value2, self)? == Some(false) {
reader.seek(offset as i64)?;
reader.seek(full_data, offset);
}

Ok(FrameControl::Continue)
}

fn op_if_gt(
fn op_if_gt<'b>(
&mut self,
offset: i32,
reader: &mut Reader<Cursor<&[u8]>>,
reader: &mut Reader<'b>,
full_data: &'b [u8],
) -> Result<FrameControl<'gc>, Error> {
let value2 = self.context.avm2.pop();
let value1 = self.context.avm2.pop();

if value2.abstract_lt(&value1, self)? == Some(true) {
reader.seek(offset as i64)?;
reader.seek(full_data, offset);
}

Ok(FrameControl::Continue)
}

fn op_if_le(
fn op_if_le<'b>(
&mut self,
offset: i32,
reader: &mut Reader<Cursor<&[u8]>>,
reader: &mut Reader<'b>,
full_data: &'b [u8],
) -> Result<FrameControl<'gc>, Error> {
let value2 = self.context.avm2.pop();
let value1 = self.context.avm2.pop();

if value2.abstract_lt(&value1, self)? == Some(false) {
reader.seek(offset as i64)?;
reader.seek(full_data, offset);
}

Ok(FrameControl::Continue)
}

fn op_if_lt(
fn op_if_lt<'b>(
&mut self,
offset: i32,
reader: &mut Reader<Cursor<&[u8]>>,
reader: &mut Reader<'b>,
full_data: &'b [u8],
) -> Result<FrameControl<'gc>, Error> {
let value2 = self.context.avm2.pop();
let value1 = self.context.avm2.pop();

if value1.abstract_lt(&value2, self)? == Some(true) {
reader.seek(offset as i64)?;
reader.seek(full_data, offset);
}

Ok(FrameControl::Continue)
}

fn op_if_nge(
fn op_if_nge<'b>(
&mut self,
offset: i32,
reader: &mut Reader<Cursor<&[u8]>>,
reader: &mut Reader<'b>,
full_data: &'b [u8],
) -> Result<FrameControl<'gc>, Error> {
let value2 = self.context.avm2.pop();
let value1 = self.context.avm2.pop();

if value1.abstract_lt(&value2, self)?.unwrap_or(true) {
reader.seek(offset as i64)?;
reader.seek(full_data, offset);
}

Ok(FrameControl::Continue)
}

fn op_if_ngt(
fn op_if_ngt<'b>(
&mut self,
offset: i32,
reader: &mut Reader<Cursor<&[u8]>>,
reader: &mut Reader<'b>,
full_data: &'b [u8],
) -> Result<FrameControl<'gc>, Error> {
let value2 = self.context.avm2.pop();
let value1 = self.context.avm2.pop();

if !value2.abstract_lt(&value1, self)?.unwrap_or(false) {
reader.seek(offset as i64)?;
reader.seek(full_data, offset);
}

Ok(FrameControl::Continue)
}

fn op_if_nle(
fn op_if_nle<'b>(
&mut self,
offset: i32,
reader: &mut Reader<Cursor<&[u8]>>,
reader: &mut Reader<'b>,
full_data: &'b [u8],
) -> Result<FrameControl<'gc>, Error> {
let value2 = self.context.avm2.pop();
let value1 = self.context.avm2.pop();

if value2.abstract_lt(&value1, self)?.unwrap_or(true) {
reader.seek(offset as i64)?;
reader.seek(full_data, offset);
}

Ok(FrameControl::Continue)
}

fn op_if_nlt(
fn op_if_nlt<'b>(
&mut self,
offset: i32,
reader: &mut Reader<Cursor<&[u8]>>,
reader: &mut Reader<'b>,
full_data: &'b [u8],
) -> Result<FrameControl<'gc>, Error> {
let value2 = self.context.avm2.pop();
let value1 = self.context.avm2.pop();

if !value1.abstract_lt(&value2, self)?.unwrap_or(false) {
reader.seek(offset as i64)?;
reader.seek(full_data, offset);
}

Ok(FrameControl::Continue)
Expand Down
Loading