fluencelabs/parity-wasm
1
0
Fork 0
mirror of https://github.com/fluencelabs/parity-wasm synced 2025-06-15 07:51:46 +00:00
Code Issues Projects Releases Wiki Activity

Clean

Browse Source
This commit is contained in:
Sergey Pepyakin
2017-12-05 17:25:32 +01:00
parent 42142f6513
commit e9ec5e8aa8
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/validation/mod.rs
View File

@ -81,17 +81,17 @@ pub fn validate_module(module: &Module) -> Result<ValidatedModule, Error> {
// validate export section // validate export section
if let Some(export_section) = module.export_section() { if let Some(export_section) = module.export_section() {
for export in export_section.entries() { for export in export_section.entries() {
match export.internal() { match *export.internal() {
&Internal::Function(function_index) => { Internal::Function(function_index) => {
context.require_function(function_index)?; context.require_function(function_index)?;
} }
&Internal::Global(global_index) => { Internal::Global(global_index) => {
context.require_global(global_index, Some(false))?; context.require_global(global_index, Some(false))?;
} }
&Internal::Memory(memory_index) => { Internal::Memory(memory_index) => {
context.require_memory(memory_index)?; context.require_memory(memory_index)?;
} }
&Internal::Table(table_index) => { Internal::Table(table_index) => {
context.require_table(table_index)?; context.require_table(table_index)?;
} }
} }
@ -101,19 +101,19 @@ pub fn validate_module(module: &Module) -> Result<ValidatedModule, Error> {
// validate import section // validate import section
if let Some(import_section) = module.import_section() { if let Some(import_section) = module.import_section() {
for import in import_section.entries() { for import in import_section.entries() {
match import.external() { match *import.external() {
&External::Function(function_type_index) => { External::Function(function_type_index) => {
context.require_function(function_type_index)?; context.require_function(function_type_index)?;
}, },
&External::Global(ref global_type) => { External::Global(ref global_type) => {
if global_type.is_mutable() { if global_type.is_mutable() {
return Err(Error(format!("trying to import mutable global {}", import.field()))); return Err(Error(format!("trying to import mutable global {}", import.field())));
} }
}, },
&External::Memory(ref memory_type) => { External::Memory(ref memory_type) => {
memory_type.validate()?; memory_type.validate()?;
}, },
&External::Table(ref table_type) => { External::Table(ref table_type) => {
table_type.validate()?; table_type.validate()?;
}, },
} }
@ -136,7 +136,7 @@ pub fn validate_module(module: &Module) -> Result<ValidatedModule, Error> {
context.require_memory(data_segment.index())?; context.require_memory(data_segment.index())?;
let init_ty = data_segment.offset().expr_const_type(context.globals())?; let init_ty = data_segment.offset().expr_const_type(context.globals())?;
if init_ty != ValueType::I32 { if init_ty != ValueType::I32 {
return Err(Error(format!("segment offset should return I32"))); return Err(Error("segment offset should return I32".into()));
} }
} }
} }
@ -148,7 +148,7 @@ pub fn validate_module(module: &Module) -> Result<ValidatedModule, Error> {
let init_ty = element_segment.offset().expr_const_type(context.globals())?; let init_ty = element_segment.offset().expr_const_type(context.globals())?;
if init_ty != ValueType::I32 { if init_ty != ValueType::I32 {
return Err(Error(format!("segment offset should return I32"))); return Err(Error("segment offset should return I32".into()));
} }
for function_index in element_segment.members() { for function_index in element_segment.members() {
@ -290,9 +290,7 @@ impl InitExpr {
fn expr_const_type(&self, globals: &[GlobalType]) -> Result<ValueType, Error> { fn expr_const_type(&self, globals: &[GlobalType]) -> Result<ValueType, Error> {
let code = self.code(); let code = self.code();
if code.len() != 2 { if code.len() != 2 {
return Err(Error( return Err(Error("Init expression should always be with length 2".into()));
format!("Init expression should always be with length 2")
));
} }
let expr_ty: ValueType = match code[0] { let expr_ty: ValueType = match code[0] {
Opcode::I32Const(_) => ValueType::I32, Opcode::I32Const(_) => ValueType::I32,
@ -312,10 +310,10 @@ impl InitExpr {
)) ))
} }
}, },
_ => return Err(Error(format!("Non constant opcode in init expr"))), _ => return Err(Error("Non constant opcode in init expr".into())),
}; };
if code[1] != Opcode::End { if code[1] != Opcode::End {
return Err(Error(format!("Expression doesn't ends with `end` opcode"))); return Err(Error("Expression doesn't ends with `end` opcode".into()));
} }
Ok(expr_ty) Ok(expr_ty)
} }