This is xnu-11215.1.10. See this file in: xnu-8792.81.2 (MacOS 18, Darwin 22) xnu-8019 (MacOS 17.0, Darwin 21) xnu-6153.11.26 (MacOS 15.0, Darwin 19) xnu-4903.221.2 (MacOS 14.0, Darwin 18) xnu-4570.41.2 (MacOS 13.3, Darwin 17) xnu-3789.70.16 (MacOS 12.6, Darwin 16) xnu-3248.20.55 (MacOS 11.2, Darwin 15) xnu-2782.40.9 (MacOS 10.10.5, Darwin 14) xnu-2422.115.4 (MacOS 10.9.5, Darwin 13) xnu-2050.24.15 (MacOS 10.8.4, Darwin 12) xnu-1699.32.7 (MacOS 10.7.5, Darwin 11) xnu-1504.15.3 (MacOS 10.6.8, Darwin 10) xnu-1228.15.4 (MacOS 10.5.8, Darwin 9)

// To apply, at the top of xnu.git:
// $ spatch --max-width=120 --use-gitgrep --in-place --include-headers --sp-file tools/cocci/hw_atomic_rewrite.cocci -dir .
//
// coccinelle insists on adding a space for (void) casts which can be fixed with:
// $ git grep -l 'os_atomic' | xargs -n1 sed -i '' -e 's/os_atomic/os_atomic/'

@@ expression E, F; @@ // hw_atomic_add -> os_atomic_{inc,dec}

(
- hw_atomic_add(E, -1) + 1
+ os_atomic_dec_orig(E, relaxed)
|
- hw_atomic_add(E, -1)
+ os_atomic_dec(E, relaxed)
|
- hw_atomic_add(E, -F) + F
+ os_atomic_sub_orig(E, F, relaxed)
|
- hw_atomic_add(E, -F)
+ os_atomic_sub(E, F, relaxed)
|
- hw_atomic_add(E, 1) - 1
+ os_atomic_inc_orig(E, relaxed)
|
- hw_atomic_add(E, 1)
+ os_atomic_inc(E, relaxed)
|
- hw_atomic_add(E, F) - F
+ os_atomic_add_orig(E, F, relaxed)
|
- hw_atomic_add(E, F)
+ os_atomic_add(E, F, relaxed)
)

@@ expression E, F; @@ // hw_atomic_sub -> os_atomic_{inc,dec}

(
- hw_atomic_sub(E, -1) - 1
+ os_atomic_inc_orig(E, relaxed)
|
- hw_atomic_sub(E, -1)
+ os_atomic_inc(E, relaxed)
|
- hw_atomic_sub(E, -F) - F
+ os_atomic_add_orig(E, F, relaxed)
|
- hw_atomic_sub(E, -F)
+ os_atomic_add(E, F, relaxed)
|
- hw_atomic_sub(E, 1) + 1
+ os_atomic_dec_orig(E, relaxed)
|
- hw_atomic_sub(E, 1)
+ os_atomic_dec(E, relaxed)
|
- hw_atomic_sub(E, F) + F
+ os_atomic_sub_orig(E, F, relaxed)
|
- hw_atomic_sub(E, F)
+ os_atomic_sub(E, F, relaxed)
)

@@ expression E, F; @@ // hw_atomic_and -> os_atomic_and

(
- hw_atomic_and(E, ~F)
+ os_atomic_andnot(E, F, relaxed)
|
- hw_atomic_and(E, F)
+ os_atomic_and(E, F, relaxed)
|
- hw_atomic_and_noret(E, ~F)
+ os_atomic_andnot(E, F, relaxed)
|
- hw_atomic_and_noret(E, F)
+ os_atomic_and(E, F, relaxed)
)

@@ expression E, F; @@ // hw_atomic_or -> os_atomic_or

(
- hw_atomic_or(E, F)
+ os_atomic_or(E, F, relaxed)
|
- hw_atomic_or_noret(E, F)
+ os_atomic_or(E, F, relaxed)
)

@@ expression E, F, A; @@ // hw_compare_and_store

(
- hw_compare_and_store(E, F, A)
+ os_atomic_cmpxchg(A, E, F, acq_rel)
)

// vim:ft=diff: