authorgravatar for quae@daurnimator.comdaurnimator <quae@daurnimator.com> 2020-04-05 13:55:56+10:00
committergravatar for quae@daurnimator.comdaurnimator <quae@daurnimator.com> 2020-04-05 14:06:12+10:00
logf9474443620c9c654c0a888a928557f8ec2815c8
tree51039ab78be53169efc8bff00279e99948ae6978
parentcd20e0cc672249555709e1b58a415ddd50b03ad9
signaturelock-open Commit is signed but in an unrecognized format.

Tidy up compiler_rt/atomics

1 files changed, 55 insertions(+), 55 deletions(-)

lib/std/special/compiler_rt/atomics.zig+55-55
......@@ -106,7 +106,7 @@ const largest_atomic_size = switch (builtin.arch) {
106106 else => @sizeOf(usize),
107107};
108108
109fn makeAtomicLoadFn(comptime T: type) type {
109fn atomicLoadFn(comptime T: type) fn (*T, i32) callconv(.C) T {
110110 return struct {
111111 fn atomic_load_N(src: *T, model: i32) callconv(.C) T {
112112 if (@sizeOf(T) > largest_atomic_size) {
......@@ -117,17 +117,17 @@ fn makeAtomicLoadFn(comptime T: type) type {
117117 return @atomicLoad(T, src, .SeqCst);
118118 }
119119 }
120 };
120 }.atomic_load_N;
121121}
122122
123123comptime {
124 @export(makeAtomicLoadFn(u8).atomic_load_N, .{ .name = "__atomic_load_1", .linkage = linkage });
125 @export(makeAtomicLoadFn(u16).atomic_load_N, .{ .name = "__atomic_load_2", .linkage = linkage });
126 @export(makeAtomicLoadFn(u32).atomic_load_N, .{ .name = "__atomic_load_4", .linkage = linkage });
127 @export(makeAtomicLoadFn(u64).atomic_load_N, .{ .name = "__atomic_load_8", .linkage = linkage });
124 @export(atomicLoadFn(u8), .{ .name = "__atomic_load_1", .linkage = linkage });
125 @export(atomicLoadFn(u16), .{ .name = "__atomic_load_2", .linkage = linkage });
126 @export(atomicLoadFn(u32), .{ .name = "__atomic_load_4", .linkage = linkage });
127 @export(atomicLoadFn(u64), .{ .name = "__atomic_load_8", .linkage = linkage });
128128}
129129
130fn makeAtomicStoreFn(comptime T: type) type {
130fn atomicStoreFn(comptime T: type) fn (*T, T, i32) callconv(.C) void {
131131 return struct {
132132 fn atomic_store_N(dst: *T, value: T, model: i32) callconv(.C) void {
133133 if (@sizeOf(T) > largest_atomic_size) {
......@@ -138,17 +138,17 @@ fn makeAtomicStoreFn(comptime T: type) type {
138138 @atomicStore(T, dst, value, .SeqCst);
139139 }
140140 }
141 };
141 }.atomic_store_N;
142142}
143143
144144comptime {
145 @export(makeAtomicStoreFn(u8).atomic_store_N, .{ .name = "__atomic_store_1", .linkage = linkage });
146 @export(makeAtomicStoreFn(u16).atomic_store_N, .{ .name = "__atomic_store_2", .linkage = linkage });
147 @export(makeAtomicStoreFn(u32).atomic_store_N, .{ .name = "__atomic_store_4", .linkage = linkage });
148 @export(makeAtomicStoreFn(u64).atomic_store_N, .{ .name = "__atomic_store_8", .linkage = linkage });
145 @export(atomicStoreFn(u8), .{ .name = "__atomic_store_1", .linkage = linkage });
146 @export(atomicStoreFn(u16), .{ .name = "__atomic_store_2", .linkage = linkage });
147 @export(atomicStoreFn(u32), .{ .name = "__atomic_store_4", .linkage = linkage });
148 @export(atomicStoreFn(u64), .{ .name = "__atomic_store_8", .linkage = linkage });
149149}
150150
151fn makeAtomicExchangeFn(comptime T: type) type {
151fn atomicExchangeFn(comptime T: type) fn (*T, T, i32) callconv(.C) T {
152152 return struct {
153153 fn atomic_exchange_N(ptr: *T, val: T, model: i32) callconv(.C) T {
154154 if (@sizeOf(T) > largest_atomic_size) {
......@@ -161,17 +161,17 @@ fn makeAtomicExchangeFn(comptime T: type) type {
161161 return @atomicRmw(T, ptr, .Xchg, val, .SeqCst);
162162 }
163163 }
164 };
164 }.atomic_exchange_N;
165165}
166166
167167comptime {
168 @export(makeAtomicExchangeFn(u8).atomic_exchange_N, .{ .name = "__atomic_exchange_1", .linkage = linkage });
169 @export(makeAtomicExchangeFn(u16).atomic_exchange_N, .{ .name = "__atomic_exchange_2", .linkage = linkage });
170 @export(makeAtomicExchangeFn(u32).atomic_exchange_N, .{ .name = "__atomic_exchange_4", .linkage = linkage });
171 @export(makeAtomicExchangeFn(u64).atomic_exchange_N, .{ .name = "__atomic_exchange_8", .linkage = linkage });
168 @export(atomicExchangeFn(u8), .{ .name = "__atomic_exchange_1", .linkage = linkage });
169 @export(atomicExchangeFn(u16), .{ .name = "__atomic_exchange_2", .linkage = linkage });
170 @export(atomicExchangeFn(u32), .{ .name = "__atomic_exchange_4", .linkage = linkage });
171 @export(atomicExchangeFn(u64), .{ .name = "__atomic_exchange_8", .linkage = linkage });
172172}
173173
174fn makeAtomicCompareExchangeFn(comptime T: type) type {
174fn atomicCompareExchangeFn(comptime T: type) fn (*T, *T, T, i32, i32) callconv(.C) i32 {
175175 return struct {
176176 fn atomic_compare_exchange_N(ptr: *T, expected: *T, desired: T, success: i32, failure: i32) callconv(.C) i32 {
177177 if (@sizeOf(T) > largest_atomic_size) {
......@@ -191,17 +191,17 @@ fn makeAtomicCompareExchangeFn(comptime T: type) type {
191191 return 1;
192192 }
193193 }
194 };
194 }.atomic_compare_exchange_N;
195195}
196196
197197comptime {
198 @export(makeAtomicCompareExchangeFn(u8).atomic_compare_exchange_N, .{ .name = "__atomic_compare_exchange_1", .linkage = linkage });
199 @export(makeAtomicCompareExchangeFn(u16).atomic_compare_exchange_N, .{ .name = "__atomic_compare_exchange_2", .linkage = linkage });
200 @export(makeAtomicCompareExchangeFn(u32).atomic_compare_exchange_N, .{ .name = "__atomic_compare_exchange_4", .linkage = linkage });
201 @export(makeAtomicCompareExchangeFn(u64).atomic_compare_exchange_N, .{ .name = "__atomic_compare_exchange_8", .linkage = linkage });
198 @export(atomicCompareExchangeFn(u8), .{ .name = "__atomic_compare_exchange_1", .linkage = linkage });
199 @export(atomicCompareExchangeFn(u16), .{ .name = "__atomic_compare_exchange_2", .linkage = linkage });
200 @export(atomicCompareExchangeFn(u32), .{ .name = "__atomic_compare_exchange_4", .linkage = linkage });
201 @export(atomicCompareExchangeFn(u64), .{ .name = "__atomic_compare_exchange_8", .linkage = linkage });
202202}
203203
204fn makeFetchFn(comptime T: type, comptime op: builtin.AtomicRmwOp) type {
204fn fetchFn(comptime T: type, comptime op: builtin.AtomicRmwOp) fn (*T, T, i32) callconv(.C) T {
205205 return struct {
206206 pub fn fetch_op_N(ptr: *T, val: T, model: i32) callconv(.C) T {
207207 if (@sizeOf(T) > largest_atomic_size) {
......@@ -224,37 +224,37 @@ fn makeFetchFn(comptime T: type, comptime op: builtin.AtomicRmwOp) type {
224224
225225 return @atomicRmw(T, ptr, op, val, .SeqCst);
226226 }
227 };
227 }.fetch_op_N;
228228}
229229
230230comptime {
231 @export(makeFetchFn(u8, .Add).fetch_op_N, .{ .name = "__atomic_fetch_add_1", .linkage = linkage });
232 @export(makeFetchFn(u16, .Add).fetch_op_N, .{ .name = "__atomic_fetch_add_2", .linkage = linkage });
233 @export(makeFetchFn(u32, .Add).fetch_op_N, .{ .name = "__atomic_fetch_add_4", .linkage = linkage });
234 @export(makeFetchFn(u64, .Add).fetch_op_N, .{ .name = "__atomic_fetch_add_8", .linkage = linkage });
235
236 @export(makeFetchFn(u8, .Sub).fetch_op_N, .{ .name = "__atomic_fetch_sub_1", .linkage = linkage });
237 @export(makeFetchFn(u16, .Sub).fetch_op_N, .{ .name = "__atomic_fetch_sub_2", .linkage = linkage });
238 @export(makeFetchFn(u32, .Sub).fetch_op_N, .{ .name = "__atomic_fetch_sub_4", .linkage = linkage });
239 @export(makeFetchFn(u64, .Sub).fetch_op_N, .{ .name = "__atomic_fetch_sub_8", .linkage = linkage });
240
241 @export(makeFetchFn(u8, .And).fetch_op_N, .{ .name = "__atomic_fetch_and_1", .linkage = linkage });
242 @export(makeFetchFn(u16, .And).fetch_op_N, .{ .name = "__atomic_fetch_and_2", .linkage = linkage });
243 @export(makeFetchFn(u32, .And).fetch_op_N, .{ .name = "__atomic_fetch_and_4", .linkage = linkage });
244 @export(makeFetchFn(u64, .And).fetch_op_N, .{ .name = "__atomic_fetch_and_8", .linkage = linkage });
245
246 @export(makeFetchFn(u8, .Or).fetch_op_N, .{ .name = "__atomic_fetch_or_1", .linkage = linkage });
247 @export(makeFetchFn(u16, .Or).fetch_op_N, .{ .name = "__atomic_fetch_or_2", .linkage = linkage });
248 @export(makeFetchFn(u32, .Or).fetch_op_N, .{ .name = "__atomic_fetch_or_4", .linkage = linkage });
249 @export(makeFetchFn(u64, .Or).fetch_op_N, .{ .name = "__atomic_fetch_or_8", .linkage = linkage });
250
251 @export(makeFetchFn(u8, .Xor).fetch_op_N, .{ .name = "__atomic_fetch_xor_1", .linkage = linkage });
252 @export(makeFetchFn(u16, .Xor).fetch_op_N, .{ .name = "__atomic_fetch_xor_2", .linkage = linkage });
253 @export(makeFetchFn(u32, .Xor).fetch_op_N, .{ .name = "__atomic_fetch_xor_4", .linkage = linkage });
254 @export(makeFetchFn(u64, .Xor).fetch_op_N, .{ .name = "__atomic_fetch_xor_8", .linkage = linkage });
255
256 @export(makeFetchFn(u8, .Nand).fetch_op_N, .{ .name = "__atomic_fetch_nand_1", .linkage = linkage });
257 @export(makeFetchFn(u16, .Nand).fetch_op_N, .{ .name = "__atomic_fetch_nand_2", .linkage = linkage });
258 @export(makeFetchFn(u32, .Nand).fetch_op_N, .{ .name = "__atomic_fetch_nand_4", .linkage = linkage });
259 @export(makeFetchFn(u64, .Nand).fetch_op_N, .{ .name = "__atomic_fetch_nand_8", .linkage = linkage });
231 @export(fetchFn(u8, .Add), .{ .name = "__atomic_fetch_add_1", .linkage = linkage });
232 @export(fetchFn(u16, .Add), .{ .name = "__atomic_fetch_add_2", .linkage = linkage });
233 @export(fetchFn(u32, .Add), .{ .name = "__atomic_fetch_add_4", .linkage = linkage });
234 @export(fetchFn(u64, .Add), .{ .name = "__atomic_fetch_add_8", .linkage = linkage });
235
236 @export(fetchFn(u8, .Sub), .{ .name = "__atomic_fetch_sub_1", .linkage = linkage });
237 @export(fetchFn(u16, .Sub), .{ .name = "__atomic_fetch_sub_2", .linkage = linkage });
238 @export(fetchFn(u32, .Sub), .{ .name = "__atomic_fetch_sub_4", .linkage = linkage });
239 @export(fetchFn(u64, .Sub), .{ .name = "__atomic_fetch_sub_8", .linkage = linkage });
240
241 @export(fetchFn(u8, .And), .{ .name = "__atomic_fetch_and_1", .linkage = linkage });
242 @export(fetchFn(u16, .And), .{ .name = "__atomic_fetch_and_2", .linkage = linkage });
243 @export(fetchFn(u32, .And), .{ .name = "__atomic_fetch_and_4", .linkage = linkage });
244 @export(fetchFn(u64, .And), .{ .name = "__atomic_fetch_and_8", .linkage = linkage });
245
246 @export(fetchFn(u8, .Or), .{ .name = "__atomic_fetch_or_1", .linkage = linkage });
247 @export(fetchFn(u16, .Or), .{ .name = "__atomic_fetch_or_2", .linkage = linkage });
248 @export(fetchFn(u32, .Or), .{ .name = "__atomic_fetch_or_4", .linkage = linkage });
249 @export(fetchFn(u64, .Or), .{ .name = "__atomic_fetch_or_8", .linkage = linkage });
250
251 @export(fetchFn(u8, .Xor), .{ .name = "__atomic_fetch_xor_1", .linkage = linkage });
252 @export(fetchFn(u16, .Xor), .{ .name = "__atomic_fetch_xor_2", .linkage = linkage });
253 @export(fetchFn(u32, .Xor), .{ .name = "__atomic_fetch_xor_4", .linkage = linkage });
254 @export(fetchFn(u64, .Xor), .{ .name = "__atomic_fetch_xor_8", .linkage = linkage });
255
256 @export(fetchFn(u8, .Nand), .{ .name = "__atomic_fetch_nand_1", .linkage = linkage });
257 @export(fetchFn(u16, .Nand), .{ .name = "__atomic_fetch_nand_2", .linkage = linkage });
258 @export(fetchFn(u32, .Nand), .{ .name = "__atomic_fetch_nand_4", .linkage = linkage });
259 @export(fetchFn(u64, .Nand), .{ .name = "__atomic_fetch_nand_8", .linkage = linkage });
260260}