mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-16 19:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

x64: impl genBinMathOpMir for ptr_stack_off and PIE memory

Browse Source
This commit is contained in:
Jakub Konka 2022-02-11 15:04:59 +01:00
parent 5283a52af5
commit c7775a9f62
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/arch/x86_64/CodeGen.zig
View File

@ -2244,7 +2244,9 @@ fn genBinMathOpMir(self: *Self, mir_tag: Mir.Inst.Tag, dst_ty: Type, dst_mcv: MC
.none => unreachable, .none => unreachable,
.undef => try self.genSetReg(dst_ty, dst_reg, .undef), .undef => try self.genSetReg(dst_ty, dst_reg, .undef),
.dead, .unreach => unreachable, .dead, .unreach => unreachable,
.ptr_stack_offset => unreachable, .ptr_stack_offset => |off| {
return self.genBinMathOpMir(mir_tag, dst_ty, dst_mcv, .{ .immediate = @bitCast(u32, off) });
},
.ptr_embedded_in_code => unreachable, .ptr_embedded_in_code => unreachable,
.register => |src_reg| { .register => |src_reg| {
_ = try self.addInst(.{ _ = try self.addInst(.{
@ -2265,16 +2267,17 @@ fn genBinMathOpMir(self: *Self, mir_tag: Mir.Inst.Tag, dst_ty: Type, dst_mcv: MC
.data = .{ .imm = @truncate(u32, imm) }, .data = .{ .imm = @truncate(u32, imm) },
}); });
}, },
.embedded_in_code, .memory => { .embedded_in_code,
.memory,
.got_load,
.direct_load,
=> {
assert(abi_size <= 8); assert(abi_size <= 8);
self.register_manager.freezeRegs(&.{dst_reg}); self.register_manager.freezeRegs(&.{dst_reg});
defer self.register_manager.unfreezeRegs(&.{dst_reg}); defer self.register_manager.unfreezeRegs(&.{dst_reg});
const reg = try self.copyToTmpRegister(dst_ty, src_mcv); const reg = try self.copyToTmpRegister(dst_ty, src_mcv);
return self.genBinMathOpMir(mir_tag, dst_ty, dst_mcv, .{ .register = reg }); return self.genBinMathOpMir(mir_tag, dst_ty, dst_mcv, .{ .register = reg });
}, },
.got_load, .direct_load => {
return self.fail("TODO implement x86 ADD/SUB/CMP source symbol at index in linker", .{});
},
.stack_offset => |off| { .stack_offset => |off| {
if (off > math.maxInt(i32)) { if (off > math.maxInt(i32)) {
return self.fail("stack offset too large", .{}); return self.fail("stack offset too large", .{});
@ -4620,6 +4623,9 @@ fn genTypedValue(self: *Self, typed_value: TypedValue) InnerError!MCValue {
} }
switch (typed_value.ty.zigTypeTag()) { switch (typed_value.ty.zigTypeTag()) {
.Array => {
return self.lowerUnnamedConst(typed_value);
},
.Pointer => switch (typed_value.ty.ptrSize()) { .Pointer => switch (typed_value.ty.ptrSize()) {
.Slice => { .Slice => {
return self.lowerUnnamedConst(typed_value); return self.lowerUnnamedConst(typed_value);

3
test/behavior/slice.zig
View File

@ -29,7 +29,6 @@ comptime {
test "slicing" { test "slicing" {
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
var array: [20]i32 = undefined; var array: [20]i32 = undefined;
@ -223,7 +222,6 @@ test "compile time slice of pointer to hard coded address" {
test "slice string literal has correct type" { test "slice string literal has correct type" {
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
comptime { comptime {
try expect(@TypeOf("aoeu"[0..]) == *const [4:0]u8); try expect(@TypeOf("aoeu"[0..]) == *const [4:0]u8);
@ -365,7 +363,6 @@ test "empty array to slice" {
test "@ptrCast slice to pointer" { test "@ptrCast slice to pointer" {
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
const S = struct { const S = struct {
fn doTheTest() !void { fn doTheTest() !void {