[Xen-changelog] [xen-unstable] [IA64] vti fault handler clean up: introduce VMX_SAVE_MIN_WITH_COVER_NO_PANIC

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1197664829 25200
# Node ID 5ab3288e5b0fab956d0346b16d4f56e41a457aef
# Parent  9ab95900afec2083fce4fe04926d67c09e0cba32
[IA64] vti fault handler clean up: introduce VMX_SAVE_MIN_WITH_COVER_NO_PANIC

For later use.  This is a version of VMX_SAVE_MIN_WITH_COVER which
doesn't call vmx_panic even when p6 is true.

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
 xen/arch/ia64/vmx/vmx_minstate.h |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff -r 9ab95900afec -r 5ab3288e5b0f xen/arch/ia64/vmx/vmx_minstate.h
--- a/xen/arch/ia64/vmx/vmx_minstate.h  Fri Dec 14 13:37:57 2007 -0700
+++ b/xen/arch/ia64/vmx/vmx_minstate.h  Fri Dec 14 13:40:29 2007 -0700
@@ -120,7 +120,7 @@
 (p6) movl out0=panic_string;            \
 (p6) br.call.spnt.few b6=panic;
 
-#define VMX_DO_SAVE_MIN(COVER,SAVE_IFS,EXTRA)                                  
         \
+#define VMX_DO_SAVE_MIN(COVER,SAVE_IFS,EXTRA,VMX_PANIC)                        
         \
     mov r27=ar.rsc;                     /* M */                                
         \
     mov r20=r1;                         /* A */                                
         \
     mov r25=ar.unat;                    /* M */                                
         \
@@ -134,10 +134,8 @@
     tbit.z p0,p15=r29,IA64_PSR_I_BIT;                                          
         \
     ;;                                                                         
         \
 (pUStk) tbit.nz.and p6,p0=r18,IA64_ISR_NI_BIT;                                 
         \
-    ;;                                                                         
         \
-    P6_BR_VMX_PANIC                                                            
         \
 (pUStk)VMX_MINSTATE_GET_CURRENT(r1);                                           
         \
-    /*    mov r21=r16;  */                                                     
         \
+    VMX_PANIC                                                                  
         \
     /* switch from user to kernel RBS: */                                      
         \
     ;;                                                                         
         \
     invala;                             /* M */                                
         \
@@ -299,9 +297,11 @@
     ;;                                  \
     st8 [r2]=r26;       /* eml_unat */
 
-#define VMX_SAVE_MIN_WITH_COVER     VMX_DO_SAVE_MIN(cover, mov r30=cr.ifs,)
-#define VMX_SAVE_MIN_WITH_COVER_R19 VMX_DO_SAVE_MIN(cover, mov r30=cr.ifs, mov 
r15=r19)
-#define VMX_SAVE_MIN                VMX_DO_SAVE_MIN(     , mov r30=r0, )
+#define VMX_SAVE_MIN_WITH_COVER     VMX_DO_SAVE_MIN(cover, mov r30=cr.ifs,, 
P6_BR_VMX_PANIC)
+#define VMX_SAVE_MIN_WITH_COVER_NO_PANIC    \
+                                    VMX_DO_SAVE_MIN(cover, mov r30=cr.ifs,, )
+#define VMX_SAVE_MIN_WITH_COVER_R19 VMX_DO_SAVE_MIN(cover, mov r30=cr.ifs, mov 
r15=r19, P6_BR_VMX_PANIC)
+#define VMX_SAVE_MIN                VMX_DO_SAVE_MIN(     , mov r30=r0,, 
P6_BR_VMX_PANIC)
 
 /*
  * Local variables:

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog