[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/8] s390x/kvm: Simplified the calculation of the SIG
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PULL 6/8] s390x/kvm: Simplified the calculation of the SIGP order code |
Date: |
Wed, 18 Dec 2013 14:27:39 +0100 |
From: Thomas Huth <address@hidden>
We've already got a helper function for calculating the
base/displacement of RS formatted instructions, so we can
get rid of the manual calculation of the SIGP order code.
Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Signed-off-by: Jens Freimann <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>
---
target-s390x/kvm.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index fcc159f..0bf3d1f 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -626,6 +626,8 @@ static int s390_cpu_initial_reset(S390CPU *cpu)
return 0;
}
+#define SIGP_ORDER_MASK 0x000000ff
+
static int handle_sigp(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1)
{
CPUS390XState *env = &cpu->env;
@@ -637,11 +639,7 @@ static int handle_sigp(S390CPU *cpu, struct kvm_run *run,
uint8_t ipa1)
cpu_synchronize_state(CPU(cpu));
/* get order code */
- order_code = run->s390_sieic.ipb >> 28;
- if (order_code > 0) {
- order_code = env->regs[order_code];
- }
- order_code += (run->s390_sieic.ipb & 0x0fff0000) >> 16;
+ order_code = decode_basedisp_rs(env, run->s390_sieic.ipb) &
SIGP_ORDER_MASK;
cpu_addr = env->regs[ipa1 & 0x0f];
target_cpu = s390_cpu_addr2state(cpu_addr);
--
1.6.0.2
- [Qemu-devel] [PULL 0/8] s390 patch queue 2013-12-18, Alexander Graf, 2013/12/18
- [Qemu-devel] [PULL 4/8] s390x/kvm: Fix coding style in handle_sigp(), Alexander Graf, 2013/12/18
- [Qemu-devel] [PULL 1/8] s390x/kvm: Fix diagnose handling., Alexander Graf, 2013/12/18
- [Qemu-devel] [PULL 2/8] s390x/kvm: Removed duplicated SIGP defines, Alexander Graf, 2013/12/18
- [Qemu-devel] [PULL 6/8] s390x/kvm: Simplified the calculation of the SIGP order code,
Alexander Graf <=
- [Qemu-devel] [PULL 5/8] s390x/kvm: Implemented SIGP START, Alexander Graf, 2013/12/18
- [Qemu-devel] [PULL 3/8] s390x/kvm: Removed s390_store_status stub, Alexander Graf, 2013/12/18
- [Qemu-devel] [PULL 8/8] s390x/ioinst: CHSC has to set a condition code, Alexander Graf, 2013/12/18
- [Qemu-devel] [PULL 7/8] s390x/kvm: Fixed condition code for unknown SIGP orders, Alexander Graf, 2013/12/18
- Re: [Qemu-devel] [PULL 0/8] s390 patch queue 2013-12-18, Anthony Liguori, 2013/12/19