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

Commit a74680fc authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Remove android_atomic_swap from mips & mips64.

Looks like this got left behind in mips by mistake, and
84c3e992 carried this over to mips64.
Clean up before it wastes any more time...

Change-Id: I6aeaa6e68be81f94065589337e2f7d3483e6e43c
parent 29705171
Loading
Loading
Loading
Loading
+0 −17
Original line number Original line Diff line number Diff line
@@ -116,23 +116,6 @@ android_atomic_release_cas(int32_t old_value,
}
}




extern ANDROID_ATOMIC_INLINE int32_t
android_atomic_swap(int32_t new_value, volatile int32_t *ptr)
{
    int32_t prev, status;
    do {
    __asm__ __volatile__ (
        "    move %[status], %[new_value]\n"
        "    ll %[prev], (%[ptr])\n"
        "    sc %[status], (%[ptr])\n"
        : [prev] "=&r" (prev), [status] "=&r" (status)
        : [ptr] "r" (ptr), [new_value] "r" (new_value)
        );
    } while (__builtin_expect(status == 0, 0));
    android_memory_barrier();
    return prev;
}

extern ANDROID_ATOMIC_INLINE int32_t
extern ANDROID_ATOMIC_INLINE int32_t
android_atomic_add(int32_t increment, volatile int32_t *ptr)
android_atomic_add(int32_t increment, volatile int32_t *ptr)
{
{
+0 −17
Original line number Original line Diff line number Diff line
@@ -168,23 +168,6 @@ int64_t android_atomic_release_cas64(int64_t old_value, int64_t new_value,
    return android_atomic_cas64(old_value, new_value, ptr);
    return android_atomic_cas64(old_value, new_value, ptr);
}
}


extern ANDROID_ATOMIC_INLINE
int32_t android_atomic_swap(int32_t new_value, volatile int32_t *ptr)
{
    int32_t prev, status;
    do {
    __asm__ __volatile__ (
        "    move %[status], %[new_value]\n"
        "    ll %[prev], (%[ptr])\n"
        "    sc %[status], (%[ptr])\n"
        : [prev] "=&r" (prev), [status] "=&r" (status)
        : [ptr] "r" (ptr), [new_value] "r" (new_value)
        );
    } while (__builtin_expect(status == 0, 0));
    android_memory_barrier();
    return prev;
}

extern ANDROID_ATOMIC_INLINE
extern ANDROID_ATOMIC_INLINE
int32_t android_atomic_add(int32_t increment, volatile int32_t *ptr)
int32_t android_atomic_add(int32_t increment, volatile int32_t *ptr)
{
{