sim: switch config.h usage to defs.h

[deliverable/binutils-gdb.git] / sim / rl78 / rl78.c

diff --git a/sim/rl78/rl78.c b/sim/rl78/rl78.c
index 1ffee5f3e05f94710599e3735ae1e20815e0545f..e45750ad7bf5c511b8b5653a177c9f970a975b95 100644 (file)
--- a/sim/rl78/rl78.c
+++ b/sim/rl78/rl78.c
@@ -1,6 +1,6 @@
 /* rl78.c --- opcode semantics for stand-alone RL78 simulator.
 
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2021 Free Software Foundation, Inc.
    Contributed by Red Hat, Inc.
 
    This file is part of the GNU simulators.
@@ -19,7 +19,9 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "config.h"
+/* This must come before any other includes.  */
+#include "defs.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -249,6 +251,7 @@ static void
 op_flags (int before, int after, int mask, RL78_Size size)
 {
   int vmask, cmask, amask, avmask;
+  int psw;
 
   if (size == RL78_Word)
     {
@@ -265,7 +268,7 @@ op_flags (int before, int after, int mask, RL78_Size size)
       avmask = 0x0f;
     }
 
-  int psw = get_reg (RL78_Reg_PSW);
+  psw = get_reg (RL78_Reg_PSW);
   psw &= ~mask;
 
   if (mask & RL78_PSW_CY)
@@ -421,10 +424,16 @@ decode_opcode (void)
   int a, b, v, v2;
   unsigned int u, u2;
   int obits;
+  RL78_Dis_Isa isa;
+
+  isa = (rl78_g10_mode ? RL78_ISA_G10
+       : g14_multiply ? RL78_ISA_G14
+       : g13_multiply ? RL78_ISA_G13
+       : RL78_ISA_DEFAULT);
 
   rl78_data.dpc = pc;
   opcode_size = rl78_decode_opcode (pc, &opcode,
-                                   rl78_get_byte, &rl78_data);
+                                   rl78_get_byte, &rl78_data, isa);
 
   opcode_pc = pc;
   pc += opcode_size;
@@ -851,7 +860,7 @@ decode_opcode (void)
 
       rl78_data.dpc = pc;
       opcode_size = rl78_decode_opcode (pc, &opcode,
-                                       rl78_get_byte, &rl78_data);
+                                       rl78_get_byte, &rl78_data, isa);
       pc += opcode_size;
       tprintf (" skipped: %s\n", opcode.syntax);
       break;