fluencelabs/wasm-utils
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-utils synced 2025-06-03 01:51:21 +00:00
Code Issues Projects Releases Wiki Activity

ensure here that module has the DataSection

Browse Source
This commit is contained in:
fro 2018-04-05 21:32:20 +03:00
parent 7d185f25dc
commit a77ca2a974
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pack.rs
View File

@ -1,6 +1,6 @@
use std::fmt; use std::fmt;
use parity_wasm::elements::{ use parity_wasm::elements::{
self, Section, Opcode, DataSegment, InitExpr, Internal, External, self, Section, DataSection, Opcode, DataSegment, InitExpr, Internal, External,
ImportCountType, ImportCountType,
}; };
use parity_wasm::builder; use parity_wasm::builder;
@ -146,12 +146,21 @@ pub fn pack_instance(raw_module: Vec<u8>, mut ctor_module: elements::Module) ->
// If new function is put in ctor module, it will have this callable index // If new function is put in ctor module, it will have this callable index
let last_function_index = ctor_module.functions_space(); let last_function_index = ctor_module.functions_space();
// We ensure here that module has the DataSection
if ctor_module
.sections()
.iter()
.find(|section| match **section { Section::Data(ref _d) => true, _ => false })
.is_none() {
// DataSection has to be the last non-custom section according the to the spec
ctor_module.sections_mut().push(Section::Data(DataSection::with_entries(vec![])));
}
// Code data address is an address where we put the contract's code (raw_module) // Code data address is an address where we put the contract's code (raw_module)
let mut code_data_address = 0i32; let mut code_data_address = 0i32;
for section in ctor_module.sections_mut() { for section in ctor_module.sections_mut() {
match section { match section {
// TODO: add data section is there no one
&mut Section::Data(ref mut data_section) => { &mut Section::Data(ref mut data_section) => {
let (index, offset) = if let Some(ref entry) = data_section.entries().iter().last() { let (index, offset) = if let Some(ref entry) = data_section.entries().iter().last() {
if let Opcode::I32Const(offst) = entry.offset().code()[0] { if let Opcode::I32Const(offst) = entry.offset().code()[0] {