mirror of https://github.com/xemu-project/xemu.git
tcg/mips tlb lookup fix
target/alpha icount fix -----BEGIN PGP SIGNATURE----- iQFRBAABCgA7FiEEekgeeIaLTbaoWgXAZN846K9+IV8FAmBrH94dHHJpY2hhcmQu aGVuZGVyc29uQGxpbmFyby5vcmcACgkQZN846K9+IV9D0Af9HQ087lqDq37aJoFk HBrXMQZwjaxYkFf9ea8CzHUXU0zRZcTv9DSjAwt2QGrnnXSWDUfyNDwxeXgsfioq cGmwmJflKGROo9hc0AeIuvo1SFfpUiJlqj8xttLksQaMY0jcKab+XXgHjn2qPJ3P +zeAIib49aMgcmX9tds/nwuHEqo0++8lMSX/v2eQCXE/I3AcSo5dYto4aNHwVIoH 2CS3BHQLSN6tSjgQDeqs9X/LybJnMOT+33MTQQFizXgsgE2VGsQ8TIKg+DNoTqZm KbI7rlds1jrKxdi47pC5ntXQs2rg2athbGO2F+Lnp4Z2a3P+Zrnajcufsx4yQZHk cdZYaA== =ySbM -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/rth-gitlab/tags/pull-tcg-20210405' into staging tcg/mips tlb lookup fix target/alpha icount fix # gpg: Signature made Mon 05 Apr 2021 15:34:06 BST # gpg: using RSA key 7A481E78868B4DB6A85A05C064DF38E8AF7E215F # gpg: issuer "richard.henderson@linaro.org" # gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" [full] # Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A 05C0 64DF 38E8 AF7E 215F * remotes/rth-gitlab/tags/pull-tcg-20210405: target/alpha: fix icount handling for timer instructions tcg/mips: Fix SoftTLB comparison on mips backend Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
ee82c086ba
|
@ -1330,7 +1330,7 @@ static DisasJumpType gen_mfpr(DisasContext *ctx, TCGv va, int regno)
|
|||
case 249: /* VMTIME */
|
||||
helper = gen_helper_get_vmtime;
|
||||
do_helper:
|
||||
if (icount_enabled()) {
|
||||
if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) {
|
||||
gen_io_start();
|
||||
helper(va);
|
||||
return DISAS_PC_STALE;
|
||||
|
@ -1366,6 +1366,7 @@ static DisasJumpType gen_mfpr(DisasContext *ctx, TCGv va, int regno)
|
|||
static DisasJumpType gen_mtpr(DisasContext *ctx, TCGv vb, int regno)
|
||||
{
|
||||
int data;
|
||||
DisasJumpType ret = DISAS_NEXT;
|
||||
|
||||
switch (regno) {
|
||||
case 255:
|
||||
|
@ -1395,6 +1396,10 @@ static DisasJumpType gen_mtpr(DisasContext *ctx, TCGv vb, int regno)
|
|||
|
||||
case 251:
|
||||
/* ALARM */
|
||||
if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) {
|
||||
gen_io_start();
|
||||
ret = DISAS_PC_STALE;
|
||||
}
|
||||
gen_helper_set_alarm(cpu_env, vb);
|
||||
break;
|
||||
|
||||
|
@ -1434,7 +1439,7 @@ static DisasJumpType gen_mtpr(DisasContext *ctx, TCGv vb, int regno)
|
|||
break;
|
||||
}
|
||||
|
||||
return DISAS_NEXT;
|
||||
return ret;
|
||||
}
|
||||
#endif /* !USER_ONLY*/
|
||||
|
||||
|
|
|
@ -1201,13 +1201,13 @@ static void tcg_out_tlb_load(TCGContext *s, TCGReg base, TCGReg addrl,
|
|||
load the tlb addend for the fast path. */
|
||||
tcg_out_ld(s, TCG_TYPE_PTR, TCG_TMP2, TCG_TMP3, add_off);
|
||||
}
|
||||
tcg_out_opc_reg(s, OPC_AND, TCG_TMP1, TCG_TMP1, addrl);
|
||||
|
||||
/* Zero extend a 32-bit guest address for a 64-bit host. */
|
||||
if (TCG_TARGET_REG_BITS > TARGET_LONG_BITS) {
|
||||
tcg_out_ext32u(s, base, addrl);
|
||||
addrl = base;
|
||||
}
|
||||
tcg_out_opc_reg(s, OPC_AND, TCG_TMP1, TCG_TMP1, addrl);
|
||||
|
||||
label_ptr[0] = s->code_ptr;
|
||||
tcg_out_opc_br(s, OPC_BNE, TCG_TMP1, TCG_TMP0);
|
||||
|
|
Loading…
Reference in New Issue