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

Fix build 32bit. (#3518)

Browse Source 
* Fix build 32bit.

* Use ifcfg.
This commit is contained in:
David Craven
2021-11-15 18:47:02 +01:00
committed by GitHub
parent 4bde42e789
commit 81f6228c57
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
crates/environ/src/tunables.rs
View File

@@ -46,25 +46,26 @@ pub struct Tunables {
impl Default for Tunables { impl Default for Tunables {
fn default() -> Self { fn default() -> Self {
Self { let (static_memory_bound, static_memory_offset_guard_size) =
if cfg!(target_pointer_width = "64") {
// 64-bit has tons of address space to static memories can have 4gb // 64-bit has tons of address space to static memories can have 4gb
// address space reservations liberally by default, allowing us to // address space reservations liberally by default, allowing us to
// help eliminate bounds checks. // help eliminate bounds checks.
// //
// Coupled with a 2 GiB address space guard it lets us translate // Coupled with a 2 GiB address space guard it lets us translate
// wasm offsets into x86 offsets as aggressively as we can. // wasm offsets into x86 offsets as aggressively as we can.
#[cfg(target_pointer_width = "64")] (0x1_0000, 0x8000_0000)
static_memory_bound: 0x1_0000, } else if cfg!(target_pointer_width = "32") {
#[cfg(target_pointer_width = "64")]
static_memory_offset_guard_size: 0x8000_0000,
// For 32-bit we scale way down to 10MB of reserved memory. This // For 32-bit we scale way down to 10MB of reserved memory. This
// impacts performance severely but allows us to have more than a // impacts performance severely but allows us to have more than a
// few instances running around. // few instances running around.
#[cfg(target_pointer_width = "32")] ((10 * (1 << 20)) / crate::WASM_PAGE_SIZE as u64, 0x1_0000)
static_memory_bound: (10 * (1 << 20)) / crate::WASM_PAGE_SIZE, } else {
#[cfg(target_pointer_width = "32")] panic!("unsupported target_pointer_width");
static_memory_offset_guard_size: 0x1_0000, };
Self {
static_memory_bound,
static_memory_offset_guard_size,
// Size in bytes of the offset guard for dynamic memories. // Size in bytes of the offset guard for dynamic memories.
// //