public inbox for binutils@sourceware.org
 help / color / mirror / Atom feed
* [PATCH 1/2] LoongArch: bfd: Correct the name of R_LARCH_SOP_POP_32_U in howto_table
@ 2023-07-27 10:03 Jinyang He
  2023-07-27 10:03 ` [PATCH 2/2] LoongArch: ld: Fix other pop relocs overflow check and add tests Jinyang He
  0 siblings, 1 reply; 2+ messages in thread
From: Jinyang He @ 2023-07-27 10:03 UTC (permalink / raw)
  To: Chenghua Xu, Zhensong Liu, mengqinggang, WANG Xuerui
  Cc: Xi Ruoyao, binutils, Xing Li

---
 bfd/elfxx-loongarch.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bfd/elfxx-loongarch.c b/bfd/elfxx-loongarch.c
index f27c9fdba..924b11cfa 100644
--- a/bfd/elfxx-loongarch.c
+++ b/bfd/elfxx-loongarch.c
@@ -516,7 +516,7 @@ static loongarch_reloc_howto_type loongarch_howto_table[] =
 	 0,					/* bitpos.  */
 	 complain_overflow_unsigned,		/* complain_on_overflow.  */
 	 bfd_elf_generic_reloc,			/* special_function.  */
-	 "R_LARCH_SOP_POP_32_S_U",		/* name.  */
+	 "R_LARCH_SOP_POP_32_U",		/* name.  */
 	 false,					/* partial_inplace.  */
 	 0xffffffff00000000,			/* src_mask */
 	 0x00000000ffffffff,			/* dst_mask */
-- 
2.33.0


^ permalink raw reply	[flat|nested] 2+ messages in thread

* [PATCH 2/2] LoongArch: ld: Fix other pop relocs overflow check and add tests
  2023-07-27 10:03 [PATCH 1/2] LoongArch: bfd: Correct the name of R_LARCH_SOP_POP_32_U in howto_table Jinyang He
@ 2023-07-27 10:03 ` Jinyang He
  0 siblings, 0 replies; 2+ messages in thread
From: Jinyang He @ 2023-07-27 10:03 UTC (permalink / raw)
  To: Chenghua Xu, Zhensong Liu, mengqinggang, WANG Xuerui
  Cc: Xi Ruoyao, binutils, Xing Li

Add reloc_unsign_bits() to fix others sop_pop relocs overflow check.
Then add over/underflow tests for relocs B*, SOP_POP* and PCREL20_S2.

bfd/ChangeLog:

	* bfd/elfxx-loongarch.c: Add reloc_unsign_bits().

ld/ChangeLog:

	* testsuite/ld-loongarch-elf/ld-loongarch-elf.exp: Add test.
	* testsuite/ld-loongarch-elf/abi1_overflow_check1.dd: New test.
	* testsuite/ld-loongarch-elf/abi1_overflow_check1.s: New test.
	* testsuite/ld-loongarch-elf/abi1_overflow_check2.s: New test.
	* testsuite/ld-loongarch-elf/abi2_overflow_check1.s: New test.
	* testsuite/ld-loongarch-elf/abi2_overflow_check2.s: New test.
	* testsuite/ld-loongarch-elf/abi2_overflow_check_b16.d: New test.
	* testsuite/ld-loongarch-elf/abi2_overflow_check_b21.d: New test.
	* testsuite/ld-loongarch-elf/abi2_overflow_check_b26.d: New test.
	* testsuite/ld-loongarch-elf/abi2_overflow_check_pcrel20.d: New test.
	* testsuite/ld-loongarch-elf/overflow_b16.d: New test.
	* testsuite/ld-loongarch-elf/overflow_b21.d: New test.
	* testsuite/ld-loongarch-elf/overflow_b26.d: New test.
	* testsuite/ld-loongarch-elf/overflow_pcrel20.d: New test.
	* testsuite/ld-loongarch-elf/overflow_s_0_10_10_16_s2.d: New test.
	* testsuite/ld-loongarch-elf/overflow_s_0_5_10_16_s2.d: New test.
	* testsuite/ld-loongarch-elf/overflow_s_10_12.d: New test.
	* testsuite/ld-loongarch-elf/overflow_s_10_16.d: New test.
	* testsuite/ld-loongarch-elf/overflow_s_10_16_s2.d: New test.
	* testsuite/ld-loongarch-elf/overflow_s_10_5.d: New test.
	* testsuite/ld-loongarch-elf/overflow_s_5_20.d: New test.
	* testsuite/ld-loongarch-elf/overflow_u.d: New test.
	* testsuite/ld-loongarch-elf/overflow_u_10_12.d: New test.
	* testsuite/ld-loongarch-elf/underflow_b16.d: New test.
	* testsuite/ld-loongarch-elf/underflow_b21.d: New test.
	* testsuite/ld-loongarch-elf/underflow_b26.d: New test.
	* testsuite/ld-loongarch-elf/underflow_pcrel20.d: New test.
	* testsuite/ld-loongarch-elf/underflow_s_0_10_10_16_s2.d: New test.
	* testsuite/ld-loongarch-elf/underflow_s_0_5_10_16_s2.d: New test.
	* testsuite/ld-loongarch-elf/underflow_s_10_12.d: New test.
	* testsuite/ld-loongarch-elf/underflow_s_10_16.d: New test.
	* testsuite/ld-loongarch-elf/underflow_s_10_16_s2.d: New test.
	* testsuite/ld-loongarch-elf/underflow_s_10_5.d: New test.
	* testsuite/ld-loongarch-elf/underflow_s_5_20.d: New test.
