diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2020-01-17 14:09:31 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-01-17 14:09:31 +0000 |
| commit | 00a033976ce4c9a25cd4eaec4b404f9ddfa3afdf (patch) | |
| tree | 41fbb9d6c88d096c72cf13c908f93d6866e647c5 | |
| parent | 8ec39eb4493584cdc8aaefb6f59b5d7a1790ae1e (diff) | |
target/arm: Set ISSIs16Bit in make_issinfopull-target-arm-20200117
During the conversion to decodetree, the setting of
ISSIs16Bit got lost. This causes the guest os to
incorrectly adjust trapping memory operations.
Cc: qemu-stable@nongnu.org
Fixes: 46beb58efbb8a2a32 ("target/arm: Convert T16, load (literal)")
Reported-by: Jeff Kubascik <jeff.kubascik@dornerworks.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20200117004618.2742-3-richard.henderson@linaro.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | target/arm/translate.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/target/arm/translate.c b/target/arm/translate.c index 0c8624fb42..2f4aea927f 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -8556,6 +8556,9 @@ static ISSInfo make_issinfo(DisasContext *s, int rd, bool p, bool w) /* ISS not valid if writeback */ if (p && !w) { ret = rd; + if (s->base.pc_next - s->pc_curr == 2) { + ret |= ISSIs16Bit; + } } else { ret = ISSInvalid; } |