ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/mips: Make CPU/FPU regnames[] arrays global 

The CPU/FPU regnames[] arrays is used in mips_tcg_init() and
mips_cpu_dump_state(), which while being in translate.c is
not specific to TCG.

To be able to move mips_cpu_dump_state() to cpu.c, which is
compiled for all accelerator, we need to make the regnames[]
arrays global to target/mips/ by declaring them in "internal.h".

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210428170410.479308-5-f4bug@amsat.org>
This commit is contained in:
Philippe Mathieu-Daudé 2021-01-16 14:26:33 +01:00
parent fed50ffd5c
commit adbf1be325
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
target/mips/cpu.c
View File

@ -35,6 +35,13 @@
#include "qapi/qapi-commands-machine-target.h" #include "qapi/qapi-commands-machine-target.h"
#include "fpu_helper.h" #include "fpu_helper.h"
const char * const regnames[32] = {
"r0", "at", "v0", "v1", "a0", "a1", "a2", "a3",
"t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7",
"s0", "s1", "s2", "s3", "s4", "s5", "s6", "s7",
"t8", "t9", "k0", "k1", "gp", "sp", "s8", "ra",
};
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
/* Called for updates to CP0_Status. */ /* Called for updates to CP0_Status. */

7
target/mips/fpu.c
View File

@ -16,3 +16,10 @@ const FloatRoundMode ieee_rm[4] = {
float_round_up, float_round_up,
float_round_down float_round_down
}; };
const char * const fregnames[32] = {
"f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7",
"f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15",
"f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23",
"f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31",
};

3
target/mips/internal.h
View File

@ -71,6 +71,9 @@ struct mips_def_t {
int32_t SAARP; int32_t SAARP;
}; };
extern const char * const regnames[32];
extern const char * const fregnames[32];
extern const struct mips_def_t mips_defs[]; extern const struct mips_def_t mips_defs[];
extern const int mips_defs_number; extern const int mips_defs_number;

14
target/mips/translate.c
View File

@ -1267,13 +1267,6 @@ TCGv_i64 fpu_f64[32];
#define DISAS_STOP DISAS_TARGET_0 #define DISAS_STOP DISAS_TARGET_0
#define DISAS_EXIT DISAS_TARGET_1 #define DISAS_EXIT DISAS_TARGET_1
static const char * const regnames[] = {
"r0", "at", "v0", "v1", "a0", "a1", "a2", "a3",
"t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7",
"s0", "s1", "s2", "s3", "s4", "s5", "s6", "s7",
"t8", "t9", "k0", "k1", "gp", "sp", "s8", "ra",
};
static const char * const regnames_HI[] = { static const char * const regnames_HI[] = {
"HI0", "HI1", "HI2", "HI3", "HI0", "HI1", "HI2", "HI3",
}; };
@ -1282,13 +1275,6 @@ static const char * const regnames_LO[] = {
"LO0", "LO1", "LO2", "LO3", "LO0", "LO1", "LO2", "LO3",
}; };
static const char * const fregnames[] = {
"f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7",
"f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15",
"f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23",
"f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31",
};
/* General purpose registers moves. */ /* General purpose registers moves. */
void gen_load_gpr(TCGv t, int reg) void gen_load_gpr(TCGv t, int reg)
{ {