fix #940: ensure full-sized ptr addresses in ASM mode

AliveToolkit · Sep 25, 2023 · fc89df2 · fc89df2
1 parent f65a7fb
commit fc89df2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/ir/memory.cpp b/ir/memory.cpp
@@ -547,6 +547,7 @@ static StateValue bytesToValue(const Memory &m, const vector<Byte> &bytes,
     // allow ptr->int type punning in Assembly mode
     if (bitsize == bits_program_pointer &&
         has_null_block && // a ptr load in src sets this to true
+        does_ptr_mem_access &&
         m.getState().getFn().getFnAttrs().has(FnAttrs::Asm)) {
       StateValue ptr_val = bytesToValue(m, bytes, PtrType(0));
       ptr_val.value = Pointer(m, ptr_val.value).getAddress();

diff --git a/tools/transform.cpp b/tools/transform.cpp
@@ -1187,6 +1187,9 @@ static void calculateAndInitConstants(Transform &t) {
   bits_ptr_address = min(max(bits_size_t, bits_ptr_address) + has_local_bit,
                          bits_program_pointer);
 
+  if (config::tgt_is_asm)
+    bits_ptr_address = bits_program_pointer;
+
   bits_byte = 8 * (does_mem_access ?  (unsigned)min_access_size : 1);
 
   bits_poison_per_byte = 1;