From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17893 invoked by alias); 15 Sep 2010 08:50:41 -0000 Received: (qmail 17876 invoked by uid 22791); 15 Sep 2010 08:50:40 -0000 X-SWARE-Spam-Status: No, hits=-5.9 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,TW_GJ,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 15 Sep 2010 08:50:33 +0000 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o8F8oVQA030536 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 15 Sep 2010 04:50:32 -0400 Received: from hase.home (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o8F8oTJh023877 for ; Wed, 15 Sep 2010 04:50:30 -0400 From: Andreas Schwab To: libc-hacker@sourceware.org Subject: [PATCH] Fix register conflict in s390 ____longjmp_chk X-Yow: I don't believe there really IS a GAS SHORTAGE.. I think it's all just a BIG HOAX on the part of the plastic sign salesmen-- .. to sell more numbers!! Date: Wed, 15 Sep 2010 08:50:00 -0000 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sourceware.org X-SW-Source: 2010-09/txt/msg00005.txt.bz2 r1-r3 are call-clobbered registers so CHECK_SP might clobber them. Andreas. 2010-09-14 Andreas Schwab * sysdeps/s390/s390-32/__longjmp.c (__longjmp): Define register variables after CHECK_SP call. * sysdeps/s390/s390-64/__longjmp.c (__longjmp): Likewise. --- sysdeps/s390/s390-32/__longjmp.c | 13 ++++++++----- sysdeps/s390/s390-64/__longjmp.c | 13 ++++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/sysdeps/s390/s390-32/__longjmp.c b/sysdeps/s390/s390-32/__longjmp.c index 4abc0ec..95f8b71 100644 --- a/sysdeps/s390/s390-32/__longjmp.c +++ b/sysdeps/s390/s390-32/__longjmp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2001, 2005, 2009 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2001, 2005, 2009, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). @@ -29,16 +29,19 @@ void __longjmp (__jmp_buf env, int val) { - register int r2 __asm ("%r2") = val == 0 ? 1 : val; #ifdef PTR_DEMANGLE - register uintptr_t r3 __asm ("%r3") = THREAD_GET_POINTER_GUARD (); - register void *r1 __asm ("%r1") = (void *) env; + uintptr_t guard = THREAD_GET_POINTER_GUARD (); # ifdef CHECK_SP - CHECK_SP (env, r3); + CHECK_SP (env, guard); # endif #elif defined CHECK_SP CHECK_SP (env, 0); #endif + register int r2 __asm ("%r2") = val == 0 ? 1 : val; +#ifdef PTR_DEMANGLE + register uintptr_t r3 __asm ("%r3") = guard; + register void *r1 __asm ("%r1") = (void *) env; +#endif /* Restore registers and jump back. */ asm volatile ("ld %%f6,48(%1)\n\t" "ld %%f4,40(%1)\n\t" diff --git a/sysdeps/s390/s390-64/__longjmp.c b/sysdeps/s390/s390-64/__longjmp.c index 445bd3b..313b338 100644 --- a/sysdeps/s390/s390-64/__longjmp.c +++ b/sysdeps/s390/s390-64/__longjmp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2005, 2009 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2005, 2009, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). @@ -29,16 +29,19 @@ void __longjmp (__jmp_buf env, int val) { - register long int r2 __asm ("%r2") = val == 0 ? 1 : val; #ifdef PTR_DEMANGLE - register uintptr_t r3 __asm ("%r3") = THREAD_GET_POINTER_GUARD (); - register void *r1 __asm ("%r1") = (void *) env; + uintptr_t guard = THREAD_GET_POINTER_GUARD (); # ifdef CHECK_SP - CHECK_SP (env, r3); + CHECK_SP (env, guard); # endif #elif defined CHECK_SP CHECK_SP (env, 0); #endif + register long int r2 __asm ("%r2") = val == 0 ? 1 : val; +#ifdef PTR_DEMANGLE + register uintptr_t r3 __asm ("%r3") = guard; + register void *r1 __asm ("%r1") = (void *) env; +#endif /* Restore registers and jump back. */ asm volatile ("ld %%f7,104(%1)\n\t" "ld %%f5,96(%1)\n\t" -- 1.7.2.2 -- Andreas Schwab, schwab@redhat.com GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84 5EC7 45C6 250E 6F00 984E "And now for something completely different."