---
 bfd/elfxx-loongarch.c                         | 33 ++++++++++----
 .../ld-loongarch-elf/abi1_overflow_check1.dd  | 18 ++++++++
 .../ld-loongarch-elf/abi1_overflow_check1.s   | 39 +++++++++++++++++
 .../ld-loongarch-elf/abi1_overflow_check2.s   | 43 +++++++++++++++++++
 .../ld-loongarch-elf/abi2_overflow_check1.s   | 24 +++++++++++
 .../ld-loongarch-elf/abi2_overflow_check2.s   | 24 +++++++++++
 .../abi2_overflow_check_b16.d                 |  9 ++++
 .../abi2_overflow_check_b21.d                 |  9 ++++
 .../abi2_overflow_check_b26.d                 |  9 ++++
 .../abi2_overflow_check_pcrel20.d             |  9 ++++
 .../ld-loongarch-elf/ld-loongarch-elf.exp     | 39 +++++++++++++++++
 ld/testsuite/ld-loongarch-elf/overflow_b16.d  |  4 ++
 ld/testsuite/ld-loongarch-elf/overflow_b21.d  |  4 ++
 ld/testsuite/ld-loongarch-elf/overflow_b26.d  |  4 ++
 .../ld-loongarch-elf/overflow_pcrel20.d       |  4 ++
 .../overflow_s_0_10_10_16_s2.d                |  4 ++
 .../overflow_s_0_5_10_16_s2.d                 |  4 ++
 .../ld-loongarch-elf/overflow_s_10_12.d       |  4 ++
 .../ld-loongarch-elf/overflow_s_10_16.d       |  4 ++
 .../ld-loongarch-elf/overflow_s_10_16_s2.d    |  4 ++
 .../ld-loongarch-elf/overflow_s_10_5.d        |  4 ++
 .../ld-loongarch-elf/overflow_s_5_20.d        |  4 ++
 ld/testsuite/ld-loongarch-elf/overflow_u.d    |  4 ++
 .../ld-loongarch-elf/overflow_u_10_12.d       |  4 ++
 ld/testsuite/ld-loongarch-elf/underflow_b16.d |  4 ++
 ld/testsuite/ld-loongarch-elf/underflow_b21.d |  4 ++
 ld/testsuite/ld-loongarch-elf/underflow_b26.d |  4 ++
 .../ld-loongarch-elf/underflow_pcrel20.d      |  4 ++
 .../underflow_s_0_10_10_16_s2.d               |  4 ++
 .../underflow_s_0_5_10_16_s2.d                |  4 ++
 .../ld-loongarch-elf/underflow_s_10_12.d      |  4 ++
 .../ld-loongarch-elf/underflow_s_10_16.d      |  4 ++
 .../ld-loongarch-elf/underflow_s_10_16_s2.d   |  4 ++
 .../ld-loongarch-elf/underflow_s_10_5.d       |  4 ++
 .../ld-loongarch-elf/underflow_s_5_20.d       |  4 ++
 35 files changed, 343 insertions(+), 9 deletions(-)
 create mode 100644 ld/testsuite/ld-loongarch-elf/abi1_overflow_check1.dd
 create mode 100644 ld/testsuite/ld-loongarch-elf/abi1_overflow_check1.s
 create mode 100644 ld/testsuite/ld-loongarch-elf/abi1_overflow_check2.s
 create mode 100644 ld/testsuite/ld-loongarch-elf/abi2_overflow_check1.s
 create mode 100644 ld/testsuite/ld-loongarch-elf/abi2_overflow_check2.s
 create mode 100644 ld/testsuite/ld-loongarch-elf/abi2_overflow_check_b16.d
 create mode 100644 ld/testsuite/ld-loongarch-elf/abi2_overflow_check_b21.d
 create mode 100644 ld/testsuite/ld-loongarch-elf/abi2_overflow_check_b26.d
 create mode 100644 ld/testsuite/ld-loongarch-elf/abi2_overflow_check_pcrel20.d
 create mode 100644 ld/testsuite/ld-loongarch-elf/overflow_b16.d
 create mode 100644 ld/testsuite/ld-loongarch-elf/overflow_b21.d
 create mode 100644 ld/testsuite/ld-loongarch-elf/overflow_b26.d
 create mode 100644 ld/testsuite/ld-loongarch-elf/overflow_pcrel20.d
 create mode 100644 ld/testsuite/ld-loongarch-elf/overflow_s_0_10_10_16_s2.d
 create mode 100644 ld/testsuite/ld-loongarch-elf/overflow_s_0_5_10_16_s2.d
 create mode 100644 ld/testsuite/ld-loongarch-elf/overflow_s_10_12.d
 create mode 100644 ld/testsuite/ld-loongarch-elf/overflow_s_10_16.d
 create mode 100644 ld/testsuite/ld-loongarch-elf/overflow_s_10_16_s2.d
 create mode 100644 ld/testsuite/ld-loongarch-elf/overflow_s_10_5.d
 create mode 100644 ld/testsuite/ld-loongarch-elf/overflow_s_5_20.d
 create mode 100644 ld/testsuite/ld-loongarch-elf/overflow_u.d
 create mode 100644 ld/testsuite/ld-loongarch-elf/overflow_u_10_12.d
 create mode 100644 ld/testsuite/ld-loongarch-elf/underflow_b16.d
 create mode 100644 ld/testsuite/ld-loongarch-elf/underflow_b21.d
 create mode 100644 ld/testsuite/ld-loongarch-elf/underflow_b26.d
 create mode 100644 ld/testsuite/ld-loongarch-elf/underflow_pcrel20.d
 create mode 100644 ld/testsuite/ld-loongarch-elf/underflow_s_0_10_10_16_s2.d
 create mode 100644 ld/testsuite/ld-loongarch-elf/underflow_s_0_5_10_16_s2.d
 create mode 100644 ld/testsuite/ld-loongarch-elf/underflow_s_10_12.d
 create mode 100644 ld/testsuite/ld-loongarch-elf/underflow_s_10_16.d
 create mode 100644 ld/testsuite/ld-loongarch-elf/underflow_s_10_16_s2.d
 create mode 100644 ld/testsuite/ld-loongarch-elf/underflow_s_10_5.d
 create mode 100644 ld/testsuite/ld-loongarch-elf/underflow_s_5_20.d

