RISC-V: Support pointer masking extension 1.0

- Adding Ssnpm, Smnpm, Smmpm, Sspm, and Supm
- No new CSR added
- Pointer masking only applies to RV64
- Ref: https://github.com/riscv/riscv-j-extension/releases/download/pointer-masking-ratified/pointer-masking-ratified.pdf

Signed-off-by: Jerry Zhang Jian <jerry.zhangjian@sifive.com>

diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c
index a2f67bc244ed583488db69bea447f584b64cc476..481bac91d73624f8f010caa9e6d4d04f0df00e47 100644 (file)
--- a/bfd/elfxx-riscv.c
+++ b/bfd/elfxx-riscv.c
@@ -1477,6 +1477,11 @@ static struct riscv_supported_ext riscv_supported_std_s_ext[] =
   {"svnapot",          ISA_SPEC_CLASS_DRAFT,           1, 0, 0 },
   {"svpbmt",           ISA_SPEC_CLASS_DRAFT,           1, 0, 0 },
   {"ssqosid",          ISA_SPEC_CLASS_DRAFT,           1, 0, 0 },
+  {"ssnpm",            ISA_SPEC_CLASS_DRAFT,           1, 0, 0 },
+  {"smnpm",            ISA_SPEC_CLASS_DRAFT,           1, 0, 0 },
+  {"smmpm",            ISA_SPEC_CLASS_DRAFT,           1, 0, 0 },
+  {"sspm",             ISA_SPEC_CLASS_DRAFT,           1, 0, 0 },
+  {"supm",             ISA_SPEC_CLASS_DRAFT,           1, 0, 0 },
   {NULL, 0, 0, 0, 0}
 };
 
@@ -2125,6 +2130,36 @@ riscv_parse_check_conflicts (riscv_parse_subset_t *rps)
        (_("`xtheadvector' is conflict with the `v' extension"));
       no_conflict = false;
     }
+  if (riscv_lookup_subset (rps->subset_list, "ssnpm", &subset) && xlen != 64)
+    {
+      rps->error_handler (_ ("rv%d does not support the `ssnpm' extension"),
+                         xlen);
+      no_conflict = false;
+    }
+  if (riscv_lookup_subset (rps->subset_list, "smnpm", &subset) && xlen != 64)
+    {
+      rps->error_handler (_ ("rv%d does not support the `smnpm' extension"),
+                         xlen);
+      no_conflict = false;
+    }
+  if (riscv_lookup_subset (rps->subset_list, "smmpm", &subset) && xlen != 64)
+    {
+      rps->error_handler (_ ("rv%d does not support the `smmpm' extension"),
+                         xlen);
+      no_conflict = false;
+    }
+  if (riscv_lookup_subset (rps->subset_list, "sspm", &subset) && xlen != 64)
+    {
+      rps->error_handler (_ ("rv%d does not support the `sspm' extension"),
+                         xlen);
+      no_conflict = false;
+    }
+  if (riscv_lookup_subset (rps->subset_list, "supm", &subset) && xlen != 64)
+    {
+      rps->error_handler (_ ("rv%d does not support the `supm' extension"),
+                         xlen);
+      no_conflict = false;
+    }
 
   bool support_zve = false;
   bool support_zvl = false;

diff --git a/gas/NEWS b/gas/NEWS
index dc09ef57dfa91b25b4aad66fae8d72ce8d00ccbe..dc0fd1009cbaac3ad5f8e261141e533f6919ed0e 100644 (file)
--- a/gas/NEWS
+++ b/gas/NEWS
@@ -6,7 +6,7 @@
   directives, the file need to be rebuilt since 2.45.
 
 * Add support for RISC-V standard extensions:
-  ssqosid v1.0.
+  ssqosid v1.0, ssnpm v1.0, smnpm v1.0, smmpm v1.0, sspm v1.0, supm v1.0.
 
 * Add support for RISC-V vendor extensions:
   T-Head: xtheadvdot v1.0.

diff --git a/gas/testsuite/gas/riscv/march-fail-rv32-pointer-masking.d b/gas/testsuite/gas/riscv/march-fail-rv32-pointer-masking.d
new file mode 100644 (file)
index 0000000..fb4dfc6
--- /dev/null
+++ b/gas/testsuite/gas/riscv/march-fail-rv32-pointer-masking.d
@@ -0,0 +1,3 @@
+#as: -march=rv32i_ssnpm_smnpm_smmpm_sspm_supm
+#source: empty.s
+#error_output: march-fail-rv32-pointer-masking.l

diff --git a/gas/testsuite/gas/riscv/march-fail-rv32-pointer-masking.l b/gas/testsuite/gas/riscv/march-fail-rv32-pointer-masking.l
new file mode 100644 (file)
index 0000000..1196528
--- /dev/null
+++ b/gas/testsuite/gas/riscv/march-fail-rv32-pointer-masking.l
@@ -0,0 +1,6 @@
+.*Assembler messages:
+.*Error: rv32 does not support the `ssnpm' extension
+.*Error: rv32 does not support the `smnpm' extension
+.*Error: rv32 does not support the `smmpm' extension
+.*Error: rv32 does not support the `sspm' extension
+.*Error: rv32 does not support the `supm' extension

diff --git a/gas/testsuite/gas/riscv/march-help.l b/gas/testsuite/gas/riscv/march-help.l
index f4b1e306895825e25d4177ef296c3dd7be770bee..d77472fda9c343de15e97e9541a877e027fa0e89 100644 (file)
--- a/gas/testsuite/gas/riscv/march-help.l
+++ b/gas/testsuite/gas/riscv/march-help.l
@@ -140,6 +140,11 @@ All available -march extensions for RISC-V:
        svnapot                                 1.0
        svpbmt                                  1.0
        ssqosid                                 1.0
+       ssnpm                                   1.0
+       smnpm                                   1.0
+       smmpm                                   1.0
+       sspm                                    1.0
+       supm                                    1.0
        xcvalu                                  1.0
        xcvbi                                   1.0
        xcvbitmanip                             1.0