am 3901b1bd: Merge "Remove the __ARM_FEATURE_DSP check."

* commit '3901b1bdd939973a72e01272177757b2524995d3':
  Remove the __ARM_FEATURE_DSP check.
This commit is contained in:
Christopher Ferris 2013-10-02 23:25:08 -07:00 committed by Android Git Automerger
commit 0292c1c81d
3 changed files with 0 additions and 33 deletions

View File

@ -145,19 +145,8 @@ ENTRY(strcmp)
.macro magic_find_zero_bytes w1 .macro magic_find_zero_bytes w1
/* Macro to find all-zero bytes in w1, result is in ip. */ /* Macro to find all-zero bytes in w1, result is in ip. */
#if (defined (__ARM_FEATURE_DSP))
uadd8 ip, \w1, r6 uadd8 ip, \w1, r6
sel ip, r7, r6 sel ip, r7, r6
#else /* not defined (__ARM_FEATURE_DSP) */
/* __ARM_FEATURE_DSP is not defined for some Cortex-M processors.
Coincidently, these processors only have Thumb-2 mode, where we can use the
the (large) magic constant available directly as an immediate in instructions.
Note that we cannot use the magic constant in ARM mode, where we need
to create the constant in a register. */
sub ip, \w1, #0x01010101
bic ip, ip, \w1
and ip, ip, #0x80808080
#endif /* not defined (__ARM_FEATURE_DSP) */
.endm /* magic_find_zero_bytes */ .endm /* magic_find_zero_bytes */
.macro setup_return w1 w2 .macro setup_return w1 w2

View File

@ -145,19 +145,8 @@ ENTRY(strcmp)
.macro magic_find_zero_bytes w1 .macro magic_find_zero_bytes w1
/* Macro to find all-zero bytes in w1, result is in ip. */ /* Macro to find all-zero bytes in w1, result is in ip. */
#if (defined (__ARM_FEATURE_DSP))
uadd8 ip, \w1, r6 uadd8 ip, \w1, r6
sel ip, r7, r6 sel ip, r7, r6
#else /* not defined (__ARM_FEATURE_DSP) */
/* __ARM_FEATURE_DSP is not defined for some Cortex-M processors.
Coincidently, these processors only have Thumb-2 mode, where we can use the
the (large) magic constant available directly as an immediate in instructions.
Note that we cannot use the magic constant in ARM mode, where we need
to create the constant in a register. */
sub ip, \w1, #0x01010101
bic ip, ip, \w1
and ip, ip, #0x80808080
#endif /* not defined (__ARM_FEATURE_DSP) */
.endm /* magic_find_zero_bytes */ .endm /* magic_find_zero_bytes */
.macro setup_return w1 w2 .macro setup_return w1 w2

View File

@ -145,19 +145,8 @@ ENTRY(strcmp)
.macro magic_find_zero_bytes w1 .macro magic_find_zero_bytes w1
/* Macro to find all-zero bytes in w1, result is in ip. */ /* Macro to find all-zero bytes in w1, result is in ip. */
#if (defined (__ARM_FEATURE_DSP))
uadd8 ip, \w1, r6 uadd8 ip, \w1, r6
sel ip, r7, r6 sel ip, r7, r6
#else /* not defined (__ARM_FEATURE_DSP) */
/* __ARM_FEATURE_DSP is not defined for some Cortex-M processors.
Coincidently, these processors only have Thumb-2 mode, where we can use the
the (large) magic constant available directly as an immediate in instructions.
Note that we cannot use the magic constant in ARM mode, where we need
to create the constant in a register. */
sub ip, \w1, #0x01010101
bic ip, ip, \w1
and ip, ip, #0x80808080
#endif /* not defined (__ARM_FEATURE_DSP) */
.endm /* magic_find_zero_bytes */ .endm /* magic_find_zero_bytes */
.macro setup_return w1 w2 .macro setup_return w1 w2