From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 52153 invoked by alias); 30 Mar 2015 17:33:13 -0000 Mailing-List: contact cygwin-patches-help@cygwin.com; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Archive: List-Help: , Sender: cygwin-patches-owner@cygwin.com Mail-Followup-To: cygwin-patches@cygwin.com Received: (qmail 52093 invoked by uid 89); 30 Mar 2015 17:33:12 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 X-HELO: rgout01.bt.lon5.cpcloud.co.uk Received: from rgout01.bt.lon5.cpcloud.co.uk (HELO rgout01.bt.lon5.cpcloud.co.uk) (65.20.0.178) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 30 Mar 2015 17:33:11 +0000 X-OWM-Source-IP: 31.51.205.126(GB) X-OWM-Env-Sender: jonturney@btinternet.com X-CTCH-RefID: str=0001.0A090205.551988D6.008C,ss=1,re=0.001,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0 X-Junkmail-Premium-Raw: score=27/50,refid=2.7.2:2015.3.24.91819:17:27.888,ip=31.51.205.126,rules=__HAS_FROM, __TO_MALFORMED_2, __TO_NO_NAME, __SUBJ_ALPHA_END, __HAS_MSGID, __SANE_MSGID, __HAS_X_MAILER, __IN_REP_TO, __REFERENCES, __ANY_URI, __URI_NO_WWW, __URI_NO_PATH, BODYTEXTP_SIZE_3000_LESS, BODY_SIZE_2000_2999, __MIME_TEXT_ONLY, RDNS_GENERIC_POOLED, __URI_NS, SXL_IP_DYNAMIC[126.205.51.31.fur], HTML_00_01, HTML_00_10, BODY_SIZE_5000_LESS, RDNS_SUSP_GENERIC, RDNS_SUSP, BODY_SIZE_7000_LESS, REFERENCES X-CTCH-Spam: Unknown Received: from localhost.localdomain (31.51.205.126) by rgout01.bt.lon5.cpcloud.co.uk (8.6.122.06) (authenticated as jonturney@btinternet.com) id 5508763C01A1D7CF; Mon, 30 Mar 2015 18:33:10 +0100 From: Jon TURNEY To: cygwin-patches@cygwin.com Cc: Jon TURNEY Subject: [PATCH 1/2] Rename struct ucontext to struct mcontext Date: Mon, 30 Mar 2015 17:33:00 -0000 Message-Id: <1427736757-13884-2-git-send-email-jon.turney@dronecode.org.uk> In-Reply-To: <1427736757-13884-1-git-send-email-jon.turney@dronecode.org.uk> References: <20150330102129.GH29875@calimero.vinschen.de> <1427736757-13884-1-git-send-email-jon.turney@dronecode.org.uk> X-SW-Source: 2015-q1/txt/msg00036.txt.bz2 * include/cygwin/signal.h : Rename struct ucontext to struct mcontext. Remove unused member oldmask and simplify __COPY_CONTEXT_SIZE. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/include/cygwin/signal.h | 16 +++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 505f4ce..cfc29a8 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2015-03-30 Jon TURNEY + + * include/cygwin/signal.h : Rename struct ucontext to struct mcontext. + Remove unused member oldmask and simplify __COPY_CONTEXT_SIZE. + 2015-03-30 Corinna Vinschen * cygtls.h (struct _cygtls): Convert thread_context to type CONTEXT. diff --git a/winsup/cygwin/include/cygwin/signal.h b/winsup/cygwin/include/cygwin/signal.h index 58bbff0..47093b9 100644 --- a/winsup/cygwin/include/cygwin/signal.h +++ b/winsup/cygwin/include/cygwin/signal.h @@ -18,6 +18,10 @@ extern "C" { #endif +/* + Define a struct mcontext, which should be identical to the Win32 API type + CONTEXT +*/ #ifdef __x86_64__ struct _uc_fpxreg { @@ -45,7 +49,7 @@ struct _fpstate __uint32_t padding[24]; }; -struct ucontext +struct mcontext { __uint64_t p1home; __uint64_t p2home; @@ -93,7 +97,6 @@ struct ucontext __uint64_t etr; __uint64_t efr; __uint8_t _internal; - __uint64_t oldmask; }; #else /* !x86_64 */ @@ -117,7 +120,7 @@ struct _fpstate __uint32_t nxst; }; -struct ucontext +struct mcontext { __uint32_t cr2; __uint32_t dr0; @@ -144,14 +147,13 @@ struct ucontext __uint32_t esp; __uint32_t ss; __uint8_t _internal; - __uint32_t oldmask; }; #endif /* !x86_64 */ -/* Needed for GDB. It only compiles in the context copy code if this - macro s defined. */ -#define __COPY_CONTEXT_SIZE ((size_t) (uintptr_t) &((struct ucontext *) 0)->_internal) +/* Needed for GDB 7.9 and earlier. It only compiles in the context copy code if + this macro is defined. */ +#define __COPY_CONTEXT_SIZE (sizeof(struct mcontext)) typedef union sigval { -- 2.1.4