Skip to content

Commit

Permalink
s390x/tcg: check for AFP-register, BFP and DFP data exceptions
Browse files Browse the repository at this point in the history
With the annotated functions, we can now easily check this at a central
place.

DXC 1 is to be injected if an AFP register is used (for a HFP AND FPS
instruction) when AFP is disabled.
DXC 2 is to be injected if a BFP instruction is used when AFP is
disabled.
DXC 3 is to be injected if a DFP instruction is used when AFP is
disabled.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20180927130303.12236-7-david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
  • Loading branch information
davidhildenbrand authored and cohuck committed Oct 4, 2018
1 parent ca5f31a commit db05041
Showing 1 changed file with 33 additions and 0 deletions.
33 changes: 33 additions & 0 deletions target/s390x/translate.c
Expand Up @@ -6094,6 +6094,11 @@ static const DisasInsn *extract_insn(CPUS390XState *env, DisasContext *s,
return info;
}

static bool is_afp_reg(int reg)
{
return reg % 2 || reg > 6;
}

static DisasJumpType translate_one(CPUS390XState *env, DisasContext *s)
{
const DisasInsn *insn;
Expand All @@ -6120,6 +6125,34 @@ static DisasJumpType translate_one(CPUS390XState *env, DisasContext *s)
}
#endif

/* process flags */
if (insn->flags) {
/* if AFP is not enabled, instructions and registers are forbidden */
if (!(s->base.tb->flags & FLAG_MASK_AFP)) {
uint8_t dxc = 0;

if ((insn->flags & IF_AFP1) && is_afp_reg(get_field(&f, r1))) {
dxc = 1;
}
if ((insn->flags & IF_AFP2) && is_afp_reg(get_field(&f, r2))) {
dxc = 1;
}
if ((insn->flags & IF_AFP3) && is_afp_reg(get_field(&f, r3))) {
dxc = 1;
}
if (insn->flags & IF_BFP) {
dxc = 2;
}
if (insn->flags & IF_DFP) {
dxc = 3;
}
if (dxc) {
gen_data_exception(dxc);
return DISAS_NORETURN;
}
}
}

/* Check for insn specification exceptions. */
if (insn->spec) {
int spec = insn->spec, excp = 0, r;
Expand Down

0 comments on commit db05041

Please sign in to comment.