Home Explore Help
Sign In
pascal
/
fpc
mirror of https://gitlab.com/freepascal.org/fpc/source.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

* fixed return value of InterlockedCompareExchange(64) for ppc/ppc64,
bug exposed by tw13281

git-svn-id: trunk@13133 -

Jonas Maebe 16 years ago
parent
5ddddf60ae
commit
a24db8854c
2 changed files with 3 additions and 3 deletions
Unified View Show Diff Stats
  1. 1 1
      rtl/powerpc/powerpc.inc
  2. 2 2
      rtl/powerpc64/powerpc64.inc

+ 1 - 1
rtl/powerpc/powerpc.inc
View File 

@@ -1174,7 +1174,7 @@ asm
 
   or     r6,r7,r8
 
   or     r6,r7,r8
 
   stwcx. r6,0,r3
 
   stwcx. r6,0,r3
 
   bne .LInterlockedCompareExchangeLoop
 
   bne .LInterlockedCompareExchangeLoop
 
-  mr     r3, r6
 
+  mr     r3, r10
 
 end;
 
 end;
 
 
 
 {$IFDEF MORPHOS}
 
 {$IFDEF MORPHOS}

+ 2 - 2
rtl/powerpc64/powerpc64.inc
View File 

@@ -682,7 +682,7 @@ asm
 
   or     r6,r7,r8
 
   or     r6,r7,r8
 
   stwcx. r6,0,r3
 
   stwcx. r6,0,r3
 
   bne .LInterlockedCompareExchangeLoop
 
   bne .LInterlockedCompareExchangeLoop
 
-  mr     r3, r6
 
+  mr     r3, r10
 
 end;
 
 end;
 
 
 
 function InterLockedDecrement64(var Target: Int64) : Int64; assembler; nostackframe;
 
 function InterLockedDecrement64(var Target: Int64) : Int64; assembler; nostackframe;
 
@@ -754,7 +754,7 @@ asm
 
   or     r6,r7,r8
 
   or     r6,r7,r8
 
   stdcx. r6,0,r3
 
   stdcx. r6,0,r3
 
   bne .LInterlockedCompareExchangeLoop
 
   bne .LInterlockedCompareExchangeLoop
 
-  mr     r3, r6
 
+  mr     r3, r10
 
 end;
 
 end;
 
 
 
 {$ifndef FPC_SYSTEM_HAS_MEM_BARRIER}
 
 {$ifndef FPC_SYSTEM_HAS_MEM_BARRIER}