mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-09 06:08:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into singlepass

Browse Source 
# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	lib/compiler/src/section.rs
This commit is contained in:
Syrus
2020-05-19 19:54:52 -07:00
parent 5bb0074ad1 5dbe419a3f
commit 12b353ca7d
88 changed files with 5121 additions and 3881 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/compiler-singlepass/src/codegen_x64.rs
View File

@@ -21,15 +21,17 @@ use wasmer_compiler::{
FunctionBody, Relocation, RelocationKind, RelocationTarget, SectionBody, SectionIndex,
TrapInformation,
};
use wasmer_runtime::{MemoryPlan, Module, TablePlan, TrapCode, VMBuiltinFunctionIndex, VMOffsets};
use wasmer_runtime::{
MemoryPlan, ModuleInfo, TablePlan, TrapCode, VMBuiltinFunctionIndex, VMOffsets,
};
/// The singlepass per-function code generator.
pub struct FuncGen<'a> {
// Immutable properties assigned at creation time.
/// Static module information.
module: &'a Module,
module: &'a ModuleInfo,
/// Module compilation config.
/// ModuleInfo compilation config.
config: &'a SinglepassConfig,
/// Offsets of vmctx fields.
@@ -81,7 +83,7 @@ pub struct FuncGen<'a> {
relocations: Vec<Relocation>,
}
/// A trap table for a `RunnableModule`.
/// A trap table for a `RunnableModuleInfo`.
#[derive(Clone, Debug, Default)]
pub struct TrapTable {
/// Mappings from offsets in generated machine code to the corresponding trap code.
@@ -1764,7 +1766,7 @@ impl<'a> FuncGen<'a> {
}
pub fn new(
module: &'a Module,
module: &'a ModuleInfo,
config: &'a SinglepassConfig,
vmoffsets: &'a VMOffsets,
_memory_plans: &'a PrimaryMap<MemoryIndex, MemoryPlan>,