From e9c49f423d981dc5f4826f284226f312d51b33cc Mon Sep 17 00:00:00 2001 From: LemonBoy Date: Tue, 31 Mar 2020 12:40:28 +0200 Subject: [PATCH 1/2] compiler-rt: More clear_cache implementations --- lib/std/special/compiler_rt.zig | 2 + lib/std/special/compiler_rt/clear_cache.zig | 48 +++++++++++++-------- 2 files changed, 33 insertions(+), 17 deletions(-) diff --git a/lib/std/special/compiler_rt.zig b/lib/std/special/compiler_rt.zig index 6cdc127137..cf860dfcb0 100644 --- a/lib/std/special/compiler_rt.zig +++ b/lib/std/special/compiler_rt.zig @@ -20,6 +20,8 @@ comptime { .aarch64, .aarch64_be, .aarch64_32, + .riscv32, + .riscv64, => @export(@import("compiler_rt/clear_cache.zig").clear_cache, .{ .name = "__clear_cache", .linkage = linkage, diff --git a/lib/std/special/compiler_rt/clear_cache.zig b/lib/std/special/compiler_rt/clear_cache.zig index 1795a6e829..1286a5e009 100644 --- a/lib/std/special/compiler_rt/clear_cache.zig +++ b/lib/std/special/compiler_rt/clear_cache.zig @@ -26,6 +26,10 @@ pub fn clear_cache(start: usize, end: usize) callconv(.C) void { .mips, .mipsel, .mips64, .mips64el => true, else => false, }; + const riscv = switch (arch) { + .riscv32, .riscv64 => true, + else => false, + }; const powerpc64 = switch (arch) { .powerpc64, .powerpc64le => true, else => false, @@ -45,28 +49,31 @@ pub fn clear_cache(start: usize, end: usize) callconv(.C) void { @compileError("TODO"); // FlushInstructionCache(GetCurrentProcess(), start, end - start); } else if (arm32 and !apple) { - if (os == .freebsd or os == .netbsd) { - // struct arm_sync_icache_args arg; - // - // arg.addr = (uintptr_t)start; - // arg.len = (uintptr_t)end - (uintptr_t)start; - // - // sysarch(ARM_SYNC_ICACHE, &arg); - @compileError("TODO: implement for NetBSD/FreeBSD"); - } else if (os == .linux) { - const result = std.os.linux.syscall3(.cacheflush, start, end, 0); - std.debug.assert(result == 0); - } else { - @compileError("no __clear_cache implementation available for this target"); + switch (os) { + .freebsd, .netbsd => { + var arg = arm_sync_icache_args{ + .addr = start, + .len = end - start, + }; + const result = sysarch(ARM_SYNC_ICACHE, @ptrToInt(&arg)); + std.debug.assert(result == 0); + }, + .linux => { + const result = std.os.linux.syscall3(.cacheflush, start, end, 0); + std.debug.assert(result == 0); + }, + else => @compileError("TODO"), } } else if (os == .linux and mips) { - @compileError("TODO"); - //const uintptr_t start_int = (uintptr_t)start; - //const uintptr_t end_int = (uintptr_t)end; - //syscall(__NR_cacheflush, start, (end_int - start_int), BCACHE); + const flags = 3; // ICACHE | DCACHE + const result = std.os.linux.syscall3(std.os.linux.SYS_cacheflush, start, end - start, flags); + std.debug.assert(result == 0); } else if (mips and os == .openbsd) { @compileError("TODO"); //cacheflush(start, (uintptr_t)end - (uintptr_t)start, BCACHE); + } else if (os == .linux and riscv) { + const result = std.os.linux.syscall3(std.os.linux.SYS_riscv_flush_icache, start, end - start, 0); + std.debug.assert(result == 0); } else if (arm64 and !apple) { // Get Cache Type Info. // TODO memoize this? @@ -142,3 +149,10 @@ pub fn clear_cache(start: usize, end: usize) callconv(.C) void { // Darwin-only extern fn sys_icache_invalidate(start: usize, len: usize) void; +// BSD-only +const arm_sync_icache_args = extern struct { + addr: usize, // Virtual start address + len: usize, // Region size +}; +const ARM_SYNC_ICACHE = 0; +extern "c" fn sysarch(number: i32, args: usize) i32; From 0e372ccff511a9e286949328037d87af64e31875 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Tue, 31 Mar 2020 10:48:48 -0400 Subject: [PATCH 2/2] clean up the duplicate export logic for __clear_cache --- lib/std/special/compiler_rt.zig | 21 ++----------- lib/std/special/compiler_rt/clear_cache.zig | 33 +++++++++++++++------ 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/lib/std/special/compiler_rt.zig b/lib/std/special/compiler_rt.zig index cf860dfcb0..2a454b19dc 100644 --- a/lib/std/special/compiler_rt.zig +++ b/lib/std/special/compiler_rt.zig @@ -17,27 +17,12 @@ comptime { .linkage = linkage, }), - .aarch64, - .aarch64_be, - .aarch64_32, - .riscv32, - .riscv64, - => @export(@import("compiler_rt/clear_cache.zig").clear_cache, .{ - .name = "__clear_cache", - .linkage = linkage, - }), - - .arm, .armeb, .thumb, .thumbeb => switch (builtin.os.tag) { - .linux => @export(@import("compiler_rt/clear_cache.zig").clear_cache, .{ - .name = "__clear_cache", - .linkage = linkage, - }), - else => {}, - }, - else => {}, } + // __clear_cache manages its own logic about whether to be exported or not. + _ = @import("compiler_rt/clear_cache.zig").clear_cache; + @export(@import("compiler_rt/compareXf2.zig").__lesf2, .{ .name = "__lesf2", .linkage = linkage }); @export(@import("compiler_rt/compareXf2.zig").__ledf2, .{ .name = "__ledf2", .linkage = linkage }); @export(@import("compiler_rt/compareXf2.zig").__letf2, .{ .name = "__letf2", .linkage = linkage }); diff --git a/lib/std/special/compiler_rt/clear_cache.zig b/lib/std/special/compiler_rt/clear_cache.zig index 1286a5e009..8ea688e98a 100644 --- a/lib/std/special/compiler_rt/clear_cache.zig +++ b/lib/std/special/compiler_rt/clear_cache.zig @@ -45,9 +45,11 @@ pub fn clear_cache(start: usize, end: usize) callconv(.C) void { if (x86) { // Intel processors have a unified instruction and data cache // so there is nothing to do + exportIt(); } else if (os == .windows and (arm32 or arm64)) { - @compileError("TODO"); + // TODO // FlushInstructionCache(GetCurrentProcess(), start, end - start); + // exportIt(); } else if (arm32 and !apple) { switch (os) { .freebsd, .netbsd => { @@ -57,23 +59,28 @@ pub fn clear_cache(start: usize, end: usize) callconv(.C) void { }; const result = sysarch(ARM_SYNC_ICACHE, @ptrToInt(&arg)); std.debug.assert(result == 0); + exportIt(); }, .linux => { const result = std.os.linux.syscall3(.cacheflush, start, end, 0); std.debug.assert(result == 0); + exportIt(); }, - else => @compileError("TODO"), + else => {}, } } else if (os == .linux and mips) { const flags = 3; // ICACHE | DCACHE - const result = std.os.linux.syscall3(std.os.linux.SYS_cacheflush, start, end - start, flags); + const result = std.os.linux.syscall3(.cacheflush, start, end - start, flags); std.debug.assert(result == 0); + exportIt(); } else if (mips and os == .openbsd) { - @compileError("TODO"); + // TODO //cacheflush(start, (uintptr_t)end - (uintptr_t)start, BCACHE); + // exportIt(); } else if (os == .linux and riscv) { - const result = std.os.linux.syscall3(std.os.linux.SYS_riscv_flush_icache, start, end - start, 0); + const result = std.os.linux.syscall3(.riscv_flush_icache, start, end - start, 0); std.debug.assert(result == 0); + exportIt(); } else if (arm64 and !apple) { // Get Cache Type Info. // TODO memoize this? @@ -112,8 +119,9 @@ pub fn clear_cache(start: usize, end: usize) callconv(.C) void { } } asm volatile ("isb sy"); + exportIt(); } else if (powerpc64) { - @compileError("TODO"); + // TODO //const size_t line_size = 32; //const size_t len = (uintptr_t)end - (uintptr_t)start; // @@ -128,8 +136,9 @@ pub fn clear_cache(start: usize, end: usize) callconv(.C) void { //for (uintptr_t line = start_line; line < end_line; line += line_size) // __asm__ volatile("icbi 0, %0" : : "r"(line)); //__asm__ volatile("isync"); + // exportIt(); } else if (sparc) { - @compileError("TODO"); + // TODO //const size_t dword_size = 8; //const size_t len = (uintptr_t)end - (uintptr_t)start; // @@ -139,14 +148,20 @@ pub fn clear_cache(start: usize, end: usize) callconv(.C) void { // //for (uintptr_t dword = start_dword; dword < end_dword; dword += dword_size) // __asm__ volatile("flush %0" : : "r"(dword)); + // exportIt(); } else if (apple) { // On Darwin, sys_icache_invalidate() provides this functionality sys_icache_invalidate(start, end - start); - } else { - @compileError("no __clear_cache implementation available for this target"); + exportIt(); } } +const linkage = if (std.builtin.is_test) std.builtin.GlobalLinkage.Internal else std.builtin.GlobalLinkage.Weak; + +inline fn exportIt() void { + @export(clear_cache, .{ .name = "__clear_cache", .linkage = linkage }); +} + // Darwin-only extern fn sys_icache_invalidate(start: usize, len: usize) void; // BSD-only