Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 33 additions & 5 deletions src/value.zig
Original file line number Diff line number Diff line change
Expand Up @@ -1309,11 +1309,27 @@ pub const Value = extern union {
else => unreachable,
},
.Int, .Bool => field_val.toBigInt(&field_space, target),
.Enum => blk: {
var enum_buffer: Payload.U64 = undefined;
const int_val = field_val.enumToInt(field.ty, &enum_buffer);
break :blk int_val.toBigInt(&field_space, target);
},
.Struct => packedStructToInt(field_val, field.ty, target, &field_buf),
else => unreachable,
};
var field_bigint = BigIntMutable.init(&field_buf2, 0);
field_bigint.shiftLeft(field_bigint_const, bits);
// need to cast negative to unsigned
// r = --a
// = ~(-a - 1)
if (!field_bigint_const.positive) {
// can use 'field_buf' now, cuz this case use 'field_space' in const.
var field_bigint_mul = BigIntMutable.init(&field_buf, 0);
field_bigint_mul.addScalar(field_bigint_const.negate(), -1);
field_bigint_mul.bitNotWrap(field_bigint_mul.toConst(), .unsigned, @intCast(usize, field.ty.bitSize(target)));
field_bigint.shiftLeft(field_bigint_mul.toConst(), bits);
} else {
field_bigint.shiftLeft(field_bigint_const, bits);
}
bits += @intCast(u16, field.ty.bitSize(target));
bigint.bitOr(bigint.toConst(), field_bigint.toConst());
}
Expand Down Expand Up @@ -1443,10 +1459,22 @@ pub const Value = extern union {
else => unreachable,
},
.Bool => makeBool(!field_bigint.eqZero()),
.Int => try Tag.int_big_positive.create(
arena,
try arena.dupe(std.math.big.Limb, field_bigint.limbs),
),
.Int, .Enum => blk: {
// check if it shoudle be negative
const int_info = field.ty.intInfo(target);
if (int_info.signedness == .signed and !field_bigint.fitsInTwosComp(.signed, int_info.bits)) {
bigint_mut.bitNotWrap(field_bigint, .unsigned, int_info.bits);
bigint_mut.addScalar(bigint_mut.toConst(), 1);
break :blk try Tag.int_big_negative.create(
arena,
try arena.dupe(std.math.big.Limb, bigint_mut.limbs),
);
}
break :blk try Tag.int_big_positive.create(
arena,
try arena.dupe(std.math.big.Limb, field_bigint.limbs),
);
},
.Struct => try intToPackedStruct(field.ty, target, field_bigint, arena),
else => unreachable,
};
Expand Down
44 changes: 42 additions & 2 deletions test/behavior/bitcast.zig
Original file line number Diff line number Diff line change
Expand Up @@ -175,15 +175,17 @@ test "bitcast packed struct to integer and back" {

const LevelUpMove = packed struct {
move_id: u9,
negint: i8,
level: u7,
};
const S = struct {
fn doTheTest() !void {
var move = LevelUpMove{ .move_id = 1, .level = 2 };
var v = @bitCast(u16, move);
var move = LevelUpMove{ .move_id = 1, .level = 2, .negint = -3 };
var v = @bitCast(u24, move);
var back_to_a_move = @bitCast(LevelUpMove, v);
try expect(back_to_a_move.move_id == 1);
try expect(back_to_a_move.level == 2);
try expect(back_to_a_move.negint == -3);
}
};
try S.doTheTest();
Expand Down Expand Up @@ -282,3 +284,41 @@ test "@bitCast packed struct of floats" {
try S.doTheTest();
comptime try S.doTheTest();
}

test "@bitCast packed struct of enum" {
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;

const EnumA = enum(u2) {
zero,
one,
};

const EnumB = enum(i4) {
one = 1,
negone = -1,
_,
};

const Foo = packed struct {
a: EnumA,
b: EnumB,
c: EnumB,
};

const S = struct {
fn doTheTest() !void {
var foo = Foo{ .a = .one, .b = .negone, .c = @intToEnum(EnumB, 2) };
var v = @bitCast(u10, foo);
var back = @bitCast(Foo, v);
try expect(back.a == .one);
try expect(back.b == .negone);
try expect(@enumToInt(back.c) == 2);
}
};
try S.doTheTest();
comptime try S.doTheTest();
}