From 53891d9a7ccc2a94f45711dbbb8c3519eb7bcee1 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 1 Nov 2022 18:49:48 +0545 Subject: [PATCH] sim: cgen: prep for inverting sim_cpu storage Some common cgen code changes to allow cgen ports to invert their sim_cpu storage one-by-one. --- sim/common/cgen-cpu.h | 5 +++++ sim/common/sim-cpu.h | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/sim/common/cgen-cpu.h b/sim/common/cgen-cpu.h index 92161a84b87..d65e0dba0b2 100644 --- a/sim/common/cgen-cpu.h +++ b/sim/common/cgen-cpu.h @@ -20,6 +20,11 @@ along with this program. If not, see . */ #ifndef CGEN_CPU_H #define CGEN_CPU_H +#include "cgen-defs.h" +#include "cgen-fpu.h" +#include "cgen-par.h" +#include "cgen-scache.h" + /* Type of function that is ultimately called by sim_resume. */ typedef void (ENGINE_FN) (SIM_CPU *); diff --git a/sim/common/sim-cpu.h b/sim/common/sim-cpu.h index ab41508acb6..e895664c2ef 100644 --- a/sim/common/sim-cpu.h +++ b/sim/common/sim-cpu.h @@ -28,6 +28,10 @@ along with this program. If not, see . */ /* Type of function to return an insn name. */ typedef const char * (CPU_INSN_NAME_FN) (sim_cpu *, int); +#ifdef CGEN_ARCH +# include "cgen-cpu.h" +#endif + /* Types for register access functions. These routines implement the sim_{fetch,store}_register interface. */ typedef int (CPUREG_FETCH_FN) (sim_cpu *, int, void *, int); @@ -127,6 +131,12 @@ struct _sim_cpu { /* All the common state. */ sim_cpu_base base; +#ifdef CGEN_ARCH + /* Static parts of cgen. */ + CGEN_CPU cgen_cpu; +#define CPU_CGEN_CPU(cpu) ((cpu)->cgen_cpu) +#endif + /* Pointer for sim target to store arbitrary cpu data. Normally the target should define a struct and use it here. */ void *arch_data; -- 2.30.2