summaryrefslogtreecommitdiff
path: root/exec
diff options
context:
space:
mode:
authorPo Lu <luangruo@yahoo.com>2025-04-15 17:11:56 +0800
committerPo Lu <luangruo@yahoo.com>2025-04-15 17:11:56 +0800
commit19b6e36a22513b437b86d4b6418ce31f551902cc (patch)
treec33401adcf03e14a04da8b865df165e7aa08224b /exec
parent458ad0cb899491da546c06a3f1cd63c0f54623ac (diff)
* exec/loader-mips64el.s (rest_of_exec): Deal with assembler bugs.
Diffstat (limited to 'exec')
-rw-r--r--exec/loader-mips64el.s6
1 files changed, 4 insertions, 2 deletions
diff --git a/exec/loader-mips64el.s b/exec/loader-mips64el.s
index be978d8b18b..cab80d5e19f 100644
--- a/exec/loader-mips64el.s
+++ b/exec/loader-mips64el.s
@@ -175,13 +175,15 @@ rest_of_exec:
dadd $s1, $s1, $t0 # s1 = start of envp
skip_environ:
/* Locate the auxiliary vector. */
+ li $t8, 8 # DADDI2 isn't appropriate in delay slots.
1: ld $t0, ($s1) # t0 = *s1
bnez $t0, 1b # skip environment entry
- daddi $s1, $s1, 8 # s1++
+ dadd $s1, $s1, $t8 # s1++
move $s2, $s1 # s2 = end of environment
+ li $t8, 16
1: ld $t0, ($s1) # t0 = s1->a_type
bnez $t0, 1b # skip auxiliary vector entry
- daddi $s1, $s1, 16 # (Elf64_auxv_t *) s1++
+ dadd $s1, $s1, $t8 # (Elf64_auxv_t *) s1++
/* Decide how many bytes must be copied and where to
save the file name. Move the stack pointer to a safe
position below any data that must be preserved. */