CSKY: Add ck803r2 series cpu.

gas/
        * config/tc-csky.c (CSKY_ISA_803R2): New.
        (csky_archs): Add ck803r2 series.
        (md_begin): Fix warning about -medsp.
        (csky_get_freg_val): Support lowercase of fpu register name.
        * testsuite/gas/csky/cskyv2_ck803r2.s: New file.
        * testsuite/gas/csky/cskyv2_ck803r2.d: New file.

include/
        * csky.h (CSKYV2_ISA_3E3R2): New.

opcodes/
        * csky-opc.h (csky_v2_opcodes): Add instruction bnezad.

4 files changed, 71 insertions, 8 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 2dde2df..65b662d 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,12 @@
+2020-08-21  Cooper Qu  <cooper.qu@linux.alibaba.com>
+
+	* config/tc-csky.c (CSKY_ISA_803R2): New.
+	(csky_archs): Add ck803r2 series.
+	(md_begin): Fix warning about -medsp.
+	(csky_get_freg_val): Support lowercase of fpu register name.
+	* testsuite/gas/csky/cskyv2_ck803r2.s: New file.
+	* testsuite/gas/csky/cskyv2_ck803r2.d: New file.
+
 2020-08-23  Alan Modra  <amodra@gmail.com>
 
 	PR 26513
diff --git a/gas/config/tc-csky.c b/gas/config/tc-csky.c
index 5f536f4..d16c448 100644
--- a/gas/config/tc-csky.c
+++ b/gas/config/tc-csky.c
@@ -604,6 +604,7 @@ const struct csky_cpu_info csky_cpus[] =
   /* CK803 series.  */
 #define CSKY_ISA_803    (CSKY_ISA_802 | CSKYV2_ISA_2E3 | CSKY_ISA_MP)
 #define CSKY_ISA_803R1  (CSKY_ISA_803 | CSKYV2_ISA_3E3R1)
+#define CSKY_ISA_803R2  (CSKY_ISA_803 | CSKYV2_ISA_3E3R1 | CSKYV2_ISA_3E3R2)
 #define CSKY_ISA_FLOAT_803 (CSKY_ISA_FLOAT_E1 | CSKY_ISA_FLOAT_1E3)
   {"ck803", CSKY_ARCH_803, CSKY_ISA_803 },
   {"ck803h", CSKY_ARCH_803, CSKY_ISA_803 },
@@ -636,6 +637,22 @@ const struct csky_cpu_info csky_cpus[] =
   {"ck803eftr1", CSKY_ARCH_803 | CSKY_ARCH_DSP | CSKY_ARCH_FLOAT, CSKY_ISA_803R1 | CSKY_ISA_DSP_ENHANCE | CSKY_ISA_FLOAT_803 | CSKY_ISA_TRUST},
   {"ck803ehftr1", CSKY_ARCH_803 | CSKY_ARCH_DSP | CSKY_ARCH_FLOAT, CSKY_ISA_803R1 | CSKY_ISA_DSP_ENHANCE | CSKY_ISA_FLOAT_803 | CSKY_ISA_TRUST},
 
+  {"ck803r2", CSKY_ARCH_803, CSKY_ISA_803R2},
+  {"ck803hr2", CSKY_ARCH_803, CSKY_ISA_803R2},
+  {"ck803tr2", CSKY_ARCH_803, CSKY_ISA_803R2 | CSKY_ISA_TRUST},
+  {"ck803htr2", CSKY_ARCH_803, CSKY_ISA_803R2 | CSKY_ISA_TRUST},
+  {"ck803fr2", CSKY_ARCH_803 | CSKY_ARCH_FLOAT, CSKY_ISA_803R2 | CSKY_ISA_FLOAT_803},
+  {"ck803fhr2", CSKY_ARCH_803 | CSKY_ARCH_FLOAT, CSKY_ISA_803R2 | CSKY_ISA_FLOAT_803},
+  {"ck803er2", CSKY_ARCH_803 | CSKY_ARCH_DSP, CSKY_ISA_803R2 | CSKY_ISA_DSP_ENHANCE},
+  {"ck803ehr2", CSKY_ARCH_803 | CSKY_ARCH_DSP, CSKY_ISA_803R2 | CSKY_ISA_DSP_ENHANCE},
+  {"ck803etr2", CSKY_ARCH_803 | CSKY_ARCH_DSP, CSKY_ISA_803R2 | CSKY_ISA_DSP_ENHANCE | CSKY_ISA_TRUST},
+  {"ck803ehtr2", CSKY_ARCH_803 | CSKY_ARCH_DSP, CSKY_ISA_803R2 | CSKY_ISA_DSP_ENHANCE | CSKY_ISA_TRUST},
+  {"ck803efr2", CSKY_ARCH_803 | CSKY_ARCH_DSP | CSKY_ARCH_FLOAT, CSKY_ISA_803R2 | CSKY_ISA_DSP_ENHANCE | CSKY_ISA_FLOAT_803},
+  {"ck803efhr2", CSKY_ARCH_803 | CSKY_ARCH_DSP | CSKY_ARCH_FLOAT, CSKY_ISA_803R2 | CSKY_ISA_DSP_ENHANCE | CSKY_ISA_FLOAT_803},
+  {"ck803ftr2", CSKY_ARCH_803 | CSKY_ARCH_FLOAT, CSKY_ISA_803R2 | CSKY_ISA_FLOAT_803 | CSKY_ISA_TRUST},
+  {"ck803eftr2", CSKY_ARCH_803 | CSKY_ARCH_DSP | CSKY_ARCH_FLOAT, CSKY_ISA_803R2 | CSKY_ISA_DSP_ENHANCE | CSKY_ISA_FLOAT_803 | CSKY_ISA_TRUST},
+  {"ck803efhtr2", CSKY_ARCH_803 | CSKY_ARCH_DSP | CSKY_ARCH_FLOAT, CSKY_ISA_803R2 | CSKY_ISA_DSP_ENHANCE | CSKY_ISA_FLOAT_803 | CSKY_ISA_TRUST},
+
   {"ck803s", CSKY_ARCH_803, CSKY_ISA_803R1 },
   {"ck803se", CSKY_ARCH_803 | CSKY_ARCH_DSP, CSKY_ISA_803R1 | CSKYV2_ISA_DSP},
   {"ck803sj", CSKY_ARCH_803 | CSKY_ARCH_JAVA, CSKY_ISA_803R1 | CSKY_ISA_JAVA},
@@ -1250,16 +1267,34 @@ md_begin (void)
     {
       if (IS_CSKY_ARCH_803 (mach_flag))
 	{
-	  /* In 803, dspv1 is conflict with dspv2. We keep dspv2.  */
-	  if ((dsp_flag & CSKY_DSP_FLAG_V1) && (dsp_flag & CSKY_DSP_FLAG_V2))
-	    as_warn (_("option -mdsp conflicts with -medsp, only enabling -medsp"));
-	  isa_flag &= ~(CSKY_ISA_MAC_DSP | CSKY_ISA_DSP);
-	  isa_flag |= CSKY_ISA_DSP_ENHANCE;
+	  if ((dsp_flag & CSKY_DSP_FLAG_V1))
+	    {
+	      isa_flag |= (CSKY_ISA_MAC_DSP | CSKY_ISA_DSP);
+	      isa_flag &= ~CSKY_ISA_DSP_ENHANCE;
+	    }
+
+	  if ((dsp_flag & CSKY_DSP_FLAG_V2))
+	    {
+	      isa_flag &= ~(CSKY_ISA_MAC_DSP | CSKY_ISA_DSP);
+	      isa_flag |= CSKY_ISA_DSP_ENHANCE;
+	    }
+
+	  if ((dsp_flag & CSKY_DSP_FLAG_V1)
+	      && (dsp_flag & CSKY_DSP_FLAG_V2))
+	    {
+	      /* In 803, dspv1 is conflict with dspv2. We keep dspv2.  */
+	      as_warn ("option -mdsp conflicts with -medsp, only enabling -medsp");
+	      isa_flag &= ~(CSKY_ISA_MAC_DSP | CSKY_ISA_DSP);
+	      isa_flag |= CSKY_ISA_DSP_ENHANCE;
+	    }
 	}
       else
 	{
-	  isa_flag &= ~CSKY_ISA_DSP_ENHANCE;
-	  as_warn (_("-medsp option is only supported by ck803s, ignoring -medsp"));
+	  if (dsp_flag & CSKY_DSP_FLAG_V2)
+	    {
+	      isa_flag &= ~CSKY_ISA_DSP_ENHANCE;
+	      as_warn ("-medsp option is only supported by ck803s, ignoring -medsp");
+	    }
 	}
       ;
     }
@@ -2330,7 +2365,8 @@ csky_get_freg_val (char *str, int *len)
 {
   int reg = 0;
   char *s = NULL;
-  if ((str[0] == 'v' || str[0] == 'f') && (str[1] == 'r'))
+  if ((TOLOWER(str[0]) == 'v' || TOLOWER(str[0]) == 'f')
+      && (TOLOWER(str[1]) == 'r'))
     {
       /* It is fpu register.  */
       s = &str[2];
diff --git a/gas/testsuite/gas/csky/cskyv2_ck803r2.d b/gas/testsuite/gas/csky/cskyv2_ck803r2.d
new file mode 100644
index 0000000..298022a
--- /dev/null
+++ b/gas/testsuite/gas/csky/cskyv2_ck803r2.d
@@ -0,0 +1,12 @@
+# name: csky - ck803r2
+#as: -mcpu=ck803r2
+#objdump: -D
+
+.*: +file format .*csky.*
+
+Disassembly of section \.text:
+#...
+\s*[0-9a-f]*:\s*e8200002\s*bnezad\s*r0, 0x4.*
+#...
+\s*[0-9a-f]*:\s*6c03\s*mov\s*r0,\s*r0
+\s*[0-9a-f]*:\s*e820fffd\s*bnezad\s*r0,\s*0.*
diff --git a/gas/testsuite/gas/csky/cskyv2_ck803r2.s b/gas/testsuite/gas/csky/cskyv2_ck803r2.s
new file mode 100644
index 0000000..4c9e923
--- /dev/null
+++ b/gas/testsuite/gas/csky/cskyv2_ck803r2.s
@@ -0,0 +1,6 @@
+ck803r2:
+   bnezad r0, hello
+
+hello:
+   nop
+   bnezad r0, ck803r2