[src/trunk]: src/sys/lib/libunwind PR toolchain/55837

[rin <rin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/453fc6aeb652
branches:  trunk
changeset: 379434:453fc6aeb652
user:      rin <rin%NetBSD.org@localhost>
date:      Mon May 31 11:57:28 2021 +0000

description:
PR toolchain/55837

Fix logic error in copyFloatVectorRegister() for arm; copy s0-s31 or
d0-d31, not both.

diffstat:

 sys/lib/libunwind/Registers.hpp |  23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diffs (35 lines):

diff -r 18beedf4aaf8 -r 453fc6aeb652 sys/lib/libunwind/Registers.hpp
--- a/sys/lib/libunwind/Registers.hpp   Mon May 31 11:54:01 2021 +0000
+++ b/sys/lib/libunwind/Registers.hpp   Mon May 31 11:57:28 2021 +0000
@@ -400,19 +400,20 @@ public:
 #endif
       memcpy((uint8_t *)(fpreg + dnum) + part * sizeof(fpreg[0]) / 2,
         addr, sizeof(fpreg[0]) / 2);
-    }
-    if (num <= REGNO_ARM32_D15) {
-      if ((flags & FLAGS_VFPV2_USED) == 0) {
-        lazyVFPv2();
-        flags |= FLAGS_VFPV2_USED;
+    } else {
+      if (num <= REGNO_ARM32_D15) {
+        if ((flags & FLAGS_VFPV2_USED) == 0) {
+          lazyVFPv2();
+          flags |= FLAGS_VFPV2_USED;
+        }
+      } else {
+        if ((flags & FLAGS_VFPV3_USED) == 0) {
+          lazyVFPv3();
+          flags |= FLAGS_VFPV3_USED;
+        }
       }
-    } else {
-      if ((flags & FLAGS_VFPV3_USED) == 0) {
-        lazyVFPv3();
-        flags |= FLAGS_VFPV3_USED;
-      }
+      memcpy(fpreg + (num - REGNO_ARM32_D0), addr, sizeof(fpreg[0]));
     }
-    memcpy(fpreg + (num - REGNO_ARM32_D0), addr, sizeof(fpreg[0]));
   }
 
   __dso_hidden void lazyVFPv2();