[binutils-gdb/jremus/sframe-v3-s390x] Revert "TEST: s390: sframe: Represent .cfi_register FP/RA using SFrame V2 encoding"

[Jens Remus]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=436a9ed3ef9d18294ec05e274eca9dfa44b0668c

commit 436a9ed3ef9d18294ec05e274eca9dfa44b0668c
Author: Jens Remus <jremus@linux.ibm.com>
Date:   Mon Dec 15 15:20:28 2025 +0100

    Revert "TEST: s390: sframe: Represent .cfi_register FP/RA using SFrame V2 encoding"

Diff:
---
 gas/gen-sframe.c        | 4 ++--
 libsframe/sframe-dump.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gas/gen-sframe.c b/gas/gen-sframe.c
index 1166ce68aff..d794f2a79ec 100644
--- a/gas/gen-sframe.c
+++ b/gas/gen-sframe.c
@@ -1476,11 +1476,11 @@ s390_sframe_xlate_do_register (struct sframe_xlate_ctx *xlate_ctx,
      numbers, as offsets from CFA are always a multiple of -8 on s390x.  */
   if (cfi_insn->u.rr.reg1 == SFRAME_CFA_FP_REG)
     sframe_fre_set_fp_track (cur_fre,
-			     SFRAME_V2_S390X_OFFSET_ENCODE_REGNUM (cfi_insn->u.rr.reg2));
+			     SFRAME_V3_S390X_OFFSET_ENCODE_REGNUM (cfi_insn->u.rr.reg2));
   else if (sframe_ra_tracking_p ()
 	   && cfi_insn->u.rr.reg1 == SFRAME_CFA_RA_REG)
     sframe_fre_set_ra_track (cur_fre,
-			     SFRAME_V2_S390X_OFFSET_ENCODE_REGNUM (cfi_insn->u.rr.reg2));
+			     SFRAME_V3_S390X_OFFSET_ENCODE_REGNUM (cfi_insn->u.rr.reg2));
 
   return SFRAME_XLATE_OK;
 }
diff --git a/libsframe/sframe-dump.c b/libsframe/sframe-dump.c
index d357b8b486c..9cbb52254dc 100644
--- a/libsframe/sframe-dump.c
+++ b/libsframe/sframe-dump.c
@@ -123,7 +123,7 @@ sframe_s390x_offset_regnum_p (int32_t offset, uint8_t ver)
   if (ver == SFRAME_VERSION_2)
     return SFRAME_V2_S390X_OFFSET_IS_REGNUM (offset);
   else if (ver == SFRAME_VERSION_3)
-    return SFRAME_V2_S390X_OFFSET_IS_REGNUM (offset);
+    return SFRAME_V3_S390X_OFFSET_IS_REGNUM (offset);
   else
     /* No other version is supported yet.  */
     sframe_assert (false);
@@ -135,7 +135,7 @@ sframe_s390x_offset_decode_regnum (int32_t offset, uint8_t ver)
   if (ver == SFRAME_VERSION_2)
     return SFRAME_V2_S390X_OFFSET_DECODE_REGNUM (offset);
   else if (ver == SFRAME_VERSION_3)
-    return SFRAME_V2_S390X_OFFSET_DECODE_REGNUM (offset);
+    return SFRAME_V3_S390X_OFFSET_DECODE_REGNUM (offset);
   else
     /* No other version is supported yet.  */
     sframe_assert (false);