Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b243e15 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am bb59b7a5: am 4599c1ff: Merge change 23892 into eclair 

Merge commit 'bb59b7a5'

* commit 'bb59b7a5':
  android_atomic_write() implementation was using cmpxchg which was useless
parents 8342e885 bb59b7a5

libcutils/atomic-android-arm.S

+2 −17
Original line number Diff line number Diff line
@@ -55,23 +55,8 @@ 
 */

 

android_atomic_write:

    stmdb   sp!, {r4, lr}

    mov     r2, r1

    mov     r1, r0

1: @ android_atomic_write

    ldr     r0, [r2]

    mov     r3, #kernel_atomic_base

#ifdef __ARM_HAVE_PC_INTERWORK

    add     lr, pc, #4

    add     pc, r3, #(kernel_cmpxchg - kernel_atomic_base)

#else

    add     r3, r3, #(kernel_cmpxchg - kernel_atomic_base)

    mov     lr, pc

    bx      r3

#endif

    bcc     1b

    ldmia   sp!, {r4, lr}

    bx      lr

    str     r0, [r1]

    bx      lr;



/*

 * ----------------------------------------------------------------------------

libcutils/atomic-android-armv6.S

+2 −5
Original line number Diff line number Diff line
@@ -45,11 +45,8 @@ 
 */



android_atomic_write:

1:  ldrex   r12, [r1]

    strex   r12, r0, [r1]

    cmp     r12, #0

    bne     1b

    bx      lr

    str     r0, [r1]

    bx      lr;



/*

 * ----------------------------------------------------------------------------