|
From: Petar J. <pe...@so...> - 2019-03-25 18:54:05
|
https://sourceware.org/git/gitweb.cgi?p=valgrind.git;h=d6da48fe5ac2e94fe28184ff334cd6b2283ef9a6 commit d6da48fe5ac2e94fe28184ff334cd6b2283ef9a6 Author: Petar Jovanovic <mip...@gm...> Date: Mon Mar 25 19:53:21 2019 +0100 mips: use local labels for do_acasW() use local labels for do_acasW() to avoid defining symbols multiple times when the function gets inlined. It fixes assembler error reported in KDE #400164. Diff: --- helgrind/tests/annotate_hbefore.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/helgrind/tests/annotate_hbefore.c b/helgrind/tests/annotate_hbefore.c index e311714..71590d0 100644 --- a/helgrind/tests/annotate_hbefore.c +++ b/helgrind/tests/annotate_hbefore.c @@ -234,15 +234,15 @@ UWord do_acasW ( UWord* addr, UWord expected, UWord nyu ) "lw $t2, 8(%1)" "\n\t" "lw $t3, 4(%1)" "\n\t" "ll $t1, 0($t0)" "\n\t" - "bne $t1, $t2, exit_0" "\n\t" + "bne $t1, $t2, 1f" "\n\t" "nop" "\n\t" "sc $t3, 0($t0)" "\n\t" "move %0, $t3" "\n\t" - "b exit" "\n\t" + "b 2f" "\n\t" "nop" "\n\t" - "exit_0:" "\n\t" + "1:" "\n\t" "move %0, $zero" "\n\t" - "exit:" "\n\t" + "2:" "\n\t" : /*out*/ "=r"(success) : /*in*/ "r"(&block[0]) : /*trash*/ "t0", "t1", "t2", "t3", "memory" @@ -267,15 +267,15 @@ UWord do_acasW ( UWord* addr, UWord expected, UWord nyu ) "ld $t2, 16(%1)" "\n\t" "ld $t3, 8(%1)" "\n\t" "ll $t1, 0($t0)" "\n\t" - "bne $t1, $t2, exit_0" "\n\t" + "bne $t1, $t2, 1f" "\n\t" "nop" "\n\t" "sc $t3, 0($t0)" "\n\t" "move %0, $t3" "\n\t" - "b exit" "\n\t" + "b 2f" "\n\t" "nop" "\n\t" - "exit_0:" "\n\t" + "1:" "\n\t" "move %0, $zero" "\n\t" - "exit:" "\n\t" + "2:" "\n\t" : /*out*/ "=r"(success) : /*in*/ "r"(&block[0]) : /*trash*/ "t0", "t1", "t2", "t3", "memory" |
|
From: John R. <jr...@bi...> - 2019-03-26 00:02:25
|
Make labels prominent even in the .c file. > diff --git a/helgrind/tests/annotate_hbefore.c b/helgrind/tests/annotate_hbefore.c > index e311714..71590d0 100644 > --- a/helgrind/tests/annotate_hbefore.c > +++ b/helgrind/tests/annotate_hbefore.c > @@ -234,15 +234,15 @@ UWord do_acasW ( UWord* addr, UWord expected, UWord nyu ) > "lw $t2, 8(%1)" "\n\t" > "lw $t3, 4(%1)" "\n\t" > "ll $t1, 0($t0)" "\n\t" > - "bne $t1, $t2, exit_0" "\n\t" > + "bne $t1, $t2, 1f" "\n\t" > "nop" "\n\t" > "sc $t3, 0($t0)" "\n\t" > "move %0, $t3" "\n\t" > - "b exit" "\n\t" > + "b 2f" "\n\t" > "nop" "\n\t" > - "exit_0:" "\n\t" > +"1:" "\n\t" > "move %0, $zero" "\n\t" > - "exit:" "\n\t" > +"2:" "\n\t" > : /*out*/ "=r"(success) > : /*in*/ "r"(&block[0]) > : /*trash*/ "t0", "t1", "t2", "t3", "memory" > @@ -267,15 +267,15 @@ UWord do_acasW ( UWord* addr, UWord expected, UWord nyu ) > "ld $t2, 16(%1)" "\n\t" > "ld $t3, 8(%1)" "\n\t" > "ll $t1, 0($t0)" "\n\t" > - "bne $t1, $t2, exit_0" "\n\t" > + "bne $t1, $t2, 1f" "\n\t" > "nop" "\n\t" > "sc $t3, 0($t0)" "\n\t" > "move %0, $t3" "\n\t" > - "b exit" "\n\t" > + "b 2f" "\n\t" > "nop" "\n\t" > - "exit_0:" "\n\t" > +"1:" "\n\t" > "move %0, $zero" "\n\t" > - "exit:" "\n\t" > +"2:" "\n\t" > : /*out*/ "=r"(success) > : /*in*/ "r"(&block[0]) > : /*trash*/ "t0", "t1", "t2", "t3", "memory" > > > _______________________________________________ > Valgrind-developers mailing list > Val...@li... > https://lists.sourceforge.net/lists/listinfo/valgrind-developers > > |