mirror of https://github.com/proxmox/mirror_qemu
Two temp live across branch fixes.
-----BEGIN PGP SIGNATURE----- iQFRBAABCgA7FiEEekgeeIaLTbaoWgXAZN846K9+IV8FAl1+QRYdHHJpY2hhcmQu aGVuZGVyc29uQGxpbmFyby5vcmcACgkQZN846K9+IV9xBwgAlSjGIAOWTEtg28zq hHfnEhmAN4NZIiVHaFoVDu+6UWdK/pMQwh7PJsvgiv3PmwNaxR/sP0dPkSr4wlhd noYqs2+2ghwh+Q81OJ2A9az6H5hyeEmA9raWDaIbOzVjAembicTytCQ2xxVBHqMe 7FZi6720j99tY88xbhs7YiDnlM4IgGWLx57n9VXbF2tDRZb/LQZQU5OFVtCBVtOK S76qj0ydQ8zj83yl81ddDmYWj4XvY9yDD7KaDKfq1d78k7OMLUFuwiP1LYLRGu79 ne5jZ85QVGlA4Wf0wCFdLOOUJeenikqzOA66Hb2H3zERUPTUCSVMEjjLbPQDHw5q xCiFdQ== =DZar -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/rth/tags/pull-hppa-20190915' into staging Two temp live across branch fixes. # gpg: Signature made Sun 15 Sep 2019 14:48: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/tags/pull-hppa-20190915: target/hppa: prevent trashing of temporary in do_depw_sar() target/hppa: prevent trashing of temporary in trans_mtctl() Signed-off-by: Peter Maydell <peter.maydell@linaro.org>master
commit
6f214b3044
|
@ -2214,10 +2214,11 @@ static bool trans_mtsp(DisasContext *ctx, arg_mtsp *a)
|
|||
static bool trans_mtctl(DisasContext *ctx, arg_mtctl *a)
|
||||
{
|
||||
unsigned ctl = a->t;
|
||||
TCGv_reg reg = load_gpr(ctx, a->r);
|
||||
TCGv_reg reg;
|
||||
TCGv_reg tmp;
|
||||
|
||||
if (ctl == CR_SAR) {
|
||||
reg = load_gpr(ctx, a->r);
|
||||
tmp = tcg_temp_new();
|
||||
tcg_gen_andi_reg(tmp, reg, TARGET_REGISTER_BITS - 1);
|
||||
save_or_nullify(ctx, cpu_sar, tmp);
|
||||
|
@ -2232,6 +2233,8 @@ static bool trans_mtctl(DisasContext *ctx, arg_mtctl *a)
|
|||
|
||||
#ifndef CONFIG_USER_ONLY
|
||||
nullify_over(ctx);
|
||||
reg = load_gpr(ctx, a->r);
|
||||
|
||||
switch (ctl) {
|
||||
case CR_IT:
|
||||
gen_helper_write_interval_timer(cpu_env, reg);
|
||||
|
@ -3401,10 +3404,6 @@ static bool do_depw_sar(DisasContext *ctx, unsigned rt, unsigned c,
|
|||
TCGv_reg mask, tmp, shift, dest;
|
||||
unsigned msb = 1U << (len - 1);
|
||||
|
||||
if (c) {
|
||||
nullify_over(ctx);
|
||||
}
|
||||
|
||||
dest = dest_gpr(ctx, rt);
|
||||
shift = tcg_temp_new();
|
||||
tmp = tcg_temp_new();
|
||||
|
@ -3437,11 +3436,17 @@ static bool do_depw_sar(DisasContext *ctx, unsigned rt, unsigned c,
|
|||
|
||||
static bool trans_depw_sar(DisasContext *ctx, arg_depw_sar *a)
|
||||
{
|
||||
if (a->c) {
|
||||
nullify_over(ctx);
|
||||
}
|
||||
return do_depw_sar(ctx, a->t, a->c, a->nz, a->clen, load_gpr(ctx, a->r));
|
||||
}
|
||||
|
||||
static bool trans_depwi_sar(DisasContext *ctx, arg_depwi_sar *a)
|
||||
{
|
||||
if (a->c) {
|
||||
nullify_over(ctx);
|
||||
}
|
||||
return do_depw_sar(ctx, a->t, a->c, a->nz, a->clen, load_const(ctx, a->i));
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue