Browse Source

* switch Z80 RTL to provide atomic intrinsic helpers instead of Interlocked* functions

Sven/Sarah Barth 8 months ago
parent
commit
546c3093f7
1 changed files with 59 additions and 4 deletions
  1. 59 4
      rtl/z80/z80.inc

+ 59 - 4
rtl/z80/z80.inc

@@ -158,7 +158,17 @@ Function Sptr : pointer;assembler;nostackframe;
   end;
   end;
 
 
 
 
+{$ifndef VER3_2}
+{$define FPC_SYSTEM_INTERLOCKED_USE_INTRIN}
+{$endif VER3_2}
+
+
+{$ifdef VER3_2}
 function InterLockedDecrement (var Target: longint) : longint;
 function InterLockedDecrement (var Target: longint) : longint;
+{$else VER3_2}
+{$define FPC_SYSTEM_HAS_ATOMIC_DEC_32}
+function fpc_atomic_dec_32 (var Target: longint): longint;
+{$endif VER3_2}
   begin
   begin
     { block interrupts }
     { block interrupts }
     asm
     asm
@@ -175,7 +185,12 @@ function InterLockedDecrement (var Target: longint) : longint;
   end;
   end;
 
 
 
 
+{$ifdef VER3_2}
 function InterLockedIncrement (var Target: longint) : longint;
 function InterLockedIncrement (var Target: longint) : longint;
+{$else VER3_2}
+{$define FPC_SYSTEM_HAS_ATOMIC_INC_32}
+function fpc_atomic_inc_32 (var Target: longint): longint;
+{$endif VER3_2}
   begin
   begin
     { block interrupts }
     { block interrupts }
     asm
     asm
@@ -192,7 +207,12 @@ function InterLockedIncrement (var Target: longint) : longint;
   end;
   end;
 
 
 
 
+{$ifdef VER3_2}
 function InterLockedExchange (var Target: longint;Source : longint) : longint;
 function InterLockedExchange (var Target: longint;Source : longint) : longint;
+{$else VER3_2}
+{$define FPC_SYSTEM_HAS_ATOMIC_XCHG_32}
+function fpc_atomic_xchg_32 (var Target: longint;Source : longint): longint;
+{$endif VER3_2}
   begin
   begin
     { block interrupts }
     { block interrupts }
     asm
     asm
@@ -209,7 +229,12 @@ function InterLockedExchange (var Target: longint;Source : longint) : longint;
   end;
   end;
 
 
 
 
+{$ifdef VER3_2}
 function InterlockedCompareExchange(var Target: longint; NewValue: longint; Comperand: longint): longint;
 function InterlockedCompareExchange(var Target: longint; NewValue: longint; Comperand: longint): longint;
+{$else VER3_2}
+{$define FPC_SYSTEM_HAS_ATOMIC_CMP_XCHG_32}
+function fpc_atomic_cmp_xchg_32 (var Target: longint; NewValue: longint; Comparand: longint): longint;
+{$endif VER3_2}
   begin
   begin
     { block interrupts }
     { block interrupts }
     asm
     asm
