[PATCH 10/20] sim: moxie: move arch-specific settings to internal header

Mike Frysinger via Gdb-patches
2022-12-23T06:09:33Z

with common/ sim code, so move it all out to a new header which only
this port will include.
---
sim/moxie/interp.c | 2 ++
sim/moxie/moxie-sim.h | 34 ++++++++++++++++++++++++++++++++++
sim/moxie/sim-main.h | 11 -----------
3 files changed, 36 insertions(+), 11 deletions(-)
create mode 100644 sim/moxie/moxie-sim.h

diff --git a/sim/moxie/interp.c b/sim/moxie/interp.c
index 74a6fda433bd..144d83cbe8e7 100644
--- a/sim/moxie/interp.c
+++ b/sim/moxie/interp.c
@@ -37,6 +37,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "sim-signal.h"
#include "target-newlib-syscall.h"

+#include "moxie-sim.h"
+
/* Extract the signed 10-bit offset from a 16-bit branch
instruction. */
#define INST2OFFSET(o) ((((signed short)((o & ((1<<10)-1))<<6))>>6)<<1)
diff --git a/sim/moxie/moxie-sim.h b/sim/moxie/moxie-sim.h
new file mode 100644
index 000000000000..761ac3220ec3
--- /dev/null
+++ b/sim/moxie/moxie-sim.h
@@ -0,0 +1,34 @@
+/* Moxie Simulator definition.
+ Copyright (C) 2009-2022 Free Software Foundation, Inc.
+ Contributed by Anthony Green <green@moxielogic.com>
+
+This file is part of the GNU simulators.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+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, see <http://www.gnu.org/licenses/>. */
+
+#ifndef MOXIE_SIM_H
+#define MOXIE_SIM_H
+
+#define PCIDX 17
+
+struct moxie_sim_cpu {
+ /* To keep this default simulator simple, and fast, we use a direct
+ vector of registers. The internal simulator engine then uses
+ manifests to access the correct slot. */
+ unsigned_word registers[19];
+};
+
+#define MOXIE_SIM_CPU(cpu) ((struct moxie_sim_cpu *) CPU_ARCH_DATA (cpu))
+
+#endif
diff --git a/sim/moxie/sim-main.h b/sim/moxie/sim-main.h
index d0df1e927cd1..ad0b2b66949a 100644
--- a/sim/moxie/sim-main.h
+++ b/sim/moxie/sim-main.h
@@ -23,15 +23,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "sim-basics.h"
#include "sim-base.h"

-#define PCIDX 17
-
-struct moxie_sim_cpu {
- /* To keep this default simulator simple, and fast, we use a direct
- vector of registers. The internal simulator engine then uses
- manifests to access the correct slot. */
- unsigned_word registers[19];
-};
-
-#define MOXIE_SIM_CPU(cpu) ((struct moxie_sim_cpu *) CPU_ARCH_DATA (cpu))
-
#endif
--
2.39.0