diff options
Diffstat (limited to 'xen/arch/ia64/ivt.S')
| -rw-r--r-- | xen/arch/ia64/ivt.S | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/xen/arch/ia64/ivt.S b/xen/arch/ia64/ivt.S index 0938f6075e..4d6785c310 100644 --- a/xen/arch/ia64/ivt.S +++ b/xen/arch/ia64/ivt.S @@ -783,21 +783,22 @@ ENTRY(break_fault) ld8 r19=[r18] ;; cmp.eq p7,p0=r0,r17 // is this a psuedo-cover? -(p7) br.sptk.many dispatch_privop_fault +(p7) br.spnt.many dispatch_privop_fault ;; - cmp4.ne p7,p0=r0,r19 -(p7) br.sptk.many dispatch_break_fault - // If we get to here, we have a hyperprivop - // For now, hyperprivops are handled through the break mechanism - // Later, they will be fast hand-coded assembly with psr.ic off + // if vpsr.ic is off, we have a hyperprivop + // A hyperprivop is hand-coded assembly with psr.ic off // which means no calls, no use of r1-r15 and no memory accesses // except to pinned addresses! -#define FAST_HYPERPRIVOPS -#ifdef FAST_HYPERPRIVOPS - br.sptk.many fast_hyperprivop -#else - br.sptk.many dispatch_break_fault -#endif + cmp4.eq p7,p0=r0,r19 +(p7) br.sptk.many fast_hyperprivop + ;; + mov r22=IA64_KR(CURRENT);; + adds r22=IA64_VCPU_BREAKIMM_OFFSET,r22;; + ld4 r23=[r22];; + cmp4.eq p6,p7=r23,r17 // Xen-reserved breakimm? +(p6) br.spnt.many dispatch_break_fault + ;; + br.sptk.many fast_break_reflect ;; #endif mov r16=IA64_KR(CURRENT) // r16 = current task; 12 cycle read lat. |