diff options
| author | Cornelia Huck <cornelia.huck@de.ibm.com> | 2013-12-17 18:27:33 +0100 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-12-18 14:24:10 +0100 |
| commit | 638129ff475dd3b4c0e57e0be598efe41461e9b3 (patch) | |
| tree | 11e879fc5f7b5f6c240f1683699bc83a23b06b81 /target-s390x/cpu.h | |
| parent | f46e720a82ccdf1a521cf459448f3f96ed895d43 (diff) | |
s390x/kvm: Fix diagnose handling.
The instruction intercept handler for diagnose used only the displacement
when trying to calculate the function code. This is only correct for base
0, however; we need to perform a complete base/displacement address
calculation and use bits 48-63 as the function code.
Reviewed-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'target-s390x/cpu.h')
| -rw-r--r-- | target-s390x/cpu.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index a2c077bdcd..68b5ab7056 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -352,6 +352,9 @@ static inline hwaddr decode_basedisp_s(CPUS390XState *env, uint32_t ipb) return addr; } +/* Base/displacement are at the same locations. */ +#define decode_basedisp_rs decode_basedisp_s + void s390x_tod_timer(void *opaque); void s390x_cpu_timer(void *opaque); |