X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=sim%2Fmoxie%2Fsim-main.h;h=afb427e7e3c4bab29a9673d8cde1486238b00f89;hb=f5a7c406b1975cde626efed526960f2cf1bdaceb;hp=6a2174bc124205a295609228772bb20a1b45dbef;hpb=4c0cab1e212bd0f25879b00393bbb60e114ac724;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/moxie/sim-main.h b/sim/moxie/sim-main.h
index 6a2174bc12..afb427e7e3 100644
--- a/sim/moxie/sim-main.h
+++ b/sim/moxie/sim-main.h
@@ -1,5 +1,5 @@
 /* Moxie Simulator definition.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2020 Free Software Foundation, Inc.
    Contributed by Anthony Green <green@moxielogic.com>
 
 This file is part of GDB, the GNU debugger.
@@ -21,11 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #define SIM_MAIN_H
 
 #include "sim-basics.h"
-
-typedef address_word sim_cia;
-
-typedef struct _sim_cpu SIM_CPU;
-
 #include "sim-base.h"
 #include "bfd.h"
 
@@ -34,8 +29,6 @@ typedef struct _sim_cpu SIM_CPU;
 struct _sim_cpu {
 
   /* The following are internal simulator state variables: */
-#define CIA_GET(CPU) ((CPU)->registers[PCIDX] + 0)
-#define CIA_SET(CPU,CIA) ((CPU)->registers[PCIDX] = (CIA))
 
 /* To keep this default simulator simple, and fast, we use a direct
    vector of registers. The internal simulator engine then uses
@@ -54,4 +47,3 @@ struct sim_state {
 };
 
 #endif
-