ia64/xen-unstable

changeset 2805:150d5c49daf1

bitkeeper revision 1.1159.146.1 (41865618vMDBaanL8_33U65ovb9fHw)

rename pt_regs to xen_regs
author ach61@labyrinth.cl.cam.ac.uk
date Mon Nov 01 15:28:24 2004 +0000 (2004-11-01)
parents 2c7a372de2d0
children a5beee8013f5
files .rootkeys xen/arch/x86/apic.c xen/arch/x86/domain.c xen/arch/x86/i8259.c xen/arch/x86/irq.c xen/arch/x86/memory.c xen/arch/x86/nmi.c xen/arch/x86/pdb-linux.c xen/arch/x86/pdb-stub.c xen/arch/x86/time.c xen/arch/x86/traps.c xen/arch/x86/x86_32/entry.S xen/arch/x86/x86_32/seg_fixup.c xen/common/ac_timer.c xen/common/keyhandler.c xen/common/perfc.c xen/common/schedule.c xen/drivers/char/console.c xen/drivers/char/serial.c xen/include/asm-x86/apic.h xen/include/asm-x86/irq.h xen/include/asm-x86/pdb.h xen/include/asm-x86/processor.h xen/include/asm-x86/ptrace.h xen/include/asm-x86/regs.h xen/include/asm-x86/x86_32/ptrace.h xen/include/asm-x86/x86_32/regs.h xen/include/asm-x86/x86_64/ptrace.h xen/include/asm-x86/x86_64/regs.h xen/include/xen/irq.h xen/include/xen/keyhandler.h xen/include/xen/sched.h xen/include/xen/serial.h
line diff
     1.1 --- a/.rootkeys	Mon Nov 01 10:00:03 2004 +0000
     1.2 +++ b/.rootkeys	Mon Nov 01 15:28:24 2004 +0000
     1.3 @@ -711,7 +711,7 @@ 3ddb79c3ysKUbxZuwKBRK3WXU2TlEg xen/inclu
     1.4  404f1bb41Yl-5ZjIWnG66HDCj6OIWA xen/include/asm-x86/pda.h
     1.5  4022a73diKn2Ax4-R4gzk59lm1YdDg xen/include/asm-x86/pdb.h
     1.6  3ddb79c2QF5-pZGzuX4QukPCDAl59A xen/include/asm-x86/processor.h
     1.7 -40cf1596bim9F9DNdV75klgRSZ6Y2A xen/include/asm-x86/ptrace.h
     1.8 +40cf1596bim9F9DNdV75klgRSZ6Y2A xen/include/asm-x86/regs.h
     1.9  3ddb79c2plf7ciNgoNjU-RsbUzawsw xen/include/asm-x86/rwlock.h
    1.10  405b8599BsDsDwKEJLS0XipaiQW3TA xen/include/asm-x86/shadow.h
    1.11  3ddb79c3Hgbb2g8CyWLMCK-6_ZVQSQ xen/include/asm-x86/smp.h
    1.12 @@ -722,13 +722,13 @@ 3ddb79c3ezddh34MdelJpa5tNR00Dw xen/inclu
    1.13  3ddb79c4HugMq7IYGxcQKFBpKwKhzA xen/include/asm-x86/types.h
    1.14  40cf1596saFaHD5DC5zvrSn7CDCWGQ xen/include/asm-x86/uaccess.h
    1.15  3ddb79c2ADvRmdexd9y3AYK9_NTx-Q xen/include/asm-x86/x86_32/current.h
    1.16 -3ddb79c3mbqEM7QQr3zVq7NiBNhouA xen/include/asm-x86/x86_32/ptrace.h
    1.17 +3ddb79c3mbqEM7QQr3zVq7NiBNhouA xen/include/asm-x86/x86_32/regs.h
    1.18  3e7f358aG11EvMI9VJ4_9hD4LUO7rQ xen/include/asm-x86/x86_32/string.h
    1.19  3ddb79c3M2n1ROZH6xk3HbyN4CPDqg xen/include/asm-x86/x86_32/uaccess.h
    1.20  404f1b9ceJeGVaPNIENm2FkK0AgEOQ xen/include/asm-x86/x86_64/current.h
    1.21  404f1b9fl6AQ_a-T1TDK3fuwTPXmHw xen/include/asm-x86/x86_64/desc.h
    1.22  404f1badfXZJZ2sU8sh9PS2EZvd19Q xen/include/asm-x86/x86_64/ldt.h
    1.23 -404f1bb86rAXB3aLS1vYdcqpJiEcyg xen/include/asm-x86/x86_64/ptrace.h
    1.24 +404f1bb86rAXB3aLS1vYdcqpJiEcyg xen/include/asm-x86/x86_64/regs.h
    1.25  40e1966azOJZfNI6Ilthe6Q-T3Hewg xen/include/asm-x86/x86_64/string.h
    1.26  404f1bc4tWkB9Qr8RkKtZGW5eMQzhw xen/include/asm-x86/x86_64/uaccess.h
    1.27  400304fcmRQmDdFYEzDh0wcBba9alg xen/include/public/COPYING
     2.1 --- a/xen/arch/x86/apic.c	Mon Nov 01 10:00:03 2004 +0000
     2.2 +++ b/xen/arch/x86/apic.c	Mon Nov 01 15:28:24 2004 +0000
     2.3 @@ -724,7 +724,7 @@ int reprogram_ac_timer(s_time_t timeout)
     2.4  
     2.5  unsigned int apic_timer_irqs [NR_CPUS];
     2.6  
     2.7 -void smp_apic_timer_interrupt(struct pt_regs * regs)
     2.8 +void smp_apic_timer_interrupt(struct xen_regs * regs)
     2.9  {
    2.10      ack_APIC_irq();
    2.11  
     3.1 --- a/xen/arch/x86/domain.c	Mon Nov 01 10:00:03 2004 +0000
     3.2 +++ b/xen/arch/x86/domain.c	Mon Nov 01 15:28:24 2004 +0000
     3.3 @@ -18,7 +18,7 @@
     3.4  #include <xen/smp.h>
     3.5  #include <xen/delay.h>
     3.6  #include <xen/softirq.h>
     3.7 -#include <asm/ptrace.h>
     3.8 +#include <asm/regs.h>
     3.9  #include <asm/mc146818rtc.h>
    3.10  #include <asm/system.h>
    3.11  #include <asm/io.h>
     4.1 --- a/xen/arch/x86/i8259.c	Mon Nov 01 10:00:03 2004 +0000
     4.2 +++ b/xen/arch/x86/i8259.c	Mon Nov 01 15:28:24 2004 +0000
     4.3 @@ -7,7 +7,7 @@
     4.4  
     4.5  #include <xen/config.h>
     4.6  #include <xen/init.h>
     4.7 -#include <asm/ptrace.h>
     4.8 +#include <asm/regs.h>
     4.9  #include <xen/errno.h>
    4.10  #include <xen/sched.h>
    4.11  #include <xen/irq.h>
     5.1 --- a/xen/arch/x86/irq.c	Mon Nov 01 10:00:03 2004 +0000
     5.2 +++ b/xen/arch/x86/irq.c	Mon Nov 01 15:28:24 2004 +0000
     5.3 @@ -17,7 +17,7 @@ irq_desc_t irq_desc[NR_IRQS] __cacheline
     5.4  
     5.5  static void __do_IRQ_guest(int irq);
     5.6  
     5.7 -void no_action(int cpl, void *dev_id, struct pt_regs *regs) { }
     5.8 +void no_action(int cpl, void *dev_id, struct xen_regs *regs) { }
     5.9  
    5.10  static void enable_none(unsigned int irq) { }
    5.11  static unsigned int startup_none(unsigned int irq) { return 0; }
    5.12 @@ -87,7 +87,7 @@ void enable_irq(unsigned int irq)
    5.13      spin_unlock_irqrestore(&desc->lock, flags);
    5.14  }
    5.15  
    5.16 -asmlinkage void do_IRQ(struct pt_regs regs)
    5.17 +asmlinkage void do_IRQ(struct xen_regs regs)
    5.18  {       
    5.19  #if defined(__i386__)
    5.20      unsigned int      irq = regs.orig_eax;
     6.1 --- a/xen/arch/x86/memory.c	Mon Nov 01 10:00:03 2004 +0000
     6.2 +++ b/xen/arch/x86/memory.c	Mon Nov 01 15:28:24 2004 +0000
     6.3 @@ -2262,7 +2262,7 @@ void audit_domains(void)
     6.4  }
     6.5  
     6.6  void audit_domains_key(unsigned char key, void *dev_id,
     6.7 -                       struct pt_regs *regs)
     6.8 +                       struct xen_regs *regs)
     6.9  {
    6.10      open_softirq(MEMAUDIT_SOFTIRQ, audit_domains);
    6.11      raise_softirq(MEMAUDIT_SOFTIRQ);
     7.1 --- a/xen/arch/x86/nmi.c	Mon Nov 01 10:00:03 2004 +0000
     7.2 +++ b/xen/arch/x86/nmi.c	Mon Nov 01 15:28:24 2004 +0000
     7.3 @@ -30,7 +30,7 @@ unsigned int nmi_watchdog = NMI_NONE;
     7.4  unsigned int watchdog_on = 0;
     7.5  static unsigned int nmi_hz = HZ;
     7.6  unsigned int nmi_perfctr_msr;	/* the MSR to reset in NMI handler */
     7.7 -extern void show_registers(struct pt_regs *regs);
     7.8 +extern void show_registers(struct xen_regs *regs);
     7.9  
    7.10  extern int logical_proc_id[];
    7.11  
    7.12 @@ -270,9 +270,9 @@ void touch_nmi_watchdog (void)
    7.13          alert_counter[i] = 0;
    7.14  }
    7.15  
    7.16 -void nmi_watchdog_tick (struct pt_regs * regs)
    7.17 +void nmi_watchdog_tick (struct xen_regs * regs)
    7.18  {
    7.19 -    extern void die(const char * str, struct pt_regs * regs, long err);
    7.20 +    extern void die(const char * str, struct xen_regs * regs, long err);
    7.21  
    7.22      int sum, cpu = smp_processor_id();
    7.23  
     8.1 --- a/xen/arch/x86/pdb-linux.c	Mon Nov 01 10:00:03 2004 +0000
     8.2 +++ b/xen/arch/x86/pdb-linux.c	Mon Nov 01 15:28:24 2004 +0000
     8.3 @@ -37,7 +37,7 @@ pdb_linux_clr_bkpt (unsigned long addr, 
     8.4  }
     8.5  
     8.6  void
     8.7 -pdb_linux_syscall_enter_bkpt (struct pt_regs *regs, long error_code,
     8.8 +pdb_linux_syscall_enter_bkpt (struct xen_regs *regs, long error_code,
     8.9  			      trap_info_t *ti)
    8.10  {
    8.11      /* set at breakpoint at the beginning of the 
    8.12 @@ -49,7 +49,7 @@ pdb_linux_syscall_enter_bkpt (struct pt_
    8.13  }
    8.14  
    8.15  void
    8.16 -pdb_linux_syscall_exit_bkpt (struct pt_regs *regs, struct pdb_context *pdb_ctx)
    8.17 +pdb_linux_syscall_exit_bkpt (struct xen_regs *regs, struct pdb_context *pdb_ctx)
    8.18  {
    8.19      /*
    8.20        we've hit an int 0x80 in a user's program, jumped into xen
     9.1 --- a/xen/arch/x86/pdb-stub.c	Mon Nov 01 10:00:03 2004 +0000
     9.2 +++ b/xen/arch/x86/pdb-stub.c	Mon Nov 01 15:28:24 2004 +0000
     9.3 @@ -12,7 +12,7 @@
     9.4  
     9.5  #include <xen/lib.h>
     9.6  #include <xen/sched.h>
     9.7 -#include <asm/ptrace.h>
     9.8 +#include <asm/regs.h>
     9.9  #include <xen/keyhandler.h> 
    9.10  #include <asm/apic.h>
    9.11  #include <asm/domain_page.h>                           /* [un]map_domain_mem */
    9.12 @@ -234,7 +234,7 @@ pdb_process_query (char *ptr)
    9.13  }
    9.14  
    9.15  void
    9.16 -pdb_x86_to_gdb_regs (char *buffer, struct pt_regs *regs)
    9.17 +pdb_x86_to_gdb_regs (char *buffer, struct xen_regs *regs)
    9.18  {
    9.19      int idx = 0;
    9.20  
    9.21 @@ -273,7 +273,7 @@ pdb_x86_to_gdb_regs (char *buffer, struc
    9.22  
    9.23  /* at this point we allow any register to be changed, caveat emptor */
    9.24  void
    9.25 -pdb_gdb_to_x86_regs (struct pt_regs *regs, char *buffer)
    9.26 +pdb_gdb_to_x86_regs (struct xen_regs *regs, char *buffer)
    9.27  {
    9.28      hex2mem(buffer, (char *)&regs->eax, sizeof(regs->eax));
    9.29      buffer += sizeof(regs->eax) * 2;
    9.30 @@ -309,7 +309,7 @@ pdb_gdb_to_x86_regs (struct pt_regs *reg
    9.31  }
    9.32  
    9.33  int
    9.34 -pdb_process_command (char *ptr, struct pt_regs *regs, unsigned long cr3,
    9.35 +pdb_process_command (char *ptr, struct xen_regs *regs, unsigned long cr3,
    9.36  		     int sigval)
    9.37  {
    9.38      int length;
    9.39 @@ -1081,7 +1081,7 @@ void pdb_get_packet(char *buffer)
    9.40   */
    9.41  
    9.42  int pdb_handle_exception(int exceptionVector,
    9.43 -			 struct pt_regs *xen_regs)
    9.44 +			 struct xen_regs *xen_regs)
    9.45  {
    9.46      int signal = 0;
    9.47      struct pdb_breakpoint* bkpt;
    9.48 @@ -1215,11 +1215,11 @@ int pdb_handle_exception(int exceptionVe
    9.49  
    9.50  void __pdb_key_pressed(void)
    9.51  {
    9.52 -    struct pt_regs *regs = (struct pt_regs *)get_execution_context();
    9.53 +    struct xen_regs *regs = (struct xen_regs *)get_execution_context();
    9.54      pdb_handle_exception(KEYPRESS_EXCEPTION, regs);
    9.55  }
    9.56  
    9.57 -void pdb_key_pressed(u_char key, void *dev_id, struct pt_regs *regs) 
    9.58 +void pdb_key_pressed(u_char key, void *dev_id, struct xen_regs *regs) 
    9.59  {
    9.60      raise_softirq(DEBUGGER_SOFTIRQ);
    9.61  }
    10.1 --- a/xen/arch/x86/time.c	Mon Nov 01 10:00:03 2004 +0000
    10.2 +++ b/xen/arch/x86/time.c	Mon Nov 01 15:28:24 2004 +0000
    10.3 @@ -50,7 +50,7 @@ static s_time_t        stime_irq;       
    10.4  static unsigned long   wc_sec, wc_usec; /* UTC time at last 'time update'.   */
    10.5  static rwlock_t        time_lock = RW_LOCK_UNLOCKED;
    10.6  
    10.7 -static void timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
    10.8 +static void timer_interrupt(int irq, void *dev_id, struct xen_regs *regs)
    10.9  {
   10.10      write_lock_irq(&time_lock);
   10.11  
    11.1 --- a/xen/arch/x86/traps.c	Mon Nov 01 10:00:03 2004 +0000
    11.2 +++ b/xen/arch/x86/traps.c	Mon Nov 01 15:28:24 2004 +0000
    11.3 @@ -32,7 +32,7 @@
    11.4  #include <xen/errno.h>
    11.5  #include <xen/mm.h>
    11.6  #include <xen/console.h>
    11.7 -#include <asm/ptrace.h>
    11.8 +#include <asm/regs.h>
    11.9  #include <xen/delay.h>
   11.10  #include <xen/event.h>
   11.11  #include <xen/spinlock.h>
   11.12 @@ -163,7 +163,7 @@ void show_stack(unsigned long *esp)
   11.13      show_trace( esp );
   11.14  }
   11.15  
   11.16 -void show_registers(struct pt_regs *regs)
   11.17 +void show_registers(struct xen_regs *regs)
   11.18  {
   11.19      unsigned long esp;
   11.20      unsigned short ss;
   11.21 @@ -192,7 +192,7 @@ void show_registers(struct pt_regs *regs
   11.22  
   11.23  spinlock_t die_lock = SPIN_LOCK_UNLOCKED;
   11.24  
   11.25 -void die(const char *str, struct pt_regs * regs, long err)
   11.26 +void die(const char *str, struct xen_regs * regs, long err)
   11.27  {
   11.28      unsigned long flags;
   11.29      spin_lock_irqsave(&die_lock, flags);
   11.30 @@ -204,7 +204,7 @@ void die(const char *str, struct pt_regs
   11.31  
   11.32  
   11.33  static inline void do_trap(int trapnr, char *str,
   11.34 -                           struct pt_regs *regs, 
   11.35 +                           struct xen_regs *regs, 
   11.36                             long error_code, int use_error_code)
   11.37  {
   11.38      struct domain *p = current;
   11.39 @@ -241,13 +241,13 @@ static inline void do_trap(int trapnr, c
   11.40  }
   11.41  
   11.42  #define DO_ERROR_NOCODE(trapnr, str, name) \
   11.43 -asmlinkage void do_##name(struct pt_regs * regs, long error_code) \
   11.44 +asmlinkage void do_##name(struct xen_regs * regs, long error_code) \
   11.45  { \
   11.46      do_trap(trapnr, str, regs, error_code, 0); \
   11.47  }
   11.48  
   11.49  #define DO_ERROR(trapnr, str, name) \
   11.50 -asmlinkage void do_##name(struct pt_regs * regs, long error_code) \
   11.51 +asmlinkage void do_##name(struct xen_regs * regs, long error_code) \
   11.52  { \
   11.53      do_trap(trapnr, str, regs, error_code, 1); \
   11.54  }
   11.55 @@ -265,7 +265,7 @@ DO_ERROR(17, "alignment check", alignmen
   11.56  DO_ERROR_NOCODE(18, "machine check", machine_check)
   11.57  DO_ERROR_NOCODE(19, "simd error", simd_coprocessor_error)
   11.58  
   11.59 -asmlinkage void do_int3(struct pt_regs *regs, long error_code)
   11.60 +asmlinkage void do_int3(struct xen_regs *regs, long error_code)
   11.61  {
   11.62      struct domain *p = current;
   11.63      struct guest_trap_bounce *gtb = guest_trap_bounce+smp_processor_id();
   11.64 @@ -327,7 +327,7 @@ asmlinkage void do_double_fault(void)
   11.65      for ( ; ; ) ;
   11.66  }
   11.67  
   11.68 -asmlinkage void do_page_fault(struct pt_regs *regs, long error_code)
   11.69 +asmlinkage void do_page_fault(struct xen_regs *regs, long error_code)
   11.70  {
   11.71      struct guest_trap_bounce *gtb = guest_trap_bounce+smp_processor_id();
   11.72      trap_info_t *ti;
   11.73 @@ -433,7 +433,7 @@ asmlinkage void do_page_fault(struct pt_
   11.74            smp_processor_id(), error_code, addr);
   11.75  }
   11.76  
   11.77 -asmlinkage void do_general_protection(struct pt_regs *regs, long error_code)
   11.78 +asmlinkage void do_general_protection(struct xen_regs *regs, long error_code)
   11.79  {
   11.80      struct domain *d = current;
   11.81      struct guest_trap_bounce *gtb = guest_trap_bounce+smp_processor_id();
   11.82 @@ -516,7 +516,7 @@ asmlinkage void do_general_protection(st
   11.83      die("general protection fault", regs, error_code);
   11.84  }
   11.85  
   11.86 -asmlinkage void mem_parity_error(struct pt_regs *regs)
   11.87 +asmlinkage void mem_parity_error(struct xen_regs *regs)
   11.88  {
   11.89      console_force_unlock();
   11.90  
   11.91 @@ -536,7 +536,7 @@ asmlinkage void mem_parity_error(struct 
   11.92      for ( ; ; ) ;
   11.93  }
   11.94  
   11.95 -asmlinkage void io_check_error(struct pt_regs *regs)
   11.96 +asmlinkage void io_check_error(struct xen_regs *regs)
   11.97  {
   11.98      console_force_unlock();
   11.99  
  11.100 @@ -556,14 +556,14 @@ asmlinkage void io_check_error(struct pt
  11.101      for ( ; ; ) ;
  11.102  }
  11.103  
  11.104 -static void unknown_nmi_error(unsigned char reason, struct pt_regs * regs)
  11.105 +static void unknown_nmi_error(unsigned char reason, struct xen_regs * regs)
  11.106  {
  11.107      printk("Uhhuh. NMI received for unknown reason %02x.\n", reason);
  11.108      printk("Dazed and confused, but trying to continue\n");
  11.109      printk("Do you have a strange power saving mode enabled?\n");
  11.110  }
  11.111  
  11.112 -asmlinkage void do_nmi(struct pt_regs * regs, unsigned long reason)
  11.113 +asmlinkage void do_nmi(struct xen_regs * regs, unsigned long reason)
  11.114  {
  11.115      ++nmi_count(smp_processor_id());
  11.116  
  11.117 @@ -592,7 +592,7 @@ static void nmi_softirq(void)
  11.118      put_domain(d);
  11.119  }
  11.120  
  11.121 -asmlinkage void math_state_restore(struct pt_regs *regs, long error_code)
  11.122 +asmlinkage void math_state_restore(struct xen_regs *regs, long error_code)
  11.123  {
  11.124      /* Prevent recursion. */
  11.125      clts();
  11.126 @@ -616,7 +616,7 @@ asmlinkage void math_state_restore(struc
  11.127  }
  11.128  
  11.129  #ifdef XEN_DEBUGGER
  11.130 -asmlinkage void do_pdb_debug(struct pt_regs *regs, long error_code)
  11.131 +asmlinkage void do_pdb_debug(struct xen_regs *regs, long error_code)
  11.132  {
  11.133      unsigned int condition;
  11.134      struct domain *tsk = current;
  11.135 @@ -638,7 +638,7 @@ asmlinkage void do_pdb_debug(struct pt_r
  11.136  }
  11.137  #endif
  11.138  
  11.139 -asmlinkage void do_debug(struct pt_regs *regs, long error_code)
  11.140 +asmlinkage void do_debug(struct xen_regs *regs, long error_code)
  11.141  {
  11.142      unsigned int condition;
  11.143      struct domain *tsk = current;
  11.144 @@ -681,7 +681,7 @@ asmlinkage void do_debug(struct pt_regs 
  11.145  }
  11.146  
  11.147  
  11.148 -asmlinkage void do_spurious_interrupt_bug(struct pt_regs * regs,
  11.149 +asmlinkage void do_spurious_interrupt_bug(struct xen_regs * regs,
  11.150                                            long error_code)
  11.151  { /* nothing */ }
  11.152  
    12.1 --- a/xen/arch/x86/x86_32/entry.S	Mon Nov 01 10:00:03 2004 +0000
    12.2 +++ b/xen/arch/x86/x86_32/entry.S	Mon Nov 01 15:28:24 2004 +0000
    12.3 @@ -519,7 +519,7 @@ error_code:
    12.4  	movl  %edx,%gs
    12.5  	movl  %esp,%edx
    12.6  	pushl %esi			# push the error code
    12.7 -	pushl %edx			# push the pt_regs pointer
    12.8 +	pushl %edx			# push the xen_regs pointer
    12.9  	GET_CURRENT(%ebx)
   12.10  	call  *%edi
   12.11          addl  $8,%esp
    13.1 --- a/xen/arch/x86/x86_32/seg_fixup.c	Mon Nov 01 10:00:03 2004 +0000
    13.2 +++ b/xen/arch/x86/x86_32/seg_fixup.c	Mon Nov 01 15:28:24 2004 +0000
    13.3 @@ -259,7 +259,7 @@ int fixup_seg(u16 seg, int positive_acce
    13.4  }
    13.5  
    13.6  /* Decode Reg field of a ModRM byte: return a pointer into a register block. */
    13.7 -void *decode_reg(struct pt_regs *regs, u8 b)
    13.8 +void *decode_reg(struct xen_regs *regs, u8 b)
    13.9  {
   13.10      switch ( b & 7 )
   13.11      {
   13.12 @@ -282,7 +282,7 @@ void *decode_reg(struct pt_regs *regs, u
   13.13   * we assume that the instruction itself is paged into memory (the CPU
   13.14   * must have triggered this in order to decode the instruction itself).
   13.15   */
   13.16 -int gpf_emulate_4gb(struct pt_regs *regs)
   13.17 +int gpf_emulate_4gb(struct xen_regs *regs)
   13.18  {
   13.19      struct domain *d = current;
   13.20      trap_info_t   *ti;
    14.1 --- a/xen/common/ac_timer.c	Mon Nov 01 10:00:03 2004 +0000
    14.2 +++ b/xen/common/ac_timer.c	Mon Nov 01 15:28:24 2004 +0000
    14.3 @@ -244,7 +244,7 @@ static void ac_timer_softirq_action(void
    14.4  }
    14.5  
    14.6  
    14.7 -static void dump_timerq(u_char key, void *dev_id, struct pt_regs *regs)
    14.8 +static void dump_timerq(u_char key, void *dev_id, struct xen_regs *regs)
    14.9  {
   14.10      struct ac_timer *t;
   14.11      unsigned long    flags; 
    15.1 --- a/xen/common/keyhandler.c	Mon Nov 01 10:00:03 2004 +0000
    15.2 +++ b/xen/common/keyhandler.c	Mon Nov 01 15:28:24 2004 +0000
    15.3 @@ -27,7 +27,7 @@ key_handler *get_key_handler(unsigned ch
    15.4  }
    15.5  
    15.6  static void show_handlers(unsigned char key, void *dev_id,
    15.7 -                          struct pt_regs *regs)
    15.8 +                          struct xen_regs *regs)
    15.9  {
   15.10      int i; 
   15.11      printk("'%c' pressed -> showing installed handlers\n", key);
   15.12 @@ -40,22 +40,22 @@ static void show_handlers(unsigned char 
   15.13  
   15.14  
   15.15  static void dump_registers(unsigned char key, void *dev_id,
   15.16 -                           struct pt_regs *regs)
   15.17 +                           struct xen_regs *regs)
   15.18  {
   15.19 -    extern void show_registers(struct pt_regs *regs); 
   15.20 +    extern void show_registers(struct xen_regs *regs); 
   15.21      printk("'%c' pressed -> dumping registers\n", key); 
   15.22      show_registers(regs); 
   15.23  }
   15.24  
   15.25  static void halt_machine(unsigned char key, void *dev_id,
   15.26 -                         struct pt_regs *regs) 
   15.27 +                         struct xen_regs *regs) 
   15.28  {
   15.29      printk("'%c' pressed -> rebooting machine\n", key); 
   15.30      machine_restart(NULL); 
   15.31  }
   15.32  
   15.33  void do_task_queues(unsigned char key, void *dev_id,
   15.34 -                    struct pt_regs *regs) 
   15.35 +                    struct xen_regs *regs) 
   15.36  {
   15.37      unsigned long  flags;
   15.38      struct domain *d;
   15.39 @@ -103,21 +103,21 @@ void do_task_queues(unsigned char key, v
   15.40  }
   15.41  
   15.42  extern void dump_runq(unsigned char key, void *dev_id, 
   15.43 -                      struct pt_regs *regs);
   15.44 +                      struct xen_regs *regs);
   15.45  extern void print_sched_histo(unsigned char key, void *dev_id, 
   15.46 -                              struct pt_regs *regs);
   15.47 +                              struct xen_regs *regs);
   15.48  extern void reset_sched_histo(unsigned char key, void *dev_id, 
   15.49 -                              struct pt_regs *regs);
   15.50 +                              struct xen_regs *regs);
   15.51  #ifndef NDEBUG
   15.52  extern void audit_domains_key(unsigned char key, void *dev_id,
   15.53 -                           struct pt_regs *regs);
   15.54 +                           struct xen_regs *regs);
   15.55  #endif
   15.56  
   15.57  #ifdef PERF_COUNTERS
   15.58  extern void perfc_printall(unsigned char key, void *dev_id,
   15.59 -                           struct pt_regs *regs);
   15.60 +                           struct xen_regs *regs);
   15.61  extern void perfc_reset(unsigned char key, void *dev_id,
   15.62 -                        struct pt_regs *regs);
   15.63 +                        struct xen_regs *regs);
   15.64  #endif
   15.65  
   15.66  void initialize_keytable(void)
    16.1 --- a/xen/common/perfc.c	Mon Nov 01 10:00:03 2004 +0000
    16.2 +++ b/xen/common/perfc.c	Mon Nov 01 15:28:24 2004 +0000
    16.3 @@ -31,7 +31,7 @@ static struct {
    16.4  
    16.5  struct perfcounter_t perfcounters;
    16.6  
    16.7 -void perfc_printall(u_char key, void *dev_id, struct pt_regs *regs)
    16.8 +void perfc_printall(u_char key, void *dev_id, struct xen_regs *regs)
    16.9  {
   16.10      int i, j, sum;
   16.11      s_time_t now = NOW();
   16.12 @@ -73,7 +73,7 @@ void perfc_printall(u_char key, void *de
   16.13      }
   16.14  }
   16.15  
   16.16 -void perfc_reset(u_char key, void *dev_id, struct pt_regs *regs)
   16.17 +void perfc_reset(u_char key, void *dev_id, struct xen_regs *regs)
   16.18  {
   16.19      int i, j, sum;
   16.20      s_time_t now = NOW();
    17.1 --- a/xen/common/schedule.c	Mon Nov 01 10:00:03 2004 +0000
    17.2 +++ b/xen/common/schedule.c	Mon Nov 01 15:28:24 2004 +0000
    17.3 @@ -544,7 +544,7 @@ void schedulers_start(void)
    17.4  }
    17.5  
    17.6  
    17.7 -void dump_runq(u_char key, void *dev_id, struct pt_regs *regs)
    17.8 +void dump_runq(u_char key, void *dev_id, struct xen_regs *regs)
    17.9  {
   17.10      s_time_t      now = NOW();
   17.11      int           i;
   17.12 @@ -568,7 +568,7 @@ void dump_runq(u_char key, void *dev_id,
   17.13  }
   17.14  
   17.15  #if defined(WAKE_HISTO) || defined(BLOCKTIME_HISTO)
   17.16 -void print_sched_histo(u_char key, void *dev_id, struct pt_regs *regs)
   17.17 +void print_sched_histo(u_char key, void *dev_id, struct xen_regs *regs)
   17.18  {
   17.19      int i, j, k;
   17.20      for ( k = 0; k < smp_num_cpus; k++ )
   17.21 @@ -591,7 +591,7 @@ void print_sched_histo(u_char key, void 
   17.22      }
   17.23        
   17.24  }
   17.25 -void reset_sched_histo(u_char key, void *dev_id, struct pt_regs *regs)
   17.26 +void reset_sched_histo(u_char key, void *dev_id, struct xen_regs *regs)
   17.27  {
   17.28      int i, j;
   17.29      for ( j = 0; j < smp_num_cpus; j++ )
   17.30 @@ -599,10 +599,10 @@ void reset_sched_histo(u_char key, void 
   17.31              schedule_data[j].hist[i] = 0;
   17.32  }
   17.33  #else
   17.34 -void print_sched_histo(u_char key, void *dev_id, struct pt_regs *regs)
   17.35 +void print_sched_histo(u_char key, void *dev_id, struct xen_regs *regs)
   17.36  {
   17.37  }
   17.38 -void reset_sched_histo(u_char key, void *dev_id, struct pt_regs *regs)
   17.39 +void reset_sched_histo(u_char key, void *dev_id, struct xen_regs *regs)
   17.40  {
   17.41  }
   17.42  #endif
    18.1 --- a/xen/drivers/char/console.c	Mon Nov 01 10:00:03 2004 +0000
    18.2 +++ b/xen/drivers/char/console.c	Mon Nov 01 15:28:24 2004 +0000
    18.3 @@ -243,7 +243,7 @@ static void switch_serial_input(void)
    18.4                 input_str[xen_rx], opt_conswitch[0], input_str[!xen_rx]);
    18.5  }
    18.6  
    18.7 -static void __serial_rx(unsigned char c, struct pt_regs *regs)
    18.8 +static void __serial_rx(unsigned char c, struct xen_regs *regs)
    18.9  {
   18.10      key_handler *handler;
   18.11      struct domain *p;
   18.12 @@ -265,7 +265,7 @@ static void __serial_rx(unsigned char c,
   18.13      }
   18.14  }
   18.15  
   18.16 -static void serial_rx(unsigned char c, struct pt_regs *regs)
   18.17 +static void serial_rx(unsigned char c, struct xen_regs *regs)
   18.18  {
   18.19      static int switch_code_count = 0;
   18.20  
    19.1 --- a/xen/drivers/char/serial.c	Mon Nov 01 10:00:03 2004 +0000
    19.2 +++ b/xen/drivers/char/serial.c	Mon Nov 01 15:28:24 2004 +0000
    19.3 @@ -99,7 +99,7 @@ static uart_t com[2] = {
    19.4   * PRIVATE FUNCTIONS
    19.5   */
    19.6  
    19.7 -static void uart_rx(uart_t *uart, struct pt_regs *regs)
    19.8 +static void uart_rx(uart_t *uart, struct xen_regs *regs)
    19.9  {
   19.10      unsigned char c;
   19.11  
   19.12 @@ -125,7 +125,7 @@ static void uart_rx(uart_t *uart, struct
   19.13      }
   19.14  }
   19.15  
   19.16 -static void serial_interrupt(int irq, void *dev_id, struct pt_regs *regs)
   19.17 +static void serial_interrupt(int irq, void *dev_id, struct xen_regs *regs)
   19.18  {
   19.19      uart_rx((uart_t *)dev_id, regs);
   19.20  }
    20.1 --- a/xen/include/asm-x86/apic.h	Mon Nov 01 10:00:03 2004 +0000
    20.2 +++ b/xen/include/asm-x86/apic.h	Mon Nov 01 15:28:24 2004 +0000
    20.3 @@ -2,7 +2,7 @@
    20.4  #define __ASM_APIC_H
    20.5  
    20.6  #include <xen/config.h>
    20.7 -#include <asm/ptrace.h>
    20.8 +#include <asm/regs.h>
    20.9  #include <asm/apicdef.h>
   20.10  #include <asm/system.h>
   20.11  
   20.12 @@ -74,10 +74,10 @@ extern void sync_Arb_IDs (void);
   20.13  extern void init_bsp_APIC (void);
   20.14  extern void setup_local_APIC (void);
   20.15  extern void init_apic_mappings (void);
   20.16 -extern void smp_local_timer_interrupt (struct pt_regs * regs);
   20.17 +extern void smp_local_timer_interrupt (struct xen_regs * regs);
   20.18  extern void setup_APIC_clocks (void);
   20.19  extern void setup_apic_nmi_watchdog (void);
   20.20 -extern inline void nmi_watchdog_tick (struct pt_regs * regs);
   20.21 +extern inline void nmi_watchdog_tick (struct xen_regs * regs);
   20.22  extern int APIC_init_uniprocessor (void);
   20.23  extern void disable_APIC_timer(void);
   20.24  extern void enable_APIC_timer(void);
    21.1 --- a/xen/include/asm-x86/irq.h	Mon Nov 01 10:00:03 2004 +0000
    21.2 +++ b/xen/include/asm-x86/irq.h	Mon Nov 01 15:28:24 2004 +0000
    21.3 @@ -128,7 +128,7 @@ SYMBOL_NAME_STR(x) ":\n\t" \
    21.4  
    21.5  #define BUILD_SMP_TIMER_INTERRUPT(x,v) XBUILD_SMP_TIMER_INTERRUPT(x,v)
    21.6  #define XBUILD_SMP_TIMER_INTERRUPT(x,v) \
    21.7 -asmlinkage void x(struct pt_regs * regs); \
    21.8 +asmlinkage void x(struct xen_regs * regs); \
    21.9  asmlinkage void call_##x(void); \
   21.10  __asm__( \
   21.11  "\n"__ALIGN_STR"\n" \
    22.1 --- a/xen/include/asm-x86/pdb.h	Mon Nov 01 10:00:03 2004 +0000
    22.2 +++ b/xen/include/asm-x86/pdb.h	Mon Nov 01 15:28:24 2004 +0000
    22.3 @@ -12,7 +12,7 @@
    22.4  #ifndef __PDB_H__
    22.5  #define __PDB_H__
    22.6  
    22.7 -#include <asm/ptrace.h>
    22.8 +#include <asm/regs.h>
    22.9  #include <xen/list.h>
   22.10  #include <public/dom0_ops.h>
   22.11  #include <public/xen.h>                   /* for domain id */
   22.12 @@ -34,7 +34,7 @@ extern int pdb_get_values(u_char *buffer
   22.13  
   22.14  /* External entry points. */
   22.15  extern int pdb_handle_exception(int exceptionVector,
   22.16 -				struct pt_regs *xen_regs);
   22.17 +				struct xen_regs *xen_regs);
   22.18  extern void pdb_do_debug(dom0_op_t *op);
   22.19  
   22.20  /* PDB Context. */
   22.21 @@ -79,9 +79,9 @@ void pdb_linux_get_values(char *buffer, 
   22.22  			  int pid, unsigned long cr3);
   22.23  void pdb_linux_set_values(char *buffer, int length, unsigned long address,
   22.24  			  int pid, unsigned long cr3);
   22.25 -void pdb_linux_syscall_enter_bkpt (struct pt_regs *regs, long error_code,
   22.26 +void pdb_linux_syscall_enter_bkpt (struct xen_regs *regs, long error_code,
   22.27  				   trap_info_t *ti);
   22.28 -void pdb_linux_syscall_exit_bkpt (struct pt_regs *regs, 
   22.29 +void pdb_linux_syscall_exit_bkpt (struct xen_regs *regs, 
   22.30  				  struct pdb_context *pdb_ctx);
   22.31  
   22.32  #endif  /* __PDB_H__ */
    23.1 --- a/xen/include/asm-x86/processor.h	Mon Nov 01 10:00:03 2004 +0000
    23.2 +++ b/xen/include/asm-x86/processor.h	Mon Nov 01 15:28:24 2004 +0000
    23.3 @@ -356,7 +356,7 @@ struct guest_trap_bounce {
    23.4  };
    23.5  extern struct guest_trap_bounce guest_trap_bounce[];
    23.6  
    23.7 -extern int gpf_emulate_4gb(struct pt_regs *regs);
    23.8 +extern int gpf_emulate_4gb(struct xen_regs *regs);
    23.9  
   23.10  struct mm_struct {
   23.11      /*
    24.1 --- a/xen/include/asm-x86/ptrace.h	Mon Nov 01 10:00:03 2004 +0000
    24.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    24.3 @@ -1,6 +0,0 @@
    24.4 -
    24.5 -#ifdef __x86_64__
    24.6 -#include <asm/x86_64/ptrace.h>
    24.7 -#else
    24.8 -#include <asm/x86_32/ptrace.h>
    24.9 -#endif
    25.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    25.2 +++ b/xen/include/asm-x86/regs.h	Mon Nov 01 15:28:24 2004 +0000
    25.3 @@ -0,0 +1,6 @@
    25.4 +
    25.5 +#ifdef __x86_64__
    25.6 +#include <asm/x86_64/regs.h>
    25.7 +#else
    25.8 +#include <asm/x86_32/regs.h>
    25.9 +#endif
    26.1 --- a/xen/include/asm-x86/x86_32/ptrace.h	Mon Nov 01 10:00:03 2004 +0000
    26.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    26.3 @@ -1,47 +0,0 @@
    26.4 -#ifndef _I386_PTRACE_H
    26.5 -#define _I386_PTRACE_H
    26.6 -
    26.7 -struct pt_regs {
    26.8 -	long ebx;
    26.9 -	long ecx;
   26.10 -	long edx;
   26.11 -	long esi;
   26.12 -	long edi;
   26.13 -	long ebp;
   26.14 -	long eax;
   26.15 -	int  xds;
   26.16 -	int  xes;
   26.17 -	int  xfs;
   26.18 -	int  xgs;
   26.19 -	long orig_eax;
   26.20 -	long eip;
   26.21 -	int  xcs;
   26.22 -	long eflags;
   26.23 -	long esp;
   26.24 -	int  xss;
   26.25 -};
   26.26 -
   26.27 -enum EFLAGS {
   26.28 -        EF_CF   = 0x00000001,
   26.29 -        EF_PF   = 0x00000004,
   26.30 -        EF_AF   = 0x00000010,
   26.31 -        EF_ZF   = 0x00000040,
   26.32 -        EF_SF   = 0x00000080,
   26.33 -        EF_TF   = 0x00000100,
   26.34 -        EF_IE   = 0x00000200,
   26.35 -        EF_DF   = 0x00000400,
   26.36 -        EF_OF   = 0x00000800,
   26.37 -        EF_IOPL = 0x00003000,
   26.38 -        EF_IOPL_RING0 = 0x00000000,
   26.39 -        EF_IOPL_RING1 = 0x00001000,
   26.40 -        EF_IOPL_RING2 = 0x00002000,
   26.41 -        EF_NT   = 0x00004000,   /* nested task */
   26.42 -        EF_RF   = 0x00010000,   /* resume */
   26.43 -        EF_VM   = 0x00020000,   /* virtual mode */
   26.44 -        EF_AC   = 0x00040000,   /* alignment */
   26.45 -        EF_VIF  = 0x00080000,   /* virtual interrupt */
   26.46 -        EF_VIP  = 0x00100000,   /* virtual interrupt pending */
   26.47 -        EF_ID   = 0x00200000,   /* id */
   26.48 -};
   26.49 -
   26.50 -#endif
    27.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    27.2 +++ b/xen/include/asm-x86/x86_32/regs.h	Mon Nov 01 15:28:24 2004 +0000
    27.3 @@ -0,0 +1,47 @@
    27.4 +#ifndef _I386_REGS_H
    27.5 +#define _I386_REGS_H
    27.6 +
    27.7 +struct xen_regs {
    27.8 +	long ebx;
    27.9 +	long ecx;
   27.10 +	long edx;
   27.11 +	long esi;
   27.12 +	long edi;
   27.13 +	long ebp;
   27.14 +	long eax;
   27.15 +	int  xds;
   27.16 +	int  xes;
   27.17 +	int  xfs;
   27.18 +	int  xgs;
   27.19 +	long orig_eax;
   27.20 +	long eip;
   27.21 +	int  xcs;
   27.22 +	long eflags;
   27.23 +	long esp;
   27.24 +	int  xss;
   27.25 +};
   27.26 +
   27.27 +enum EFLAGS {
   27.28 +        EF_CF   = 0x00000001,
   27.29 +        EF_PF   = 0x00000004,
   27.30 +        EF_AF   = 0x00000010,
   27.31 +        EF_ZF   = 0x00000040,
   27.32 +        EF_SF   = 0x00000080,
   27.33 +        EF_TF   = 0x00000100,
   27.34 +        EF_IE   = 0x00000200,
   27.35 +        EF_DF   = 0x00000400,
   27.36 +        EF_OF   = 0x00000800,
   27.37 +        EF_IOPL = 0x00003000,
   27.38 +        EF_IOPL_RING0 = 0x00000000,
   27.39 +        EF_IOPL_RING1 = 0x00001000,
   27.40 +        EF_IOPL_RING2 = 0x00002000,
   27.41 +        EF_NT   = 0x00004000,   /* nested task */
   27.42 +        EF_RF   = 0x00010000,   /* resume */
   27.43 +        EF_VM   = 0x00020000,   /* virtual mode */
   27.44 +        EF_AC   = 0x00040000,   /* alignment */
   27.45 +        EF_VIF  = 0x00080000,   /* virtual interrupt */
   27.46 +        EF_VIP  = 0x00100000,   /* virtual interrupt pending */
   27.47 +        EF_ID   = 0x00200000,   /* id */
   27.48 +};
   27.49 +
   27.50 +#endif
    28.1 --- a/xen/include/asm-x86/x86_64/ptrace.h	Mon Nov 01 10:00:03 2004 +0000
    28.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    28.3 @@ -1,114 +0,0 @@
    28.4 -#ifndef _X86_64_PTRACE_H
    28.5 -#define _X86_64_PTRACE_H
    28.6 -
    28.7 -#if defined(__ASSEMBLY__) || defined(__FRAME_OFFSETS) 
    28.8 -#define R15 0
    28.9 -#define R14 8
   28.10 -#define R13 16
   28.11 -#define R12 24
   28.12 -#define RBP 36
   28.13 -#define RBX 40
   28.14 -/* arguments: interrupts/hypercalls only save upto here*/
   28.15 -#define R11 48
   28.16 -#define R10 56	
   28.17 -#define R9 64
   28.18 -#define R8 72
   28.19 -#define RAX 80
   28.20 -#define RCX 88
   28.21 -#define RDX 96
   28.22 -#define RSI 104
   28.23 -#define RDI 112
   28.24 -#define ORIG_RAX 120       /* = ERROR */ 
   28.25 -/* end of arguments */ 	
   28.26 -/* cpu exception frame or undefined in case of fast hypercall. */
   28.27 -#define RIP 128
   28.28 -#define CS 136
   28.29 -#define EFLAGS 144
   28.30 -#define RSP 152
   28.31 -#define SS 160
   28.32 -#define ARGOFFSET R11
   28.33 -#endif /* __ASSEMBLY__ */
   28.34 -
   28.35 -/* top of stack page */ 
   28.36 -#define FRAME_SIZE 168
   28.37 -
   28.38 -#define PTRACE_SETOPTIONS         21
   28.39 -
   28.40 -/* options set using PTRACE_SETOPTIONS */
   28.41 -#define PTRACE_O_TRACESYSGOOD     0x00000001
   28.42 -
   28.43 -/* Dummy values for ptrace */ 
   28.44 -#define FS 1000 
   28.45 -#define GS 1008
   28.46 -
   28.47 -#ifndef __ASSEMBLY__ 
   28.48 -
   28.49 -struct pt_regs {
   28.50 -	unsigned long r15;
   28.51 -	unsigned long r14;
   28.52 -	unsigned long r13;
   28.53 -	unsigned long r12;
   28.54 -	unsigned long rbp;
   28.55 -	unsigned long rbx;
   28.56 -/* arguments: non interrupts/hypercalls only save upto here*/
   28.57 - 	unsigned long r11;
   28.58 -	unsigned long r10;	
   28.59 -	unsigned long r9;
   28.60 -	unsigned long r8;
   28.61 -	unsigned long rax;
   28.62 -	unsigned long rcx;
   28.63 -	unsigned long rdx;
   28.64 -	unsigned long rsi;
   28.65 -	unsigned long rdi;
   28.66 -	unsigned long orig_rax;
   28.67 -/* end of arguments */ 	
   28.68 -/* cpu exception frame or undefined */
   28.69 -	unsigned long rip;
   28.70 -	unsigned long cs;
   28.71 -	unsigned long eflags; 
   28.72 -	unsigned long rsp; 
   28.73 -	unsigned long ss;
   28.74 -/* top of stack page */ 
   28.75 -};
   28.76 -
   28.77 -#endif
   28.78 -
   28.79 -/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
   28.80 -#define PTRACE_GETREGS            12
   28.81 -#define PTRACE_SETREGS            13
   28.82 -#define PTRACE_GETFPREGS          14
   28.83 -#define PTRACE_SETFPREGS          15
   28.84 -#define PTRACE_GETFPXREGS         18
   28.85 -#define PTRACE_SETFPXREGS         19
   28.86 -
   28.87 -#if !defined(__ASSEMBLY__) 
   28.88 -
   28.89 -#define instruction_pointer(regs) ((regs)->rip)
   28.90 -extern void show_regs(struct pt_regs *);
   28.91 -
   28.92 -enum {
   28.93 -        EF_CF   = 0x00000001,
   28.94 -        EF_PF   = 0x00000004,
   28.95 -        EF_AF   = 0x00000010,
   28.96 -        EF_ZF   = 0x00000040,
   28.97 -        EF_SF   = 0x00000080,
   28.98 -        EF_TF   = 0x00000100,
   28.99 -        EF_IE   = 0x00000200,
  28.100 -        EF_DF   = 0x00000400,
  28.101 -        EF_OF   = 0x00000800,
  28.102 -        EF_IOPL = 0x00003000,
  28.103 -        EF_IOPL_RING0 = 0x00000000,
  28.104 -        EF_IOPL_RING1 = 0x00001000,
  28.105 -        EF_IOPL_RING2 = 0x00002000,
  28.106 -        EF_NT   = 0x00004000,   /* nested task */
  28.107 -        EF_RF   = 0x00010000,   /* resume */
  28.108 -        EF_VM   = 0x00020000,   /* virtual mode */
  28.109 -        EF_AC   = 0x00040000,   /* alignment */
  28.110 -        EF_VIF  = 0x00080000,   /* virtual interrupt */
  28.111 -        EF_VIP  = 0x00100000,   /* virtual interrupt pending */
  28.112 -        EF_ID   = 0x00200000,   /* id */
  28.113 -};
  28.114 -
  28.115 -#endif
  28.116 -
  28.117 -#endif
    29.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    29.2 +++ b/xen/include/asm-x86/x86_64/regs.h	Mon Nov 01 15:28:24 2004 +0000
    29.3 @@ -0,0 +1,114 @@
    29.4 +#ifndef _X86_64_REGS_H
    29.5 +#define _X86_64_REGS_H
    29.6 +
    29.7 +#if defined(__ASSEMBLY__) || defined(__FRAME_OFFSETS) 
    29.8 +#define R15 0
    29.9 +#define R14 8
   29.10 +#define R13 16
   29.11 +#define R12 24
   29.12 +#define RBP 36
   29.13 +#define RBX 40
   29.14 +/* arguments: interrupts/hypercalls only save upto here*/
   29.15 +#define R11 48
   29.16 +#define R10 56	
   29.17 +#define R9 64
   29.18 +#define R8 72
   29.19 +#define RAX 80
   29.20 +#define RCX 88
   29.21 +#define RDX 96
   29.22 +#define RSI 104
   29.23 +#define RDI 112
   29.24 +#define ORIG_RAX 120       /* = ERROR */ 
   29.25 +/* end of arguments */ 	
   29.26 +/* cpu exception frame or undefined in case of fast hypercall. */
   29.27 +#define RIP 128
   29.28 +#define CS 136
   29.29 +#define EFLAGS 144
   29.30 +#define RSP 152
   29.31 +#define SS 160
   29.32 +#define ARGOFFSET R11
   29.33 +#endif /* __ASSEMBLY__ */
   29.34 +
   29.35 +/* top of stack page */ 
   29.36 +#define FRAME_SIZE 168
   29.37 +
   29.38 +#define PTRACE_SETOPTIONS         21
   29.39 +
   29.40 +/* options set using PTRACE_SETOPTIONS */
   29.41 +#define PTRACE_O_TRACESYSGOOD     0x00000001
   29.42 +
   29.43 +/* Dummy values for ptrace */ 
   29.44 +#define FS 1000 
   29.45 +#define GS 1008
   29.46 +
   29.47 +#ifndef __ASSEMBLY__ 
   29.48 +
   29.49 +struct xen_regs {
   29.50 +	unsigned long r15;
   29.51 +	unsigned long r14;
   29.52 +	unsigned long r13;
   29.53 +	unsigned long r12;
   29.54 +	unsigned long rbp;
   29.55 +	unsigned long rbx;
   29.56 +/* arguments: non interrupts/hypercalls only save upto here*/
   29.57 + 	unsigned long r11;
   29.58 +	unsigned long r10;	
   29.59 +	unsigned long r9;
   29.60 +	unsigned long r8;
   29.61 +	unsigned long rax;
   29.62 +	unsigned long rcx;
   29.63 +	unsigned long rdx;
   29.64 +	unsigned long rsi;
   29.65 +	unsigned long rdi;
   29.66 +	unsigned long orig_rax;
   29.67 +/* end of arguments */ 	
   29.68 +/* cpu exception frame or undefined */
   29.69 +	unsigned long rip;
   29.70 +	unsigned long cs;
   29.71 +	unsigned long eflags; 
   29.72 +	unsigned long rsp; 
   29.73 +	unsigned long ss;
   29.74 +/* top of stack page */ 
   29.75 +};
   29.76 +
   29.77 +#endif
   29.78 +
   29.79 +/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
   29.80 +#define PTRACE_GETREGS            12
   29.81 +#define PTRACE_SETREGS            13
   29.82 +#define PTRACE_GETFPREGS          14
   29.83 +#define PTRACE_SETFPREGS          15
   29.84 +#define PTRACE_GETFPXREGS         18
   29.85 +#define PTRACE_SETFPXREGS         19
   29.86 +
   29.87 +#if !defined(__ASSEMBLY__) 
   29.88 +
   29.89 +#define instruction_pointer(regs) ((regs)->rip)
   29.90 +extern void show_regs(struct xen_regs *);
   29.91 +
   29.92 +enum {
   29.93 +        EF_CF   = 0x00000001,
   29.94 +        EF_PF   = 0x00000004,
   29.95 +        EF_AF   = 0x00000010,
   29.96 +        EF_ZF   = 0x00000040,
   29.97 +        EF_SF   = 0x00000080,
   29.98 +        EF_TF   = 0x00000100,
   29.99 +        EF_IE   = 0x00000200,
  29.100 +        EF_DF   = 0x00000400,
  29.101 +        EF_OF   = 0x00000800,
  29.102 +        EF_IOPL = 0x00003000,
  29.103 +        EF_IOPL_RING0 = 0x00000000,
  29.104 +        EF_IOPL_RING1 = 0x00001000,
  29.105 +        EF_IOPL_RING2 = 0x00002000,
  29.106 +        EF_NT   = 0x00004000,   /* nested task */
  29.107 +        EF_RF   = 0x00010000,   /* resume */
  29.108 +        EF_VM   = 0x00020000,   /* virtual mode */
  29.109 +        EF_AC   = 0x00040000,   /* alignment */
  29.110 +        EF_VIF  = 0x00080000,   /* virtual interrupt */
  29.111 +        EF_VIP  = 0x00100000,   /* virtual interrupt pending */
  29.112 +        EF_ID   = 0x00200000,   /* id */
  29.113 +};
  29.114 +
  29.115 +#endif
  29.116 +
  29.117 +#endif
    30.1 --- a/xen/include/xen/irq.h	Mon Nov 01 10:00:03 2004 +0000
    30.2 +++ b/xen/include/xen/irq.h	Mon Nov 01 15:28:24 2004 +0000
    30.3 @@ -3,12 +3,12 @@
    30.4  
    30.5  #include <xen/config.h>
    30.6  #include <xen/spinlock.h>
    30.7 -#include <asm/ptrace.h>
    30.8 +#include <asm/regs.h>
    30.9  #include <asm/hardirq.h>
   30.10  
   30.11  struct irqaction
   30.12  {
   30.13 -    void (*handler)(int, void *, struct pt_regs *);
   30.14 +    void (*handler)(int, void *, struct xen_regs *);
   30.15      const char *name;
   30.16      void *dev_id;
   30.17  };
   30.18 @@ -62,7 +62,7 @@ extern int setup_irq(unsigned int, struc
   30.19  extern void free_irq(unsigned int);
   30.20  
   30.21  extern hw_irq_controller no_irq_type;
   30.22 -extern void no_action(int cpl, void *dev_id, struct pt_regs *regs);
   30.23 +extern void no_action(int cpl, void *dev_id, struct xen_regs *regs);
   30.24  
   30.25  struct domain;
   30.26  extern int pirq_guest_unmask(struct domain *p);
    31.1 --- a/xen/include/xen/keyhandler.h	Mon Nov 01 10:00:03 2004 +0000
    31.2 +++ b/xen/include/xen/keyhandler.h	Mon Nov 01 15:28:24 2004 +0000
    31.3 @@ -7,7 +7,7 @@
    31.4  #include <xen/sched.h>
    31.5  
    31.6  typedef void key_handler(unsigned char key, void *dev_id, 
    31.7 -			 struct pt_regs *regs); 
    31.8 +			 struct xen_regs *regs); 
    31.9  
   31.10  extern void add_key_handler(unsigned char key, 
   31.11  			    key_handler *handler, char *desc); 
    32.1 --- a/xen/include/xen/sched.h	Mon Nov 01 10:00:03 2004 +0000
    32.2 +++ b/xen/include/xen/sched.h	Mon Nov 01 15:28:24 2004 +0000
    32.3 @@ -6,7 +6,7 @@
    32.4  #include <xen/config.h>
    32.5  #include <xen/types.h>
    32.6  #include <xen/spinlock.h>
    32.7 -#include <asm/ptrace.h>
    32.8 +#include <asm/regs.h>
    32.9  #include <xen/smp.h>
   32.10  #include <asm/page.h>
   32.11  #include <asm/processor.h>
    33.1 --- a/xen/include/xen/serial.h	Mon Nov 01 10:00:03 2004 +0000
    33.2 +++ b/xen/include/xen/serial.h	Mon Nov 01 15:28:24 2004 +0000
    33.3 @@ -11,7 +11,7 @@
    33.4  #ifndef __XEN_SERIAL_H__
    33.5  #define __XEN_SERIAL_H__
    33.6  
    33.7 -#include <asm/ptrace.h>
    33.8 +#include <asm/regs.h>
    33.9  
   33.10  /* 'Serial handles' are comprise the following fields. */
   33.11  #define SERHND_IDX      (1<<0) /* COM1 or COM2?                           */
   33.12 @@ -27,7 +27,7 @@ void serial_init_stage2(void);
   33.13  int parse_serial_handle(char *conf);
   33.14  
   33.15  /* Register a character-receive hook on the specified COM port. */
   33.16 -typedef void (*serial_rx_fn)(unsigned char, struct pt_regs *);
   33.17 +typedef void (*serial_rx_fn)(unsigned char, struct xen_regs *);
   33.18  void serial_set_rx_handler(int handle, serial_rx_fn fn);
   33.19  
   33.20  /* Transmit a single character via the specified COM port. */