fix stack lowering for new lea semantics

Author: Hugobros3

src/shady/passes/lower_physical_ptrs.c

@@ -94,7 +94,7 @@ static const Node* gen_deserialisation(Context* ctx, BodyBuilder* bb, const Type
             }
             if (config->printf_trace.memory_accesses) {
                 AddressSpace as = get_unqualified_type(arr->type)->payload.ptr_type.address_space;
-                String template = format_string_interned(a, "loaded %s at %s:%s\n", element_type->payload.int_type.width == IntTy64 ? "%lu" : "%u", get_address_space_name(as), "%lx");
+                String template = format_string_interned(a, "loaded %s at %s:0x%s\n", element_type->payload.int_type.width == IntTy64 ? "%lu" : "%u", get_address_space_name(as), "%lx");
                 const Node* widened = acc;
                 if (element_type->payload.int_type.width < IntTy32)
                     widened = gen_conversion(bb, uint32_type(a), acc);
@@ -198,7 +198,7 @@ static void gen_serialisation(Context* ctx, BodyBuilder* bb, const Type* element
             }
             if (config->printf_trace.memory_accesses) {
                 AddressSpace as = get_unqualified_type(arr->type)->payload.ptr_type.address_space;
-                String template = format_string_interned(a, "stored %s at %s:%s\n", element_type->payload.int_type.width == IntTy64 ? "%lu" : "%u", get_address_space_name(as), "%lx");
+                String template = format_string_interned(a, "stored %s at %s:0x%s\n", element_type->payload.int_type.width == IntTy64 ? "%lu" : "%u", get_address_space_name(as), "%lx");
                 const Node* widened = value;
                 if (element_type->payload.int_type.width < IntTy32)
                     widened = gen_conversion(bb, uint32_type(a), value);

src/shady/passes/lower_stack.c

@@ -59,7 +59,7 @@ static const Node* gen_fn(Context* ctx, const Type* element_type, bool push) {
     if (!push) // for pop, we decrease the stack size first
         stack_size = gen_primop_ce(bb, sub_op, 2, (const Node* []) { stack_size, element_size});
 
-    const Node* addr = gen_lea(bb, stack, stack_size, nodes(a, 1, (const Node* []) {uint32_literal(a, 0) }));
+    const Node* addr = gen_lea(bb, ctx->stack, int32_literal(a, 0), singleton(stack_size));
     assert(get_unqualified_type(addr->type)->tag == PtrType_TAG);
     AddressSpace addr_space = get_unqualified_type(addr->type)->payload.ptr_type.address_space;
 
@@ -118,7 +118,7 @@ static const Node* process_let(Context* ctx, const Node* node) {
                 BodyBuilder* bb = begin_body(a);
                 const Node* stack_pointer = ctx->stack_pointer;
                 const Node* stack_size = gen_load(bb, stack_pointer);
-                const Node* stack_base_ptr = gen_lea(bb, ctx->stack, stack_size, empty(a));
+                const Node* stack_base_ptr = gen_lea(bb, ctx->stack, int32_literal(a, 0), singleton(stack_size));
                 if (ctx->config->printf_trace.stack_size) {
                     if (oprim_op->op == get_stack_base_op)
                         bind_instruction(bb, prim_op(a, (PrimOp) {.op = debug_printf_op, .operands = mk_nodes(a, string_lit(a, (StringLiteral) {.string = "trace: stack_size=%d\n"}), stack_size)}));