From patchwork Sun Jun 22 21:23:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 4396601 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 81DF7BEEAA for ; Sun, 22 Jun 2014 21:24:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C1D302022A for ; Sun, 22 Jun 2014 21:24:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DCAAA2021B for ; Sun, 22 Jun 2014 21:24:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752491AbaFVVX7 (ORCPT ); Sun, 22 Jun 2014 17:23:59 -0400 Received: from cantor2.suse.de ([195.135.220.15]:33350 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752201AbaFVVXo (ORCPT ); Sun, 22 Jun 2014 17:23:44 -0400 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 45DF4AD6C; Sun, 22 Jun 2014 21:23:38 +0000 (UTC) From: Alexander Graf To: kvm-ppc@vger.kernel.org Cc: kvm@vger.kernel.org Subject: [PATCH 19/33] KVM: PPC: Add addis instruction emulation Date: Sun, 22 Jun 2014 23:23:23 +0200 Message-Id: <1403472217-22263-20-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.7.12.4 In-Reply-To: <1403472217-22263-1-git-send-email-agraf@suse.de> References: <1403472217-22263-1-git-send-email-agraf@suse.de> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch implements emulation for the addis instruction which is also used to implement lis. Signed-off-by: Alexander Graf --- arch/powerpc/include/asm/ppc-opcode.h | 1 + arch/powerpc/kvm/emulate.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/arch/powerpc/include/asm/ppc-opcode.h b/arch/powerpc/include/asm/ppc-opcode.h index ce135be..2302a8e 100644 --- a/arch/powerpc/include/asm/ppc-opcode.h +++ b/arch/powerpc/include/asm/ppc-opcode.h @@ -112,6 +112,7 @@ #define OP_31_XOP_LHBRX 790 #define OP_31_XOP_STHBRX 918 +#define OP_ADDIS 15 #define OP_LWZ 32 #define OP_LD 58 #define OP_LWZU 33 diff --git a/arch/powerpc/kvm/emulate.c b/arch/powerpc/kvm/emulate.c index 33a34c3..40f21bb 100644 --- a/arch/powerpc/kvm/emulate.c +++ b/arch/powerpc/kvm/emulate.c @@ -473,6 +473,13 @@ int kvmppc_emulate_any_instruction(struct kvm_vcpu *vcpu) emulated = kvmppc_emulate_load(vcpu, addr, &value, 4); kvmppc_set_gpr(vcpu, get_rt(inst), value); break; + case OP_ADDIS: + value = 0; + if (get_ra(inst)) + value = kvmppc_get_gpr(vcpu, get_ra(inst)); + value += ((s16)get_d(inst)) << 16; + kvmppc_set_gpr(vcpu, get_rt(inst), value); + break; case 31: switch (get_xop(inst)) { case OP_31_XOP_MFCR: