From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1726) id DEBD53858413; Tue, 26 Mar 2024 18:59:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DEBD53858413 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1711479574; bh=O0K4giBoo9ZaEu0oe5RnOZrDRpU5Ib9WC3B8VpjObdc=; h=From:To:Subject:Date:From; b=HSKUdGsFr3QJuthn1EJfiwHW1L6xwcOcbXgo1P5v09naeVmLLIpJrUnd3JNEu4LJU uk6jqP9Te/XeYwMUkwGmsZ+Kt0hpz/smF7ZF4jO7i8ub90TlfV4JiwMXjxIbQ1vq8A 0/JoZBv1beWKSKhHnxkth0PbEWAP/sOsE2cegDLo= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Andrew Burgess To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Revert "gdbserver: convert have_ptrace_getregset to a tribool" X-Act-Checkin: binutils-gdb X-Git-Author: Andrew Burgess X-Git-Refname: refs/heads/master X-Git-Oldrev: 9480801c1f446952d6b499f5fb45e3474ac87a90 X-Git-Newrev: 56f703d39d6f4793ba73b2364a4ea052e8ad755d Message-Id: <20240326185934.DEBD53858413@sourceware.org> Date: Tue, 26 Mar 2024 18:59:34 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D56f703d39d6f= 4793ba73b2364a4ea052e8ad755d commit 56f703d39d6f4793ba73b2364a4ea052e8ad755d Author: Andrew Burgess Date: Tue Mar 26 18:53:31 2024 +0000 Revert "gdbserver: convert have_ptrace_getregset to a tribool" =20 This reverts commit 5920765d7513aaae9241a1850d62d73e0477f81c. Diff: --- gdbserver/linux-arm-low.cc | 6 +++--- gdbserver/linux-low.cc | 2 +- gdbserver/linux-low.h | 2 +- gdbserver/linux-x86-low.cc | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gdbserver/linux-arm-low.cc b/gdbserver/linux-arm-low.cc index b4f0e071c92..396ec88081b 100644 --- a/gdbserver/linux-arm-low.cc +++ b/gdbserver/linux-arm-low.cc @@ -1007,9 +1007,9 @@ arm_target::low_arch_setup () =20 /* Check if PTRACE_GETREGSET works. */ if (ptrace (PTRACE_GETREGSET, tid, NT_PRSTATUS, &iov) =3D=3D 0) - have_ptrace_getregset =3D TRIBOOL_TRUE; + have_ptrace_getregset =3D 1; else - have_ptrace_getregset =3D TRIBOOL_FALSE; + have_ptrace_getregset =3D 0; } =20 bool @@ -1122,7 +1122,7 @@ arm_target::get_regs_info () { const struct target_desc *tdesc =3D current_process ()->tdesc; =20 - if (have_ptrace_getregset =3D=3D TRIBOOL_TRUE + if (have_ptrace_getregset =3D=3D 1 && (is_aarch32_linux_description (tdesc) || arm_linux_get_tdesc_fp_type (tdesc) =3D=3D ARM_FP_TYPE_VFPV3)) return ®s_info_aarch32; diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index dfa26d451b0..9d5a6242803 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -135,7 +135,7 @@ typedef struct #endif =20 /* Does the current host support PTRACE_GETREGSET? */ -enum tribool have_ptrace_getregset =3D TRIBOOL_UNKNOWN; +int have_ptrace_getregset =3D -1; =20 /* Return TRUE if THREAD is the leader thread of the process. */ =20 diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index eaf87527338..d34d2738238 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -951,7 +951,7 @@ void thread_db_notice_clone (struct thread_info *parent= _thr, ptid_t child_ptid); =20 bool thread_db_thread_handle (ptid_t ptid, gdb_byte **handle, int *handle_= len); =20 -extern enum tribool have_ptrace_getregset; +extern int have_ptrace_getregset; =20 /* Search for the value with type MATCH in the auxv vector, with entries of length WORDSIZE bytes, of process with pid PID. If found, store the diff --git a/gdbserver/linux-x86-low.cc b/gdbserver/linux-x86-low.cc index 04202e355bb..933d1fb012a 100644 --- a/gdbserver/linux-x86-low.cc +++ b/gdbserver/linux-x86-low.cc @@ -899,7 +899,7 @@ x86_linux_read_description (void) if (ptrace (PTRACE_GETFPXREGS, tid, 0, (long) &fpxregs) < 0) { have_ptrace_getfpxregs =3D 0; - have_ptrace_getregset =3D TRIBOOL_FALSE; + have_ptrace_getregset =3D 0; return i386_linux_read_description (X86_XSTATE_X87); } else @@ -918,7 +918,7 @@ x86_linux_read_description (void) return tdesc_i386_linux_no_xml.get (); } =20 - if (have_ptrace_getregset =3D=3D TRIBOOL_UNKNOWN) + if (have_ptrace_getregset =3D=3D -1) { uint64_t xstateregs[(X86_XSTATE_SSE_SIZE / sizeof (uint64_t))]; struct iovec iov; @@ -929,10 +929,10 @@ x86_linux_read_description (void) /* Check if PTRACE_GETREGSET works. */ if (ptrace (PTRACE_GETREGSET, tid, (unsigned int) NT_X86_XSTATE, (long) &iov) < 0) - have_ptrace_getregset =3D TRIBOOL_FALSE; + have_ptrace_getregset =3D 0; else { - have_ptrace_getregset =3D TRIBOOL_TRUE; + have_ptrace_getregset =3D 1; =20 /* Get XCR0 from XSAVE extended state. */ xcr0 =3D xstateregs[(I386_LINUX_XSAVE_XCR0_OFFSET @@ -955,7 +955,7 @@ x86_linux_read_description (void) } =20 /* Check the native XCR0 only if PTRACE_GETREGSET is available. */ - xcr0_features =3D (have_ptrace_getregset =3D=3D TRIBOOL_TRUE + xcr0_features =3D (have_ptrace_getregset && (xcr0 & X86_XSTATE_ALL_MASK)); =20 if (xcr0_features)