diff --git a/bfd/elfxx-loongarch.c b/bfd/elfxx-loongarch.c
index 924b11cfa..9b4fbfe36 100644
--- a/bfd/elfxx-loongarch.c
+++ b/bfd/elfxx-loongarch.c
@@ -55,6 +55,8 @@ static bool
 reloc_bits (bfd *abfd, reloc_howto_type *howto, bfd_vma *val);
 static bool
 reloc_sign_bits (bfd *abfd, reloc_howto_type *howto, bfd_vma *fix_val);
+static bool
+reloc_unsign_bits (bfd *abfd, reloc_howto_type *howto, bfd_vma *fix_val);
 
 static bfd_reloc_status_type
 loongarch_elf_add_sub_reloc (bfd *, arelent *, asymbol *, void *,
@@ -383,7 +385,7 @@ static loongarch_reloc_howto_type loongarch_howto_table[] =
 	 0x7c00,				  /* dst_mask */
 	 false,					  /* pcrel_offset */
 	 BFD_RELOC_LARCH_SOP_POP_32_S_10_5,	  /* bfd_reloc_code_real_type */
-	 reloc_bits,				  /* adjust_reloc_bits */
+	 reloc_sign_bits,			  /* adjust_reloc_bits */
 	 NULL),					  /* larch_reloc_type_name */
 
   LOONGARCH_HOWTO (R_LARCH_SOP_POP_32_U_10_12,	  /* type (39).  */
@@ -400,7 +402,7 @@ static loongarch_reloc_howto_type loongarch_howto_table[] =
 	 0x3ffc00,				  /* dst_mask */
 	 false,					  /* pcrel_offset */
 	 BFD_RELOC_LARCH_SOP_POP_32_U_10_12,	  /* bfd_reloc_code_real_type */
-	 reloc_bits,				  /* adjust_reloc_bits */
+	 reloc_unsign_bits,			  /* adjust_reloc_bits */
 	 NULL),					  /* larch_reloc_type_name */
 
   LOONGARCH_HOWTO (R_LARCH_SOP_POP_32_S_10_12,	  /* type (40).  */
@@ -417,7 +419,7 @@ static loongarch_reloc_howto_type loongarch_howto_table[] =
 	 0x3ffc00,				  /* dst_mask */
 	 false,					  /* pcrel_offset */
 	 BFD_RELOC_LARCH_SOP_POP_32_S_10_12,	  /* bfd_reloc_code_real_type */
-	 reloc_bits,				  /* adjust_reloc_bits */
+	 reloc_sign_bits,			  /* adjust_reloc_bits */
 	 NULL),					  /* larch_reloc_type_name */
 
   LOONGARCH_HOWTO (R_LARCH_SOP_POP_32_S_10_16,	  /* type (41).  */
@@ -434,7 +436,7 @@ static loongarch_reloc_howto_type loongarch_howto_table[] =
 	 0x3fffc00,				  /* dst_mask */
 	 false,					  /* pcrel_offset */
 	 BFD_RELOC_LARCH_SOP_POP_32_S_10_16,	  /* bfd_reloc_code_real_type */
-	 reloc_bits,				  /* adjust_reloc_bits */
+	 reloc_sign_bits,			  /* adjust_reloc_bits */
 	 NULL),					  /* larch_reloc_type_name */
 
   LOONGARCH_HOWTO (R_LARCH_SOP_POP_32_S_10_16_S2, /* type (42).  */
@@ -468,7 +470,7 @@ static loongarch_reloc_howto_type loongarch_howto_table[] =
 	 0x1ffffe0,				  /* dst_mask */
 	 false,					  /* pcrel_offset */
 	 BFD_RELOC_LARCH_SOP_POP_32_S_5_20,	  /* bfd_reloc_code_real_type */
-	 reloc_bits,				  /* adjust_reloc_bits */
+	 reloc_sign_bits,			  /* adjust_reloc_bits */
 	 NULL),					  /* larch_reloc_type_name */
 
   LOONGARCH_HOWTO (R_LARCH_SOP_POP_32_S_0_5_10_16_S2,
@@ -522,7 +524,7 @@ static loongarch_reloc_howto_type loongarch_howto_table[] =
 	 0x00000000ffffffff,			/* dst_mask */
 	 false,					/* pcrel_offset */
 	 BFD_RELOC_LARCH_SOP_POP_32_U,		/* bfd_reloc_code_real_type */
-	 reloc_bits,				/* adjust_reloc_bits */
+	 reloc_unsign_bits,			/* adjust_reloc_bits */
 	 NULL),					/* larch_reloc_type_name */
 
   /* 8-bit in-place addition, for local label subtraction.  */
@@ -1671,9 +1673,10 @@ reloc_bits (bfd *abfd ATTRIBUTE_UNUSED,
 }
 
 static bool
