1 files changed, 19 insertions, 32 deletions

diff --git a/arch/powerpc/kvm/44x_emulate.c b/arch/powerpc/kvm/44x_emulate.c
index 549bb2c9a47a..c8c61578fdfc 100644
--- a/arch/powerpc/kvm/44x_emulate.c
+++ b/arch/powerpc/kvm/44x_emulate.c
@@ -37,22 +37,19 @@ int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,
                            unsigned int inst, int *advance)
 {
         int emulated = EMULATE_DONE;
-        int dcrn;
-        int ra;
-        int rb;
-        int rc;
-        int rs;
-        int rt;
-        int ws;
+        int dcrn = get_dcrn(inst);
+        int ra = get_ra(inst);
+        int rb = get_rb(inst);
+        int rc = get_rc(inst);
+        int rs = get_rs(inst);
+        int rt = get_rt(inst);
+        int ws = get_ws(inst);
 
         switch (get_op(inst)) {
         case 31:
                 switch (get_xop(inst)) {
 
                 case XOP_MFDCR:
-                        dcrn = get_dcrn(inst);
-                        rt = get_rt(inst);
-
                         /* The guest may access CPR0 registers to determine the timebase
                          * frequency, and it must know the real host frequency because it
                          * can directly access the timebase registers.
@@ -88,9 +85,6 @@ int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,
                         break;
 
                 case XOP_MTDCR:
-                        dcrn = get_dcrn(inst);
-                        rs = get_rs(inst);
-
                         /* emulate some access in kernel */
                         switch (dcrn) {
                         case DCRN_CPR0_CONFIG_ADDR:
@@ -108,17 +102,10 @@ int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,
                         break;
 
                 case XOP_TLBWE:
-                        ra = get_ra(inst);
-                        rs = get_rs(inst);
-                        ws = get_ws(inst);
                         emulated = kvmppc_44x_emul_tlbwe(vcpu, ra, rs, ws);
                         break;
 
                 case XOP_TLBSX:
-                        rt = get_rt(inst);
-                        ra = get_ra(inst);
-                        rb = get_rb(inst);
-                        rc = get_rc(inst);
                         emulated = kvmppc_44x_emul_tlbsx(vcpu, rt, ra, rb, rc);
                         break;
 
@@ -141,41 +128,41 @@ int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,
         return emulated;
 }
 
-int kvmppc_core_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, int rs)
+int kvmppc_core_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, ulong spr_val)
 {
         int emulated = EMULATE_DONE;
 
         switch (sprn) {
         case SPRN_PID:
-                kvmppc_set_pid(vcpu, kvmppc_get_gpr(vcpu, rs)); break;
+                kvmppc_set_pid(vcpu, spr_val); break;
         case SPRN_MMUCR:
-                vcpu->arch.mmucr = kvmppc_get_gpr(vcpu, rs); break;
+                vcpu->arch.mmucr = spr_val; break;
         case SPRN_CCR0:
-                vcpu->arch.ccr0 = kvmppc_get_gpr(vcpu, rs); break;
+                vcpu->arch.ccr0 = spr_val; break;
         case SPRN_CCR1:
-                vcpu->arch.ccr1 = kvmppc_get_gpr(vcpu, rs); break;
+                vcpu->arch.ccr1 = spr_val; break;
         default:
-                emulated = kvmppc_booke_emulate_mtspr(vcpu, sprn, rs);
+                emulated = kvmppc_booke_emulate_mtspr(vcpu, sprn, spr_val);
         }
 
         return emulated;
 }
 
-int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt)
+int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, ulong *spr_val)
 {
         int emulated = EMULATE_DONE;
 
         switch (sprn) {
         case SPRN_PID:
-                kvmppc_set_gpr(vcpu, rt, vcpu->arch.pid); break;
+                *spr_val = vcpu->arch.pid; break;
         case SPRN_MMUCR:
-                kvmppc_set_gpr(vcpu, rt, vcpu->arch.mmucr); break;
+                *spr_val = vcpu->arch.mmucr; break;
         case SPRN_CCR0:
-                kvmppc_set_gpr(vcpu, rt, vcpu->arch.ccr0); break;
+                *spr_val = vcpu->arch.ccr0; break;
         case SPRN_CCR1:
-                kvmppc_set_gpr(vcpu, rt, vcpu->arch.ccr1); break;
+                *spr_val = vcpu->arch.ccr1; break;
         default:
-                emulated = kvmppc_booke_emulate_mfspr(vcpu, sprn, rt);
+                emulated = kvmppc_booke_emulate_mfspr(vcpu, sprn, spr_val);
         }
 
         return emulated;