From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Neil Jerram Newsgroups: gmane.lisp.guile.devel Subject: Re: Problems with and libguile/__scm.h on HP-UX/IA64 Date: Fri, 14 Aug 2009 17:50:38 +0100 Message-ID: <87ws5649wh.fsf@arudy.ossau.uklinux.net> References: <20090325221030.GC30799@honinbu.il.thewrittenword.com> <87ab77rhsj.fsf@arudy.ossau.uklinux.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1250268736 7009 80.91.229.12 (14 Aug 2009 16:52:16 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 14 Aug 2009 16:52:16 +0000 (UTC) To: guile-devel@gnu.org Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Fri Aug 14 18:52:09 2009 Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1Mc00f-0002ns-3m for guile-devel@m.gmane.org; Fri, 14 Aug 2009 18:52:09 +0200 Original-Received: from localhost ([127.0.0.1]:53174 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mc00e-0002yt-Bk for guile-devel@m.gmane.org; Fri, 14 Aug 2009 12:52:08 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MbzzM-0002Rx-N1 for guile-devel@gnu.org; Fri, 14 Aug 2009 12:50:48 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MbzzJ-0002Pn-0C for guile-devel@gnu.org; Fri, 14 Aug 2009 12:50:48 -0400 Original-Received: from [199.232.76.173] (port=51606 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MbzzI-0002Ph-KU for guile-devel@gnu.org; Fri, 14 Aug 2009 12:50:44 -0400 Original-Received: from mail3.uklinux.net ([80.84.72.33]:60960) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MbzzH-0002VA-TO for guile-devel@gnu.org; Fri, 14 Aug 2009 12:50:44 -0400 Original-Received: from arudy (host86-152-99-133.range86-152.btcentralplus.com [86.152.99.133]) by mail3.uklinux.net (Postfix) with ESMTP id 878021F6618 for ; Fri, 14 Aug 2009 17:50:42 +0100 (BST) Original-Received: from arudy.ossau.uklinux.net (arudy [127.0.0.1]) by arudy (Postfix) with ESMTP id 9405B38021 for ; Fri, 14 Aug 2009 17:50:38 +0100 (BST) In-Reply-To: <87ab77rhsj.fsf@arudy.ossau.uklinux.net> (Neil Jerram's message of "Thu\, 26 Mar 2009 23\:22\:20 +0000") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.2 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.lisp.guile.devel:9108 Archived-At: --=-=-= Neil Jerram writes: > Albert Chin writes: >> But, on HP-UX/IA64, has a conflicting declaration of jmp_buf. > > Thanks for the report. This is also a Debian bug [1], and their patch > is [2]. > > [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=506684 > [2] http://patch-tracking.debian.net/patch/series/view/guile-1.8/1.8.5+1-4.1/dont-redefine-jmp_buf.diff Here's my proposed fix for this, for 1.8 and master. Please let me know of any comments. Neil --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Avoid-clash-with-system-setjmp-longjmp-on-IA64.patch >From 26adbdf1ea98e20124f44960a8e0dfa302306991 Mon Sep 17 00:00:00 2001 From: Neil Jerram Date: Wed, 5 Aug 2009 16:13:28 +0100 Subject: [PATCH] Avoid clash with system setjmp/longjmp on IA64 Problem was that if an application includes both libguile.h and the system's setjmp.h, and is compiled on IA64, it gets compile errors because of jmp_buf, setjmp and longjmp being multiply defined. * libguile/__scm.h (__ia64__): Define scm_i_jmp_buf, SCM_I_SETJMP and SCM_I_LONGJMP instead of jmp_buf, setjmp and longjmp. (all other platforms): Map scm_i_jmp_buf, SCM_I_SETJMP and SCM_I_LONGJMP to jmp_buf, setjmp and longjmp. * libguile/continuations.c (scm_make_continuation): Use `SCM_I_SETJMP' instead of `setjmp'. (copy_stack_and_call): Use `SCM_I_LONJMP' instead of `longjmp'. (scm_ia64_longjmp): Use type `scm_i_jmp_buf' instead of `jmp_buf'. * libguile/continuations.h (scm_t_contregs): Use type `scm_i_jmp_buf' instead of `jmp_buf'. * libguile/threads.c (suspend): Use `SCM_I_SETJMP' instead of `setjmp'. * libguile/threads.h (scm_i_thread): Use type `scm_i_jmp_buf' instead of `jmp_buf'. * libguile/throw.c (JBJMPBUF, make_jmpbuf, jmp_buf_and_retval): Use type `scm_i_jmp_buf' instead of `jmp_buf'. (scm_c_catch): Use `SCM_I_SETJMP' instead of `setjmp'. (scm_ithrow): Use `SCM_I_LONGJMP' instead of `longjmp'. --- libguile/__scm.h | 17 +++++++++++++---- libguile/continuations.c | 6 +++--- libguile/continuations.h | 2 +- libguile/threads.c | 6 +++--- libguile/threads.h | 2 +- libguile/throw.c | 10 +++++----- 6 files changed, 26 insertions(+), 17 deletions(-) diff --git a/libguile/__scm.h b/libguile/__scm.h index 29b371d..6782654 100644 --- a/libguile/__scm.h +++ b/libguile/__scm.h @@ -423,19 +423,28 @@ typedef struct { ucontext_t ctx; int fresh; - } jmp_buf; -# define setjmp(JB) \ + } scm_i_jmp_buf; +# define SCM_I_SETJMP(JB) \ ( (JB).fresh = 1, \ getcontext (&((JB).ctx)), \ ((JB).fresh ? ((JB).fresh = 0, 0) : 1) ) -# define longjmp(JB,VAL) scm_ia64_longjmp (&(JB), VAL) - void scm_ia64_longjmp (jmp_buf *, int); +# define SCM_I_LONGJMP(JB,VAL) scm_ia64_longjmp (&(JB), VAL) + void scm_ia64_longjmp (scm_i_jmp_buf *, int); # else /* ndef __ia64__ */ # include # endif /* ndef __ia64__ */ # endif /* ndef _CRAY1 */ #endif /* ndef vms */ +/* For any platform where SCM_I_SETJMP hasn't been defined in some + special way above, map SCM_I_SETJMP, SCM_I_LONGJMP and + scm_i_jmp_buf to setjmp, longjmp and jmp_buf. */ +#ifndef SCM_I_SETJMP +#define scm_i_jmp_buf jmp_buf +#define SCM_I_SETJMP setjmp +#define SCM_I_LONGJMP longjmp +#endif + /* James Clark came up with this neat one instruction fix for * continuations on the SPARC. It flushes the register windows so * that all the state of the process is contained in the stack. diff --git a/libguile/continuations.c b/libguile/continuations.c index f856476..347bd80 100644 --- a/libguile/continuations.c +++ b/libguile/continuations.c @@ -131,7 +131,7 @@ scm_make_continuation (int *first) SCM_NEWSMOB (cont, scm_tc16_continuation, continuation); - *first = !setjmp (continuation->jmpbuf); + *first = !SCM_I_SETJMP (continuation->jmpbuf); if (*first) { #ifdef __ia64__ @@ -229,12 +229,12 @@ copy_stack_and_call (scm_t_contregs *continuation, SCM val, scm_i_set_last_debug_frame (continuation->dframe); continuation->throw_value = val; - longjmp (continuation->jmpbuf, 1); + SCM_I_LONGJMP (continuation->jmpbuf, 1); } #ifdef __ia64__ void -scm_ia64_longjmp (jmp_buf *JB, int VAL) +scm_ia64_longjmp (scm_i_jmp_buf *JB, int VAL) { scm_i_thread *t = SCM_I_CURRENT_THREAD; diff --git a/libguile/continuations.h b/libguile/continuations.h index 08eec8f..82cf178 100644 --- a/libguile/continuations.h +++ b/libguile/continuations.h @@ -44,7 +44,7 @@ SCM_API scm_t_bits scm_tc16_continuation; typedef struct { SCM throw_value; - jmp_buf jmpbuf; + scm_i_jmp_buf jmpbuf; SCM dynenv; #ifdef __ia64__ void *backing_store; diff --git a/libguile/threads.c b/libguile/threads.c index 9589336..1721e0b 100644 --- a/libguile/threads.c +++ b/libguile/threads.c @@ -312,7 +312,7 @@ unblock_from_queue (SCM queue) var 't' // save registers. SCM_FLUSH_REGISTER_WINDOWS; // sparc only - setjmp (t->regs); // here's most of the magic + SCM_I_SETJMP (t->regs); // here's most of the magic ... and returns. @@ -366,7 +366,7 @@ unblock_from_queue (SCM queue) t->top = SCM_STACK_PTR (&t); // save registers. SCM_FLUSH_REGISTER_WINDOWS; - setjmp (t->regs); + SCM_I_SETJMP (t->regs); res = func(data); scm_enter_guile (t); @@ -425,7 +425,7 @@ suspend (void) t->top = SCM_STACK_PTR (&t); /* save registers. */ SCM_FLUSH_REGISTER_WINDOWS; - setjmp (t->regs); + SCM_I_SETJMP (t->regs); return t; } diff --git a/libguile/threads.h b/libguile/threads.h index 32b0ea6..9a1b6f0 100644 --- a/libguile/threads.h +++ b/libguile/threads.h @@ -123,7 +123,7 @@ typedef struct scm_i_thread { SCM vm; SCM_STACKITEM *base; SCM_STACKITEM *top; - jmp_buf regs; + scm_i_jmp_buf regs; #ifdef __ia64__ void *register_backing_store_base; scm_t_contregs *pending_rbs_continuation; diff --git a/libguile/throw.c b/libguile/throw.c index b48bea1..4413efa 100644 --- a/libguile/throw.c +++ b/libguile/throw.c @@ -59,7 +59,7 @@ static scm_t_bits tc16_jmpbuffer; #define DEACTIVATEJB(x) \ (SCM_SET_CELL_WORD_0 ((x), (SCM_CELL_WORD_0 (x) & ~(1L << 16L)))) -#define JBJMPBUF(OBJ) ((jmp_buf *) SCM_CELL_WORD_1 (OBJ)) +#define JBJMPBUF(OBJ) ((scm_i_jmp_buf *) SCM_CELL_WORD_1 (OBJ)) #define SETJBJMPBUF(x, v) (SCM_SET_CELL_WORD_1 ((x), (scm_t_bits) (v))) #define SCM_JBDFRAME(x) ((scm_t_debug_frame *) SCM_CELL_WORD_2 (x)) #define SCM_SETJBDFRAME(x, v) (SCM_SET_CELL_WORD_2 ((x), (scm_t_bits) (v))) @@ -81,7 +81,7 @@ make_jmpbuf (void) { SCM answer; SCM_NEWSMOB2 (answer, tc16_jmpbuffer, 0, 0); - SETJBJMPBUF(answer, (jmp_buf *)0); + SETJBJMPBUF(answer, (scm_i_jmp_buf *)0); DEACTIVATEJB(answer); return answer; } @@ -91,7 +91,7 @@ make_jmpbuf (void) struct jmp_buf_and_retval /* use only on the stack, in scm_catch */ { - jmp_buf buf; /* must be first */ + scm_i_jmp_buf buf; /* must be first */ SCM throw_tag; SCM retval; }; @@ -194,7 +194,7 @@ scm_c_catch (SCM tag, pre_unwind.lazy_catch_p = 0; SCM_SETJBPREUNWIND(jmpbuf, &pre_unwind); - if (setjmp (jbr.buf)) + if (SCM_I_SETJMP (jbr.buf)) { SCM throw_tag; SCM throw_args; @@ -884,7 +884,7 @@ scm_ithrow (SCM key, SCM args, int noreturn SCM_UNUSED) jbr->throw_tag = key; jbr->retval = args; scm_i_set_last_debug_frame (SCM_JBDFRAME (jmpbuf)); - longjmp (*JBJMPBUF (jmpbuf), 1); + SCM_I_LONGJMP (*JBJMPBUF (jmpbuf), 1); } /* Otherwise, it's some random piece of junk. */ -- 1.5.6.5 --=-=-=--