target-alpha: Convert mfpr/mtpr to source/sink

Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Richard Henderson 2014-03-19 14:05:09 -07:00
parent ef3765cb95
commit 0e154fe92c
1 changed files with 19 additions and 33 deletions

View File

@ -1274,16 +1274,10 @@ static int cpu_pr_data(int pr)
return 0; return 0;
} }
static ExitStatus gen_mfpr(int ra, int regno) static ExitStatus gen_mfpr(TCGv va, int regno)
{ {
int data = cpu_pr_data(regno); int data = cpu_pr_data(regno);
/* In our emulated PALcode, these processor registers have no
side effects from reading. */
if (ra == 31) {
return NO_EXIT;
}
/* Special help for VMTIME and WALLTIME. */ /* Special help for VMTIME and WALLTIME. */
if (regno == 250 || regno == 249) { if (regno == 250 || regno == 249) {
void (*helper)(TCGv) = gen_helper_get_walltime; void (*helper)(TCGv) = gen_helper_get_walltime;
@ -1292,11 +1286,11 @@ static ExitStatus gen_mfpr(int ra, int regno)
} }
if (use_icount) { if (use_icount) {
gen_io_start(); gen_io_start();
helper(cpu_ir[ra]); helper(va);
gen_io_end(); gen_io_end();
return EXIT_PC_STALE; return EXIT_PC_STALE;
} else { } else {
helper(cpu_ir[ra]); helper(va);
return NO_EXIT; return NO_EXIT;
} }
} }
@ -1304,28 +1298,22 @@ static ExitStatus gen_mfpr(int ra, int regno)
/* The basic registers are data only, and unknown registers /* The basic registers are data only, and unknown registers
are read-zero, write-ignore. */ are read-zero, write-ignore. */
if (data == 0) { if (data == 0) {
tcg_gen_movi_i64(cpu_ir[ra], 0); tcg_gen_movi_i64(va, 0);
} else if (data & PR_BYTE) { } else if (data & PR_BYTE) {
tcg_gen_ld8u_i64(cpu_ir[ra], cpu_env, data & ~PR_BYTE); tcg_gen_ld8u_i64(va, cpu_env, data & ~PR_BYTE);
} else if (data & PR_LONG) { } else if (data & PR_LONG) {
tcg_gen_ld32s_i64(cpu_ir[ra], cpu_env, data & ~PR_LONG); tcg_gen_ld32s_i64(va, cpu_env, data & ~PR_LONG);
} else { } else {
tcg_gen_ld_i64(cpu_ir[ra], cpu_env, data); tcg_gen_ld_i64(va, cpu_env, data);
} }
return NO_EXIT; return NO_EXIT;
} }
static ExitStatus gen_mtpr(DisasContext *ctx, int rb, int regno) static ExitStatus gen_mtpr(DisasContext *ctx, TCGv vb, int regno)
{ {
TCGv tmp; TCGv tmp;
int data; int data;
if (rb == 31) {
tmp = tcg_const_i64(0);
} else {
tmp = cpu_ir[rb];
}
switch (regno) { switch (regno) {
case 255: case 255:
/* TBIA */ /* TBIA */
@ -1334,7 +1322,7 @@ static ExitStatus gen_mtpr(DisasContext *ctx, int rb, int regno)
case 254: case 254:
/* TBIS */ /* TBIS */
gen_helper_tbis(cpu_env, tmp); gen_helper_tbis(cpu_env, vb);
break; break;
case 253: case 253:
@ -1346,17 +1334,17 @@ static ExitStatus gen_mtpr(DisasContext *ctx, int rb, int regno)
case 252: case 252:
/* HALT */ /* HALT */
gen_helper_halt(tmp); gen_helper_halt(vb);
return EXIT_PC_STALE; return EXIT_PC_STALE;
case 251: case 251:
/* ALARM */ /* ALARM */
gen_helper_set_alarm(cpu_env, tmp); gen_helper_set_alarm(cpu_env, vb);
break; break;
case 7: case 7:
/* PALBR */ /* PALBR */
tcg_gen_st_i64(tmp, cpu_env, offsetof(CPUAlphaState, palbr)); tcg_gen_st_i64(vb, cpu_env, offsetof(CPUAlphaState, palbr));
/* Changing the PAL base register implies un-chaining all of the TBs /* Changing the PAL base register implies un-chaining all of the TBs
that ended with a CALL_PAL. Since the base register usually only that ended with a CALL_PAL. Since the base register usually only
changes during boot, flushing everything works well. */ changes during boot, flushing everything works well. */
@ -1369,20 +1357,16 @@ static ExitStatus gen_mtpr(DisasContext *ctx, int rb, int regno)
data = cpu_pr_data(regno); data = cpu_pr_data(regno);
if (data != 0) { if (data != 0) {
if (data & PR_BYTE) { if (data & PR_BYTE) {
tcg_gen_st8_i64(tmp, cpu_env, data & ~PR_BYTE); tcg_gen_st8_i64(vb, cpu_env, data & ~PR_BYTE);
} else if (data & PR_LONG) { } else if (data & PR_LONG) {
tcg_gen_st32_i64(tmp, cpu_env, data & ~PR_LONG); tcg_gen_st32_i64(vb, cpu_env, data & ~PR_LONG);
} else { } else {
tcg_gen_st_i64(tmp, cpu_env, data); tcg_gen_st_i64(vb, cpu_env, data);
} }
} }
break; break;
} }
if (rb == 31) {
tcg_temp_free(tmp);
}
return NO_EXIT; return NO_EXIT;
} }
#endif /* !USER_ONLY*/ #endif /* !USER_ONLY*/
@ -2328,7 +2312,8 @@ static ExitStatus translate_one(DisasContext *ctx, uint32_t insn)
/* HW_MFPR (PALcode) */ /* HW_MFPR (PALcode) */
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
REQUIRE_TB_FLAG(TB_FLAGS_PAL_MODE); REQUIRE_TB_FLAG(TB_FLAGS_PAL_MODE);
return gen_mfpr(ra, insn & 0xffff); va = dest_gpr(ctx, ra);
return gen_mfpr(va, insn & 0xffff);
#else #else
goto invalid_opc; goto invalid_opc;
#endif #endif
@ -2562,7 +2547,8 @@ static ExitStatus translate_one(DisasContext *ctx, uint32_t insn)
/* HW_MTPR (PALcode) */ /* HW_MTPR (PALcode) */
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
REQUIRE_TB_FLAG(TB_FLAGS_PAL_MODE); REQUIRE_TB_FLAG(TB_FLAGS_PAL_MODE);
return gen_mtpr(ctx, rb, insn & 0xffff); vb = load_gpr(ctx, rb);
return gen_mtpr(ctx, vb, insn & 0xffff);
#else #else
goto invalid_opc; goto invalid_opc;
#endif #endif