authorgravatar for xavierb@gmail.comXavier Bouchoux <xavierb@gmail.com> 2023-10-08 11:10:27+02:00
committergravatar for xavierb@gmail.comXavier Bouchoux <xavierb@gmail.com> 2023-10-08 11:37:49+02:00
log85315bb535a98cb08b4eb8bad6254ef3f5d9714f
treea67dfef7804df7718368f09288be664fc31adcc6
parentc86ba0f9d0d6d1421c93fa09a5172c796110258b

codegen/wasm: fix intcast accross 32-bits boundary


2 files changed, 13 insertions(+), 4 deletions(-)

src/arch/wasm/CodeGen.zig+13-3
......@@ -4353,9 +4353,21 @@ fn intcast(func: *CodeGen, operand: WValue, given: Type, wanted: Type) InnerErro
43534353 if (op_bits > 32 and op_bits <= 64 and wanted_bits == 32) {
43544354 try func.emitWValue(operand);
43554355 try func.addTag(.i32_wrap_i64);
4356 if (given.isSignedInt(mod) and wanted_bitsize < 32)
4357 return func.wrapOperand(.{ .stack = {} }, wanted)
4358 else
4359 return WValue{ .stack = {} };
43564360 } else if (op_bits == 32 and wanted_bits > 32 and wanted_bits <= 64) {
4357 try func.emitWValue(operand);
4361 const operand32 = if (given_bitsize < 32 and wanted.isSignedInt(mod))
4362 try func.signExtendInt(operand, given)
4363 else
4364 operand;
4365 try func.emitWValue(operand32);
43584366 try func.addTag(if (wanted.isSignedInt(mod)) .i64_extend_i32_s else .i64_extend_i32_u);
4367 if (given.isSignedInt(mod) and wanted_bitsize < 64)
4368 return func.wrapOperand(.{ .stack = {} }, wanted)
4369 else
4370 return WValue{ .stack = {} };
43594371 } else if (wanted_bits == 128) {
43604372 // for 128bit integers we store the integer in the virtual stack, rather than a local
43614373 const stack_ptr = try func.allocStack(wanted);
......@@ -4381,8 +4393,6 @@ fn intcast(func: *CodeGen, operand: WValue, given: Type, wanted: Type) InnerErro
43814393 }
43824394 return stack_ptr;
43834395 } else return func.load(operand, wanted, 0);
4384
4385 return WValue{ .stack = {} };
43864396}
43874397
43884398fn airIsNull(func: *CodeGen, inst: Air.Inst.Index, opcode: wasm.Opcode, op_kind: enum { value, ptr }) InnerError!void {
test/behavior/cast_int.zig-1
......@@ -31,7 +31,6 @@ test "coerce i8 to i32 and @intCast back" {
3131}
3232
3333test "coerce non byte-sized integers accross 32bits boundary" {
34 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
3534 {
3635 var v: u21 = 6417;
3736 const a: u32 = v;