|
From: <sv...@va...> - 2016-10-17 16:06:43
|
Author: sewardj
Date: Mon Oct 17 17:06:31 2016
New Revision: 16047
Log:
Merge, from trunk:
16018 mips: replace use of (d)addi with (d)addiu
Modified:
branches/VALGRIND_3_12_BRANCH/ (props changed)
branches/VALGRIND_3_12_BRANCH/coregrind/m_dispatch/dispatch-mips32-linux.S
branches/VALGRIND_3_12_BRANCH/coregrind/m_dispatch/dispatch-mips64-linux.S
branches/VALGRIND_3_12_BRANCH/coregrind/m_libcsetjmp.c
branches/VALGRIND_3_12_BRANCH/coregrind/m_syswrap/syswrap-mips64-linux.c
branches/VALGRIND_3_12_BRANCH/coregrind/m_trampoline.S
branches/VALGRIND_3_12_BRANCH/helgrind/tests/tc08_hbl2.c
Modified: branches/VALGRIND_3_12_BRANCH/coregrind/m_dispatch/dispatch-mips32-linux.S
==============================================================================
--- branches/VALGRIND_3_12_BRANCH/coregrind/m_dispatch/dispatch-mips32-linux.S (original)
+++ branches/VALGRIND_3_12_BRANCH/coregrind/m_dispatch/dispatch-mips32-linux.S Mon Oct 17 17:06:31 2016
@@ -196,7 +196,7 @@
addu $13, $13, $14
lw $12, 0($13) /* t3 = VG_(tt_fast)[hash] :: ULong* */
- addi $13, $13, 4
+ addiu $13, $13, 4
lw $25, 0($13) /* little-endian, so comparing 1st 32bit word */
nop
Modified: branches/VALGRIND_3_12_BRANCH/coregrind/m_dispatch/dispatch-mips64-linux.S
==============================================================================
--- branches/VALGRIND_3_12_BRANCH/coregrind/m_dispatch/dispatch-mips64-linux.S (original)
+++ branches/VALGRIND_3_12_BRANCH/coregrind/m_dispatch/dispatch-mips64-linux.S Mon Oct 17 17:06:31 2016
@@ -196,7 +196,7 @@
daddu $13, $13, $14
ld $12, 0($13) /* t3 = VG_(tt_fast)[hash] :: ULong* */
- daddi $13, $13, 8
+ daddiu $13, $13, 8
ld $25, 0($13) /* little-endian, so comparing 1st 32bit word */
nop
Modified: branches/VALGRIND_3_12_BRANCH/coregrind/m_libcsetjmp.c
==============================================================================
--- branches/VALGRIND_3_12_BRANCH/coregrind/m_libcsetjmp.c (original)
+++ branches/VALGRIND_3_12_BRANCH/coregrind/m_libcsetjmp.c Mon Oct 17 17:06:31 2016
@@ -594,7 +594,7 @@
/* Checking whether second argument is zero. */
" bnez $a1, 1f \n\t"
" nop \n\t"
-" addi $a1, $a1, 1 \n\t" /* We must return 1 if val=0. */
+" addiu $a1, $a1, 1 \n\t" /* We must return 1 if val=0. */
"1: \n\t"
" move $v0, $a1 \n\t" /* Return value of second argument. */
" j $ra \n\t"
Modified: branches/VALGRIND_3_12_BRANCH/coregrind/m_syswrap/syswrap-mips64-linux.c
==============================================================================
--- branches/VALGRIND_3_12_BRANCH/coregrind/m_syswrap/syswrap-mips64-linux.c (original)
+++ branches/VALGRIND_3_12_BRANCH/coregrind/m_syswrap/syswrap-mips64-linux.c Mon Oct 17 17:06:31 2016
@@ -173,7 +173,7 @@
" ld $30, 8($29)\n"
" ld $28, 16($29)\n"
" jr $31\n"
-" daddi $29,$29, 32\n"
+" daddiu $29,$29, 32\n"
".previous\n"
);
Modified: branches/VALGRIND_3_12_BRANCH/coregrind/m_trampoline.S
==============================================================================
--- branches/VALGRIND_3_12_BRANCH/coregrind/m_trampoline.S (original)
+++ branches/VALGRIND_3_12_BRANCH/coregrind/m_trampoline.S Mon Oct 17 17:06:31 2016
@@ -1278,8 +1278,8 @@
//la $a0, string
j strlen_cond
strlen_loop:
- addi $v0, $v0, 1
- addi $a0, $a0, 1
+ addiu $v0, $v0, 1
+ addiu $a0, $a0, 1
strlen_cond:
lbu $t0, ($a0)
bne $t0, $zero, strlen_loop
Modified: branches/VALGRIND_3_12_BRANCH/helgrind/tests/tc08_hbl2.c
==============================================================================
--- branches/VALGRIND_3_12_BRANCH/helgrind/tests/tc08_hbl2.c (original)
+++ branches/VALGRIND_3_12_BRANCH/helgrind/tests/tc08_hbl2.c Mon Oct 17 17:06:31 2016
@@ -125,11 +125,11 @@
# define INC(_lval,_lqual) \
__asm__ __volatile__ ( \
"L1xyzzy1" _lqual":\n" \
- " move $t0, %0\n" \
- " ll $t1, 0($t0)\n" \
- " addi $t1, $t1, 1\n" \
- " sc $t1, 0($t0)\n" \
- " beqz $t1, L1xyzzy1" _lqual \
+ " move $t0, %0\n" \
+ " ll $t1, 0($t0)\n" \
+ " addiu $t1, $t1, 1\n" \
+ " sc $t1, 0($t0)\n" \
+ " beqz $t1, L1xyzzy1" _lqual \
: /*out*/ : /*in*/ "r"(&(_lval)) \
: /*trash*/ "t0", "t1", "memory" \
)
|