* [PATCH roland/arm-memcpy-fix] ARM: Fix memcpy computed-jump calculations for ARM_ALWAYS_BX case.
@ 2013-11-22 13:38 Roland McGrath
2013-11-22 19:40 ` Joseph S. Myers
0 siblings, 1 reply; 3+ messages in thread
From: Roland McGrath @ 2013-11-22 13:38 UTC (permalink / raw)
To: libc-ports
I flubbed the first version (and its testing!) of this, so it worked in the
synthetic situation on GNU/Linux as I was testing, but did not work in the
actual Native Client situation that motivated the change. For this fix I
tested on arm-linux-gnueabi with arm-features.h hacked to define
ARM_BX_ALIGN_LOG2 to 4, define ARM_ALWAYS_BX and ARM_NO_INDEX_REGISTER, and
define 'bx' as a macro for 'nop;bx' to simulate the Native Client build
where it's defined as a macro that expands to two instructions. The last
hack (the 'bx' macro) is what was missing in my testing of the original
version; testing the trunk code with that hack demonstrated the bug.
OK for trunk?
Thanks,
Roland
ports/ChangeLog.arm
2013-11-21 Roland McGrath <roland@hack.frob.com>
* sysdeps/arm/armv7/multiarch/memcpy_impl.S
[ARM_ALWAYS_BX] (dispatch_helper): Fix PC computation to properly
account for instructions after the reference to PC given that 'bx'
might actually be expanded to multiple instructions.
* sysdeps/arm/arm-features.h (ARM_BX_NINSNS): Macro removed.
--- a/ports/sysdeps/arm/arm-features.h
+++ b/ports/sysdeps/arm/arm-features.h
@@ -53,14 +53,6 @@
# define ARM_BX_ALIGN_LOG2 2
#endif
-/* The number of instructions that 'bx' expands to. A more-specific
- arm-features.h that defines 'bx' as a macro should define this to the
- number instructions it expands to. This is used only in a context
- where the 'bx' expansion won't cross an ARM_BX_ALIGN_LOG2 boundary. */
-#ifndef ARM_BX_NINSNS
-# define ARM_BX_NINSNS 1
-#endif
-
/* An OS-specific arm-features.h file may define ARM_NO_INDEX_REGISTER to
indicate that the two-register addressing modes must never be used. */
--- a/ports/sysdeps/arm/armv7/multiarch/memcpy_impl.S
+++ b/ports/sysdeps/arm/armv7/multiarch/memcpy_impl.S
@@ -127,25 +127,26 @@
.purgem dispatch_step
.endm
#else
-# if ARM_BX_ALIGN_LOG2 < 4
+# if ARM_BX_ALIGN_LOG2 < 3
# error case not handled
# endif
.macro dispatch_helper steps, log2_bytes_per_step
- .p2align ARM_BX_ALIGN_LOG2
/* TMP1 gets (max_bytes - bytes_to_copy), where max_bytes is
(STEPS << LOG2_BYTES_PER_STEP).
- So this is (steps_to_skip << LOG2_BYTES_PER_STEP). */
- rsb tmp1, tmp1, #(\steps << \log2_bytes_per_step)
- /* Pad so that the add;bx pair immediately precedes an alignment
- boundary. Hence, TMP1=0 will run all the steps. */
- .rept (1 << (ARM_BX_ALIGN_LOG2 - 2)) - (2 + ARM_BX_NINSNS)
- nop
- .endr
+ So this is (steps_to_skip << LOG2_BYTES_PER_STEP).
+ Then it needs further adjustment to compensate for the
+ distance between the PC value taken below (0f + PC_OFS)
+ and the first step's instructions (1f). */
+ rsb tmp1, tmp1, #((\steps << \log2_bytes_per_step) \
+ + ((1f - PC_OFS - 0f) \
+ >> (ARM_BX_ALIGN_LOG2 - \log2_bytes_per_step)))
/* Shifting down LOG2_BYTES_PER_STEP gives us the number of
steps to skip, then shifting up ARM_BX_ALIGN_LOG2 gives us
the (byte) distance to add to the PC. */
- add tmp1, pc, tmp1, lsl #(ARM_BX_ALIGN_LOG2 - \log2_bytes_per_step)
+0: add tmp1, pc, tmp1, lsl #(ARM_BX_ALIGN_LOG2 - \log2_bytes_per_step)
bx tmp1
+ .p2align ARM_BX_ALIGN_LOG2
+1:
.endm
.macro dispatch_7_dword
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH roland/arm-memcpy-fix] ARM: Fix memcpy computed-jump calculations for ARM_ALWAYS_BX case.
2013-11-22 13:38 [PATCH roland/arm-memcpy-fix] ARM: Fix memcpy computed-jump calculations for ARM_ALWAYS_BX case Roland McGrath
@ 2013-11-22 19:40 ` Joseph S. Myers
2013-11-25 9:14 ` Roland McGrath
0 siblings, 1 reply; 3+ messages in thread
From: Joseph S. Myers @ 2013-11-22 19:40 UTC (permalink / raw)
To: Roland McGrath; +Cc: libc-ports
On Thu, 21 Nov 2013, Roland McGrath wrote:
> I flubbed the first version (and its testing!) of this, so it worked in the
> synthetic situation on GNU/Linux as I was testing, but did not work in the
> actual Native Client situation that motivated the change. For this fix I
> tested on arm-linux-gnueabi with arm-features.h hacked to define
> ARM_BX_ALIGN_LOG2 to 4, define ARM_ALWAYS_BX and ARM_NO_INDEX_REGISTER, and
> define 'bx' as a macro for 'nop;bx' to simulate the Native Client build
> where it's defined as a macro that expands to two instructions. The last
> hack (the 'bx' macro) is what was missing in my testing of the original
> version; testing the trunk code with that hack demonstrated the bug.
>
> OK for trunk?
OK.
--
Joseph S. Myers
joseph@codesourcery.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-11-22 19:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-11-22 13:38 [PATCH roland/arm-memcpy-fix] ARM: Fix memcpy computed-jump calculations for ARM_ALWAYS_BX case Roland McGrath
2013-11-22 19:40 ` Joseph S. Myers
2013-11-25 9:14 ` Roland McGrath
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).