* [PATCH 2/3] sim: moxie: replace custom "word" type with int32_t
2022-12-23 2:55 [PATCH 1/3] sim: cr16/d10v/mcore/moxie: clean up unused word & uword types Mike Frysinger
@ 2022-12-23 2:55 ` Mike Frysinger
2022-12-23 2:55 ` [PATCH 3/3] sim: mcore: " Mike Frysinger
1 sibling, 0 replies; 3+ messages in thread
From: Mike Frysinger @ 2022-12-23 2:55 UTC (permalink / raw)
To: gdb-patches
This is a 32-bit architecture with 32-bit registers, so replace the
custom "word" int typedef with an explicit int32_t. Practically
speaking, this produces the same code, but it should hopefully make
it easier to merge common code in the future.
---
sim/moxie/interp.c | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/sim/moxie/interp.c b/sim/moxie/interp.c
index 42918659e488..74a6fda433bd 100644
--- a/sim/moxie/interp.c
+++ b/sim/moxie/interp.c
@@ -37,8 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "sim-signal.h"
#include "target-newlib-syscall.h"
-typedef int word;
-
/* Extract the signed 10-bit offset from a 16-bit branch
instruction. */
#define INST2OFFSET(o) ((((signed short)((o & ((1<<10)-1))<<6))>>6)<<1)
@@ -114,9 +112,9 @@ static const char *reg_names[16] =
/* TODO: This should be moved to sim-main.h:_sim_cpu. */
struct moxie_regset
{
- word regs[NUM_MOXIE_REGS + 1]; /* primary registers */
- word sregs[256]; /* special registers */
- word cc; /* the condition code reg */
+ int32_t regs[NUM_MOXIE_REGS + 1]; /* primary registers */
+ int32_t sregs[256]; /* special registers */
+ int32_t cc; /* the condition code reg */
unsigned long long insts; /* instruction counter */
};
@@ -130,7 +128,7 @@ struct moxie_regset
union
{
struct moxie_regset asregs;
- word asints [1]; /* but accessed larger... */
+ int32_t asints [1]; /* but accessed larger... */
} cpu;
static void
@@ -152,7 +150,7 @@ set_initial_gprs (void)
/* Write a 1 byte value to memory. */
static INLINE void
-wbat (sim_cpu *scpu, word pc, word x, word v)
+wbat (sim_cpu *scpu, int32_t pc, int32_t x, int32_t v)
{
address_word cia = CPU_PC_GET (scpu);
@@ -162,7 +160,7 @@ wbat (sim_cpu *scpu, word pc, word x, word v)
/* Write a 2 byte value to memory. */
static INLINE void
-wsat (sim_cpu *scpu, word pc, word x, word v)
+wsat (sim_cpu *scpu, int32_t pc, int32_t x, int32_t v)
{
address_word cia = CPU_PC_GET (scpu);
@@ -172,7 +170,7 @@ wsat (sim_cpu *scpu, word pc, word x, word v)
/* Write a 4 byte value to memory. */
static INLINE void
-wlat (sim_cpu *scpu, word pc, word x, word v)
+wlat (sim_cpu *scpu, int32_t pc, int32_t x, int32_t v)
{
address_word cia = CPU_PC_GET (scpu);
@@ -182,7 +180,7 @@ wlat (sim_cpu *scpu, word pc, word x, word v)
/* Read 2 bytes from memory. */
static INLINE int
-rsat (sim_cpu *scpu, word pc, word x)
+rsat (sim_cpu *scpu, int32_t pc, int32_t x)
{
address_word cia = CPU_PC_GET (scpu);
@@ -192,7 +190,7 @@ rsat (sim_cpu *scpu, word pc, word x)
/* Read 1 byte from memory. */
static INLINE int
-rbat (sim_cpu *scpu, word pc, word x)
+rbat (sim_cpu *scpu, int32_t pc, int32_t x)
{
address_word cia = CPU_PC_GET (scpu);
@@ -202,7 +200,7 @@ rbat (sim_cpu *scpu, word pc, word x)
/* Read 4 bytes from memory. */
static INLINE int
-rlat (sim_cpu *scpu, word pc, word x)
+rlat (sim_cpu *scpu, int32_t pc, int32_t x)
{
address_word cia = CPU_PC_GET (scpu);
@@ -248,7 +246,7 @@ sim_engine_run (SIM_DESC sd,
int nr_cpus, /* ignore */
int siggnal) /* ignore */
{
- word pc, opc;
+ int32_t pc, opc;
unsigned short inst;
sim_cpu *scpu = STATE_CPU (sd, 0); /* FIXME */
address_word cia = CPU_PC_GET (scpu);
--
2.39.0
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH 3/3] sim: mcore: replace custom "word" type with int32_t
2022-12-23 2:55 [PATCH 1/3] sim: cr16/d10v/mcore/moxie: clean up unused word & uword types Mike Frysinger
2022-12-23 2:55 ` [PATCH 2/3] sim: moxie: replace custom "word" type with int32_t Mike Frysinger
@ 2022-12-23 2:55 ` Mike Frysinger
1 sibling, 0 replies; 3+ messages in thread
From: Mike Frysinger @ 2022-12-23 2:55 UTC (permalink / raw)
To: gdb-patches
This is a 32-bit architecture with 32-bit registers, so replace the
custom "word" long int typedef with an explicit int32_t. This is
a correctness fix since long will be 64-bits on most 64-bit hosts.
---
sim/mcore/interp.c | 48 ++++++++++++++++++++++----------------------
sim/mcore/sim-main.h | 15 ++++++--------
2 files changed, 30 insertions(+), 33 deletions(-)
diff --git a/sim/mcore/interp.c b/sim/mcore/interp.c
index 40bd77d850da..8465f56d2d7c 100644
--- a/sim/mcore/interp.c
+++ b/sim/mcore/interp.c
@@ -258,7 +258,7 @@ iu_carry (unsigned long a, unsigned long b, int cin)
#ifdef WATCHFUNCTIONS
#define MAXWL 80
-word WL[MAXWL];
+int32_t WL[MAXWL];
char * WLstr[MAXWL];
int ENDWL=0;
@@ -267,7 +267,7 @@ int WLcyc[MAXWL];
int WLcnts[MAXWL];
int WLmax[MAXWL];
int WLmin[MAXWL];
-word WLendpc;
+int32_t WLendpc;
int WLbcyc;
int WLW;
#endif
@@ -295,8 +295,8 @@ step_once (SIM_DESC sd, SIM_CPU *cpu)
{
struct mcore_sim_cpu *mcore_cpu = MCORE_SIM_CPU (cpu);
int needfetch;
- word ibuf;
- word pc;
+ int32_t ibuf;
+ int32_t pc;
unsigned short inst;
int memops;
int bonus_cycles;
@@ -304,7 +304,7 @@ step_once (SIM_DESC sd, SIM_CPU *cpu)
int w;
int cycs;
#ifdef WATCHFUNCTIONS
- word WLhash;
+ int32_t WLhash;
#endif
pc = CPU_PC_GET (cpu);
@@ -330,7 +330,7 @@ step_once (SIM_DESC sd, SIM_CPU *cpu)
/* TODO: Unindent this block. */
{
- word oldpc;
+ int32_t oldpc;
insts ++;
@@ -404,7 +404,7 @@ step_once (SIM_DESC sd, SIM_CPU *cpu)
#endif
if (tracing)
- fprintf (stderr, "%.4lx: inst = %.4x ", pc, inst);
+ fprintf (stderr, "%.4x: inst = %.4x ", pc, inst);
oldpc = pc;
@@ -498,7 +498,7 @@ step_once (SIM_DESC sd, SIM_CPU *cpu)
break;
case 0x4: /* ldq */
{
- word addr = gr[RD];
+ int32_t addr = gr[RD];
int regno = 4; /* always r4-r7 */
bonus_cycles++;
@@ -514,7 +514,7 @@ step_once (SIM_DESC sd, SIM_CPU *cpu)
break;
case 0x5: /* stq */
{
- word addr = gr[RD];
+ int32_t addr = gr[RD];
int regno = 4; /* always r4-r7 */
memops += 4;
@@ -530,7 +530,7 @@ step_once (SIM_DESC sd, SIM_CPU *cpu)
break;
case 0x6: /* ldm */
{
- word addr = gr[0];
+ int32_t addr = gr[0];
int regno = RD;
/* bonus cycle is really only needed if
@@ -549,7 +549,7 @@ step_once (SIM_DESC sd, SIM_CPU *cpu)
break;
case 0x7: /* stm */
{
- word addr = gr[0];
+ int32_t addr = gr[0];
int regno = RD;
/* this should be removed! */
@@ -580,7 +580,7 @@ step_once (SIM_DESC sd, SIM_CPU *cpu)
case 0xC: /* jmp */
pc = gr[RD];
if (tracing && RD == 15)
- fprintf (stderr, "Func return, r2 = %lxx, r3 = %lx\n",
+ fprintf (stderr, "Func return, r2 = %xx, r3 = %x\n",
gr[2], gr[3]);
bonus_cycles++;
needfetch = 1;
@@ -593,7 +593,7 @@ step_once (SIM_DESC sd, SIM_CPU *cpu)
break;
case 0xE: /* ff1 */
{
- word tmp, i;
+ int32_t tmp, i;
tmp = gr[RD];
for (i = 0; !(tmp & 0x80000000) && i < 32; i++)
tmp <<= 1;
@@ -602,7 +602,7 @@ step_once (SIM_DESC sd, SIM_CPU *cpu)
break;
case 0xF: /* brev */
{
- word tmp;
+ int32_t tmp;
tmp = gr[RD];
tmp = ((tmp & 0xaaaaaaaa) >> 1) | ((tmp & 0x55555555) << 1);
tmp = ((tmp & 0xcccccccc) >> 2) | ((tmp & 0x33333333) << 2);
@@ -662,7 +662,7 @@ step_once (SIM_DESC sd, SIM_CPU *cpu)
break;
case 0x9: /* tstnbz */
{
- word tmp = gr[RD];
+ int32_t tmp = gr[RD];
NEW_C ((tmp & 0xFF000000) != 0 &&
(tmp & 0x00FF0000) != 0 && (tmp & 0x0000FF00) != 0 &&
(tmp & 0x000000FF) != 0);
@@ -708,7 +708,7 @@ step_once (SIM_DESC sd, SIM_CPU *cpu)
}
bonus_cycles += 2; /* min. is 3, so add 2, plus ticks above */
if (tracing)
- fprintf (stderr, " mult %lx by %lx to give %lx",
+ fprintf (stderr, " mult %x by %x to give %x",
gr[RD], gr[RS], gr[RD] * gr[RS]);
gr[RD] = gr[RD] * gr[RS];
break;
@@ -791,7 +791,7 @@ step_once (SIM_DESC sd, SIM_CPU *cpu)
case 0x12: /* mov */
gr[RD] = gr[RS];
if (tracing)
- fprintf (stderr, "MOV %lx into reg %d", gr[RD], RD);
+ fprintf (stderr, "MOV %x into reg %d", gr[RD], RD);
break;
case 0x13: /* bgenr */
@@ -915,7 +915,7 @@ step_once (SIM_DESC sd, SIM_CPU *cpu)
exe = 0;
/* unsigned divide */
- gr[RD] = (word) ((unsigned int) gr[RD] / (unsigned int)gr[1] );
+ gr[RD] = (int32_t) ((unsigned int) gr[RD] / (unsigned int)gr[1] );
/* compute bonus_cycles for divu */
for (r1nlz = 0; ((r1 & 0x80000000) == 0) && (r1nlz < 32); r1nlz ++)
@@ -1020,7 +1020,7 @@ step_once (SIM_DESC sd, SIM_CPU *cpu)
unsigned long tmp = gr[RD];
if (imm == 0)
{
- word cbit;
+ int32_t cbit;
cbit = C_VALUE();
NEW_C (tmp);
gr[RD] = (cbit << 31) | (tmp >> 1);
@@ -1097,7 +1097,7 @@ step_once (SIM_DESC sd, SIM_CPU *cpu)
case 0x7C: case 0x7D: case 0x7E: /* lrw */
gr[RX] = rlat ((pc + ((inst & 0xFF) << 2)) & 0xFFFFFFFC);
if (tracing)
- fprintf (stderr, "LRW of 0x%x from 0x%lx to reg %d",
+ fprintf (stderr, "LRW of 0x%x from 0x%x to reg %d",
rlat ((pc + ((inst & 0xFF) << 2)) & 0xFFFFFFFC),
(pc + ((inst & 0xFF) << 2)) & 0xFFFFFFFC, RX);
memops++;
@@ -1106,7 +1106,7 @@ step_once (SIM_DESC sd, SIM_CPU *cpu)
gr[15] = pc;
if (tracing)
fprintf (stderr,
- "func call: r2 = %lx r3 = %lx r4 = %lx r5 = %lx r6 = %lx r7 = %lx\n",
+ "func call: r2 = %x r3 = %x r4 = %x r5 = %x r6 = %x r7 = %x\n",
gr[2], gr[3], gr[4], gr[5], gr[6], gr[7]);
case 0x70: /* jmpi */
pc = rlat ((pc + ((inst & 0xFF) << 2)) & 0xFFFFFFFC);
@@ -1121,7 +1121,7 @@ step_once (SIM_DESC sd, SIM_CPU *cpu)
case 0x8C: case 0x8D: case 0x8E: case 0x8F: /* ld */
gr[RX] = rlat (gr[RD] + ((inst >> 2) & 0x003C));
if (tracing)
- fprintf (stderr, "load reg %d from 0x%lx with 0x%lx",
+ fprintf (stderr, "load reg %d from 0x%x with 0x%x",
RX,
gr[RD] + ((inst >> 2) & 0x003C), gr[RX]);
memops++;
@@ -1132,7 +1132,7 @@ step_once (SIM_DESC sd, SIM_CPU *cpu)
case 0x9C: case 0x9D: case 0x9E: case 0x9F: /* st */
wlat (gr[RD] + ((inst >> 2) & 0x003C), gr[RX]);
if (tracing)
- fprintf (stderr, "store reg %d (containing 0x%lx) to 0x%lx",
+ fprintf (stderr, "store reg %d (containing 0x%x) to 0x%x",
RX, gr[RX],
gr[RD] + ((inst >> 2) & 0x003C));
memops++;
@@ -1472,7 +1472,7 @@ sim_create_inferior (SIM_DESC sd, struct bfd *prog_bfd,
}
/* Claim some memory for the pointers and strings. */
- pointers = hi_stack - sizeof(word) * (nenv+1+nargs+1);
+ pointers = hi_stack - sizeof(int32_t) * (nenv+1+nargs+1);
pointers &= ~3; /* must be 4-byte aligned */
gr[0] = pointers;
diff --git a/sim/mcore/sim-main.h b/sim/mcore/sim-main.h
index 23e7ae64b05c..7290e02131ec 100644
--- a/sim/mcore/sim-main.h
+++ b/sim/mcore/sim-main.h
@@ -20,9 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#define SIM_MAIN_H
#include "sim-basics.h"
-
-typedef long int word;
-
#include "sim-base.h"
#include "bfd.h"
@@ -39,10 +36,10 @@ typedef long int word;
gdb/config/mcore/tm-mcore.h file in the REGISTER_NAMES macro. */
struct mcore_regset
{
- word gregs[16]; /* primary registers */
- word alt_gregs[16]; /* alt register file */
- word cregs[32]; /* control registers */
- word pc;
+ int32_t gregs[16]; /* primary registers */
+ int32_t alt_gregs[16]; /* alt register file */
+ int32_t cregs[32]; /* control registers */
+ int32_t pc;
};
#define LAST_VALID_CREG 32 /* only 0..12 implemented */
#define NUM_MCORE_REGS (16 + 16 + LAST_VALID_CREG + 1)
@@ -52,11 +49,11 @@ struct mcore_sim_cpu {
{
struct mcore_regset regs;
/* Used by the fetch/store reg helpers to access registers linearly. */
- word asints[NUM_MCORE_REGS];
+ int32_t asints[NUM_MCORE_REGS];
};
/* Used to switch between gregs/alt_gregs based on the control state. */
- word *active_gregs;
+ int32_t *active_gregs;
int ticks;
int stalls;
--
2.39.0
^ permalink raw reply [flat|nested] 3+ messages in thread