|
From: <sv...@va...> - 2011-03-28 08:37:26
|
Author: sewardj
Date: 2011-03-28 09:37:19 +0100 (Mon, 28 Mar 2011)
New Revision: 11669
Log:
Fix broken inline asm in these tests. Fixes #256726.
(Jakub Jelinek, ja...@re...)
Modified:
trunk/helgrind/tests/tc07_hbl1.c
trunk/helgrind/tests/tc08_hbl2.c
Modified: trunk/helgrind/tests/tc07_hbl1.c
===================================================================
--- trunk/helgrind/tests/tc07_hbl1.c 2011-03-28 08:22:55 UTC (rev 11668)
+++ trunk/helgrind/tests/tc07_hbl1.c 2011-03-28 08:37:19 UTC (rev 11669)
@@ -48,23 +48,23 @@
|| defined(PLAT_ppc32_aix5) || defined(PLAT_ppc64_aix5)
# define INC(_lval,_lqual) \
__asm__ __volatile__( \
- "L1xyzzy1" _lqual ":\n" \
+ "1:\n" \
" lwarx 15,0,%0\n" \
" addi 15,15,1\n" \
" stwcx. 15,0,%0\n" \
- " bne- L1xyzzy1" _lqual \
+ " bne- 1b\n" \
: /*out*/ : /*in*/ "b"(&(_lval)) \
: /*trash*/ "r15", "cr0", "memory" \
)
#elif defined(PLAT_arm_linux)
# define INC(_lval,_lqual) \
__asm__ __volatile__( \
- "L1xyzzy1" _lqual ":\n" \
+ "1:\n" \
" ldrex r8, [%0, #0]\n" \
" add r8, r8, #1\n" \
" strex r9, r8, [%0, #0]\n" \
" cmp r9, #0\n" \
- " bne L1xyzzy1" _lqual \
+ " bne 1b\n" \
: /*out*/ : /*in*/ "r"(&(_lval)) \
: /*trash*/ "r8", "r9", "cc", "memory" \
);
Modified: trunk/helgrind/tests/tc08_hbl2.c
===================================================================
--- trunk/helgrind/tests/tc08_hbl2.c 2011-03-28 08:22:55 UTC (rev 11668)
+++ trunk/helgrind/tests/tc08_hbl2.c 2011-03-28 08:37:19 UTC (rev 11669)
@@ -65,23 +65,23 @@
|| defined(PLAT_ppc32_aix5) || defined(PLAT_ppc64_aix5)
# define INC(_lval,_lqual) \
__asm__ __volatile__( \
- "L1xyzzy1" _lqual ":\n" \
+ "1:\n" \
" lwarx 15,0,%0\n" \
" addi 15,15,1\n" \
" stwcx. 15,0,%0\n" \
- " bne- L1xyzzy1" _lqual \
+ " bne- 1b\n" \
: /*out*/ : /*in*/ "b"(&(_lval)) \
: /*trash*/ "r15", "cr0", "memory" \
)
#elif defined(PLAT_arm_linux)
# define INC(_lval,_lqual) \
__asm__ __volatile__( \
- "L1xyzzy1" _lqual ":\n" \
+ "1:\n" \
" ldrex r8, [%0, #0]\n" \
" add r8, r8, #1\n" \
" strex r9, r8, [%0, #0]\n" \
" cmp r9, #0\n" \
- " bne L1xyzzy1" _lqual \
+ " bne 1b\n" \
: /*out*/ : /*in*/ "r"(&(_lval)) \
: /*trash*/ "r8", "r9", "cc", "memory" \
);
|