From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27401 invoked by alias); 27 Jan 2014 09:37:21 -0000 Mailing-List: contact libc-ports-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: libc-ports-owner@sourceware.org Received: (qmail 27380 invoked by uid 89); 27 Jan 2014 09:37:17 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.1 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-we0-f169.google.com Received: from mail-we0-f169.google.com (HELO mail-we0-f169.google.com) (74.125.82.169) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Mon, 27 Jan 2014 09:37:16 +0000 Received: by mail-we0-f169.google.com with SMTP id u57so5033202wes.0 for ; Mon, 27 Jan 2014 01:37:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=S18Bm/llz9mklN+5NUu8iKF8PDLG4pKVnq9ZxA+1uuk=; b=M4HAmogIcnhH0JncbYjQ5hO8mMSqIeDXCXp8vYBtxKupPR0qa9zOHEGtAcsi9sn508 SdcULRu2GQy6/JakIk51Dv8MyJbXHuaecK/55G3wuUkpc2yyq85XjRe3pc5v/yTwPXBQ T3XsUNTAGzxXgH83dC1rOv5/F48it+0JkEdc3ndORRZZvAMlK/4Y9TEOHpL/Vlu68qAy DQ2m4X6JJuKLytI9kEwhDLcGuja9bcNlP8HeIXeLuGe8yNnR53gVadbSuRaA4swKLbZR OiSkZOTVtIE7ripcMpFZCIyln4BVEH28AneEaeCUGV0lghOPwLujbjis3ttMS5h8+OXS R/hA== X-Gm-Message-State: ALoCoQnKe19DXXc0DfoR/qH2ERZ7KxX77yHifEJKcXaYLSGdto/2GNmjYGr//o9GbuYC/hXzb4DX X-Received: by 10.180.97.71 with SMTP id dy7mr11034798wib.35.1390815432209; Mon, 27 Jan 2014 01:37:12 -0800 (PST) Received: from localhost.localdomain (cpc6-seac21-2-0-cust453.7-2.cable.virginm.net. [82.1.113.198]) by mx.google.com with ESMTPSA id el1sm16267451wib.4.2014.01.27.01.37.10 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Jan 2014 01:37:11 -0800 (PST) From: Will Newton To: libc-ports@sourceware.org Cc: patches@linaro.org Subject: [PATCH] ARM: Add SystemTap probes to longjmp and setjmp. Date: Mon, 27 Jan 2014 09:37:00 -0000 Message-Id: <1390815426-10792-1-git-send-email-will.newton@linaro.org> X-IsSubscribed: yes X-SW-Source: 2014-01/txt/msg00062.txt.bz2 Now the ARM port implements pointer encryption for jmpbufs, gdb needs a SystemTap probe point in longjmp to determine the target PC of a call to longjmp. This patch implements the probe point in longjmp and a similar probe point in setjmp. In order to have all the appropriate registers available to pass to the probe this reorders the layout of jmpbuf, putting the sp and lr registers at the start rather than the end. Tested on armv7, no new failures in the glibc testsuite and confirmed that this fixes the gdb.base/longjmp.exp failures in the gdb testsuite. ports/ChangeLog.arm: 2014-01-27 Will Newton * sysdeps/arm/__longjmp.S: Include stap-probe.h. (__longjmp): Restore sp and lr before restoring callee saved registers. Add longjmp SystemTap probe point. * sysdeps/arm/include/bits/setjmp.h (__JMP_BUF_SP): Define to zero to match jmpbuf layout. * sysdeps/arm/setjmp.S: Include stap-probe.h. (__sigsetjmp): Save sp and lr before saving callee saved registers. Add setjmp SystemTap probe point. --- ports/sysdeps/arm/__longjmp.S | 21 ++++++++++++++------- ports/sysdeps/arm/include/bits/setjmp.h | 2 +- ports/sysdeps/arm/setjmp.S | 12 +++++++++--- 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/ports/sysdeps/arm/__longjmp.S b/ports/sysdeps/arm/__longjmp.S index 27c57a1..ad5fa9f 100644 --- a/ports/sysdeps/arm/__longjmp.S +++ b/ports/sysdeps/arm/__longjmp.S @@ -17,6 +17,7 @@ . */ #include +#include #include #include #include @@ -25,24 +26,21 @@ ENTRY (__longjmp) mov ip, r0 - movs r0, r1 /* get the return value in place */ - it eq - moveq r0, #1 /* can't let setjmp() return zero! */ #ifdef CHECK_SP sfi_breg ip, \ - ldr r4, [\B, #32] /* jmpbuf's sp */ + ldr r4, [\B] /* jmpbuf's sp */ cfi_undefined (r4) #ifdef PTR_DEMANGLE PTR_DEMANGLE (r4, r4, a3, a4) #endif CHECK_SP (r4) #endif - sfi_sp sfi_breg ip, \ - ldmia \B!, JMP_BUF_REGLIST + #ifdef PTR_DEMANGLE ldr a4, [ip], #4 - PTR_DEMANGLE (a4, a4, a3, a2) + PTR_DEMANGLE (a4, a4, a3, r4) + cfi_undefined (r4) mov sp, a4 ldr a4, [ip], #4 PTR_DEMANGLE2 (lr, a4, a3) @@ -50,6 +48,11 @@ ENTRY (__longjmp) ldr sp, [ip], #4 ldr lr, [ip], #4 #endif + /* longjmp probe expects longjmp first argument (4@r0), second + argument (-4@r1), and target address (4@r14), respectively. */ + LIBC_PROBE (longjmp, 3, 4@r0, -4@r1, 4@r14) + sfi_sp sfi_breg ip, \ + ldmia \B!, JMP_BUF_REGLIST cfi_restore (v1) cfi_restore (v2) cfi_restore (v3) @@ -61,6 +64,10 @@ ENTRY (__longjmp) cfi_restore (sp) cfi_restore (lr) + movs r0, r1 /* get the return value in place */ + it eq + moveq r0, #1 /* can't let setjmp() return zero! */ + #if !defined ARM_ASSUME_NO_IWMMXT || defined __SOFTFP__ # define NEED_HWCAP 1 #endif diff --git a/ports/sysdeps/arm/include/bits/setjmp.h b/ports/sysdeps/arm/include/bits/setjmp.h index 220dfe8..5877c1f 100644 --- a/ports/sysdeps/arm/include/bits/setjmp.h +++ b/ports/sysdeps/arm/include/bits/setjmp.h @@ -30,7 +30,7 @@ # define JMP_BUF_REGLIST {v1-v6, sl, fp} /* Index of __jmp_buf where the sp register resides. */ -# define __JMP_BUF_SP 8 +# define __JMP_BUF_SP 0 #endif #endif /* include/bits/setjmp.h */ diff --git a/ports/sysdeps/arm/setjmp.S b/ports/sysdeps/arm/setjmp.S index b0b45ed..5e55ca5 100644 --- a/ports/sysdeps/arm/setjmp.S +++ b/ports/sysdeps/arm/setjmp.S @@ -17,6 +17,7 @@ . */ #include +#include #include #include #include @@ -27,9 +28,11 @@ ENTRY (__sigsetjmp) #endif mov ip, r0 - /* Save registers */ - sfi_breg ip, \ - stmia \B!, JMP_BUF_REGLIST + /* setjmp probe expects sigsetjmp first argument (4@r0), second + argument (-4@r1), and target address (4@r14), respectively. */ + LIBC_PROBE (setjmp, 3, 4@r0, -4@r1, 4@r14) + + /* Save sp and lr */ #ifdef PTR_MANGLE mov a4, sp PTR_MANGLE2 (a4, a4, a3) @@ -40,6 +43,9 @@ ENTRY (__sigsetjmp) str sp, [ip], #4 str lr, [ip], #4 #endif + /* Save registers */ + sfi_breg ip, \ + stmia \B!, JMP_BUF_REGLIST #if !defined ARM_ASSUME_NO_IWMMXT || defined __SOFTFP__ # define NEED_HWCAP 1 -- 1.8.1.4