From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34983) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VtHAF-000143-Tc for qemu-devel@nongnu.org; Wed, 18 Dec 2013 08:27:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VtHA9-0002ul-12 for qemu-devel@nongnu.org; Wed, 18 Dec 2013 08:27:51 -0500 Received: from cantor2.suse.de ([195.135.220.15]:36121 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VtHA8-0002uR-R0 for qemu-devel@nongnu.org; Wed, 18 Dec 2013 08:27:44 -0500 From: Alexander Graf Date: Wed, 18 Dec 2013 14:27:39 +0100 Message-Id: <1387373261-26398-7-git-send-email-agraf@suse.de> In-Reply-To: <1387373261-26398-1-git-send-email-agraf@suse.de> References: <1387373261-26398-1-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PULL 6/8] s390x/kvm: Simplified the calculation of the SIGP order code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers Cc: Blue Swirl , Jens Freimann , Aurelien Jarno , Anthony Liguori , Thomas Huth From: Thomas Huth 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 Reviewed-by: Cornelia Huck Signed-off-by: Jens Freimann Signed-off-by: Alexander Graf --- 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