Skip to content

Commit dd8c19c

Browse files
author
florian
committed
Use local labels instead of global labels (ppc and mips
specific code). git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15701 a5019735-40e9-0310-863c-91ae7b9d1cf9
1 parent cf5c887 commit dd8c19c

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

coregrind/m_libcassert.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@
8787
{ UInt cia, r1, lr; \
8888
__asm__ __volatile__( \
8989
"mflr 0;" /* r0 = lr */ \
90-
"bl m_libcassert_get_ip;" /* lr = pc */ \
91-
"m_libcassert_get_ip:\n" \
90+
"bl 0f;" /* lr = pc */ \
91+
"0:\n" \
9292
"mflr %0;" /* %0 = pc */ \
9393
"mtlr 0;" /* restore lr */ \
9494
"mr %1,1;" /* %1 = r1 */ \
@@ -106,8 +106,8 @@
106106
{ ULong cia, r1, lr; \
107107
__asm__ __volatile__( \
108108
"mflr 0;" /* r0 = lr */ \
109-
"bl .m_libcassert_get_ip;" /* lr = pc */ \
110-
".m_libcassert_get_ip:\n" \
109+
"bl 0f;" /* lr = pc */ \
110+
"0:\n" \
111111
"mflr %0;" /* %0 = pc */ \
112112
"mtlr 0;" /* restore lr */ \
113113
"mr %1,1;" /* %1 = r1 */ \
@@ -180,8 +180,8 @@
180180
# define GET_STARTREGS(srP) \
181181
{ UInt pc, sp, fp, ra, gp; \
182182
asm("move $8, $31;" /* t0 = ra */ \
183-
"bal m_libcassert_get_ip;" /* ra = pc */ \
184-
"m_libcassert_get_ip:\n" \
183+
"bal 0f;" /* ra = pc */ \
184+
"0:\n" \
185185
"move %0, $31;" \
186186
"move $31, $8;" /* restore lr */ \
187187
"move %1, $29;" \
@@ -203,10 +203,10 @@
203203
}
204204
#elif defined(VGP_mips64_linux)
205205
# define GET_STARTREGS(srP) \
206-
{ ULong pc, sp, fp, ra, gp; \
206+
{ ULong pc, sp, fp, ra, gp; \
207207
asm("move $8, $31;" /* t0 = ra */ \
208-
"bal m_libcassert_get_ip;" /* ra = pc */ \
209-
"m_libcassert_get_ip:\n" \
208+
"bal 0f;" /* ra = pc */ \
209+
"0:\n" \
210210
"move %0, $31;" \
211211
"move $31, $8;" /* restore lr */ \
212212
"move %1, $29;" \

0 commit comments

Comments
 (0)