diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-05-02 16:44:46 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-05-02 16:44:46 +0800 |
| commit | f4512cca0b996e5343ebe57511f45a29f64c4a8e (patch) | |
| tree | d7eca09f5d2f3a4db3b10212c10e66e24253c046 /exec/loader-mipsel.s | |
| parent | 5a58a6bc477f290ee0b8a6111e92df56ff538719 (diff) | |
| download | emacs-f4512cca0b996e5343ebe57511f45a29f64c4a8e.tar.gz | |
Fix ps name in Android subprocesses
* exec/Makefile.in (.SUFFIXES): Include ., then `srcdir'.
* exec/loader-aarch64.s (_start):
* exec/loader-armeabi.s (_start):
* exec/loader-mips64el.s (__start):
* exec/loader-mipsel.s (__start):
* exec/loader-x86.s (_start):
* exec/loader-x86_64.s (_start): Get basename of opened exec
file and make it the command name. Fix envp skipping on x86
and various leaks.
Diffstat (limited to 'exec/loader-mipsel.s')
| -rw-r--r-- | exec/loader-mipsel.s | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/exec/loader-mipsel.s b/exec/loader-mipsel.s index 2ad9d97dfed..8537a0d2fe2 100644 --- a/exec/loader-mipsel.s +++ b/exec/loader-mipsel.s @@ -24,10 +24,10 @@ include(`config-mips.m4') .section .text .global __start __start: -dnl li $v0, SYSCALL_nanosleep # SYS_nanosleep -dnl la $a0, .timespec # rqtp -dnl li $a1, 0 # rmtp -dnl syscall # syscall + li $v0, SYSCALL_nanosleep # SYS_nanosleep + la $a0, .timespec # rqtp + li $a1, 0 # rmtp + syscall # syscall lw $s6, ($sp) # original stack pointer addi $s0, $sp, 8 # start of load area addi $sp, -8 # primary fd, secondary fd @@ -121,10 +121,16 @@ RESTORE() # delay slot, restore sp syscall # syscall bne $a3, $zero, .perror # perror addi $s0, $s0, 4 # start of string, delay slot + move $t3, $s0 # t3 = char past separator .nextc: lb $t0, ($s0) # load byte addi $s0, $s0, 1 # s0++ - bne $t0, $zero, .nextc # next character? + li $t1, 47 # directory separator `/' + bne $t0, $t1, .nextc1 # is separator char? + nop # delay slot + move $t3, $s0 # t3 = char past separator +.nextc1: + bnez $t0, .nextc # next character? nop # delay slot addi $s0, $s0, 3 # adjust for round li $t2, -4 # t2 = -4 @@ -133,8 +139,17 @@ RESTORE() # delay slot, restore sp beqz $t0, .primary # primary fd? move $t0, $sp # address of primary fd, delay slot addi $t0, $t0, 4 # address of secondary fd + j .next_action # next action .primary: - sw $v0, ($t0) # store fd + sw $v0, ($t0) # store fd, delay slot + li $v0, SYSCALL_prctl # SYS_prctl + li $a0, 15 # PR_SET_NAME + move $a1, $t3 # name + move $a2, $zero # arg1 + move $a3, $zero # arg2 +SYSCALL(`$a2',`$a2',`$a2',`$a2') # syscall args + syscall # syscall +RESTORE() # restore sp j .next_action # next action nop # delay slot .perror: |