Use 8-byte pointers on 32-bit hosts for now.

This will be target-dependent and host-independent eventually.

diff --git a/src/memory.rs b/src/memory.rs
index b99dae15970f88c594409338ce92733570fec37c..14aa4f9d799ec7634d687e8b104ed8fb593e0647 100644 (file)
--- a/src/memory.rs
+++ b/src/memory.rs
@@ -102,8 +102,9 @@ pub fn new() -> Self {
             alloc_map: HashMap::new(),
             next_id: AllocId(0),
 
-            // TODO(tsion): Should this be host's or target's usize?
-            pointer_size: mem::size_of::<usize>(),
+            // FIXME(tsion): This should work for both 4 and 8, but it currently breaks some things
+            // when set to 4.
+            pointer_size: 8,
         }
     }