* cranelift-wasm: translate Wasm loads into lower-level CLIF operations
Rather than using `heap_{load,store,addr}`.
* cranelift: Remove the `heap_{addr,load,store}` instructions
These are now legalized in the `cranelift-wasm` frontend.
* cranelift: Remove the `ir::Heap` entity from CLIF
* Port basic memory operation tests to .wat filetests
* Remove test for verifying CLIF heaps
* Remove `heap_addr` from replace_branching_instructions_and_cfg_predecessors.clif test
* Remove `heap_addr` from readonly.clif test
* Remove `heap_addr` from `table_addr.clif` test
* Remove `heap_addr` from the simd-fvpromote_low.clif test
* Remove `heap_addr` from simd-fvdemote.clif test
* Remove `heap_addr` from the load-op-store.clif test
* Remove the CLIF heap runtest
* Remove `heap_addr` from the global_value.clif test
* Remove `heap_addr` from fpromote.clif runtests
* Remove `heap_addr` from fdemote.clif runtests
* Remove `heap_addr` from memory.clif parser test
* Remove `heap_addr` from reject_load_readonly.clif test
* Remove `heap_addr` from reject_load_notrap.clif test
* Remove `heap_addr` from load_readonly_notrap.clif test
* Remove `static-heap-without-guard-pages.clif` test
Will be subsumed when we port `make-heap-load-store-tests.sh` to generating
`.wat` tests.
* Remove `static-heap-with-guard-pages.clif` test
Will be subsumed when we port `make-heap-load-store-tests.sh` over to `.wat`
tests.
* Remove more heap tests
These will be subsumed by porting `make-heap-load-store-tests.sh` over to `.wat`
tests.
* Remove `heap_addr` from `simple-alias.clif` test
* Remove `heap_addr` from partial-redundancy.clif test
* Remove `heap_addr` from multiple-blocks.clif test
* Remove `heap_addr` from fence.clif test
* Remove `heap_addr` from extends.clif test
* Remove runtests that rely on heaps
Heaps are not a thing in CLIF or the interpreter anymore
* Add generated load/store `.wat` tests
* Enable memory-related wasm features in `.wat` tests
* Remove CLIF heap from fcmp-mem-bug.clif test
* Add a mode for compiling `.wat` all the way to assembly in filetests
* Also generate WAT to assembly tests in `make-load-store-tests.sh`
* cargo fmt
* Reinstate `f{de,pro}mote.clif` tests without the heap bits
* Remove undefined doc link
* Remove outdated SVG and dot file from docs
* Add docs about `None` returns for base address computation helpers
* Factor out `env.heap_access_spectre_mitigation()` to a local
* Expand docs for `FuncEnvironment::heaps` trait method
* Restore f{de,pro}mote+load clif runtests with stack memory
249 lines
8.1 KiB
Rust
249 lines
8.1 KiB
Rust
//! Source map associating entities with their source locations.
|
|
//!
|
|
//! When the parser reads in a source file, it records the locations of the
|
|
//! definitions of entities like instructions, blocks, and values.
|
|
//!
|
|
//! The `SourceMap` struct defined in this module makes this mapping available
|
|
//! to parser clients.
|
|
|
|
use crate::error::{Location, ParseResult};
|
|
use crate::lexer::split_entity_name;
|
|
use cranelift_codegen::ir::entities::{AnyEntity, DynamicType};
|
|
use cranelift_codegen::ir::{
|
|
Block, Constant, DynamicStackSlot, FuncRef, GlobalValue, JumpTable, SigRef, StackSlot, Table,
|
|
Value,
|
|
};
|
|
use std::collections::HashMap;
|
|
|
|
/// Mapping from entity names to source locations.
|
|
#[derive(Debug, Default)]
|
|
pub struct SourceMap {
|
|
// Store locations for entities, including instructions.
|
|
locations: HashMap<AnyEntity, Location>,
|
|
}
|
|
|
|
/// Read-only interface which is exposed outside the parser crate.
|
|
impl SourceMap {
|
|
/// Look up a value entity.
|
|
pub fn contains_value(&self, v: Value) -> bool {
|
|
self.locations.contains_key(&v.into())
|
|
}
|
|
|
|
/// Look up a block entity.
|
|
pub fn contains_block(&self, block: Block) -> bool {
|
|
self.locations.contains_key(&block.into())
|
|
}
|
|
|
|
/// Look up a stack slot entity.
|
|
pub fn contains_ss(&self, ss: StackSlot) -> bool {
|
|
self.locations.contains_key(&ss.into())
|
|
}
|
|
|
|
/// Look up a dynamic stack slot entity.
|
|
pub fn contains_dss(&self, dss: DynamicStackSlot) -> bool {
|
|
self.locations.contains_key(&dss.into())
|
|
}
|
|
|
|
/// Look up a global value entity.
|
|
pub fn contains_gv(&self, gv: GlobalValue) -> bool {
|
|
self.locations.contains_key(&gv.into())
|
|
}
|
|
|
|
/// Look up a table entity.
|
|
pub fn contains_table(&self, table: Table) -> bool {
|
|
self.locations.contains_key(&table.into())
|
|
}
|
|
|
|
/// Look up a signature entity.
|
|
pub fn contains_sig(&self, sig: SigRef) -> bool {
|
|
self.locations.contains_key(&sig.into())
|
|
}
|
|
|
|
/// Look up a function entity.
|
|
pub fn contains_fn(&self, fn_: FuncRef) -> bool {
|
|
self.locations.contains_key(&fn_.into())
|
|
}
|
|
|
|
/// Look up a jump table entity.
|
|
pub fn contains_jt(&self, jt: JumpTable) -> bool {
|
|
self.locations.contains_key(&jt.into())
|
|
}
|
|
|
|
/// Look up a constant entity.
|
|
pub fn contains_constant(&self, c: Constant) -> bool {
|
|
self.locations.contains_key(&c.into())
|
|
}
|
|
|
|
/// Look up an entity by source name.
|
|
/// Returns the entity reference corresponding to `name`, if it exists.
|
|
pub fn lookup_str(&self, name: &str) -> Option<AnyEntity> {
|
|
split_entity_name(name).and_then(|(ent, num)| match ent {
|
|
"v" => Value::with_number(num).and_then(|v| {
|
|
if !self.contains_value(v) {
|
|
None
|
|
} else {
|
|
Some(v.into())
|
|
}
|
|
}),
|
|
"block" => Block::with_number(num).and_then(|block| {
|
|
if !self.contains_block(block) {
|
|
None
|
|
} else {
|
|
Some(block.into())
|
|
}
|
|
}),
|
|
"ss" => StackSlot::with_number(num).and_then(|ss| {
|
|
if !self.contains_ss(ss) {
|
|
None
|
|
} else {
|
|
Some(ss.into())
|
|
}
|
|
}),
|
|
"gv" => GlobalValue::with_number(num).and_then(|gv| {
|
|
if !self.contains_gv(gv) {
|
|
None
|
|
} else {
|
|
Some(gv.into())
|
|
}
|
|
}),
|
|
"table" => Table::with_number(num).and_then(|table| {
|
|
if !self.contains_table(table) {
|
|
None
|
|
} else {
|
|
Some(table.into())
|
|
}
|
|
}),
|
|
"sig" => SigRef::with_number(num).and_then(|sig| {
|
|
if !self.contains_sig(sig) {
|
|
None
|
|
} else {
|
|
Some(sig.into())
|
|
}
|
|
}),
|
|
"fn" => FuncRef::with_number(num).and_then(|fn_| {
|
|
if !self.contains_fn(fn_) {
|
|
None
|
|
} else {
|
|
Some(fn_.into())
|
|
}
|
|
}),
|
|
"jt" => JumpTable::with_number(num).and_then(|jt| {
|
|
if !self.contains_jt(jt) {
|
|
None
|
|
} else {
|
|
Some(jt.into())
|
|
}
|
|
}),
|
|
_ => None,
|
|
})
|
|
}
|
|
|
|
/// Get the source location where an entity was defined.
|
|
pub fn location(&self, entity: AnyEntity) -> Option<Location> {
|
|
self.locations.get(&entity).cloned()
|
|
}
|
|
}
|
|
|
|
impl SourceMap {
|
|
/// Create a new empty `SourceMap`.
|
|
pub fn new() -> Self {
|
|
Self {
|
|
locations: HashMap::new(),
|
|
}
|
|
}
|
|
|
|
/// Define the value `entity`.
|
|
pub fn def_value(&mut self, entity: Value, loc: Location) -> ParseResult<()> {
|
|
self.def_entity(entity.into(), loc)
|
|
}
|
|
|
|
/// Define the block `entity`.
|
|
pub fn def_block(&mut self, entity: Block, loc: Location) -> ParseResult<()> {
|
|
self.def_entity(entity.into(), loc)
|
|
}
|
|
|
|
/// Define the stack slot `entity`.
|
|
pub fn def_ss(&mut self, entity: StackSlot, loc: Location) -> ParseResult<()> {
|
|
self.def_entity(entity.into(), loc)
|
|
}
|
|
|
|
/// Define the dynamic stack slot `entity`.
|
|
pub fn def_dss(&mut self, entity: DynamicStackSlot, loc: Location) -> ParseResult<()> {
|
|
self.def_entity(entity.into(), loc)
|
|
}
|
|
|
|
/// Define the dynamic type `entity`.
|
|
pub fn def_dt(&mut self, entity: DynamicType, loc: Location) -> ParseResult<()> {
|
|
self.def_entity(entity.into(), loc)
|
|
}
|
|
|
|
/// Define the global value `entity`.
|
|
pub fn def_gv(&mut self, entity: GlobalValue, loc: Location) -> ParseResult<()> {
|
|
self.def_entity(entity.into(), loc)
|
|
}
|
|
|
|
/// Define the table `entity`.
|
|
pub fn def_table(&mut self, entity: Table, loc: Location) -> ParseResult<()> {
|
|
self.def_entity(entity.into(), loc)
|
|
}
|
|
|
|
/// Define the signature `entity`.
|
|
pub fn def_sig(&mut self, entity: SigRef, loc: Location) -> ParseResult<()> {
|
|
self.def_entity(entity.into(), loc)
|
|
}
|
|
|
|
/// Define the external function `entity`.
|
|
pub fn def_fn(&mut self, entity: FuncRef, loc: Location) -> ParseResult<()> {
|
|
self.def_entity(entity.into(), loc)
|
|
}
|
|
|
|
/// Define the jump table `entity`.
|
|
pub fn def_jt(&mut self, entity: JumpTable, loc: Location) -> ParseResult<()> {
|
|
self.def_entity(entity.into(), loc)
|
|
}
|
|
|
|
/// Define the jump table `entity`.
|
|
pub fn def_constant(&mut self, entity: Constant, loc: Location) -> ParseResult<()> {
|
|
self.def_entity(entity.into(), loc)
|
|
}
|
|
|
|
/// Define an entity. This can be used for instructions whose numbers never
|
|
/// appear in source, or implicitly defined signatures.
|
|
pub fn def_entity(&mut self, entity: AnyEntity, loc: Location) -> ParseResult<()> {
|
|
if self.locations.insert(entity, loc).is_some() {
|
|
err!(loc, "duplicate entity: {}", entity)
|
|
} else {
|
|
Ok(())
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use crate::{parse_test, ParseOptions};
|
|
|
|
#[test]
|
|
fn details() {
|
|
let tf = parse_test(
|
|
"function %detail() {
|
|
ss10 = explicit_slot 13
|
|
jt10 = jump_table [block0]
|
|
block0(v4: i32, v7: i32):
|
|
v10 = iadd v4, v7
|
|
}",
|
|
ParseOptions::default(),
|
|
)
|
|
.unwrap();
|
|
let map = &tf.functions[0].1.map;
|
|
|
|
assert_eq!(map.lookup_str("v0"), None);
|
|
assert_eq!(map.lookup_str("ss1"), None);
|
|
assert_eq!(map.lookup_str("ss10").unwrap().to_string(), "ss10");
|
|
assert_eq!(map.lookup_str("jt10").unwrap().to_string(), "jt10");
|
|
assert_eq!(map.lookup_str("block0").unwrap().to_string(), "block0");
|
|
assert_eq!(map.lookup_str("v4").unwrap().to_string(), "v4");
|
|
assert_eq!(map.lookup_str("v7").unwrap().to_string(), "v7");
|
|
assert_eq!(map.lookup_str("v10").unwrap().to_string(), "v10");
|
|
}
|
|
}
|