Fix assembly on windows (#5)

rerun-io · Oct 15, 2024 · a2c5600 · a2c5600
1 parent df538e4
commit a2c5600
Show file tree

Hide file tree

Showing 19 changed files with 52 additions and 46 deletions.
diff --git a/src/ext/x86/x86inc.asm b/src/ext/x86/x86inc.asm
@@ -868,17 +868,23 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae,
     extern %1
 %endmacro
 
-; %2 and %3 give control over symbol type and symbol visibility, respectively.
-; E.g. `cextern_args some_symbol,data,hidden`.
+; Like `cextern`, but assumes the symbol is hidden data (i.e. `extern:data hidden`).
+; Portable across all supported platforms.
 ;
 ; This can be life saving in position-independent contexts, where it is very easy to generate
 ; illegal relocations otherwise.
 ;
 ; See <https://github.com/rerun-io/re_rav1d/pull/3> for more information.
-%macro cextern_args 3
+%macro cextern_hidden_data 1
     %xdefine %1 mangle(private_prefix %+ _ %+ %1)
     CAT_XDEFINE cglobaled_, %1, 2
-    extern %1:%2 %3
+    %if FORMAT_ELF
+        extern %1:data hidden
+    %elif FORMAT_MACHO && HAVE_PRIVATE_EXTERN
+        extern %1:private_extern
+    %else
+        extern %1
+    %endif
 %endmacro
 
 ; Like cextern, but without the prefix. This should be used for symbols from external libraries.

diff --git a/src/x86/filmgrain_common.asm b/src/x86/filmgrain_common.asm
@@ -43,4 +43,4 @@ struc FGData
     .clip_to_restricted_range:  resd 1
 endstruc
 
-cextern_args gaussian_sequence,data,hidden
+cextern_hidden_data gaussian_sequence
diff --git a/src/x86/ipred16_avx2.asm b/src/x86/ipred16_avx2.asm
@@ -129,8 +129,8 @@ JMP_TABLE ipred_cfl_left_16bpc,   avx2, h4, h8, h16, h32
 JMP_TABLE ipred_cfl_ac_444_16bpc, avx2, w4, w8, w16, w32
 JMP_TABLE pal_pred_16bpc,         avx2, w4, w8, w16, w32, w64
 
-cextern_args dr_intra_derivative,data,hidden
-cextern_args filter_intra_taps,data,hidden
+cextern_hidden_data dr_intra_derivative
+cextern_hidden_data filter_intra_taps
 
 SECTION .text
 

diff --git a/src/x86/ipred16_avx512.asm b/src/x86/ipred16_avx512.asm
@@ -121,10 +121,10 @@ JMP_TABLE ipred_z2_16bpc,         avx512icl, w4, w8, w16, w32, w64
 JMP_TABLE ipred_z3_16bpc,         avx512icl, w4, w8, w16, w32, w64
 JMP_TABLE pal_pred_16bpc,         avx512icl, w4, w8, w16, w32, w64
 
-cextern_args smooth_weights_1d_16bpc,data,hidden
-cextern_args smooth_weights_2d_16bpc,data,hidden
-cextern_args dr_intra_derivative,data,hidden
-cextern_args filter_intra_taps,data,hidden
+cextern_hidden_data smooth_weights_1d_16bpc
+cextern_hidden_data smooth_weights_2d_16bpc
+cextern_hidden_data dr_intra_derivative
+cextern_hidden_data filter_intra_taps
 
 SECTION .text
 

diff --git a/src/x86/ipred16_sse.asm b/src/x86/ipred16_sse.asm
@@ -99,10 +99,10 @@ JMP_TABLE ipred_cfl_left_16bpc,   ssse3, h4, h8, h16, h32
 JMP_TABLE ipred_cfl_ac_444_16bpc, ssse3, w4, w8, w16, w32
 JMP_TABLE pal_pred_16bpc,         ssse3, w4, w8, w16, w32, w64
 
-cextern_args smooth_weights_1d_16bpc,data,hidden
-cextern_args smooth_weights_2d_16bpc,data,hidden
-cextern_args dr_intra_derivative,data,hidden
-cextern_args filter_intra_taps,data,hidden
+cextern_hidden_data smooth_weights_1d_16bpc
+cextern_hidden_data smooth_weights_2d_16bpc
+cextern_hidden_data dr_intra_derivative
+cextern_hidden_data filter_intra_taps
 
 SECTION .text
 

diff --git a/src/x86/ipred_avx2.asm b/src/x86/ipred_avx2.asm
@@ -173,8 +173,8 @@ JMP_TABLE ipred_cfl_ac_422, avx2, w16_pad1, w16_pad2, w16_pad3
 JMP_TABLE ipred_cfl_ac_444, avx2, w32_pad1, w32_pad2, w32_pad3, w4, w8, w16, w32
 JMP_TABLE pal_pred,         avx2, w4, w8, w16, w32, w64
 
-cextern_args dr_intra_derivative,data,hidden
-cextern_args filter_intra_taps,data,hidden
+cextern_hidden_data dr_intra_derivative
+cextern_hidden_data filter_intra_taps
 
 SECTION .text
 

diff --git a/src/x86/ipred_avx512.asm b/src/x86/ipred_avx512.asm
@@ -213,8 +213,8 @@ JMP_TABLE ipred_dc_8bpc,         avx512icl, h4, h8, h16, h32, h64, w4, w8, w16,
                                        s4-10*4, s8-10*4, s16-10*4, s32-10*4, s64-10*4
 JMP_TABLE ipred_dc_left_8bpc,    avx512icl, h4, h8, h16, h32, h64
 
-cextern_args dr_intra_derivative,data,hidden
-cextern_args pb_0to63,data,hidden
+cextern_hidden_data dr_intra_derivative
+cextern_hidden_data pb_0to63
 
 SECTION .text
 

diff --git a/src/x86/ipred_sse.asm b/src/x86/ipred_sse.asm
@@ -141,8 +141,8 @@ JMP_TABLE ipred_cfl,        ssse3, h4, h8, h16, h32, w4, w8, w16, w32, \
 JMP_TABLE ipred_cfl_left,   ssse3, h4, h8, h16, h32
 JMP_TABLE ipred_filter,     ssse3, w4, w8, w16, w32
 
-cextern_args dr_intra_derivative,data,hidden
-cextern_args filter_intra_taps,data,hidden
+cextern_hidden_data dr_intra_derivative
+cextern_hidden_data filter_intra_taps
 
 SECTION .text
 

diff --git a/src/x86/looprestoration16_avx2.asm b/src/x86/looprestoration16_avx2.asm
@@ -62,8 +62,8 @@ pd_0xf00801c7: dd 0xf00801c7
 
 %define pw_256 sgr_lshuf5
 
-cextern_args pb_0to63,data,hidden
-cextern_args sgr_x_by_x_avx2,data,hidden
+cextern_hidden_data pb_0to63
+cextern_hidden_data sgr_x_by_x_avx2
 
 SECTION .text
 

diff --git a/src/x86/looprestoration16_avx512.asm b/src/x86/looprestoration16_avx512.asm
@@ -51,7 +51,7 @@ pd_m9:         dd -9
 pd_8:          dd 8
 pd_2147483648: dd 2147483648
 
-cextern_args sgr_x_by_x,data,hidden
+cextern_hidden_data sgr_x_by_x
 
 SECTION .text
 

diff --git a/src/x86/looprestoration16_sse.asm b/src/x86/looprestoration16_sse.asm
@@ -59,7 +59,7 @@ pd_0xfffffff0: times 4 dd 0xfffffff0
 wiener_shifts: dw 4, 4, 2048, 2048, 1, 1, 8192, 8192
 wiener_round:  dd 1049600, 1048832
 
-cextern_args sgr_x_by_x,data,hidden
+cextern_hidden_data sgr_x_by_x
 
 SECTION .text
 

diff --git a/src/x86/looprestoration_avx512.asm b/src/x86/looprestoration_avx512.asm
@@ -53,7 +53,7 @@ pd_m9:         dd -9
 pd_34816:      dd 34816
 pd_8421376:    dd 8421376
 
-cextern_args sgr_x_by_x,data,hidden
+cextern_hidden_data sgr_x_by_x
 
 SECTION .text
 

diff --git a/src/x86/looprestoration_sse.asm b/src/x86/looprestoration_sse.asm
@@ -51,7 +51,7 @@ pd_0xffff:     times 4 dd 0xffff
 pd_0xf00800a4: times 4 dd 0xf00800a4
 pd_0xf00801c7: times 4 dd 0xf00801c7
 
-cextern_args sgr_x_by_x,data,hidden
+cextern_hidden_data sgr_x_by_x
 
 SECTION .text
 

diff --git a/src/x86/mc16_avx2.asm b/src/x86/mc16_avx2.asm
@@ -194,11 +194,11 @@ SCALED_JMP_TABLE prep_8tap_scaled, avx2,   4, 8, 16, 32, 64, 128
 
 %define table_offset(type, fn) type %+ fn %+ SUFFIX %+ _table - type %+ SUFFIX
 
-cextern_args mc_subpel_filters,data,hidden
+cextern_hidden_data mc_subpel_filters
 %define subpel_filters (mangle(private_prefix %+ _mc_subpel_filters)-8)
 
-cextern_args mc_warp_filter,data,hidden
-cextern_args resize_filter,data,hidden
+cextern_hidden_data mc_warp_filter
+cextern_hidden_data resize_filter
 
 SECTION .text
 

diff --git a/src/x86/mc16_avx512.asm b/src/x86/mc16_avx512.asm
@@ -251,12 +251,12 @@ HV_JMP_TABLE   prep, 8tap,  avx512icl, 2,    4, 8, 16, 32, 64, 128
 
 %define table_offset(type, fn) type %+ fn %+ SUFFIX %+ _table - type %+ SUFFIX
 
-cextern_args mc_subpel_filters,data,hidden
+cextern_hidden_data mc_subpel_filters
 %define subpel_filters (mangle(private_prefix %+ _mc_subpel_filters)-8)
 
-cextern_args mc_warp_filter,data,hidden
-cextern_args obmc_masks_avx2,data,hidden
-cextern_args resize_filter,data,hidden
+cextern_hidden_data mc_warp_filter
+cextern_hidden_data obmc_masks_avx2
+cextern_hidden_data resize_filter
 
 SECTION .text
 

diff --git a/src/x86/mc16_sse.asm b/src/x86/mc16_sse.asm
@@ -158,11 +158,11 @@ BASE_JMP_TABLE prep, ssse3,    4, 8, 16, 32, 64, 128
 SCALED_JMP_TABLE put_8tap_scaled, ssse3, 2, 4, 8, 16, 32, 64, 128
 SCALED_JMP_TABLE prep_8tap_scaled, ssse3,   4, 8, 16, 32, 64, 128
 
-cextern_args mc_subpel_filters,data,hidden
+cextern_hidden_data mc_subpel_filters
 %define subpel_filters (mangle(private_prefix %+ _mc_subpel_filters)-8)
 
-cextern_args mc_warp_filter,data,hidden
-cextern_args resize_filter,data,hidden
+cextern_hidden_data mc_warp_filter
+cextern_hidden_data resize_filter
 
 SECTION .text
 

diff --git a/src/x86/mc_avx2.asm b/src/x86/mc_avx2.asm
@@ -91,10 +91,10 @@ pd_0x3ff:        dd 0x3ff
 pd_0x4000:       dd 0x4000
 pq_0x40000000:   dq 0x40000000
 
-cextern_args mc_subpel_filters,data,hidden
-cextern_args mc_warp_filter2,data,hidden
-cextern_args resize_filter,data,hidden
-cextern_args z_filter_s,data,hidden
+cextern_hidden_data mc_subpel_filters
+cextern_hidden_data mc_warp_filter2
+cextern_hidden_data resize_filter
+cextern_hidden_data z_filter_s
 
 %define subpel_filters (mangle(private_prefix %+ _mc_subpel_filters)-8)
 

diff --git a/src/x86/mc_avx512.asm b/src/x86/mc_avx512.asm
@@ -200,10 +200,10 @@ pd_512:             dd 512
 %define pb_64  (wm_sign+8)
 %define pd_2   (pd_0to7+8)
 
-cextern_args mc_subpel_filters,data,hidden
+cextern_hidden_data mc_subpel_filters
 %define subpel_filters (mangle(private_prefix %+ _mc_subpel_filters)-8)
-cextern_args mc_warp_filter,data,hidden
-cextern_args resize_filter,data,hidden
+cextern_hidden_data mc_warp_filter
+cextern_hidden_data resize_filter
 
 %macro BASE_JMP_TABLE 3-*
     %xdefine %1_%2_table (%%table - %3)

diff --git a/src/x86/mc_sse.asm b/src/x86/mc_sse.asm
@@ -202,7 +202,7 @@ const mc_warp_filter2 ; dav1d_mc_warp_filter[] reordered for pmaddubsw usage
 
 pw_258:  times 2 dw 258
 
-cextern_args mc_subpel_filters,data,hidden
+cextern_hidden_data mc_subpel_filters
 %define subpel_filters (mangle(private_prefix %+ _mc_subpel_filters)-8)
 
 %macro BIDIR_JMP_TABLE 2-*
@@ -9357,7 +9357,7 @@ cglobal emu_edge_8bpc, 10, 13, 2, bw, bh, iw, ih, x, \
 %undef reg_blkm
 %undef reg_tmp
 
-cextern_args resize_filter,data,hidden
+cextern_hidden_data resize_filter
 
 %macro SCRATCH 3
 %if ARCH_X86_32