authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2024-12-01 15:29:05+01:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2024-12-03 11:57:20+01:00
logdd1d9cce3c068c76e99fbe9028bba4219d5d5792
treebf8bbac03e388075a4465d068ea9b3fb7ad52fc6
parentf29daebd904c8a3bc2792301be218fe7c99dfe8d
signaturebadge-check Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

zig.h: Add a zig_msvc macro to be used instead of _MSC_VER.

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

lib/zig.h+55-53
......@@ -1,5 +1,17 @@
11#undef linux
22
3#if defined(_MSC_VER)
4#define zig_msvc
5#elif defined(__clang__)
6#define zig_clang
7#elif defined(__GNUC__)
8#define zig_gnuc
9#elif defined(__TINYC__)
10#define zig_tinyc
11#elif defined(__slimcc__)
12#define zig_slimcc
13#endif
14
315#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
416#define __STDC_WANT_IEC_60559_TYPES_EXT__
517#endif
......@@ -9,7 +21,7 @@
921#include <stddef.h>
1022#include <stdint.h>
1123
12#if _MSC_VER
24#if defined(zig_msvc)
1325#include <intrin.h>
1426#elif defined(__i386__) || defined(__x86_64__)
1527#include <cpuid.h>
......@@ -25,16 +37,6 @@ typedef char bool;
2537#define true 1
2638#endif
2739
28#if defined(__clang__)
29#define zig_clang
30#elif defined(__GNUC__)
31#define zig_gnuc
32#elif defined(__TINYC__)
33#define zig_tinyc
34#elif defined(__slimcc__)
35#define zig_slimcc
36#endif
37
3840#define zig_concat(lhs, rhs) lhs##rhs
3941#define zig_expand_concat(lhs, rhs) zig_concat(lhs, rhs)
4042
......@@ -51,7 +53,7 @@ typedef char bool;
5153#define zig_has_attribute(attribute) 0
5254#endif
5355
54#if defined(_MSC_VER) || __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
56#if defined(zig_msvc) || __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
5557#define zig_little_endian 1
5658#define zig_big_endian 0
5759#else
......@@ -65,7 +67,7 @@ typedef char bool;
6567#define zig_threadlocal _Thread_local
6668#elif defined(__GNUC__) || defined(zig_slimcc)
6769#define zig_threadlocal __thread
68#elif _MSC_VER
70#elif defined(zig_msvc)
6971#define zig_threadlocal __declspec(thread)
7072#else
7173#define zig_threadlocal zig_threadlocal_unavailable
......@@ -77,7 +79,7 @@ typedef char bool;
7779#define zig_f128_has_miscompilations 0
7880#endif
7981
80#if _MSC_VER
82#if defined(zig_msvc)
8183#define zig_const_arr
8284#define zig_callconv(c) __##c
8385#else
......@@ -88,7 +90,7 @@ typedef char bool;
8890#if zig_has_attribute(naked) || defined(zig_gnuc)
8991#define zig_naked_decl __attribute__((naked))
9092#define zig_naked __attribute__((naked))
91#elif defined(_MSC_VER)
93#elif defined(zig_msvc)
9294#define zig_naked_decl
9395#define zig_naked __declspec(naked)
9496#else
......@@ -110,7 +112,7 @@ typedef char bool;
110112
111113#if zig_has_attribute(noinline)
112114#define zig_never_inline __attribute__((noinline)) zig_maybe_flatten
113#elif defined(_MSC_VER)
115#elif defined(zig_msvc)
114116#define zig_never_inline __declspec(noinline) zig_maybe_flatten
115117#else
116118#define zig_never_inline zig_never_inline_unavailable
......@@ -138,7 +140,7 @@ typedef char bool;
138140
139141#if zig_has_attribute(aligned) || defined(zig_tinyc)
140142#define zig_under_align(alignment) __attribute__((aligned(alignment)))
141#elif _MSC_VER
143#elif defined(zig_msvc)
142144#define zig_under_align(alignment) __declspec(align(alignment))
143145#else
144146#define zig_under_align zig_align_unavailable
......@@ -154,7 +156,7 @@ typedef char bool;
154156
155157#if zig_has_attribute(aligned) || defined(zig_tinyc)
156158#define zig_align_fn(alignment) __attribute__((aligned(alignment)))
157#elif _MSC_VER
159#elif defined(zig_msvc)
158160#define zig_align_fn(alignment)
159161#else
160162#define zig_align_fn zig_align_fn_unavailable
......@@ -162,7 +164,7 @@ typedef char bool;
162164
163165#if zig_has_attribute(packed) || defined(zig_tinyc)
164166#define zig_packed(definition) __attribute__((packed)) definition
165#elif _MSC_VER
167#elif defined(zig_msvc)
166168#define zig_packed(definition) __pragma(pack(1)) definition __pragma(pack())
167169#else
168170#define zig_packed(definition) zig_packed_unavailable
......@@ -171,7 +173,7 @@ typedef char bool;
171173#if zig_has_attribute(section) || defined(zig_tinyc)
172174#define zig_linksection(name) __attribute__((section(name)))
173175#define zig_linksection_fn zig_linksection
174#elif _MSC_VER
176#elif defined(zig_msvc)
175177#define zig_linksection(name) __pragma(section(name, read, write)) __declspec(allocate(name))
176178#define zig_linksection_fn(name) __pragma(section(name, read, execute)) __declspec(code_seg(name))
177179#else
......@@ -191,23 +193,23 @@ typedef char bool;
191193#define zig_extern extern
192194#endif
193195
194#if _MSC_VER
196#if defined(zig_msvc)
195197#if _M_X64
196198#define zig_mangle_c(symbol) symbol
197199#else /*_M_X64 */
198200#define zig_mangle_c(symbol) "_" symbol
199201#endif /*_M_X64 */
200#else /* _MSC_VER */
202#else /* zig_msvc */
201203#if __APPLE__
202204#define zig_mangle_c(symbol) "_" symbol
203205#else /* __APPLE__ */
204206#define zig_mangle_c(symbol) symbol
205207#endif /* __APPLE__ */
206#endif /* _MSC_VER */
208#endif /* zig_msvc */
207209
208210#if (zig_has_attribute(alias) || defined(zig_tinyc)) && !__APPLE__
209211#define zig_export(symbol, name) __attribute__((alias(symbol)))
210#elif _MSC_VER
212#elif defined(zig_msvc)
211213#define zig_export(symbol, name) ; \
212214 __pragma(comment(linker, "/alternatename:" zig_mangle_c(name) "=" zig_mangle_c(symbol)))
213215#else
......@@ -217,24 +219,24 @@ typedef char bool;
217219
218220#define zig_mangled_tentative zig_mangled
219221#define zig_mangled_final zig_mangled
220#if _MSC_VER
222#if defined(zig_msvc)
221223#define zig_mangled(mangled, unmangled) ; \
222224 zig_export(#mangled, unmangled)
223225#define zig_mangled_export(mangled, unmangled, symbol) \
224226 zig_export(unmangled, #mangled) \
225227 zig_export(symbol, unmangled)
226#else /* _MSC_VER */
228#else /* zig_msvc */
227229#define zig_mangled(mangled, unmangled) __asm(zig_mangle_c(unmangled))
228230#define zig_mangled_export(mangled, unmangled, symbol) \
229231 zig_mangled_final(mangled, unmangled) \
230232 zig_export(symbol, unmangled)
231#endif /* _MSC_VER */
233#endif /* zig_msvc */
232234
233#if _MSC_VER
235#if defined(zig_msvc)
234236#define zig_import(Type, fn_name, libc_name, sig_args, call_args) zig_extern Type fn_name sig_args;\
235237 __pragma(comment(linker, "/alternatename:" zig_mangle_c(#fn_name) "=" zig_mangle_c(#libc_name)));
236238#define zig_import_builtin(Type, fn_name, libc_name, sig_args, call_args) zig_import(Type, fn_name, sig_args, call_args)
237#else /* _MSC_VER */
239#else /* zig_msvc */
238240#define zig_import(Type, fn_name, libc_name, sig_args, call_args) zig_extern Type fn_name sig_args __asm(zig_mangle_c(#libc_name));
239241#define zig_import_builtin(Type, fn_name, libc_name, sig_args, call_args) zig_extern Type libc_name sig_args; \
240242 static inline Type fn_name sig_args { return libc_name call_args; }
......@@ -246,7 +248,7 @@ typedef char bool;
246248#if zig_has_attribute(weak) || defined(zig_gnuc) || defined(zig_tinyc)
247249#define zig_weak_linkage __attribute__((weak))
248250#define zig_weak_linkage_fn __attribute__((weak))
249#elif _MSC_VER
251#elif defined(zig_msvc)
250252#define zig_weak_linkage __declspec(selectany)
251253#define zig_weak_linkage_fn
252254#else
......@@ -256,9 +258,9 @@ typedef char bool;
256258
257259#if zig_has_builtin(trap)
258260#define zig_trap() __builtin_trap()
259#elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))
261#elif defined(zig_msvc) && (defined(_M_IX86) || defined(_M_X64))
260262#define zig_trap() __ud2()
261#elif defined(_MSC_VER)
263#elif defined(zig_msvc)
262264#define zig_trap() __fastfail(7)
263265#elif defined(__thumb__)
264266#define zig_trap() __asm__ volatile("udf #0xfe")
......@@ -284,7 +286,7 @@ typedef char bool;
284286
285287#if zig_has_builtin(debugtrap)
286288#define zig_breakpoint() __builtin_debugtrap()
287#elif defined(_MSC_VER) || defined(__MINGW32__) || defined(__MINGW64__)
289#elif defined(zig_msvc) || defined(__MINGW32__) || defined(__MINGW64__)
288290#define zig_breakpoint() __debugbreak()
289291#elif defined(__arm__)
290292#define zig_breakpoint() __asm__ volatile("bkpt #0x0")
......@@ -312,7 +314,7 @@ typedef char bool;
312314
313315#if zig_has_builtin(return_address) || defined(zig_gnuc) || defined(zig_tinyc)
314316#define zig_return_address() __builtin_extract_return_addr(__builtin_return_address(0))
315#elif defined(_MSC_VER)
317#elif defined(zig_msvc)
316318#define zig_return_address() _ReturnAddress()
317319#else
318320#define zig_return_address() 0
......@@ -344,7 +346,7 @@ typedef char bool;
344346#define zig_noreturn _Noreturn
345347#elif zig_has_attribute(noreturn) || defined(zig_gnuc) || defined(zig_tinyc)
346348#define zig_noreturn __attribute__((noreturn))
347#elif _MSC_VER
349#elif defined(zig_msvc)
348350#define zig_noreturn __declspec(noreturn)
349351#else
350352#define zig_noreturn
......@@ -369,7 +371,7 @@ zig_extern void *memset (void *, int, size_t);
369371
370372/* ===================== 8/16/32/64-bit Integer Support ===================== */
371373
372#if __STDC_VERSION__ >= 199901L || _MSC_VER
374#if __STDC_VERSION__ >= 199901L || defined(zig_msvc)
373375#include <stdint.h>
374376#else
375377
......@@ -1268,7 +1270,7 @@ typedef struct { zig_align(16) int64_t hi; uint64_t lo; } zig_i128;
12681270#define zig_make_u128(hi, lo) ((zig_u128){ .h##i = (hi), .l##o = (lo) })
12691271#define zig_make_i128(hi, lo) ((zig_i128){ .h##i = (hi), .l##o = (lo) })
12701272
1271#if _MSC_VER /* MSVC doesn't allow struct literals in constant expressions */
1273#if defined(zig_msvc) /* MSVC doesn't allow struct literals in constant expressions */
12721274#define zig_init_u128(hi, lo) { .h##i = (hi), .l##o = (lo) }
12731275#define zig_init_i128(hi, lo) { .h##i = (hi), .l##o = (lo) }
12741276#else /* But non-MSVC doesn't like the unprotected commas */
......@@ -3030,7 +3032,7 @@ static inline uint16_t zig_popcount_big(const void *val, bool is_signed, uint16_
30303032
30313033/* ========================= Floating Point Support ========================= */
30323034
3033#if _MSC_VER
3035#if defined(zig_msvc)
30343036float __cdecl nanf(char const* input);
30353037double __cdecl nan(char const* input);
30363038long double __cdecl nanl(char const* input);
......@@ -3100,7 +3102,7 @@ typedef zig_f16 zig_compiler_rt_f16;
31003102
31013103#define zig_has_f32 1
31023104#define zig_libc_name_f32(name) name##f
3103#if _MSC_VER
3105#if defined(zig_msvc)
31043106#define zig_init_special_f32(sign, name, arg, repr) sign zig_make_f32(zig_msvc_flt_##name, )
31053107#else
31063108#define zig_init_special_f32(sign, name, arg, repr) zig_make_special_f32(sign, name, arg, repr)
......@@ -3132,7 +3134,7 @@ typedef uint32_t zig_f32;
31323134#define zig_has_f64 1
31333135#define zig_libc_name_f64(name) name
31343136
3135#if _MSC_VER
3137#if defined(zig_msvc)
31363138#define zig_init_special_f64(sign, name, arg, repr) sign zig_make_f64(zig_msvc_flt_##name, )
31373139#else
31383140#define zig_init_special_f64(sign, name, arg, repr) zig_make_special_f64(sign, name, arg, repr)
......@@ -3244,10 +3246,10 @@ typedef zig_u128 zig_f128;
32443246#endif
32453247#endif
32463248
3247#if !_MSC_VER && defined(ZIG_TARGET_ABI_MSVC)
3249#if !defined(zig_msvc) && defined(ZIG_TARGET_ABI_MSVC)
32483250/* Emulate msvc abi on a gnu compiler */
32493251typedef zig_f64 zig_c_longdouble;
3250#elif _MSC_VER && !defined(ZIG_TARGET_ABI_MSVC)
3252#elif defined(zig_msvc) && !defined(ZIG_TARGET_ABI_MSVC)
32513253/* Emulate gnu abi on an msvc compiler */
32523254typedef zig_f128 zig_c_longdouble;
32533255#else
......@@ -3647,7 +3649,7 @@ typedef int zig_memory_order;
36473649#define zig_atomic_load(res, obj, order, Type, ReprType) __atomic_load (obj, &(res), order)
36483650#undef zig_atomicrmw_xchg_float
36493651#define zig_atomicrmw_xchg_float zig_atomicrmw_xchg
3650#elif _MSC_VER && (_M_IX86 || _M_X64)
3652#elif defined(zig_msvc) && (_M_IX86 || _M_X64)
36513653#define zig_memory_order_relaxed 0
36523654#define zig_memory_order_acquire 2
36533655#define zig_memory_order_release 3
......@@ -3667,7 +3669,7 @@ typedef int zig_memory_order;
36673669#define zig_atomicrmw_max(res, obj, arg, order, Type, ReprType) res = zig_msvc_atomicrmw_max_ ##Type(obj, arg)
36683670#define zig_atomic_store( obj, arg, order, Type, ReprType) zig_msvc_atomic_store_ ##Type(obj, arg)
36693671#define zig_atomic_load(res, obj, order, Type, ReprType) res = zig_msvc_atomic_load_ ##order##_##Type(obj)
3670/* TODO: _MSC_VER && (_M_ARM || _M_ARM64) */
3672/* TODO: zig_msvc && (_M_ARM || _M_ARM64) */
36713673#else
36723674#define zig_memory_order_relaxed 0
36733675#define zig_memory_order_acquire 2
......@@ -3690,7 +3692,7 @@ typedef int zig_memory_order;
36903692#define zig_atomic_load(res, obj, order, Type, ReprType) zig_atomics_unavailable
36913693#endif
36923694
3693#if _MSC_VER && (_M_IX86 || _M_X64)
3695#if defined(zig_msvc) && (_M_IX86 || _M_X64)
36943696
36953697/* TODO: zig_msvc_atomic_load should load 32 bit without interlocked on x86, and load 64 bit without interlocked on x64 */
36963698
......@@ -3936,7 +3938,7 @@ static inline void zig_msvc_atomic_store_i128(zig_i128 volatile* obj, zig_i128 a
39363938
39373939#endif /* _M_IX86 */
39383940
3939#endif /* _MSC_VER && (_M_IX86 || _M_X64) */
3941#endif /* zig_msvc && (_M_IX86 || _M_X64) */
39403942
39413943/* ======================== Special Case Intrinsics ========================= */
39423944
......@@ -3944,7 +3946,7 @@ static inline void zig_msvc_atomic_store_i128(zig_i128 volatile* obj, zig_i128 a
39443946
39453947static inline void* zig_thumb_windows_teb(void) {
39463948 void* teb = 0;
3947#if defined(_MSC_VER)
3949#if defined(zig_msvc)
39483950 teb = (void*)_MoveFromCoprocessor(15, 0, 13, 0, 2);
39493951#elif defined(__GNUC__)
39503952 __asm__ ("mrc p15, 0, %[ptr], c13, c0, 2" : [ptr] "=r" (teb));
......@@ -3956,7 +3958,7 @@ static inline void* zig_thumb_windows_teb(void) {
39563958
39573959static inline void* zig_aarch64_windows_teb(void) {
39583960 void* teb = 0;
3959#if defined(_MSC_VER)
3961#if defined(zig_msvc)
39603962 teb = (void*)__readx18qword(0x0);
39613963#elif defined(__GNUC__)
39623964 __asm__ ("mov %[ptr], x18" : [ptr] "=r" (teb));
......@@ -3968,7 +3970,7 @@ static inline void* zig_aarch64_windows_teb(void) {
39683970
39693971static inline void* zig_x86_windows_teb(void) {
39703972 void* teb = 0;
3971#if defined(_MSC_VER)
3973#if defined(zig_msvc)
39723974 teb = (void*)__readfsdword(0x18);
39733975#elif defined(__GNUC__)
39743976 __asm__ ("movl %%fs:0x18, %[ptr]" : [ptr] "=r" (teb));
......@@ -3980,7 +3982,7 @@ static inline void* zig_x86_windows_teb(void) {
39803982
39813983static inline void* zig_x86_64_windows_teb(void) {
39823984 void* teb = 0;
3983#if defined(_MSC_VER)
3985#if defined(zig_msvc)
39843986 teb = (void*)__readgsqword(0x30);
39853987#elif defined(__GNUC__)
39863988 __asm__ ("movq %%gs:0x30, %[ptr]" : [ptr] "=r" (teb));
......@@ -3990,10 +3992,10 @@ static inline void* zig_x86_64_windows_teb(void) {
39903992
39913993#endif
39923994
3993#if (_MSC_VER && (_M_IX86 || _M_X64)) || defined(__i386__) || defined(__x86_64__)
3995#if (defined(zig_msvc) && (_M_IX86 || _M_X64)) || defined(__i386__) || defined(__x86_64__)
39943996
39953997static inline void zig_x86_cpuid(uint32_t leaf_id, uint32_t subid, uint32_t* eax, uint32_t* ebx, uint32_t* ecx, uint32_t* edx) {
3996#if _MSC_VER
3998#if defined(zig_msvc)
39973999 int cpu_info[4];
39984000 __cpuidex(cpu_info, leaf_id, subid);
39994001 *eax = (uint32_t)cpu_info[0];
......@@ -4006,7 +4008,7 @@ static inline void zig_x86_cpuid(uint32_t leaf_id, uint32_t subid, uint32_t* eax
40064008}
40074009
40084010static inline uint32_t zig_x86_get_xcr0(void) {
4009#if _MSC_VER
4011#if defined(zig_msvc)
40104012 return (uint32_t)_xgetbv(0);
40114013#else
40124014 uint32_t eax;