ubsan: nds32: left shift cannot be represented in type 'int'

[deliverable/binutils-gdb.git] / sim / microblaze / sim-main.h

diff --git a/sim/microblaze/sim-main.h b/sim/microblaze/sim-main.h
index 562962f35d0cc0590ffa3384a707831f566c8fa5..137c59300572400ba762181b2aa1971589bd5d35 100644 (file)
--- a/sim/microblaze/sim-main.h
+++ b/sim/microblaze/sim-main.h
@@ -1,7 +1,4 @@
-#ifndef MICROBLAZE_SIM_MAIN
-#define MICROBLAZE_SIM_MAIN
-
-/* Copyright 2009, 2010 Free Software Foundation, Inc.
+/* Copyright 2009-2019 Free Software Foundation, Inc.
 
    This file is part of the Xilinx MicroBlaze simulator.
 
@@ -16,13 +13,13 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
-   MA 02110-1301, USA.  */
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef MICROBLAZE_SIM_MAIN
+#define MICROBLAZE_SIM_MAIN
 
 #include "microblaze.h"
 #include "sim-basics.h"
-typedef address_word sim_cia;
 #include "sim-base.h"
 
 /* The machine state.
@@ -42,9 +39,6 @@ typedef address_word sim_cia;
   word           spregs[2];            /* pc + msr */
   int            cycles;
   int            insts;
-  int            exception;
-  unsigned long   msize;
-  unsigned char  *memory;
   ubyte           imm_enable;
   half            imm_high;
 };
@@ -54,11 +48,11 @@ struct _sim_cpu {
   sim_cpu_base base;
 };
 
-#define MAX_NR_PROCESSORS 1
 struct sim_state {
-  sim_cpu cpu[MAX_NR_PROCESSORS];
-#define STATE_CPU(sd, n) (&(sd)->cpu[0])
+
+  sim_cpu *cpu[MAX_NR_PROCESSORS];
+
   sim_state_base base;
 };
-#endif /* MICROBLAZE_SIM_MAIN */
 
+#endif /* MICROBLAZE_SIM_MAIN */