diff options
| author | Elliott Hughes <enh@google.com> | 2010-04-12 14:29:37 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2010-04-12 14:29:37 -0700 |
| commit | 2bdbcb6db8c3ab984cf64d4a3a3f0d5529aa9e52 (patch) | |
| tree | 68fb0ff46662ff0a68bb70f9d7b4250dc687c09b /vm/InlineNative.h | |
| parent | 5ace75d35912aec8c5a7e5661f0f42483ab17015 (diff) | |
| download | android_dalvik-2bdbcb6db8c3ab984cf64d4a3a3f0d5529aa9e52.tar.gz android_dalvik-2bdbcb6db8c3ab984cf64d4a3a3f0d5529aa9e52.tar.bz2 android_dalvik-2bdbcb6db8c3ab984cf64d4a3a3f0d5529aa9e52.zip | |
Fix supplementary character support.
Fixes all known bugs in our handling of supplementary characters. This change
introduces a performance regression on the assumption that it won't be released
without a corresponding JIT change to enable the code to be inlined back to
pretty much what it used to be.
Bug: 2587122
Change-Id: I3449c9718bbe32ebe53b6c10454ae1dc82105b59
Diffstat (limited to 'vm/InlineNative.h')
| -rw-r--r-- | vm/InlineNative.h | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/vm/InlineNative.h b/vm/InlineNative.h index 890226e97..9b9ae3910 100644 --- a/vm/InlineNative.h +++ b/vm/InlineNative.h @@ -54,19 +54,18 @@ typedef enum NativeInlineOps { INLINE_STRING_CHARAT = 1, INLINE_STRING_COMPARETO = 2, INLINE_STRING_EQUALS = 3, - INLINE_STRING_INDEXOF_I = 4, - INLINE_STRING_INDEXOF_II = 5, - INLINE_STRING_IS_EMPTY = 6, - INLINE_STRING_LENGTH = 7, - INLINE_MATH_ABS_INT = 8, - INLINE_MATH_ABS_LONG = 9, - INLINE_MATH_ABS_FLOAT = 10, - INLINE_MATH_ABS_DOUBLE = 11, - INLINE_MATH_MIN_INT = 12, - INLINE_MATH_MAX_INT = 13, - INLINE_MATH_SQRT = 14, - INLINE_MATH_COS = 15, - INLINE_MATH_SIN = 16, + INLINE_STRING_FASTINDEXOF_II = 4, + INLINE_STRING_IS_EMPTY = 5, + INLINE_STRING_LENGTH = 6, + INLINE_MATH_ABS_INT = 7, + INLINE_MATH_ABS_LONG = 8, + INLINE_MATH_ABS_FLOAT = 9, + INLINE_MATH_ABS_DOUBLE = 10, + INLINE_MATH_MIN_INT = 11, + INLINE_MATH_MAX_INT = 12, + INLINE_MATH_SQRT = 13, + INLINE_MATH_COS = 14, + INLINE_MATH_SIN = 15, } NativeInlineOps; /* |