-reloc_sign_bits (bfd *abfd, reloc_howto_type *howto, bfd_vma *fix_val)
+reloc_bits_sanity (bfd *abfd, reloc_howto_type *howto, bfd_vma *fix_val, bool sign)
 {
-  if (howto->complain_on_overflow != complain_overflow_signed)
+  if ((sign && howto->complain_on_overflow != complain_overflow_signed)
+      || (!sign && howto->complain_on_overflow != complain_overflow_unsigned))
     return false;
 
   bfd_signed_vma val = (bfd_signed_vma)(*fix_val);
@@ -1689,7 +1692,7 @@ reloc_sign_bits (bfd *abfd, reloc_howto_type *howto, bfd_vma *fix_val)
     }
 
   bfd_signed_vma mask = ((bfd_signed_vma)0x1 << (howto->bitsize
-			  + howto->rightshift - 1)) - 1;
+			  + howto->rightshift - sign)) - 1;
 
   /* Positive number: high part is all 0;
      Negative number: if high part is not all 0, high part must be all 1.
@@ -1728,6 +1731,18 @@ reloc_sign_bits (bfd *abfd, reloc_howto_type *howto, bfd_vma *fix_val)
   return true;
 }
 
+static bool
+reloc_sign_bits (bfd *abfd, reloc_howto_type *howto, bfd_vma *fix_val)
+{
+  return reloc_bits_sanity (abfd, howto, fix_val, true);
+}
+
+static bool
+reloc_unsign_bits (bfd *abfd, reloc_howto_type *howto, bfd_vma *fix_val)
+{
+  return reloc_bits_sanity (abfd, howto, fix_val, false);
+}
+
 bool
 loongarch_adjust_reloc_bitsfield (bfd *abfd, reloc_howto_type *howto,
 				  bfd_vma *fix_val)
diff --git a/ld/testsuite/ld-loongarch-elf/abi1_overflow_check1.dd b/ld/testsuite/ld-loongarch-elf/abi1_overflow_check1.dd
new file mode 100644
index 000000000..c85271408
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/abi1_overflow_check1.dd
@@ -0,0 +1,18 @@
+#...
+.*00003c00.*
+.*00004000.*
+.*001ffc00.*
+.*00200000.*
+.*01fffc00.*
+.*02000000.*
+.*01fffc00.*
+.*02000000.*
+.*03fffc0f.*
+.*00000010.*
+.*03fffdff.*
+.*00000200.*
+.*00ffffe0.*
+.*01000000.*
+.*003ffc00.*
+.*ffffffff.*
+#pass
diff --git a/ld/testsuite/ld-loongarch-elf/abi1_overflow_check1.s b/ld/testsuite/ld-loongarch-elf/abi1_overflow_check1.s
new file mode 100644
index 000000000..02507f19c
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/abi1_overflow_check1.s
@@ -0,0 +1,39 @@
+.macro sign_check reloc_name reloc_bits
+  .reloc off, R_LARCH_SOP_PUSH_ABSOLUTE, (1 << (\reloc_bits - 1)) - 1
+  .reloc off, \reloc_name
+  .word 0
+  .set off, off + 4
+  .reloc off, R_LARCH_SOP_PUSH_ABSOLUTE, -(1 << (\reloc_bits - 1))
+  .reloc off, \reloc_name
+  .word 0
+  .set off, off + 4
+.endm
+
+.macro sign_check_s2 reloc_name reloc_bits
+  .reloc off, R_LARCH_SOP_PUSH_ABSOLUTE, ((1 << (\reloc_bits - 1)) - 1) << 2
+  .reloc off, \reloc_name
+  .word 0
+  .set off, off + 4
+  .reloc off, R_LARCH_SOP_PUSH_ABSOLUTE, (-(1 << (\reloc_bits - 1))) << 2
+  .reloc off, \reloc_name
+  .word 0
+  .set off, off + 4
+.endm
+
+.macro unsign_check reloc_name reloc_bits
+  .reloc off, R_LARCH_SOP_PUSH_ABSOLUTE, (1 << \reloc_bits) - 1
+  .reloc off, \reloc_name
+  .word 0
+  .set off, off + 4
+.endm
+
+.set off, 0
+sign_check R_LARCH_SOP_POP_32_S_10_5 5
+sign_check R_LARCH_SOP_POP_32_S_10_12 12
+sign_check R_LARCH_SOP_POP_32_S_10_16 16
+sign_check_s2 R_LARCH_SOP_POP_32_S_10_16_S2 16
+sign_check_s2 R_LARCH_SOP_POP_32_S_0_5_10_16_S2 21
+sign_check_s2 R_LARCH_SOP_POP_32_S_0_10_10_16_S2 26
+sign_check R_LARCH_SOP_POP_32_S_5_20 20
+unsign_check R_LARCH_SOP_POP_32_U_10_12 12
+unsign_check R_LARCH_SOP_POP_32_U 32
diff --git a/ld/testsuite/ld-loongarch-elf/abi1_overflow_check2.s b/ld/testsuite/ld-loongarch-elf/abi1_overflow_check2.s
new file mode 100644
index 000000000..34f2d5920
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/abi1_overflow_check2.s
@@ -0,0 +1,43 @@
+.macro sign_check reloc_sym reloc_name reloc_bits
+  .ifdef \reloc_sym
+    .ifdef overflow
+      .reloc 0, R_LARCH_SOP_PUSH_ABSOLUTE, 1 << (\reloc_bits - 1)
+      .reloc 0, \reloc_name
+    .else
+      .reloc 0, R_LARCH_SOP_PUSH_ABSOLUTE, -(1 << (\reloc_bits - 1)) - 1
+      .reloc 0, \reloc_name
+    .endif
+    .word 0
+  .endif
+.endm
+
+.macro sign_check_s2 reloc_sym reloc_name reloc_bits
+  .ifdef \reloc_sym
+    .ifdef overflow
+      .reloc 0, R_LARCH_SOP_PUSH_ABSOLUTE, (1 << (\reloc_bits - 1)) << 2
+      .reloc 0, \reloc_name
+    .else
+      .reloc 0, R_LARCH_SOP_PUSH_ABSOLUTE, (-(1 << (\reloc_bits - 1)) - 1) << 2
+      .reloc 0, \reloc_name
+    .endif
+    .word 0
+  .endif
+.endm
+
+.macro unsign_check reloc_sym reloc_name reloc_bits
+  .ifdef \reloc_sym
+    .reloc 0, R_LARCH_SOP_PUSH_ABSOLUTE, 1 << \reloc_bits
+    .reloc 0, \reloc_name
+    .word 0
+  .endif
+.endm
+
+sign_check	s_10_5		R_LARCH_SOP_POP_32_S_10_5 5
+sign_check	s_10_12		R_LARCH_SOP_POP_32_S_10_12 12
+sign_check	s_10_16		R_LARCH_SOP_POP_32_S_10_16 16
+sign_check_s2	s_10_16_s2	R_LARCH_SOP_POP_32_S_10_16_S2 16
+sign_check_s2	s_0_5_10_16_s2	R_LARCH_SOP_POP_32_S_0_5_10_16_S2 21
+sign_check_s2	s_0_10_10_16_s2	R_LARCH_SOP_POP_32_S_0_10_10_16_S2 26
+sign_check	s_5_20		R_LARCH_SOP_POP_32_S_5_20 20
+unsign_check	u_10_12		R_LARCH_SOP_POP_32_U_10_12 12
+unsign_check	u		R_LARCH_SOP_POP_32_U 32
diff --git a/ld/testsuite/ld-loongarch-elf/abi2_overflow_check1.s b/ld/testsuite/ld-loongarch-elf/abi2_overflow_check1.s
new file mode 100644
index 000000000..f1bc3868f
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/abi2_overflow_check1.s
@@ -0,0 +1,24 @@
+  .text
+.ifdef b16
+  beq $a0, $a1, low
+  beq $a0, $a1, high
+.endif
+.ifdef b21
+  beqz $a0, low
+  beqz $a0, high
+.endif
+.ifdef b26
+  b low
+  b high
+.endif
+.ifdef pcrel20
+  .reloc 0, R_LARCH_PCREL20_S2, low
+  pcaddi $a0, 0
+  .reloc 4, R_LARCH_PCREL20_S2, high
+  pcaddi $a0, 0
+.endif
+
+  .section ".low"
+low: nop
+  .section ".high"
+high: nop
diff --git a/ld/testsuite/ld-loongarch-elf/abi2_overflow_check2.s b/ld/testsuite/ld-loongarch-elf/abi2_overflow_check2.s
new file mode 100644
index 000000000..1c25bd8c5
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/abi2_overflow_check2.s
@@ -0,0 +1,24 @@
+  .text
+
+.set idx, 0
+.ifdef underflow
+  nop
+  .set idx, 4
+.endif
+
+.ifdef b16
+  beq $a0, $a1, local_sym
+.endif
+.ifdef b21
+  beqz $a0, local_sym
+.endif
+.ifdef b26
+  b local_sym
+.endif
+.ifdef pcrel20
+  .reloc idx, R_LARCH_PCREL20_S2, local_sym
+  pcaddi $a0, 0
+.endif
+
+  .section ".local_sym"
+local_sym: nop
diff --git a/ld/testsuite/ld-loongarch-elf/abi2_overflow_check_b16.d b/ld/testsuite/ld-loongarch-elf/abi2_overflow_check_b16.d
new file mode 100644
index 000000000..cd73a5136
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/abi2_overflow_check_b16.d
@@ -0,0 +1,9 @@
+#source: abi2_overflow_check1.s
+#as: --defsym b16=1
+#ld: -e 0 -Ttext 0x20000000 --section-start=.low=0x1ffe0000 --section-start=.high=0x20020000
+#objdump: -s
+
+#...
+Contents of section .text:
+ 20000000 8500005a 85fcff59.*
+#pass
diff --git a/ld/testsuite/ld-loongarch-elf/abi2_overflow_check_b21.d b/ld/testsuite/ld-loongarch-elf/abi2_overflow_check_b21.d
new file mode 100644
index 000000000..143824388
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/abi2_overflow_check_b21.d
@@ -0,0 +1,9 @@
+#source: abi2_overflow_check1.s
+#as: --defsym b21=1
+#ld: -e 0 -Ttext 0x20000000 --section-start=.low=0x1fc00000 --section-start=.high=0x20400000
+#objdump: -s
+
+#...
+Contents of section .text:
+ 20000000 90000040 8ffcff43.*
+#pass
diff --git a/ld/testsuite/ld-loongarch-elf/abi2_overflow_check_b26.d b/ld/testsuite/ld-loongarch-elf/abi2_overflow_check_b26.d
new file mode 100644
index 000000000..c8e996995
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/abi2_overflow_check_b26.d
@@ -0,0 +1,9 @@
+#source: abi2_overflow_check1.s
+#as: --defsym b26=1
+#ld: -e 0 -Ttext 0x20000000 --section-start=.low=0x18000000 --section-start=.high=0x28000000
+#objdump: -s
+
+#...
+Contents of section .text:
+ 20000000 00020050 fffdff53.*
+#pass
diff --git a/ld/testsuite/ld-loongarch-elf/abi2_overflow_check_pcrel20.d b/ld/testsuite/ld-loongarch-elf/abi2_overflow_check_pcrel20.d
new file mode 100644
index 000000000..3948f4216
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/abi2_overflow_check_pcrel20.d
@@ -0,0 +1,9 @@
+#source: abi2_overflow_check1.s
+#as: --defsym pcrel20=1
+#ld: -e 0 -Ttext 0x20000000 --section-start=.low=0x1fe00000 --section-start=.high=0x20200000
+#objdump: -s
+
+#...
+Contents of section .text:
+ 20000000 04000019 e4ffff18.*
+#pass
diff --git a/ld/testsuite/ld-loongarch-elf/ld-loongarch-elf.exp b/ld/testsuite/ld-loongarch-elf/ld-loongarch-elf.exp
index b95cc53e5..a6812ea2a 100644
--- a/ld/testsuite/ld-loongarch-elf/ld-loongarch-elf.exp
+++ b/ld/testsuite/ld-loongarch-elf/ld-loongarch-elf.exp
@@ -32,6 +32,22 @@ if [istarget "loongarch64-*-*"] {
     run_dump_test "syscall"
     run_dump_test "disas-jirl"
     run_dump_test "local-ifunc-reloc"
+    run_dump_test "overflow_s_10_5"
+    run_dump_test "overflow_s_10_12"
+    run_dump_test "overflow_s_10_16"
+    run_dump_test "overflow_s_10_16_s2"
+    run_dump_test "overflow_s_0_5_10_16_s2"
+    run_dump_test "overflow_s_0_10_10_16_s2"
+    run_dump_test "overflow_s_5_20"
+    run_dump_test "overflow_u_10_12"
+    run_dump_test "overflow_u"
+    run_dump_test "underflow_s_10_5"
+    run_dump_test "underflow_s_10_12"
+    run_dump_test "underflow_s_10_16"
+    run_dump_test "underflow_s_10_16_s2"
+    run_dump_test "underflow_s_0_5_10_16_s2"
+    run_dump_test "underflow_s_0_10_10_16_s2"
+    run_dump_test "underflow_s_5_20"
 }
 
 if [istarget "loongarch32-*-*"] {
@@ -54,5 +70,28 @@ if [istarget "loongarch64-*-*"] {
 	      ] \
 	      "64_pcrel" \
 	  ] \
+	  [list \
+	      "abi1_overflow_check1" \
+	      "-e 0x0" "" \
+	      "" \
+	      {abi1_overflow_check1.s} \
+	      [list \
+		  [list objdump -D abi1_overflow_check1.dd] \
+	      ] \
+	      "abi1_overflow_check1" \
+	  ] \
       ]
 }
+
+run_dump_test "abi2_overflow_check_b16"
+run_dump_test "abi2_overflow_check_b21"
+run_dump_test "abi2_overflow_check_b26"
+run_dump_test "abi2_overflow_check_pcrel20"
+run_dump_test "overflow_b16"
+run_dump_test "overflow_b21"
+run_dump_test "overflow_b26"
+run_dump_test "overflow_pcrel20"
+run_dump_test "underflow_b16"
+run_dump_test "underflow_b21"
+run_dump_test "underflow_b26"
+run_dump_test "underflow_pcrel20"
diff --git a/ld/testsuite/ld-loongarch-elf/overflow_b16.d b/ld/testsuite/ld-loongarch-elf/overflow_b16.d
new file mode 100644
index 000000000..a015f57d8
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/overflow_b16.d
@@ -0,0 +1,4 @@
+#source: abi2_overflow_check2.s
+#as: --defsym overflow=1 --defsym b16=1
+#ld: -e 0 --section-start=.local_sym=0x20020000
+#error: .*relocation truncated to fit: R_LARCH_B16 against `local_sym'
diff --git a/ld/testsuite/ld-loongarch-elf/overflow_b21.d b/ld/testsuite/ld-loongarch-elf/overflow_b21.d
new file mode 100644
index 000000000..ad0d20de1
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/overflow_b21.d
@@ -0,0 +1,4 @@
+#source: abi2_overflow_check2.s
+#as: --defsym overflow=1 --defsym b21=1
+#ld: -e 0 --section-start=.local_sym=0x20400000
+#error: .*relocation truncated to fit: R_LARCH_B21 against `local_sym'
diff --git a/ld/testsuite/ld-loongarch-elf/overflow_b26.d b/ld/testsuite/ld-loongarch-elf/overflow_b26.d
new file mode 100644
index 000000000..510283756
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/overflow_b26.d
@@ -0,0 +1,4 @@
+#source: abi2_overflow_check2.s
+#as: --defsym overflow=1 --defsym b26=1
+#ld: -e 0 --section-start=.local_sym=0x28000000
+#error: .*relocation truncated to fit: R_LARCH_B26 against `local_sym'
diff --git a/ld/testsuite/ld-loongarch-elf/overflow_pcrel20.d b/ld/testsuite/ld-loongarch-elf/overflow_pcrel20.d
new file mode 100644
index 000000000..354fc2903
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/overflow_pcrel20.d
@@ -0,0 +1,4 @@
+#source: abi2_overflow_check2.s
+#as: --defsym overflow=1 --defsym pcrel20=1
+#ld: -e 0 --section-start=.local_sym=0x20200000
+#error: .*relocation truncated to fit: R_LARCH_PCREL20_S2 against `local_sym'
diff --git a/ld/testsuite/ld-loongarch-elf/overflow_s_0_10_10_16_s2.d b/ld/testsuite/ld-loongarch-elf/overflow_s_0_10_10_16_s2.d
new file mode 100644
index 000000000..38a7d0173
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/overflow_s_0_10_10_16_s2.d
@@ -0,0 +1,4 @@
+#source: abi1_overflow_check2.s
+#as: --defsym overflow=1 --defsym s_0_10_10_16_s2=1
+#ld: -e 0
+#error: .*relocation truncated to fit: R_LARCH_SOP_POP_32_S_0_10_10_16_S2 against `<nameless>'
\ No newline at end of file
diff --git a/ld/testsuite/ld-loongarch-elf/overflow_s_0_5_10_16_s2.d b/ld/testsuite/ld-loongarch-elf/overflow_s_0_5_10_16_s2.d
new file mode 100644
index 000000000..cf6cbcce0
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/overflow_s_0_5_10_16_s2.d
@@ -0,0 +1,4 @@
+#source: abi1_overflow_check2.s
+#as: --defsym overflow=1 --defsym s_0_5_10_16_s2=1
+#ld: -e 0
+#error: .*relocation truncated to fit: R_LARCH_SOP_POP_32_S_0_5_10_16_S2 against `<nameless>'
\ No newline at end of file
diff --git a/ld/testsuite/ld-loongarch-elf/overflow_s_10_12.d b/ld/testsuite/ld-loongarch-elf/overflow_s_10_12.d
new file mode 100644
index 000000000..30541c999
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/overflow_s_10_12.d
@@ -0,0 +1,4 @@
+#source: abi1_overflow_check2.s
+#as: --defsym overflow=1 --defsym s_10_12=1
+#ld: -e 0
+#error: .*relocation truncated to fit: R_LARCH_SOP_POP_32_S_10_12 against `<nameless>'
\ No newline at end of file
diff --git a/ld/testsuite/ld-loongarch-elf/overflow_s_10_16.d b/ld/testsuite/ld-loongarch-elf/overflow_s_10_16.d
new file mode 100644
index 000000000..304ab9697
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/overflow_s_10_16.d
@@ -0,0 +1,4 @@
+#source: abi1_overflow_check2.s
+#as: --defsym overflow=1 --defsym s_10_16=1
+#ld: -e 0
+#error: .*relocation truncated to fit: R_LARCH_SOP_POP_32_S_10_16 against `<nameless>'
\ No newline at end of file
diff --git a/ld/testsuite/ld-loongarch-elf/overflow_s_10_16_s2.d b/ld/testsuite/ld-loongarch-elf/overflow_s_10_16_s2.d
new file mode 100644
index 000000000..00037013f
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/overflow_s_10_16_s2.d
@@ -0,0 +1,4 @@
+#source: abi1_overflow_check2.s
+#as: --defsym overflow=1 --defsym s_10_16_s2=1
+#ld: -e 0
+#error: .*relocation truncated to fit: R_LARCH_SOP_POP_32_S_10_16_S2 against `<nameless>'
\ No newline at end of file
diff --git a/ld/testsuite/ld-loongarch-elf/overflow_s_10_5.d b/ld/testsuite/ld-loongarch-elf/overflow_s_10_5.d
new file mode 100644
index 000000000..183a43451
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/overflow_s_10_5.d
@@ -0,0 +1,4 @@
+#source: abi1_overflow_check2.s
+#as: --defsym overflow=1 --defsym s_10_5=1
+#ld: -e 0
+#error: .*relocation truncated to fit: R_LARCH_SOP_POP_32_S_10_5 against `<nameless>'
\ No newline at end of file
diff --git a/ld/testsuite/ld-loongarch-elf/overflow_s_5_20.d b/ld/testsuite/ld-loongarch-elf/overflow_s_5_20.d
new file mode 100644
index 000000000..d35448945
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/overflow_s_5_20.d
@@ -0,0 +1,4 @@
+#source: abi1_overflow_check2.s
+#as: --defsym overflow=1 --defsym s_5_20=1
+#ld: -e 0
+#error: .*relocation truncated to fit: R_LARCH_SOP_POP_32_S_5_20 against `<nameless>'
\ No newline at end of file
diff --git a/ld/testsuite/ld-loongarch-elf/overflow_u.d b/ld/testsuite/ld-loongarch-elf/overflow_u.d
new file mode 100644
index 000000000..ea332a6a5
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/overflow_u.d
@@ -0,0 +1,4 @@
+#source: abi1_overflow_check2.s
+#as: --defsym overflow=1 --defsym u=1
+#ld: -e 0
+#error: .*relocation truncated to fit: R_LARCH_SOP_POP_32_U against `<nameless>'
\ No newline at end of file
diff --git a/ld/testsuite/ld-loongarch-elf/overflow_u_10_12.d b/ld/testsuite/ld-loongarch-elf/overflow_u_10_12.d
new file mode 100644
index 000000000..80ac8f1fa
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/overflow_u_10_12.d
@@ -0,0 +1,4 @@
+#source: abi1_overflow_check2.s
+#as: --defsym overflow=1 --defsym u_10_12=1
+#ld: -e 0
+#error: .*relocation truncated to fit: R_LARCH_SOP_POP_32_U_10_12 against `<nameless>'
\ No newline at end of file
diff --git a/ld/testsuite/ld-loongarch-elf/underflow_b16.d b/ld/testsuite/ld-loongarch-elf/underflow_b16.d
new file mode 100644
index 000000000..dcb50b9d4
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/underflow_b16.d
@@ -0,0 +1,4 @@
+#source: abi2_overflow_check2.s
+#as: --defsym underflow=1 --defsym b16=1
+#ld: -e 0 --section-start=.local_sym=0x1ffe0000
+#error: .*relocation truncated to fit: R_LARCH_B16 against `local_sym'
diff --git a/ld/testsuite/ld-loongarch-elf/underflow_b21.d b/ld/testsuite/ld-loongarch-elf/underflow_b21.d
new file mode 100644
index 000000000..55047e12a
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/underflow_b21.d
@@ -0,0 +1,4 @@
+#source: abi2_overflow_check2.s
+#as: --defsym underflow=1 --defsym b21=1
+#ld: -e 0 --section-start=.local_sym=0x1fc00000
+#error: .*relocation truncated to fit: R_LARCH_B21 against `local_sym'
diff --git a/ld/testsuite/ld-loongarch-elf/underflow_b26.d b/ld/testsuite/ld-loongarch-elf/underflow_b26.d
new file mode 100644
index 000000000..675c47f0e
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/underflow_b26.d
@@ -0,0 +1,4 @@
+#source: abi2_overflow_check2.s
+#as: --defsym underflow=1 --defsym b26=1
+#ld: -e 0 --section-start=.local_sym=0x28000000
+#error: .*relocation truncated to fit: R_LARCH_B26 against `local_sym'
diff --git a/ld/testsuite/ld-loongarch-elf/underflow_pcrel20.d b/ld/testsuite/ld-loongarch-elf/underflow_pcrel20.d
new file mode 100644
index 000000000..186034e4f
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/underflow_pcrel20.d
@@ -0,0 +1,4 @@
+#source: abi2_overflow_check2.s
+#as: --defsym underflow=1 --defsym pcrel20=1
+#ld: -e 0 --section-start=.local_sym=0x1fe00000
+#error: .*relocation truncated to fit: R_LARCH_PCREL20_S2 against `local_sym'
diff --git a/ld/testsuite/ld-loongarch-elf/underflow_s_0_10_10_16_s2.d b/ld/testsuite/ld-loongarch-elf/underflow_s_0_10_10_16_s2.d
new file mode 100644
index 000000000..cd7abb1a1
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/underflow_s_0_10_10_16_s2.d
@@ -0,0 +1,4 @@
+#source: abi1_overflow_check2.s
+#as: --defsym underflow=1 --defsym s_0_10_10_16_s2=1
+#ld: -e 0
+#error: .*relocation truncated to fit: R_LARCH_SOP_POP_32_S_0_10_10_16_S2 against `<nameless>'
\ No newline at end of file
diff --git a/ld/testsuite/ld-loongarch-elf/underflow_s_0_5_10_16_s2.d b/ld/testsuite/ld-loongarch-elf/underflow_s_0_5_10_16_s2.d
new file mode 100644
index 000000000..21474c9d1
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/underflow_s_0_5_10_16_s2.d
@@ -0,0 +1,4 @@
+#source: abi1_overflow_check2.s
+#as: --defsym underflow=1 --defsym s_0_5_10_16_s2=1
+#ld: -e 0
+#error: .*relocation truncated to fit: R_LARCH_SOP_POP_32_S_0_5_10_16_S2 against `<nameless>'
\ No newline at end of file
diff --git a/ld/testsuite/ld-loongarch-elf/underflow_s_10_12.d b/ld/testsuite/ld-loongarch-elf/underflow_s_10_12.d
new file mode 100644
index 000000000..7cbd45216
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/underflow_s_10_12.d
@@ -0,0 +1,4 @@
+#source: abi1_overflow_check2.s
+#as: --defsym underflow=1 --defsym s_10_12=1
+#ld: -e 0
+#error: .*relocation truncated to fit: R_LARCH_SOP_POP_32_S_10_12 against `<nameless>'
\ No newline at end of file
diff --git a/ld/testsuite/ld-loongarch-elf/underflow_s_10_16.d b/ld/testsuite/ld-loongarch-elf/underflow_s_10_16.d
new file mode 100644
index 000000000..e3dde7e25
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/underflow_s_10_16.d
@@ -0,0 +1,4 @@
+#source: abi1_overflow_check2.s
+#as: --defsym underflow=1 --defsym s_10_16=1
+#ld: -e 0
+#error: .*relocation truncated to fit: R_LARCH_SOP_POP_32_S_10_16 against `<nameless>'
\ No newline at end of file
diff --git a/ld/testsuite/ld-loongarch-elf/underflow_s_10_16_s2.d b/ld/testsuite/ld-loongarch-elf/underflow_s_10_16_s2.d
new file mode 100644
index 000000000..b05b56df4
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/underflow_s_10_16_s2.d
@@ -0,0 +1,4 @@
+#source: abi1_overflow_check2.s
+#as: --defsym underflow=1 --defsym s_10_16_s2=1
+#ld: -e 0
+#error: .*relocation truncated to fit: R_LARCH_SOP_POP_32_S_10_16_S2 against `<nameless>'
\ No newline at end of file
diff --git a/ld/testsuite/ld-loongarch-elf/underflow_s_10_5.d b/ld/testsuite/ld-loongarch-elf/underflow_s_10_5.d
new file mode 100644
index 000000000..5e0352e4f
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/underflow_s_10_5.d
@@ -0,0 +1,4 @@
+#source: abi1_overflow_check2.s
+#as: --defsym underflow=1 --defsym s_10_5=1
+#ld: -e 0
+#error: .*relocation truncated to fit: R_LARCH_SOP_POP_32_S_10_5 against `<nameless>'
\ No newline at end of file
diff --git a/ld/testsuite/ld-loongarch-elf/underflow_s_5_20.d b/ld/testsuite/ld-loongarch-elf/underflow_s_5_20.d
new file mode 100644
index 000000000..d88818a52
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/underflow_s_5_20.d
@@ -0,0 +1,4 @@
+#source: abi1_overflow_check2.s
+#as: --defsym underflow=1 --defsym s_5_20=1
+#ld: -e 0
+#error: .*relocation truncated to fit: R_LARCH_SOP_POP_32_S_5_20 against `<nameless>'
\ No newline at end of file
-- 
2.33.0


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-07-27 10:03 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-27 10:03 [PATCH 1/2] LoongArch: bfd: Correct the name of R_LARCH_SOP_POP_32_U in howto_table Jinyang He
2023-07-27 10:03 ` [PATCH 2/2] LoongArch: ld: Fix other pop relocs overflow check and add tests Jinyang He

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).