From: Corinna Vinschen <corinna-cygwin@cygwin.com>
To: Brian Inglis <Brian.Inglis@shaw.ca>
Cc: cygwin-patches@cygwin.com
Subject: Re: [PATCH v2 3/3] fhandler/proc.cc: use wincap.has_user_shstk
Date: Thu, 15 Jun 2023 09:11:26 +0200 [thread overview]
Message-ID: <ZIq5ng7w4m8LDhA8@calimero.vinschen.de> (raw)
In-Reply-To: <0afbace57b9ee469eb12fba773ef1347f24a8802.1686095734.git.Brian.Inglis@Shaw.ca>
Hi Brian,
thanks, that looks good, except this single snippet:
On Jun 7 10:37, Brian Inglis wrote:
> ---
> winsup/cygwin/fhandler/proc.cc | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/winsup/cygwin/fhandler/proc.cc b/winsup/cygwin/fhandler/proc.cc
> index 3c79762e0fbd..2eaf436dc122 100644
> --- a/winsup/cygwin/fhandler/proc.cc
> +++ b/winsup/cygwin/fhandler/proc.cc
> @@ -1486,12 +1486,12 @@ format_proc_cpuinfo (void *, char *&destbuf)
>
> /* ftcprint (features1, 6, "split_lock_detect");*//* MSR_TEST_CTRL split lock */
>
> - /* cpuid 0x00000007 ecx & Windows [20]20H1/[20]2004+ */
> - if (maxf >= 0x00000007 && wincap.osname () >= "10.0"
> - && wincap.build_number () >= 19041)
> + /* Windows [20]20H1/[20]2004/19041 user shadow stack */
> + if (maxf >= 0x00000007 && wincap.has_user_shstk)
^^^^^^^^^^^^^^^^^^^^^
wincapc::has_user_shstk is a method, accessing the wincaps::has_user_shstk
member. The parens are missing. Consequentially I see an error when
trying to build it:
winsup/cygwin/fhandler/proc.cc:1490:40: error: invalid use of member ‘bool wincapc::has_user_shstk() const’ (did you forget the ‘&’ ?)
1490 | if (maxf >= 0x00000007 && wincap.has_user_shstk)
| ~~~~~~~^~~~~~~~~~~~~~
make[4]: *** [Makefile:2068: fhandler/proc.o] Error 1
Thanks,
Corinna
next prev parent reply other threads:[~2023-06-15 7:11 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-07 16:37 [PATCH v2 0/3] use wincap in format_proc_cpuinfo for user_shstk Brian Inglis
2023-06-07 16:37 ` [PATCH v2 1/3] wincap.h: add wincap member has_user_shstk Brian Inglis
2023-06-07 16:37 ` [PATCH v2 2/3] wincap.cc: set wincap member has_user_shstk for 2004+ Brian Inglis
2023-06-07 16:37 ` [PATCH v2 3/3] fhandler/proc.cc: use wincap.has_user_shstk Brian Inglis
2023-06-15 7:11 ` Corinna Vinschen [this message]
2023-06-16 0:12 ` Brian Inglis
2023-06-16 0:16 ` [PATCH v3 " Brian Inglis
2023-06-16 8:28 ` Corinna Vinschen
2023-06-16 8:32 ` Corinna Vinschen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZIq5ng7w4m8LDhA8@calimero.vinschen.de \
--to=corinna-cygwin@cygwin.com \
--cc=Brian.Inglis@shaw.ca \
--cc=cygwin-patches@cygwin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).