Add virtual destructor to tui_layout_base

[deliverable/binutils-gdb.git] / opcodes / score-dis.c

diff --git a/opcodes/score-dis.c b/opcodes/score-dis.c
index 9c1c06cc02d06721348aa66b1bed346f9efbad09..74a1f1d93203d995ecee35c14c74cac33c91d201 100644 (file)
--- a/opcodes/score-dis.c
+++ b/opcodes/score-dis.c
@@ -1,5 +1,5 @@
 /* Instruction printing code for Score
-   Copyright (C) 2006-2017 Free Software Foundation, Inc.
+   Copyright (C) 2006-2019 Free Software Foundation, Inc.
    Contributed by:
    Brain.lin (brain.lin@sunplusct.com)
    Mei Ligang (ligang@sunnorth.com.cn)
@@ -23,7 +23,7 @@
    MA 02110-1301, USA.  */
 
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #define DEFINE_TABLE
 #include "opintl.h"
 #include "bfd.h"
@@ -473,6 +473,7 @@ static struct score_opcode score_opcodes[] =
   {0x00003454, 0x3e007fff, "tvc"},
   {0x00000026, 0x3e0003ff, "xor\t\t%20-24r, %15-19r, %10-14r"},
   {0x00000027, 0x3e0003ff, "xor.c\t\t%20-24r, %15-19r, %10-14r"},
+  {0,0,NULL}
 };
 \f
 
@@ -953,15 +954,6 @@ print_insn_score16 (bfd_vma pc, struct disassemble_info *info, long given)
                               reg = given >> bitstart;
                               reg &= (2 << (bitend - bitstart)) - 1;
 
-                              /* Check rpush rd, 0 and rpop! rd, 0.
-                                 If reg = 0, then set to 32.  */
-                              if (((given & 0x00007c00) == 0x00006c00
-                                    || (given & 0x00007c00) == 0x00006800)
-                                  && reg == 0)
-                                {
-                                  reg = 32;
-                                }
-
                               switch (*c)
                                 {
                                 case 'R':
@@ -971,6 +963,13 @@ print_insn_score16 (bfd_vma pc, struct disassemble_info *info, long given)
                                   func (stream, "%s", score_regnames[reg]);
                                   break;
                                 case 'd':
+                                 /* Check rpush rd, 0 and rpop! rd, 0.
+                                    If 0, then print 32.  */
+                                 if (((given & 0x00007c00) == 0x00006c00
+                                      || (given & 0x00007c00) == 0x00006800)
+                                     && reg == 0)
+                                   reg = 32;
+
                                   if (*(c + 1) == '\0')
                                     func (stream, "%ld", reg);
                                   else