liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

avm1: Revert #1470 to improve wasm performance

This commit is contained in:
Adrian Wielgosik 2020-12-17 21:47:22 +01:00 committed by GitHub
parent ef88307c10
commit 484bd2c11a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
swf/src/avm1/read.rs
View File

@ -4,7 +4,6 @@ use crate::avm1::opcode::OpCode;
use crate::avm1::types::*; use crate::avm1::types::*;
use crate::error::{Error, Result}; use crate::error::{Error, Result};
use crate::read::SwfRead; use crate::read::SwfRead;
use smallvec::SmallVec;
use std::io::Cursor; use std::io::Cursor;
#[allow(dead_code)] #[allow(dead_code)]
@ -283,7 +282,7 @@ impl<'a> Reader<'a> {
fn read_push(&mut self, length: usize) -> Result<Action<'a>> { fn read_push(&mut self, length: usize) -> Result<Action<'a>> {
let end_pos = self.pos() + length; let end_pos = self.pos() + length;
let mut values = SmallVec::new(); let mut values = Vec::with_capacity(4);
while self.pos() < end_pos { while self.pos() < end_pos {
values.push(self.read_push_value()?); values.push(self.read_push_value()?);
} }
@ -391,21 +390,12 @@ impl<'a> Reader<'a> {
pub mod tests { pub mod tests {
use super::*; use super::*;
use crate::test_data; use crate::test_data;
use smallvec::smallvec;
#[test] #[test]
fn read_action() { fn read_action() {
for (swf_version, expected_action, action_bytes) in test_data::avm1_tests() { for (swf_version, expected_action, action_bytes) in test_data::avm1_tests() {
// TODO: Limitations in SmallVec prevent this from compiling when it should be safe.
// SmallVec is invariant over T, when it should be covariant.
// This code works with Vec, which is properly covariant.
// see https://github.com/servo/rust-smallvec/issues/146
// This should be fixed when const generics are stable.
// This code should be safe and it's just for testing.
let expected_action: Action<'_> = unsafe { std::mem::transmute(expected_action) };
let mut reader = Reader::new(&action_bytes[..], swf_version); let mut reader = Reader::new(&action_bytes[..], swf_version);
let parsed_action: Action<'_> = reader.read_action().unwrap().unwrap(); let parsed_action = reader.read_action().unwrap().unwrap();
if parsed_action != expected_action { if parsed_action != expected_action {
// Failed, result doesn't match. // Failed, result doesn't match.
panic!( panic!(
@ -421,8 +411,7 @@ pub mod tests {
fn read_parse_error() { fn read_parse_error() {
let action_bytes = [0xff, 0xff, 0xff, 0x00, 0x00]; let action_bytes = [0xff, 0xff, 0xff, 0x00, 0x00];
let mut reader = Reader::new(&action_bytes[..], 5); let mut reader = Reader::new(&action_bytes[..], 5);
let action = reader.read_action(); match reader.read_action() {
match action {
Err(crate::error::Error::Avm1ParseError { .. }) => (), Err(crate::error::Error::Avm1ParseError { .. }) => (),
result => { result => {
panic!("Expected Avm1ParseError, got {:?}", result); panic!("Expected Avm1ParseError, got {:?}", result);
@ -451,7 +440,7 @@ pub mod tests {
if let Action::DefineFunction { actions, .. } = action { if let Action::DefineFunction { actions, .. } = action {
let mut reader = Reader::new(actions, 5); let mut reader = Reader::new(actions, 5);
let action = reader.read_action().unwrap().unwrap(); let action = reader.read_action().unwrap().unwrap();
assert_eq!(action, Action::Push(smallvec![Value::Str("test")])); assert_eq!(action, Action::Push(vec![Value::Str("test")]));
} }
} }
@ -462,9 +451,6 @@ pub mod tests {
let action_bytes = [0x96, 2, 0, 2, 3, 3]; // Extra 3 at the end shouldn't be read. let action_bytes = [0x96, 2, 0, 2, 3, 3]; // Extra 3 at the end shouldn't be read.
let mut reader = Reader::new(&action_bytes[..], 5); let mut reader = Reader::new(&action_bytes[..], 5);
let action = reader.read_action().unwrap().unwrap(); let action = reader.read_action().unwrap().unwrap();
assert_eq!( assert_eq!(action, Action::Push(vec![Value::Null, Value::Undefined]));
action,
Action::Push(smallvec![Value::Null, Value::Undefined])
);
} }
} }

4
swf/src/avm1/types.rs
View File

@ -1,5 +1,3 @@
use smallvec::SmallVec;
#[derive(Clone, Debug, PartialEq)] #[derive(Clone, Debug, PartialEq)]
pub enum Action<'a> { pub enum Action<'a> {
Add, Add,
@ -84,7 +82,7 @@ pub enum Action<'a> {
Play, Play,
Pop, Pop,
PreviousFrame, PreviousFrame,
Push(SmallVec<[Value<'a>; 4]>), Push(Vec<Value<'a>>),
PushDuplicate, PushDuplicate,
RandomNumber, RandomNumber,
RemoveSprite, RemoveSprite,

33
swf/src/test_data.rs
View File

@ -8,7 +8,6 @@ use crate::read::tests::{read_tag_bytes_from_file, read_tag_bytes_from_file_with
use crate::tag_code::TagCode; use crate::tag_code::TagCode;
use crate::types::*; use crate::types::*;
use crate::write::write_swf; use crate::write::write_swf;
use smallvec::smallvec;
use std::fs::File; use std::fs::File;
use std::vec::Vec; use std::vec::Vec;
@ -2731,68 +2730,64 @@ pub fn avm1_tests() -> Vec<Avm1TestData> {
(3, Action::PreviousFrame, vec![0x05]), (3, Action::PreviousFrame, vec![0x05]),
( (
4, 4,
Action::Push(smallvec![Value::Str("test")]), Action::Push(vec![Value::Str("test")]),
vec![0x96, 6, 0, 0, 116, 101, 115, 116, 0], vec![0x96, 6, 0, 0, 116, 101, 115, 116, 0],
), ),
( (
4, 4,
Action::Push(smallvec![Value::Float(0.0)]), Action::Push(vec![Value::Float(0.0)]),
vec![0x96, 5, 0, 1, 0, 0, 0, 0], vec![0x96, 5, 0, 1, 0, 0, 0, 0],
), ),
( (
5, 5,
Action::Push(smallvec![Value::Double(1.5)]), Action::Push(vec![Value::Double(1.5)]),
vec![0x96, 9, 0, 6, 0, 0, 248, 63, 0, 0, 0, 0], vec![0x96, 9, 0, 6, 0, 0, 248, 63, 0, 0, 0, 0],
), ),
(5, Action::Push(smallvec![Value::Null]), vec![0x96, 1, 0, 2]), (5, Action::Push(vec![Value::Null]), vec![0x96, 1, 0, 2]),
(5, Action::Push(vec![Value::Undefined]), vec![0x96, 1, 0, 3]),
( (
5, 5,
Action::Push(smallvec![Value::Undefined]), Action::Push(vec![Value::Null, Value::Undefined]),
vec![0x96, 1, 0, 3],
),
(
5,
Action::Push(smallvec![Value::Null, Value::Undefined]),
vec![0x96, 2, 0, 2, 3], vec![0x96, 2, 0, 2, 3],
), ),
( (
5, 5,
Action::Push(smallvec![Value::Register(1)]), Action::Push(vec![Value::Register(1)]),
vec![0x96, 2, 0, 4, 1], vec![0x96, 2, 0, 4, 1],
), ),
( (
5, 5,
Action::Push(smallvec![Value::Bool(false)]), Action::Push(vec![Value::Bool(false)]),
vec![0x96, 2, 0, 5, 0], vec![0x96, 2, 0, 5, 0],
), ),
( (
5, 5,
Action::Push(smallvec![Value::Bool(true)]), Action::Push(vec![Value::Bool(true)]),
vec![0x96, 2, 0, 5, 1], vec![0x96, 2, 0, 5, 1],
), ),
( (
5, 5,
Action::Push(smallvec![Value::Double(0.0)]), Action::Push(vec![Value::Double(0.0)]),
vec![0x96, 9, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0], vec![0x96, 9, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0],
), ),
( (
5, 5,
Action::Push(smallvec![Value::Int(31)]), Action::Push(vec![Value::Int(31)]),
vec![0x96, 5, 0, 7, 31, 0, 0, 0], vec![0x96, 5, 0, 7, 31, 0, 0, 0],
), ),
( (
5, 5,
Action::Push(smallvec![Value::Int(-50)]), Action::Push(vec![Value::Int(-50)]),
vec![0x96, 5, 0, 7, 206, 255, 255, 255], vec![0x96, 5, 0, 7, 206, 255, 255, 255],
), ),
( (
5, 5,
Action::Push(smallvec![Value::ConstantPool(77)]), Action::Push(vec![Value::ConstantPool(77)]),
vec![0x96, 2, 0, 8, 77], vec![0x96, 2, 0, 8, 77],
), ),
( (
5, 5,
Action::Push(smallvec![Value::ConstantPool(257)]), Action::Push(vec![Value::ConstantPool(257)]),
vec![0x96, 3, 0, 9, 1, 1], vec![0x96, 3, 0, 9, 1, 1],
), ),
(4, Action::RandomNumber, vec![0x30]), (4, Action::RandomNumber, vec![0x30]),