From 55f069454e4e7e49b5d749bba14e2a788bcdf7a1 Mon Sep 17 00:00:00 2001 From: marcel Date: Wed, 5 Mar 2003 03:30:54 +0000 Subject: [PATCH] ABI breaker: Move the J_SIGMASK field in the jmpbuf before the J_SIG0 field. While here, rename J_SIG0 to J_SIGSET and remove J_SIG1. The main reason for this change is that the 128-bit sigset_t is now aligned on a 16-byte boundary, which allows us to use 16-byte atomic loads and stores on CPUs that support it. The removal of J_SIG1 is done to avoid confusion: it is never accessed and should not be. Renaming J_SIG0 to J_SIGSET is the icing on the cake that's better done now than later. --- lib/libc/ia64/gen/setjmp.S | 4 ++-- sys/ia64/include/setjmp.h | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/libc/ia64/gen/setjmp.S b/lib/libc/ia64/gen/setjmp.S index 7b1eb6797e2c..a2b56d6af9f0 100644 --- a/lib/libc/ia64/gen/setjmp.S +++ b/lib/libc/ia64/gen/setjmp.S @@ -50,7 +50,7 @@ ENTRY(setjmp, 1) ;; mov out0=1 // how = SIG_BLOCK mov out1=0 // set = NULL - add out2=J_SIG0,in0 // oset = &jb[J_SIG0] + add out2=J_SIGSET,in0 // oset = &jb[J_SIGSET] br.call.sptk.few rp=__sys_sigprocmask ;; mov rp=loc1 @@ -68,7 +68,7 @@ ENTRY(__longjmp, 2) mov loc1=rp ;; mov out0=3 // how = SIG_SETMASK - add out1=J_SIG0,in0 // set = &jb[J_SIG0] + add out1=J_SIGSET,in0 // set = &jb[J_SIGSET] mov out2=0 // oset = NULL br.call.sptk.few rp=__sys_sigprocmask ;; diff --git a/sys/ia64/include/setjmp.h b/sys/ia64/include/setjmp.h index c74cbadca863..208e0721931f 100644 --- a/sys/ia64/include/setjmp.h +++ b/sys/ia64/include/setjmp.h @@ -86,9 +86,8 @@ #define J_B3 0x1c0 #define J_B4 0x1c8 #define J_B5 0x1d0 -#define J_SIG0 0x1d8 -#define J_SIG1 0x1e0 -#define J_SIGMASK 0x1e8 +#define J_SIGMASK 0x1d8 +#define J_SIGSET 0x1e0 #endif /* __BSD_VISIBLE */ /*