@@ -217,7 +242,7 @@ function InterlockedCompareExchange(var Target: longint; NewValue: longint; Comp
     end;
     end;
 
 
     Result:=Target;
     Result:=Target;
-    if Target=Comperand then
+    if Target={$ifdef VER3_2}Comperand{$else}Comparand{$endif} then
       Target:=NewValue;
       Target:=NewValue;
 
 
     { release interrupts }
     { release interrupts }
@@ -227,7 +252,12 @@ function InterlockedCompareExchange(var Target: longint; NewValue: longint; Comp
   end;
   end;
 
 
 
 
+{$ifdef VER3_2}
 function InterLockedExchangeAdd (var Target: longint;Source : longint) : longint;
 function InterLockedExchangeAdd (var Target: longint;Source : longint) : longint;
+{$else VER3_2}
+{$define FPC_SYSTEM_HAS_ATOMIC_ADD_32}
+function fpc_atomic_add_32 (var Target: longint;Value : longint): longint;
+{$endif VER3_2}
   begin
   begin
     { block interrupts }
     { block interrupts }
     asm
     asm
@@ -235,7 +265,7 @@ function InterLockedExchangeAdd (var Target: longint;Source : longint) : longint
     end;
     end;
 
 
     Result:=Target;
     Result:=Target;
-    inc(Target,Source);
+    inc(Target,{$ifdef VER3_2}Source{$else}Value{$endif});
 
 
     { release interrupts }
     { release interrupts }
     asm
     asm
@@ -244,7 +274,12 @@ function InterLockedExchangeAdd (var Target: longint;Source : longint) : longint
   end;
   end;
 
 
 
 
+{$ifdef VER3_2}
 function InterLockedDecrement (var Target: smallint) : smallint;
 function InterLockedDecrement (var Target: smallint) : smallint;
+{$else VER3_2}
+{$define FPC_SYSTEM_HAS_ATOMIC_DEC_16}
+function fpc_atomic_dec_16 (var Target: smallint): smallint;
+{$endif VER3_2}
   begin
   begin
     { block interrupts }
     { block interrupts }
     asm
     asm
@@ -261,7 +296,12 @@ function InterLockedDecrement (var Target: smallint) : smallint;
   end;
   end;
 
 
 
 
+{$ifdef VER3_2}
 function InterLockedIncrement (var Target: smallint) : smallint;
 function InterLockedIncrement (var Target: smallint) : smallint;
+{$else VER3_2}
+{$define FPC_SYSTEM_HAS_ATOMIC_INC_16}
+function fpc_atomic_inc_16 (var Target: smallint): smallint;
+{$endif VER3_2}
   begin
   begin
     { block interrupts }
     { block interrupts }
     asm
     asm
@@ -278,7 +318,12 @@ function InterLockedIncrement (var Target: smallint) : smallint;
   end;
   end;
 
 
 
 
+{$ifdef VER3_2}
 function InterLockedExchange (var Target: smallint;Source : smallint) : smallint;
 function InterLockedExchange (var Target: smallint;Source : smallint) : smallint;
+{$else VER3_2}
+{$define FPC_SYSTEM_HAS_ATOMIC_XCHG_16}
+function fpc_atomic_xchg_16 (var Target: smallint;Source : smallint): smallint;
+{$endif VER3_2}
   begin
   begin
     { block interrupts }
     { block interrupts }
     asm
     asm
@@ -295,7 +340,12 @@ function InterLockedExchange (var Target: smallint;Source : smallint) : smallint
   end;
   end;
 
 
 
 
+{$ifdef VER3_2}
 function InterlockedCompareExchange(var Target: smallint; NewValue: smallint; Comperand: smallint): smallint;
 function InterlockedCompareExchange(var Target: smallint; NewValue: smallint; Comperand: smallint): smallint;
+{$else VER3_2}
+{$define FPC_SYSTEM_HAS_ATOMIC_CMP_XCHG_16}
+function fpc_atomic_cmp_xchg_16 (var Target: smallint; NewValue: smallint; Comparand: smallint): smallint; [public,alias:'FPC_ATOMIC_CMP_XCHG_16'];
+{$endif VER3_2}
   begin
   begin
     { block interrupts }
     { block interrupts }
     asm
     asm
@@ -303,7 +353,7 @@ function InterlockedCompareExchange(var Target: smallint; NewValue: smallint; Co
     end;
     end;
 
 
     Result:=Target;
     Result:=Target;
-    if Target=Comperand then
+    if Target={$ifdef VER3_2}Comperand{$else}Comparand{$endif} then
       Target:=NewValue;
       Target:=NewValue;
 
 
     { release interrupts }
     { release interrupts }
@@ -313,7 +363,12 @@ function InterlockedCompareExchange(var Target: smallint; NewValue: smallint; Co
   end;
   end;
 
 
 
 
+{$ifdef VER3_2}
 function InterLockedExchangeAdd (var Target: smallint;Source : smallint) : smallint;
 function InterLockedExchangeAdd (var Target: smallint;Source : smallint) : smallint;
+{$else VER3_2}
+{$define FPC_SYSTEM_HAS_ATOMIC_ADD_16}
+function fpc_atomic_add_16 (var Target: smallint;Value : smallint): smallint;
+{$endif VER3_2}
   begin
   begin
     { block interrupts }
     { block interrupts }
     asm
     asm
@@ -321,7 +376,7 @@ function InterLockedExchangeAdd (var Target: smallint;Source : smallint) : small
     end;
     end;
 
 
     Result:=Target;
     Result:=Target;
-    inc(Target,Source);
+    inc(Target,{$ifdef VER3_2}Source{$else}Value{$endif});
 
 
     { release interrupts }
     { release interrupts }
     asm
     asm