T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change the reloc sink to use vectors instead of hash maps.

Browse Source
This commit is contained in:
Dan Gohman
2017-10-03 14:02:41 -07:00
parent 412fedcc6d
commit 6ded83332f
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/wasm2obj/src/emit_module.rs
View File

@@ -9,7 +9,6 @@ use cretonne::ir::entities::AnyEntity;
use cretonne::ir::{self, Ebb, FuncRef, JumpTable, Function}; use cretonne::ir::{self, Ebb, FuncRef, JumpTable, Function};
use cretonne::binemit::{RelocSink, Reloc, CodeOffset}; use cretonne::binemit::{RelocSink, Reloc, CodeOffset};
use cton_wasm::TranslationResult; use cton_wasm::TranslationResult;
use std::collections::HashMap;
use std::fmt::Write; use std::fmt::Write;
use faerie::Artifact; use faerie::Artifact;
use wasmstandalone; use wasmstandalone;
@@ -18,29 +17,29 @@ type RelocRef = u16;
// Implementation of a relocation sink that just saves all the information for later // Implementation of a relocation sink that just saves all the information for later
struct FaerieRelocSink { struct FaerieRelocSink {
ebbs: HashMap<RelocRef, (Ebb, CodeOffset)>, ebbs: Vec<(RelocRef, Ebb, CodeOffset)>,
funcs: HashMap<RelocRef, (FuncRef, CodeOffset)>, funcs: Vec<(RelocRef, FuncRef, CodeOffset)>,
jts: HashMap<RelocRef, (JumpTable, CodeOffset)>, jts: Vec<(RelocRef, JumpTable, CodeOffset)>,
} }
impl RelocSink for FaerieRelocSink { impl RelocSink for FaerieRelocSink {
fn reloc_ebb(&mut self, offset: CodeOffset, reloc: Reloc, ebb: Ebb) { fn reloc_ebb(&mut self, offset: CodeOffset, reloc: Reloc, ebb: Ebb) {
self.ebbs.insert(reloc.0, (ebb, offset)); self.ebbs.push((reloc.0, ebb, offset));
} }
fn reloc_func(&mut self, offset: CodeOffset, reloc: Reloc, func: FuncRef) { fn reloc_func(&mut self, offset: CodeOffset, reloc: Reloc, func: FuncRef) {
self.funcs.insert(reloc.0, (func, offset)); self.funcs.push((reloc.0, func, offset));
} }
fn reloc_jt(&mut self, offset: CodeOffset, reloc: Reloc, jt: JumpTable) { fn reloc_jt(&mut self, offset: CodeOffset, reloc: Reloc, jt: JumpTable) {
self.jts.insert(reloc.0, (jt, offset)); self.jts.push((reloc.0, jt, offset));
} }
} }
impl FaerieRelocSink { impl FaerieRelocSink {
fn new() -> FaerieRelocSink { fn new() -> FaerieRelocSink {
FaerieRelocSink { FaerieRelocSink {
ebbs: HashMap::new(), ebbs: Vec::new(),
funcs: HashMap::new(), funcs: Vec::new(),
jts: HashMap::new(), jts: Vec::new(),
} }
} }
} }