Skip to content

Update to avm1-types 0.10 #9

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to avm1-types 0.10 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ readme = "README.md"
description = "Adobe Flash / SWF preservation tools."

[dependencies]
avm1-parser = "0.2.0"
avm1-tree = "0.2.1"
avm1-parser = "0.10.0"
avm1-types = "0.10.0"
swf-parser = "0.11.0"
swf-types = "0.11.0"
svg = "0.5.12"
Expand Down
84 changes: 44 additions & 40 deletions src/avm1.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
use crate::timeline::Frame;
use avm1_parser::parse_cfg;
use avm1_types::cfg::{Action, Cfg, CfgBlock, CfgFlow};
use avm1_types::PushValue;

#[derive(Clone, Debug)]
pub enum Value {
Expand Down Expand Up @@ -54,19 +57,13 @@ pub struct Code {
}

impl Code {
pub fn parse_and_compile(mut data: &[u8]) -> Self {
let mut actions = vec![];
while data[0] != 0 {
let (rest, action) = avm1_parser::parse_action(data).unwrap();
data = rest;
actions.push(action);
}
assert_eq!(data, [0]);
pub fn parse_and_compile(data: &[u8]) -> Self {
let cfg = parse_cfg(data);

Code::compile(actions)
Code::compile(cfg)
}

pub fn compile(actions: Vec<avm1_tree::Action>) -> Self {
pub fn compile(cfg: Cfg) -> Self {
let mut consts = vec![];
let mut regs = vec![];
let mut stack = vec![];
Expand All @@ -77,48 +74,44 @@ impl Code {
regs.push(Value::Undefined);
regs.pop();

for action in actions {
// FIXME(demurgos) Handle control flow, we're currently only compiling the first block
let block: CfgBlock = cfg.blocks.into_vec().remove(0);

for action in block.actions {
match action {
avm1_tree::Action::Play => ops.push(Op::Play),
avm1_tree::Action::Stop => ops.push(Op::Stop),
avm1_tree::Action::GotoFrame(goto) => {
Action::Play => ops.push(Op::Play),
Action::Stop => ops.push(Op::Stop),
Action::GotoFrame(goto) => {
ops.push(Op::GotoFrame(Frame(goto.frame as u16)));
}
avm1_tree::Action::GotoLabel(goto) => {
Action::GotoLabel(goto) => {
ops.push(Op::GotoLabel(goto.label));
}
avm1_tree::Action::GetUrl(get_url) => {
Action::GetUrl(get_url) => {
ops.push(Op::GetUrl(get_url.url, get_url.target));
}

// All of frames are loaded ahead of time, no waiting needed.
avm1_tree::Action::WaitForFrame(_) => {}
avm1_tree::Action::WaitForFrame2(_) => {
stack.pop();
}

avm1_tree::Action::ConstantPool(pool) => {
consts = pool.constant_pool;
Action::ConstantPool(pool) => {
consts = pool.pool;
}
avm1_tree::Action::Push(push) => {
Action::Push(push) => {
stack.extend(push.values.into_iter().map(|value| match value {
avm1_tree::Value::Undefined => Value::Undefined,
avm1_tree::Value::Null => Value::Null,
avm1_tree::Value::Boolean(x) => Value::Bool(x),
avm1_tree::Value::Sint32(x) => Value::I32(x),
avm1_tree::Value::Float32(x) => Value::F32(x),
avm1_tree::Value::Float64(x) => Value::F64(x),
avm1_tree::Value::String(s) => Value::Str(s),
PushValue::Undefined => Value::Undefined,
PushValue::Null => Value::Null,
PushValue::Boolean(x) => Value::Bool(x),
PushValue::Sint32(x) => Value::I32(x),
PushValue::Float32(x) => Value::F32(x),
PushValue::Float64(x) => Value::F64(x),
PushValue::String(s) => Value::Str(s),

// FIXME(eddyb) avoid per-use cloning.
avm1_tree::Value::Constant(i) => Value::Str(consts[i as usize].to_string()),
avm1_tree::Value::Register(i) => regs[i as usize].clone(),
PushValue::Constant(i) => Value::Str(consts[i as usize].to_string()),
PushValue::Register(i) => regs[i as usize].clone(),
}));
}
avm1_tree::Action::Pop => {
Action::Pop => {
stack.pop();
}
avm1_tree::Action::GetVariable => match stack.pop().unwrap() {
Action::GetVariable => match stack.pop().unwrap() {
Value::Str(name) => {
ops.push(Op::GetVar(name));
stack.push(Value::OpRes(ops.len() - 1));
Expand All @@ -128,7 +121,7 @@ impl Code {
break;
}
},
avm1_tree::Action::SetVariable => {
Action::SetVariable => {
let value = stack.pop().unwrap();
match stack.pop().unwrap() {
Value::Str(name) => {
Expand All @@ -141,7 +134,7 @@ impl Code {
}
}
}
avm1_tree::Action::CallFunction => {
Action::CallFunction => {
let name = stack.pop().unwrap();
let arg_count = stack.pop().unwrap();
match (name, arg_count.as_i32()) {
Expand All @@ -160,7 +153,7 @@ impl Code {
}
}
}
avm1_tree::Action::CallMethod => {
Action::CallMethod => {
let mut name = stack.pop().unwrap();
let this = stack.pop().unwrap();
let arg_count = stack.pop().unwrap();
Expand Down Expand Up @@ -195,6 +188,17 @@ impl Code {
}
}

match block.flow {
// All of frames are loaded ahead of time, no waiting needed.
CfgFlow::WaitForFrame(_) => {}
CfgFlow::WaitForFrame2(_) => {
stack.pop();
}
_ => {
eprintln!("unknown flow: {:?}", block.flow);
}
}

Code { ops }
}
}