1.1 --- a/xen/arch/ia64/vmx/vmx_ivt.S	Fri Mar 14 14:57:58 2008 -0600
     1.2 +++ b/xen/arch/ia64/vmx/vmx_ivt.S	Fri Mar 14 15:00:27 2008 -0600
     1.3 @@ -524,38 +524,33 @@ ENTRY(vmx_break_fault)
     1.4      * to prevent leaking bits from kernel to user level.
     1.5      */
     1.6     
     1.7 -//  mov.m r16=IA64_KR(CURRENT)		// M2 r16 <- current task (12 cyc)
     1.8 -    mov r14=r21
     1.9 -    bsw.1					// B (6 cyc) regs are saved, switch to bank 1
    1.10 +    mov r14=r21				// save r21 before bsw.1
    1.11 +    bsw.1				// B (6 cyc) switch to bank 1
    1.12      ;;   
    1.13 -    mov r29=cr.ipsr				// M2 (12 cyc)
    1.14 +    mov r29=cr.ipsr			// M2 (12 cyc)
    1.15      mov r31=pr				// I0 (2 cyc)
    1.16      mov r16=r14
    1.17      mov r15=r2
    1.18  
    1.19 -    mov r17=cr.iim				// M2 (2 cyc)
    1.20 +    mov r17=cr.iim			// M2 (2 cyc)
    1.21      mov.m r27=ar.rsc			// M2 (12 cyc)
    1.22 -//  mov r18=__IA64_BREAK_SYSCALL		// A
    1.23  
    1.24 -    mov.m ar.rsc=0				// M2
    1.25 +    mov.m ar.rsc=0			// M2
    1.26      mov.m r21=ar.fpsr			// M2 (12 cyc)
    1.27      mov r19=b6				// I0 (2 cyc)
    1.28      ;;
    1.29 -    mov.m r23=ar.bspstore			// M2 (12 cyc)
    1.30 +    mov.m r23=ar.bspstore		// M2 (12 cyc)
    1.31      mov.m r24=ar.rnat			// M2 (5 cyc)
    1.32      mov.i r26=ar.pfs			// I0 (2 cyc)
    1.33  
    1.34 -    invala					// M0|1
    1.35 -    nop.m 0					// M
    1.36 +    invala				// M0|1
    1.37 +    nop.m 0				// M
    1.38      mov r20=r1				// A			save r1
    1.39  
    1.40      nop.m 0
    1.41 -//  movl r30=sys_call_table			// X
    1.42 -    movl r30=ia64_hypercall_table			// X
    1.43 +    movl r30=ia64_hypercall_table	// X
    1.44  
    1.45 -    mov r28=cr.iip				// M2 (2 cyc)
    1.46 -//  cmp.eq p0,p7=r18,r17			// I0 is this a system call?
    1.47 -//(p7)  br.cond.spnt non_syscall		// B  no ->
    1.48 +    mov r28=cr.iip			// M2 (2 cyc)
    1.49     //
    1.50     // From this point on, we are definitely on the syscall-path
    1.51     // and we can use (non-banked) scratch registers.
    1.52 @@ -563,37 +558,30 @@ ENTRY(vmx_break_fault)
    1.53  ///////////////////////////////////////////////////////////////////////
    1.54      mov r1=r16				// A    move task-pointer to "addl"-addressable reg
    1.55      mov r2=r16				// A    setup r2 for ia64_syscall_setup
    1.56 -//  add r9=TI_FLAGS+IA64_TASK_SIZE,r16	// A	r9 = &current_thread_info()->flags
    1.57  
    1.58 -//  adds r16=IA64_TASK_THREAD_ON_USTACK_OFFSET,r16
    1.59 -//  adds r15=-1024,r15			// A    subtract 1024 from syscall number
    1.60 -//  mov r3=NR_syscalls - 1
    1.61      mov r3=NR_hypercalls - 1
    1.62      ;;
    1.63 -//  ld1.bias r17=[r16]			// M0|1 r17 = current->thread.on_ustack flag
    1.64 -//  ld4 r9=[r9]				// M0|1 r9 = current_thread_info()->flags
    1.65 -    mov r9=r0               // force flags = 0
    1.66 +    mov r9=r0               		// force flags = 0
    1.67      extr.u r8=r29,41,2			// I0   extract ei field from cr.ipsr
    1.68  
    1.69 -    shladd r30=r15,3,r30			// A    r30 = sys_call_table + 8*(syscall-1024)
    1.70 +    shladd r30=r15,3,r30		// A    r30 = hcall_table + 8*syscall
    1.71      addl r22=IA64_RBS_OFFSET,r1		// A    compute base of RBS
    1.72 -    cmp.leu p6,p7=r15,r3			// A    syscall number in range?
    1.73 +    cmp.leu p6,p7=r15,r3		// A    syscall number in range?
    1.74      ;;
    1.75  
    1.76      lfetch.fault.excl.nt1 [r22]		// M0|1 prefetch RBS
    1.77 -(p6) ld8 r30=[r30]				// M0|1 load address of syscall entry point
    1.78 -    tnat.nz.or p7,p0=r15			// I0	is syscall nr a NaT?
    1.79 +(p6) ld8 r30=[r30]			// M0|1 load address of syscall entry point
    1.80 +    tnat.nz.or p7,p0=r15		// I0	is syscall nr a NaT?
    1.81  
    1.82 -    mov.m ar.bspstore=r22			// M2   switch to kernel RBS
    1.83 +    mov.m ar.bspstore=r22		// M2   switch to kernel RBS
    1.84      cmp.eq p8,p9=2,r8			// A    isr.ei==2?
    1.85      ;;
    1.86  
    1.87  (p8) mov r8=0				// A    clear ei to 0
    1.88 -//(p7)  movl r30=sys_ni_syscall			// X
    1.89 -(p7) movl r30=do_ni_hypercall			// X
    1.90 +(p7) movl r30=do_ni_hypercall		// X
    1.91  
    1.92 -(p8) adds r28=16,r28				// A    switch cr.iip to next bundle
    1.93 -(p9) adds r8=1,r8				// A    increment ei to next slot
    1.94 +(p8) adds r28=16,r28			// A    switch cr.iip to next bundle
    1.95 +(p9) adds r8=1,r8			// A    increment ei to next slot
    1.96      nop.i 0
    1.97      ;;
    1.98  
    1.99 @@ -604,7 +592,6 @@ ENTRY(vmx_break_fault)
   1.100     // the data arrives.
   1.101     //
   1.102  ///////////////////////////////////////////////////////////////////////
   1.103 -//    st1 [r16]=r0				// M2|3 clear current->thread.on_ustack flag
   1.104      mov b6=r30				// I0   setup syscall handler branch reg early
   1.105  
   1.106      mov r18=ar.bsp				// M2 (12 cyc)
   1.107 @@ -720,7 +707,7 @@ END(vmx_virtual_exirq)
   1.108       *	- ar.fpsr: set to kernel settings
   1.109       *	-  b6: preserved (same as on entry)
   1.110       */
   1.111 -GLOBAL_ENTRY(ia64_hypercall_setup)
   1.112 +ENTRY(ia64_hypercall_setup)
   1.113  #if PT(B6) != 0
   1.114  # error This code assumes that b6 is the first field in pt_regs.
   1.115  #endif