From 18df7fd24f0f7afb2595e5f77f97779e20ac5b37 Mon Sep 17 00:00:00 2001 From: Richard Feldman Date: Sun, 23 May 2021 11:04:35 -0400 Subject: [PATCH] Make alignment be a u32 --- .../fixtures/multi-dep-str/platform/host.zig | 6 +++--- .../fixtures/multi-dep-thunk/platform/host.zig | 7 +++---- compiler/gen/src/llvm/build.rs | 18 +++++++++--------- examples/balance/platform/src/lib.rs | 6 +++--- examples/benchmarks/platform/host.zig | 6 +++--- examples/cli/platform/src/lib.rs | 6 +++--- examples/custom-malloc/platform/host.zig | 6 +++--- examples/effect/thing/platform-dir/src/lib.rs | 6 +++--- examples/hello-world/platform/host.zig | 6 +++--- examples/quicksort/platform/host.zig | 6 +++--- examples/shared-quicksort/platform/src/lib.rs | 6 +++--- examples/task/platform/host.zig | 6 +++--- examples/tea/platform/src/lib.rs | 6 +++--- 13 files changed, 45 insertions(+), 46 deletions(-) diff --git a/cli/tests/fixtures/multi-dep-str/platform/host.zig b/cli/tests/fixtures/multi-dep-str/platform/host.zig index de76fb2e74..b7a4c79629 100644 --- a/cli/tests/fixtures/multi-dep-str/platform/host.zig +++ b/cli/tests/fixtures/multi-dep-str/platform/host.zig @@ -29,15 +29,15 @@ extern fn malloc(size: usize) callconv(.C) ?*c_void; extern fn realloc(c_ptr: [*]align(@alignOf(u128)) u8, size: usize) callconv(.C) ?*c_void; extern fn free(c_ptr: [*]align(@alignOf(u128)) u8) callconv(.C) void; -export fn roc_alloc(alignment: usize, size: usize) callconv(.C) ?*c_void { +export fn roc_alloc(alignment: u32, size: usize) callconv(.C) ?*c_void { return malloc(size); } -export fn roc_realloc(alignment: usize, c_ptr: *c_void, old_size: usize, new_size: usize) callconv(.C) ?*c_void { +export fn roc_realloc(alignment: u32, c_ptr: *c_void, old_size: usize, new_size: usize) callconv(.C) ?*c_void { return realloc(@alignCast(16, @ptrCast([*]u8, c_ptr)), new_size); } -export fn roc_dealloc(alignment: usize, c_ptr: *c_void) callconv(.C) void { +export fn roc_dealloc(alignment: u32, c_ptr: *c_void) callconv(.C) void { free(@alignCast(16, @ptrCast([*]u8, c_ptr))); } diff --git a/cli/tests/fixtures/multi-dep-thunk/platform/host.zig b/cli/tests/fixtures/multi-dep-thunk/platform/host.zig index 0277c382f6..6781abce8b 100644 --- a/cli/tests/fixtures/multi-dep-thunk/platform/host.zig +++ b/cli/tests/fixtures/multi-dep-thunk/platform/host.zig @@ -28,19 +28,18 @@ extern fn malloc(size: usize) callconv(.C) ?*c_void; extern fn realloc(c_ptr: [*]align(@alignOf(u128)) u8, size: usize) callconv(.C) ?*c_void; extern fn free(c_ptr: [*]align(@alignOf(u128)) u8) callconv(.C) void; -export fn roc_alloc(alignment: usize, size: usize) callconv(.C) ?*c_void { +export fn roc_alloc(alignment: u32, size: usize) callconv(.C) ?*c_void { return malloc(size); } -export fn roc_realloc(alignment: usize, c_ptr: *c_void, old_size: usize, new_size: usize) callconv(.C) ?*c_void { +export fn roc_realloc(alignment: u32, c_ptr: *c_void, old_size: usize, new_size: usize) callconv(.C) ?*c_void { return realloc(@alignCast(16, @ptrCast([*]u8, c_ptr)), new_size); } -export fn roc_dealloc(alignment: usize, c_ptr: *c_void) callconv(.C) void { +export fn roc_dealloc(alignment: u32, c_ptr: *c_void) callconv(.C) void { free(@alignCast(16, @ptrCast([*]u8, c_ptr))); } - const RocCallResult = extern struct { flag: usize, content: RocStr }; const Unit = extern struct {}; diff --git a/compiler/gen/src/llvm/build.rs b/compiler/gen/src/llvm/build.rs index d82c110d10..1465e4d62c 100644 --- a/compiler/gen/src/llvm/build.rs +++ b/compiler/gen/src/llvm/build.rs @@ -363,8 +363,8 @@ fn add_intrinsics<'ctx>(ctx: &'ctx Context, module: &Module<'ctx>) { ROC_ALLOC_64, i8_ptr_type.fn_type( &[ - // alignment: usize - i64_type.into(), + // alignment: u32 + i32_type.into(), // size: usize i64_type.into(), ], @@ -377,7 +377,7 @@ fn add_intrinsics<'ctx>(ctx: &'ctx Context, module: &Module<'ctx>) { ROC_ALLOC_32, i8_ptr_type.fn_type( &[ - // alignment: usize + // alignment: u32 i32_type.into(), // size: usize i32_type.into(), @@ -391,8 +391,8 @@ fn add_intrinsics<'ctx>(ctx: &'ctx Context, module: &Module<'ctx>) { ROC_REALLOC_64, i8_ptr_type.fn_type( &[ - // alignment: usize - i64_type.into(), + // alignment: u32 + i32_type.into(), // ptr: *c_void i8_ptr_type.into(), // old_size: usize @@ -409,7 +409,7 @@ fn add_intrinsics<'ctx>(ctx: &'ctx Context, module: &Module<'ctx>) { ROC_REALLOC_32, i8_ptr_type.fn_type( &[ - // alignment: usize + // alignment: u32 i32_type.into(), // ptr: *c_void i8_ptr_type.into(), @@ -427,8 +427,8 @@ fn add_intrinsics<'ctx>(ctx: &'ctx Context, module: &Module<'ctx>) { ROC_DEALLOC_64, void_type.fn_type( &[ - // alignment: usize - i64_type.into(), + // alignment: u32 + i32_type.into(), // ptr: *c_void i8_ptr_type.into(), ], @@ -441,7 +441,7 @@ fn add_intrinsics<'ctx>(ctx: &'ctx Context, module: &Module<'ctx>) { ROC_DEALLOC_32, void_type.fn_type( &[ - // alignment: usize + // alignment: u32 i32_type.into(), // ptr: *c_void i8_ptr_type.into(), diff --git a/examples/balance/platform/src/lib.rs b/examples/balance/platform/src/lib.rs index 93d8baef68..cc8a7dc37b 100644 --- a/examples/balance/platform/src/lib.rs +++ b/examples/balance/platform/src/lib.rs @@ -26,13 +26,13 @@ extern "C" { } #[no_mangle] -pub unsafe fn roc_alloc(_alignment: usize, size: usize) -> *mut c_void { +pub unsafe fn roc_alloc(_alignment: u32, size: usize) -> *mut c_void { return malloc(size); } #[no_mangle] pub unsafe fn roc_realloc( - _alignment: usize, + _alignment: u32, c_ptr: *mut c_void, _old_size: usize, new_size: usize, @@ -41,7 +41,7 @@ pub unsafe fn roc_realloc( } #[no_mangle] -pub unsafe fn roc_dealloc(_alignment: usize, c_ptr: *mut c_void) { +pub unsafe fn roc_dealloc(_alignment: u32, c_ptr: *mut c_void) { return free(c_ptr); } diff --git a/examples/benchmarks/platform/host.zig b/examples/benchmarks/platform/host.zig index 674e434447..e6a9f8a7b2 100644 --- a/examples/benchmarks/platform/host.zig +++ b/examples/benchmarks/platform/host.zig @@ -33,15 +33,15 @@ extern fn malloc(size: usize) callconv(.C) ?*c_void; extern fn realloc(c_ptr: [*]align(@alignOf(u128)) u8, size: usize) callconv(.C) ?*c_void; extern fn free(c_ptr: [*]align(@alignOf(u128)) u8) callconv(.C) void; -export fn roc_alloc(alignment: usize, size: usize) callconv(.C) ?*c_void { +export fn roc_alloc(alignment: u32, size: usize) callconv(.C) ?*c_void { return malloc(size); } -export fn roc_realloc(alignment: usize, c_ptr: *c_void, old_size: usize, new_size: usize) callconv(.C) ?*c_void { +export fn roc_realloc(alignment: u32, c_ptr: *c_void, old_size: usize, new_size: usize) callconv(.C) ?*c_void { return realloc(@alignCast(16, @ptrCast([*]u8, c_ptr)), new_size); } -export fn roc_dealloc(alignment: usize, c_ptr: *c_void) callconv(.C) void { +export fn roc_dealloc(alignment: u32, c_ptr: *c_void) callconv(.C) void { free(@alignCast(16, @ptrCast([*]u8, c_ptr))); } diff --git a/examples/cli/platform/src/lib.rs b/examples/cli/platform/src/lib.rs index a64819ec6b..2f96584924 100644 --- a/examples/cli/platform/src/lib.rs +++ b/examples/cli/platform/src/lib.rs @@ -32,13 +32,13 @@ extern "C" { } #[no_mangle] -pub unsafe fn roc_alloc(_alignment: usize, size: usize) -> *mut c_void { +pub unsafe fn roc_alloc(_alignment: u32, size: usize) -> *mut c_void { return malloc(size); } #[no_mangle] pub unsafe fn roc_realloc( - _alignment: usize, + _alignment: u32, c_ptr: *mut c_void, _old_size: usize, new_size: usize, @@ -47,7 +47,7 @@ pub unsafe fn roc_realloc( } #[no_mangle] -pub unsafe fn roc_dealloc(_alignment: usize, c_ptr: *mut c_void) { +pub unsafe fn roc_dealloc(_alignment: u32, c_ptr: *mut c_void) { return free(c_ptr); } diff --git a/examples/custom-malloc/platform/host.zig b/examples/custom-malloc/platform/host.zig index e76fc63a84..2ce6354671 100644 --- a/examples/custom-malloc/platform/host.zig +++ b/examples/custom-malloc/platform/host.zig @@ -64,7 +64,7 @@ pub export fn main() u8 { return 0; } -export fn roc_alloc(alignment: usize, size: usize) callconv(.C) ?*c_void { +export fn roc_alloc(alignment: u32, size: usize) callconv(.C) ?*c_void { const stdout = std.io.getStdOut().writer(); const allocator = testing.allocator; @@ -80,11 +80,11 @@ export fn roc_alloc(alignment: usize, size: usize) callconv(.C) ?*c_void { return ptr; } -export fn roc_realloc(alignment: usize, c_ptr: *c_void, old_size: usize, new_size: usize) callconv(.C) ?*c_void { +export fn roc_realloc(alignment: u32, c_ptr: *c_void, old_size: usize, new_size: usize) callconv(.C) ?*c_void { return realloc(@alignCast(16, @ptrCast([*]u8, c_ptr)), new_size); } -export fn roc_dealloc(alignment: usize, c_ptr: *c_void) callconv(.C) void { +export fn roc_dealloc(alignment: u32, c_ptr: *c_void) callconv(.C) void { const stdout = std.io.getStdOut().writer(); const allocator = testing.allocator; diff --git a/examples/effect/thing/platform-dir/src/lib.rs b/examples/effect/thing/platform-dir/src/lib.rs index 85a6e1fa7c..a9a6633753 100644 --- a/examples/effect/thing/platform-dir/src/lib.rs +++ b/examples/effect/thing/platform-dir/src/lib.rs @@ -34,13 +34,13 @@ extern "C" { } #[no_mangle] -pub unsafe fn roc_alloc(_alignment: usize, size: usize) -> *mut c_void { +pub unsafe fn roc_alloc(_alignment: u32, size: usize) -> *mut c_void { return malloc(size); } #[no_mangle] pub unsafe fn roc_realloc( - _alignment: usize, + _alignment: u32, c_ptr: *mut c_void, _old_size: usize, new_size: usize, @@ -49,7 +49,7 @@ pub unsafe fn roc_realloc( } #[no_mangle] -pub unsafe fn roc_dealloc(_alignment: usize, c_ptr: *mut c_void) { +pub unsafe fn roc_dealloc(_alignment: u32, c_ptr: *mut c_void) { return free(c_ptr); } diff --git a/examples/hello-world/platform/host.zig b/examples/hello-world/platform/host.zig index 097a034372..c10cfdd426 100644 --- a/examples/hello-world/platform/host.zig +++ b/examples/hello-world/platform/host.zig @@ -23,15 +23,15 @@ extern fn malloc(size: usize) callconv(.C) ?*c_void; extern fn realloc(c_ptr: [*]align(@alignOf(u128)) u8, size: usize) callconv(.C) ?*c_void; extern fn free(c_ptr: [*]align(@alignOf(u128)) u8) callconv(.C) void; -export fn roc_alloc(alignment: usize, size: usize) callconv(.C) ?*c_void { +export fn roc_alloc(alignment: u32, size: usize) callconv(.C) ?*c_void { return malloc(size); } -export fn roc_realloc(alignment: usize, c_ptr: *c_void, old_size: usize, new_size: usize) callconv(.C) ?*c_void { +export fn roc_realloc(alignment: u32, c_ptr: *c_void, old_size: usize, new_size: usize) callconv(.C) ?*c_void { return realloc(@alignCast(16, @ptrCast([*]u8, c_ptr)), new_size); } -export fn roc_dealloc(alignment: usize, c_ptr: *c_void) callconv(.C) void { +export fn roc_dealloc(alignment: u32, c_ptr: *c_void) callconv(.C) void { free(@alignCast(16, @ptrCast([*]u8, c_ptr))); } diff --git a/examples/quicksort/platform/host.zig b/examples/quicksort/platform/host.zig index 88b3ebe190..026253378c 100644 --- a/examples/quicksort/platform/host.zig +++ b/examples/quicksort/platform/host.zig @@ -26,15 +26,15 @@ extern fn malloc(size: usize) callconv(.C) ?*c_void; extern fn realloc(c_ptr: [*]align(@alignOf(u128)) u8, size: usize) callconv(.C) ?*c_void; extern fn free(c_ptr: [*]align(@alignOf(u128)) u8) callconv(.C) void; -export fn roc_alloc(alignment: usize, size: usize) callconv(.C) ?*c_void { +export fn roc_alloc(alignment: u32, size: usize) callconv(.C) ?*c_void { return malloc(size); } -export fn roc_realloc(alignment: usize, c_ptr: *c_void, old_size: usize, new_size: usize) callconv(.C) ?*c_void { +export fn roc_realloc(alignment: u32, c_ptr: *c_void, old_size: usize, new_size: usize) callconv(.C) ?*c_void { return realloc(@alignCast(16, @ptrCast([*]u8, c_ptr)), new_size); } -export fn roc_dealloc(alignment: usize, c_ptr: *c_void) callconv(.C) void { +export fn roc_dealloc(alignment: u32, c_ptr: *c_void) callconv(.C) void { free(@alignCast(16, @ptrCast([*]u8, c_ptr))); } diff --git a/examples/shared-quicksort/platform/src/lib.rs b/examples/shared-quicksort/platform/src/lib.rs index dddd26910d..b7529b1f56 100644 --- a/examples/shared-quicksort/platform/src/lib.rs +++ b/examples/shared-quicksort/platform/src/lib.rs @@ -15,13 +15,13 @@ extern "C" { } #[no_mangle] -pub unsafe fn roc_alloc(_alignment: usize, size: usize) -> *mut c_void { +pub unsafe fn roc_alloc(_alignment: u32, size: usize) -> *mut c_void { return malloc(size); } #[no_mangle] pub unsafe fn roc_realloc( - _alignment: usize, + _alignment: u32, c_ptr: *mut c_void, _old_size: usize, new_size: usize, @@ -30,7 +30,7 @@ pub unsafe fn roc_realloc( } #[no_mangle] -pub unsafe fn roc_dealloc(_alignment: usize, c_ptr: *mut c_void) { +pub unsafe fn roc_dealloc(_alignment: u32, c_ptr: *mut c_void) { return free(c_ptr); } diff --git a/examples/task/platform/host.zig b/examples/task/platform/host.zig index 154e2c45ef..f573ac4b0e 100644 --- a/examples/task/platform/host.zig +++ b/examples/task/platform/host.zig @@ -32,15 +32,15 @@ extern fn malloc(size: usize) callconv(.C) ?*c_void; extern fn realloc(c_ptr: [*]align(@alignOf(u128)) u8, size: usize) callconv(.C) ?*c_void; extern fn free(c_ptr: [*]align(@alignOf(u128)) u8) callconv(.C) void; -export fn roc_alloc(alignment: usize, size: usize) callconv(.C) ?*c_void { +export fn roc_alloc(alignment: u32, size: usize) callconv(.C) ?*c_void { return malloc(size); } -export fn roc_realloc(alignment: usize, c_ptr: *c_void, old_size: usize, new_size: usize) callconv(.C) ?*c_void { +export fn roc_realloc(alignment: u32, c_ptr: *c_void, old_size: usize, new_size: usize) callconv(.C) ?*c_void { return realloc(@alignCast(16, @ptrCast([*]u8, c_ptr)), new_size); } -export fn roc_dealloc(alignment: usize, c_ptr: *c_void) callconv(.C) void { +export fn roc_dealloc(alignment: u32, c_ptr: *c_void) callconv(.C) void { free(@alignCast(16, @ptrCast([*]u8, c_ptr))); } diff --git a/examples/tea/platform/src/lib.rs b/examples/tea/platform/src/lib.rs index 56cd5730c8..1a8f6b9446 100644 --- a/examples/tea/platform/src/lib.rs +++ b/examples/tea/platform/src/lib.rs @@ -67,13 +67,13 @@ extern "C" { } #[no_mangle] -pub unsafe fn roc_alloc(_alignment: usize, size: usize) -> *mut c_void { +pub unsafe fn roc_alloc(_alignment: u32, size: usize) -> *mut c_void { return malloc(size); } #[no_mangle] pub unsafe fn roc_realloc( - _alignment: usize, + _alignment: u32, c_ptr: *mut c_void, _old_size: usize, new_size: usize, @@ -82,7 +82,7 @@ pub unsafe fn roc_realloc( } #[no_mangle] -pub unsafe fn roc_dealloc(_alignment: usize, c_ptr: *mut c_void) { +pub unsafe fn roc_dealloc(_alignment: u32, c_ptr: *mut c_void) { return free(c_ptr); }