sim: ppc: inline common sim-fpu.c logic

[binutils-gdb.git] / sim / cris / crisv32f.c

diff --git a/sim/cris/crisv32f.c b/sim/cris/crisv32f.c
index e7b69a50969d8b80bcaabe428e75919cb6e3f398..656be733b4e0f04409e0db657191dfa9b538152a 100644 (file)
--- a/sim/cris/crisv32f.c
+++ b/sim/cris/crisv32f.c
@@ -1,6 +1,5 @@
 /* CRIS v32 simulator support code
-   Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
-   Free Software Foundation, Inc.
+   Copyright (C) 2004-2021 Free Software Foundation, Inc.
    Contributed by Axis Communications.
 
 This file is part of the GNU simulators.
@@ -20,6 +19,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* The infrastructure is based on that of i960.c.  */
 
+/* This must come before any other includes.  */
+#include "defs.h"
+
 #define WANT_CPU_CRISV32F
 
 #define SPECIFIC_U_EXEC_FN
@@ -616,7 +618,7 @@ MY (deliver_interrupt) (SIM_CPU *current_cpu,
                            GET_H_SR (H_SR_EBP) + vec * 4, 4) == 0)
     {
       /* Nothing to do actually; either abort or send a signal.  */
-      sim_core_signal (sd, current_cpu, CIA_GET (current_cpu), 0, 4,
+      sim_core_signal (sd, current_cpu, CPU_PC_GET (current_cpu), 0, 4,
                       GET_H_SR (H_SR_EBP) + vec * 4,
                       read_transfer, sim_core_unmapped_signal);
       return 0;