mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/mips/translate: Expose check_mips_64() to 32-bit mode

Browse Source 
To allow compiling 64-bit specific translation code more
generically (and removing #ifdef'ry), allow compiling
check_mips_64() on 32-bit targets.
If ever called on 32-bit, we obviously emit a reserved
instruction exception.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Message-Id: <20201215225757.764263-3-f4bug@amsat.org>
This commit is contained in:
Philippe Mathieu-Daudé 2020-12-15 00:54:34 +01:00
parent 311edee771
commit d7efb69382
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target/mips/translate.c
View File

@ -2971,18 +2971,16 @@ static inline void check_ps(DisasContext *ctx)
check_cp1_64bitmode(ctx); check_cp1_64bitmode(ctx);
} }
#ifdef TARGET_MIPS64
/* /*
* This code generates a "reserved instruction" exception if 64-bit * This code generates a "reserved instruction" exception if cpu is not
* instructions are not enabled. * 64-bit or 64-bit instructions are not enabled.
*/ */
void check_mips_64(DisasContext *ctx) void check_mips_64(DisasContext *ctx)
{ {
if (unlikely(!(ctx->hflags & MIPS_HFLAG_64))) { if (unlikely((TARGET_LONG_BITS != 64) || !(ctx->hflags & MIPS_HFLAG_64))) {
gen_reserved_instruction(ctx); gen_reserved_instruction(ctx);
} }
} }
#endif
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
static inline void check_mvh(DisasContext *ctx) static inline void check_mvh(DisasContext *ctx)

2
target/mips/translate.h
View File

@ -129,9 +129,7 @@ void generate_exception_end(DisasContext *ctx, int excp);
void gen_reserved_instruction(DisasContext *ctx); void gen_reserved_instruction(DisasContext *ctx);
void check_insn(DisasContext *ctx, uint64_t flags); void check_insn(DisasContext *ctx, uint64_t flags);
#ifdef TARGET_MIPS64
void check_mips_64(DisasContext *ctx); void check_mips_64(DisasContext *ctx);
#endif
void check_cp0_enabled(DisasContext *ctx); void check_cp0_enabled(DisasContext *ctx);
void check_cp1_enabled(DisasContext *ctx); void check_cp1_enabled(DisasContext *ctx);
void check_cp1_64bitmode(DisasContext *ctx); void check_cp1_64bitmode(DisasContext *ctx);