revert valgrind
This commit is contained in:
parent
133eee0e01
commit
279432d4fa
|
@ -26,27 +26,21 @@
|
||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#ifdef __aarch64__
|
||||||
|
|
||||||
// Copied and simplified macros from bionic_asm.h.
|
// Copied and simplified macros from bionic_asm.h.
|
||||||
|
|
||||||
#define ENTRY(f) \
|
#define ENTRY(f) \
|
||||||
.text; \
|
.text; \
|
||||||
.globl f; \
|
.globl f; \
|
||||||
.balign 16; \
|
.type f, @function; \
|
||||||
.type f, %function; \
|
|
||||||
f: \
|
f: \
|
||||||
.cfi_startproc;; \
|
.cfi_startproc \
|
||||||
|
|
||||||
#define END(f) \
|
#define END(f) \
|
||||||
.cfi_endproc; \
|
.cfi_endproc; \
|
||||||
.size f, .-f; \
|
.size f, .-f; \
|
||||||
|
|
||||||
// Size of the shadow call stack. This must be a power of 2.
|
|
||||||
#define SCS_SIZE (8 * 1024)
|
|
||||||
|
|
||||||
#define ALIAS_SYMBOL(alias, original) \
|
|
||||||
.globl alias; \
|
|
||||||
.equ alias, original; \
|
|
||||||
|
|
||||||
// According to AARCH64 PCS document we need to save the following
|
// According to AARCH64 PCS document we need to save the following
|
||||||
// registers:
|
// registers:
|
||||||
//
|
//
|
||||||
|
@ -63,14 +57,14 @@
|
||||||
// word name description
|
// word name description
|
||||||
// 0 sigflag/cookie setjmp cookie in top 31 bits, signal mask flag in low bit
|
// 0 sigflag/cookie setjmp cookie in top 31 bits, signal mask flag in low bit
|
||||||
// 1 sigmask signal mask (not used with _setjmp / _longjmp)
|
// 1 sigmask signal mask (not used with _setjmp / _longjmp)
|
||||||
// 2 core_base base of core registers (x18-x30, sp)
|
// 2 core_base base of core registers (x19-x30, sp)
|
||||||
// (We only store the low bits of x18 to avoid leaking the
|
// 15 float_base base of float registers (d8-d15)
|
||||||
// shadow call stack address into memory.)
|
// 23 checksum checksum of core registers
|
||||||
// 16 float_base base of float registers (d8-d15)
|
// 24 reserved reserved entries (room to grow)
|
||||||
// 24 checksum checksum of core registers
|
|
||||||
// 25 reserved reserved entries (room to grow)
|
|
||||||
// 32
|
// 32
|
||||||
|
|
||||||
|
// 'sigmask' and 'checksum' are not used in this simplified version for valgrind.
|
||||||
|
|
||||||
#define _JB_SIGFLAG 0
|
#define _JB_SIGFLAG 0
|
||||||
#define _JB_SIGMASK (_JB_SIGFLAG + 1)
|
#define _JB_SIGMASK (_JB_SIGFLAG + 1)
|
||||||
#define _JB_X30_SP (_JB_SIGMASK + 1)
|
#define _JB_X30_SP (_JB_SIGMASK + 1)
|
||||||
|
@ -79,110 +73,23 @@
|
||||||
#define _JB_X24_X25 (_JB_X26_X27 + 2)
|
#define _JB_X24_X25 (_JB_X26_X27 + 2)
|
||||||
#define _JB_X22_X23 (_JB_X24_X25 + 2)
|
#define _JB_X22_X23 (_JB_X24_X25 + 2)
|
||||||
#define _JB_X20_X21 (_JB_X22_X23 + 2)
|
#define _JB_X20_X21 (_JB_X22_X23 + 2)
|
||||||
#define _JB_SCS_X19 (_JB_X20_X21 + 2)
|
#define _JB_X19 (_JB_X20_X21 + 2)
|
||||||
#define _JB_D14_D15 (_JB_SCS_X19 + 2)
|
#define _JB_D14_D15 (_JB_X19 + 1)
|
||||||
#define _JB_D12_D13 (_JB_D14_D15 + 2)
|
#define _JB_D12_D13 (_JB_D14_D15 + 2)
|
||||||
#define _JB_D10_D11 (_JB_D12_D13 + 2)
|
#define _JB_D10_D11 (_JB_D12_D13 + 2)
|
||||||
#define _JB_D8_D9 (_JB_D10_D11 + 2)
|
#define _JB_D8_D9 (_JB_D10_D11 + 2)
|
||||||
#define _JB_CHECKSUM (_JB_D8_D9 + 2)
|
|
||||||
|
|
||||||
#define SCS_MASK (SCS_SIZE - 1)
|
|
||||||
|
|
||||||
.macro m_mangle_registers reg, sp_reg
|
|
||||||
eor x3, x3, \reg
|
|
||||||
eor x19, x19, \reg
|
|
||||||
eor x20, x20, \reg
|
|
||||||
eor x21, x21, \reg
|
|
||||||
eor x22, x22, \reg
|
|
||||||
eor x23, x23, \reg
|
|
||||||
eor x24, x24, \reg
|
|
||||||
eor x25, x25, \reg
|
|
||||||
eor x26, x26, \reg
|
|
||||||
eor x27, x27, \reg
|
|
||||||
eor x28, x28, \reg
|
|
||||||
eor x29, x29, \reg
|
|
||||||
eor x30, x30, \reg
|
|
||||||
eor \sp_reg, \sp_reg, \reg
|
|
||||||
.endm
|
|
||||||
|
|
||||||
.macro m_calculate_checksum dst, src, scratch
|
|
||||||
mov \dst, #0
|
|
||||||
.irp i,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23
|
|
||||||
ldr \scratch, [\src, #(\i * 8)]
|
|
||||||
eor \dst, \dst, \scratch
|
|
||||||
.endr
|
|
||||||
.endm
|
|
||||||
|
|
||||||
.macro m_unmangle_registers reg, sp_reg
|
|
||||||
m_mangle_registers \reg, sp_reg=\sp_reg
|
|
||||||
.endm
|
|
||||||
|
|
||||||
|
// int setjmp(jmp_buf env);
|
||||||
ENTRY(setjmp)
|
ENTRY(setjmp)
|
||||||
mov w1, #1
|
|
||||||
b sigsetjmp
|
|
||||||
END(setjmp)
|
|
||||||
|
|
||||||
ENTRY(_setjmp)
|
|
||||||
mov w1, #0
|
|
||||||
b sigsetjmp
|
|
||||||
END(_setjmp)
|
|
||||||
|
|
||||||
// int sigsetjmp(sigjmp_buf env, int save_signal_mask);
|
|
||||||
ENTRY(sigsetjmp)
|
|
||||||
paciasp
|
|
||||||
.cfi_negate_ra_state
|
|
||||||
stp x0, x30, [sp, #-16]!
|
|
||||||
.cfi_def_cfa_offset 16
|
|
||||||
.cfi_rel_offset x0, 0
|
|
||||||
.cfi_rel_offset x30, 8
|
|
||||||
|
|
||||||
// Get the cookie and store it along with the signal flag.
|
|
||||||
mov x0, x1
|
|
||||||
bl __bionic_setjmp_cookie_get
|
|
||||||
mov x1, x0
|
|
||||||
ldr x0, [sp, #0]
|
|
||||||
str x1, [x0, #(_JB_SIGFLAG * 8)]
|
|
||||||
|
|
||||||
// Do we need to save the signal mask?
|
|
||||||
tbz w1, #0, 1f
|
|
||||||
|
|
||||||
// Save the cookie for later.
|
|
||||||
stp x1, xzr, [sp, #-16]!
|
|
||||||
.cfi_adjust_cfa_offset 16
|
|
||||||
|
|
||||||
// Save current signal mask.
|
|
||||||
// The 'how' argument is ignored if new_mask is NULL.
|
|
||||||
mov x1, #0 // NULL.
|
|
||||||
add x2, x0, #(_JB_SIGMASK * 8) // old_mask.
|
|
||||||
bl sigprocmask
|
|
||||||
|
|
||||||
ldp x1, xzr, [sp], #16
|
|
||||||
.cfi_adjust_cfa_offset -16
|
|
||||||
|
|
||||||
1:
|
|
||||||
// Restore original x0 and lr.
|
|
||||||
ldp x0, x30, [sp], #16
|
|
||||||
.cfi_adjust_cfa_offset -16
|
|
||||||
.cfi_restore x0
|
|
||||||
.cfi_restore x30
|
|
||||||
|
|
||||||
// Mask off the signal flag bit.
|
|
||||||
bic x1, x1, #1
|
|
||||||
|
|
||||||
// Mask off the high bits of the shadow call stack pointer.
|
|
||||||
and x3, x18, #SCS_MASK
|
|
||||||
|
|
||||||
// Save core registers.
|
// Save core registers.
|
||||||
mov x10, sp
|
mov x10, sp
|
||||||
m_mangle_registers x1, sp_reg=x10
|
|
||||||
stp x30, x10, [x0, #(_JB_X30_SP * 8)]
|
stp x30, x10, [x0, #(_JB_X30_SP * 8)]
|
||||||
stp x28, x29, [x0, #(_JB_X28_X29 * 8)]
|
stp x28, x29, [x0, #(_JB_X28_X29 * 8)]
|
||||||
stp x26, x27, [x0, #(_JB_X26_X27 * 8)]
|
stp x26, x27, [x0, #(_JB_X26_X27 * 8)]
|
||||||
stp x24, x25, [x0, #(_JB_X24_X25 * 8)]
|
stp x24, x25, [x0, #(_JB_X24_X25 * 8)]
|
||||||
stp x22, x23, [x0, #(_JB_X22_X23 * 8)]
|
stp x22, x23, [x0, #(_JB_X22_X23 * 8)]
|
||||||
stp x20, x21, [x0, #(_JB_X20_X21 * 8)]
|
stp x20, x21, [x0, #(_JB_X20_X21 * 8)]
|
||||||
stp x3, x19, [x0, #(_JB_SCS_X19 * 8)]
|
str x19, [x0, #(_JB_X19 * 8)]
|
||||||
m_unmangle_registers x1, sp_reg=x10
|
|
||||||
|
|
||||||
// Save floating point registers.
|
// Save floating point registers.
|
||||||
stp d14, d15, [x0, #(_JB_D14_D15 * 8)]
|
stp d14, d15, [x0, #(_JB_D14_D15 * 8)]
|
||||||
|
@ -190,108 +97,22 @@ ENTRY(sigsetjmp)
|
||||||
stp d10, d11, [x0, #(_JB_D10_D11 * 8)]
|
stp d10, d11, [x0, #(_JB_D10_D11 * 8)]
|
||||||
stp d8, d9, [x0, #(_JB_D8_D9 * 8)]
|
stp d8, d9, [x0, #(_JB_D8_D9 * 8)]
|
||||||
|
|
||||||
// Calculate the checksum.
|
|
||||||
m_calculate_checksum x12, x0, x2
|
|
||||||
str x12, [x0, #(_JB_CHECKSUM * 8)]
|
|
||||||
|
|
||||||
mov w0, #0
|
mov w0, #0
|
||||||
autiasp
|
|
||||||
.cfi_negate_ra_state
|
|
||||||
ret
|
ret
|
||||||
END(sigsetjmp)
|
END(setjmp)
|
||||||
|
|
||||||
// void siglongjmp(sigjmp_buf env, int value);
|
// void longjmp(jmp_buf env, int value);
|
||||||
ENTRY(siglongjmp)
|
ENTRY(longjmp)
|
||||||
// Check the checksum before doing anything.
|
|
||||||
m_calculate_checksum x12, x0, x2
|
|
||||||
ldr x2, [x0, #(_JB_CHECKSUM * 8)]
|
|
||||||
cmp x2, x12
|
|
||||||
bne __bionic_setjmp_checksum_mismatch
|
|
||||||
|
|
||||||
#if __has_feature(hwaddress_sanitizer)
|
|
||||||
stp x0, x30, [sp, #-16]!
|
|
||||||
.cfi_adjust_cfa_offset 16
|
|
||||||
.cfi_rel_offset x0, 0
|
|
||||||
.cfi_rel_offset x30, 8
|
|
||||||
mov x19, x1 // Save 'value'.
|
|
||||||
|
|
||||||
// load and unmangle destination SP
|
|
||||||
ldr x2, [x0, #(_JB_SIGFLAG * 8)]
|
|
||||||
bic x2, x2, #1
|
|
||||||
ldr x0, [x0, #(_JB_X30_SP * 8 + 8)]
|
|
||||||
eor x0, x0, x2
|
|
||||||
bl __hwasan_handle_longjmp
|
|
||||||
|
|
||||||
mov x1, x19 // Restore 'value'.
|
|
||||||
// Restore original x0 and lr.
|
|
||||||
ldp x0, x30, [sp], #16
|
|
||||||
.cfi_adjust_cfa_offset -16
|
|
||||||
.cfi_restore x0
|
|
||||||
.cfi_restore x30
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Do we need to restore the signal mask?
|
|
||||||
ldr x2, [x0, #(_JB_SIGFLAG * 8)]
|
|
||||||
tbz w2, #0, 1f
|
|
||||||
|
|
||||||
stp x0, x30, [sp, #-16]!
|
|
||||||
.cfi_adjust_cfa_offset 16
|
|
||||||
.cfi_rel_offset x0, 0
|
|
||||||
.cfi_rel_offset x30, 8
|
|
||||||
|
|
||||||
// Restore signal mask.
|
|
||||||
mov x19, x1 // Save 'value'.
|
|
||||||
|
|
||||||
mov x2, x0
|
|
||||||
mov x0, #2 // SIG_SETMASK
|
|
||||||
add x1, x2, #(_JB_SIGMASK * 8) // new_mask.
|
|
||||||
mov x2, #0 // NULL.
|
|
||||||
bl sigprocmask
|
|
||||||
mov x1, x19 // Restore 'value'.
|
|
||||||
|
|
||||||
// Restore original x0 and lr.
|
|
||||||
ldp x0, x30, [sp], #16
|
|
||||||
.cfi_adjust_cfa_offset -16
|
|
||||||
.cfi_restore x0
|
|
||||||
.cfi_restore x30
|
|
||||||
|
|
||||||
ldr x2, [x0, #(_JB_SIGFLAG * 8)]
|
|
||||||
1:
|
|
||||||
// Restore core registers.
|
// Restore core registers.
|
||||||
bic x2, x2, #1
|
|
||||||
// x30 was saved with PAC to jmp_buf in sigsetjmp().
|
|
||||||
ldp x30, x10, [x0, #(_JB_X30_SP * 8)]
|
ldp x30, x10, [x0, #(_JB_X30_SP * 8)]
|
||||||
.cfi_negate_ra_state
|
|
||||||
ldp x28, x29, [x0, #(_JB_X28_X29 * 8)]
|
ldp x28, x29, [x0, #(_JB_X28_X29 * 8)]
|
||||||
ldp x26, x27, [x0, #(_JB_X26_X27 * 8)]
|
ldp x26, x27, [x0, #(_JB_X26_X27 * 8)]
|
||||||
ldp x24, x25, [x0, #(_JB_X24_X25 * 8)]
|
ldp x24, x25, [x0, #(_JB_X24_X25 * 8)]
|
||||||
ldp x22, x23, [x0, #(_JB_X22_X23 * 8)]
|
ldp x22, x23, [x0, #(_JB_X22_X23 * 8)]
|
||||||
ldp x20, x21, [x0, #(_JB_X20_X21 * 8)]
|
ldp x20, x21, [x0, #(_JB_X20_X21 * 8)]
|
||||||
ldp x3, x19, [x0, #(_JB_SCS_X19 * 8)]
|
ldr x19, [x0, #(_JB_X19 * 8)]
|
||||||
m_unmangle_registers x2, sp_reg=x10
|
|
||||||
mov sp, x10
|
mov sp, x10
|
||||||
|
|
||||||
// Restore the low bits of the shadow call stack pointer.
|
|
||||||
and x18, x18, #~SCS_MASK
|
|
||||||
orr x18, x3, x18
|
|
||||||
|
|
||||||
stp x0, x1, [sp, #-16]!
|
|
||||||
.cfi_adjust_cfa_offset 16
|
|
||||||
.cfi_rel_offset x0, 0
|
|
||||||
.cfi_rel_offset x1, 8
|
|
||||||
stp x30, xzr, [sp, #-16]!
|
|
||||||
.cfi_adjust_cfa_offset 16
|
|
||||||
.cfi_rel_offset x30, 0
|
|
||||||
ldr x0, [x0, #(_JB_SIGFLAG * 8)]
|
|
||||||
bl __bionic_setjmp_cookie_check
|
|
||||||
ldp x30, xzr, [sp], #16
|
|
||||||
.cfi_adjust_cfa_offset -16
|
|
||||||
.cfi_restore x30
|
|
||||||
ldp x0, x1, [sp], #16
|
|
||||||
.cfi_adjust_cfa_offset -16
|
|
||||||
.cfi_restore x0
|
|
||||||
.cfi_restore x1
|
|
||||||
|
|
||||||
// Restore floating point registers.
|
// Restore floating point registers.
|
||||||
ldp d14, d15, [x0, #(_JB_D14_D15 * 8)]
|
ldp d14, d15, [x0, #(_JB_D14_D15 * 8)]
|
||||||
ldp d12, d13, [x0, #(_JB_D12_D13 * 8)]
|
ldp d12, d13, [x0, #(_JB_D12_D13 * 8)]
|
||||||
|
@ -301,10 +122,7 @@ ENTRY(siglongjmp)
|
||||||
// Set return value.
|
// Set return value.
|
||||||
cmp w1, wzr
|
cmp w1, wzr
|
||||||
csinc w0, w1, wzr, ne
|
csinc w0, w1, wzr, ne
|
||||||
autiasp
|
|
||||||
.cfi_negate_ra_state
|
|
||||||
ret
|
ret
|
||||||
END(siglongjmp)
|
END(longjmp)
|
||||||
|
|
||||||
ALIAS_SYMBOL(longjmp, siglongjmp)
|
#endif // __aarch64__
|
||||||
ALIAS_SYMBOL(_longjmp, siglongjmp)
|
|
||||||
|
|
|
@ -3,7 +3,6 @@ TERMUX_PKG_DESCRIPTION="Instrumentation framework for building dynamic analysis
|
||||||
TERMUX_PKG_LICENSE="GPL-2.0"
|
TERMUX_PKG_LICENSE="GPL-2.0"
|
||||||
TERMUX_PKG_MAINTAINER="@termux"
|
TERMUX_PKG_MAINTAINER="@termux"
|
||||||
TERMUX_PKG_VERSION=3.17.0
|
TERMUX_PKG_VERSION=3.17.0
|
||||||
TERMUX_PKG_REVISION=1
|
|
||||||
TERMUX_PKG_SRCURL=ftp://sourceware.org/pub/valgrind/valgrind-${TERMUX_PKG_VERSION}.tar.bz2
|
TERMUX_PKG_SRCURL=ftp://sourceware.org/pub/valgrind/valgrind-${TERMUX_PKG_VERSION}.tar.bz2
|
||||||
TERMUX_PKG_SHA256=ad3aec668e813e40f238995f60796d9590eee64a16dff88421430630e69285a2
|
TERMUX_PKG_SHA256=ad3aec668e813e40f238995f60796d9590eee64a16dff88421430630e69285a2
|
||||||
TERMUX_PKG_BREAKS="valgrind-dev"
|
TERMUX_PKG_BREAKS="valgrind-dev"
|
||||||
|
|
Loading…
Reference in New Issue