On Mon, Dec 3, 2012 at 5:26 AM, Will Deacon <will.deacon@xxxxxxx> wrote: > On Sat, Dec 01, 2012 at 12:57:22AM +0000, Christoffer Dall wrote: >> Always use r0 to store the vcpu pointer and change the macro parameters >> to be more meaningful, and use named parameters when calling them to >> signify what we're doing. > > Makes sense, I think you might have missed a couple of spots though: > >> @@ -277,20 +278,20 @@ ENTRY(kvm_call_hyp) >> ands r1, r1, #0xff >> beq 99f >> >> - load_vcpu r1 @ Load VCPU pointer >> + load_vcpu @ Load VCPU pointer >> .if \exception_code == ARM_EXCEPTION_DATA_ABORT >> mrc p15, 4, r2, c5, c2, 0 @ HSR >> - mrc p15, 4, r0, c6, c0, 0 @ HDFAR >> - str r2, [r1, #VCPU_HSR] >> - str r0, [r1, #VCPU_HxFAR] >> + mrc p15, 4, r1, c6, c0, 0 @ HDFAR >> + str r2, [r0, #VCPU_HSR] >> + str r1, [r0, #VCPU_HxFAR] > > s/r0/vcpu/ > >> .endif >> .if \exception_code == ARM_EXCEPTION_PREF_ABORT >> mrc p15, 4, r2, c5, c2, 0 @ HSR >> - mrc p15, 4, r0, c6, c0, 2 @ HIFAR >> - str r2, [r1, #VCPU_HSR] >> - str r0, [r1, #VCPU_HxFAR] >> + mrc p15, 4, r1, c6, c0, 2 @ HIFAR >> + str r2, [r0, #VCPU_HSR] >> + str r1, [r0, #VCPU_HxFAR] > > and here? > indeed, thanks! -Christoffer _______________________________________________ kvmarm mailing list kvmarm@xxxxxxxxxxxxxxxxxxxxx https://lists.cs.columbia.edu/cucslists/listinfo/kvmarm
