authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2022-02-28 11:01:56+01:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2022-02-28 11:40:25+01:00
log4d0c48738bbfe5f657c72f4f52fbcd4c73d4034c
treeb9d1c08fe6d76dae1672bb484f968541568a304f
parent06f58a0b3b241a38ca4092a9f4ee8012370dcff6

x64: make lowerUnnamedConst a fallthrough condition


1 files changed, 7 insertions(+), 24 deletions(-)

src/arch/x86_64/CodeGen.zig+7-24
......@@ -5433,24 +5433,14 @@ fn genTypedValue(self: *Self, typed_value: TypedValue) InnerError!MCValue {
54335433 }
54345434
54355435 switch (typed_value.ty.zigTypeTag()) {
5436 .Array => {
5437 return self.lowerUnnamedConst(typed_value);
5438 },
54395436 .Pointer => switch (typed_value.ty.ptrSize()) {
5440 .Slice => {
5441 return self.lowerUnnamedConst(typed_value);
5442 },
5437 .Slice => {},
54435438 else => {
54445439 switch (typed_value.val.tag()) {
54455440 .int_u64 => {
54465441 return MCValue{ .immediate = typed_value.val.toUnsignedInt() };
54475442 },
5448 .slice => {
5449 return self.lowerUnnamedConst(typed_value);
5450 },
5451 else => {
5452 return self.fail("TODO codegen more kinds of const pointers: {}", .{typed_value.val.tag()});
5453 },
5443 else => {},
54545444 }
54555445 },
54565446 },
......@@ -5459,10 +5449,9 @@ fn genTypedValue(self: *Self, typed_value: TypedValue) InnerError!MCValue {
54595449 if (info.bits <= ptr_bits and info.signedness == .signed) {
54605450 return MCValue{ .immediate = @bitCast(u64, typed_value.val.toSignedInt()) };
54615451 }
5462 if (info.bits > ptr_bits or info.signedness == .signed) {
5463 return self.fail("TODO const int bigger than ptr and signed int", .{});
5452 if (!(info.bits > ptr_bits or info.signedness == .signed)) {
5453 return MCValue{ .immediate = typed_value.val.toUnsignedInt() };
54645454 }
5465 return MCValue{ .immediate = typed_value.val.toUnsignedInt() };
54665455 },
54675456 .Bool => {
54685457 return MCValue{ .immediate = @boolToInt(typed_value.val.toBool()) };
......@@ -5482,7 +5471,6 @@ fn genTypedValue(self: *Self, typed_value: TypedValue) InnerError!MCValue {
54825471 } else if (typed_value.ty.abiSize(self.target.*) == 1) {
54835472 return MCValue{ .immediate = @boolToInt(typed_value.val.isNull()) };
54845473 }
5485 return self.fail("TODO non pointer optionals", .{});
54865474 },
54875475 .Enum => {
54885476 if (typed_value.val.castTag(.enum_field_index)) |field_index| {
......@@ -5529,16 +5517,11 @@ fn genTypedValue(self: *Self, typed_value: TypedValue) InnerError!MCValue {
55295517 return self.genTypedValue(.{ .ty = error_type, .val = typed_value.val });
55305518 }
55315519 }
5532 return self.lowerUnnamedConst(typed_value);
55335520 },
5534 .Struct => {
5535 return self.lowerUnnamedConst(typed_value);
5536 },
5537 .Union => {
5538 return self.lowerUnnamedConst(typed_value);
5539 },
5540 else => return self.fail("TODO implement const of type '{}'", .{typed_value.ty}),
5521 else => {},
55415522 }
5523
5524 return self.lowerUnnamedConst(typed_value);
55425525}
55435526
55445527const CallMCValues = struct {