diff options
| author | Wei Wang <wangw@codeaurora.org> | 2014-06-16 12:15:45 -0700 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2014-07-22 12:04:37 -0700 |
| commit | 96de38b6cef879b320e619b8946c2833d4e14179 (patch) | |
| tree | 4ba91043ce4708d8731af18a378ce01d5b9c7f40 | |
| parent | df4822ef8ac1ed2b64b8376a29307b835b97530e (diff) | |
| download | android_dalvik-96de38b6cef879b320e619b8946c2833d4e14179.tar.gz android_dalvik-96de38b6cef879b320e619b8946c2833d4e14179.tar.bz2 android_dalvik-96de38b6cef879b320e619b8946c2833d4e14179.zip | |
dalvik: use memmove_words for word atomic memmove
use memmove_words for word atomic memmove
Change-Id: Ife31c217f7038f5054969b4bbe1108b351881b3b
| -rw-r--r-- | vm/native/java_lang_System.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vm/native/java_lang_System.cpp b/vm/native/java_lang_System.cpp index 33c295554..4e200d6a1 100644 --- a/vm/native/java_lang_System.cpp +++ b/vm/native/java_lang_System.cpp @@ -62,10 +62,6 @@ * TODO: use __builtin_prefetch * TODO: write an ARM-optimized version */ -#if defined(HAVE_HALFWORD_ATOMIC_MEMMOVE) -#define move16 memmove -#define move32 memmove -#else static void memmove_words(void* dest, const void* src, size_t n) { assert((((uintptr_t) dest | (uintptr_t) src | n) & 0x01) == 0); @@ -179,6 +175,10 @@ static void memmove_words(void* dest, const void* src, size_t n) { } } +#if defined(HAVE_HALFWORD_ATOMIC_MEMMOVE) +#define move16 memmove +#define move32 memmove_words +#else #define move16 memmove_words #define move32 memmove_words #endif |