Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / arch / um / os-Linux / sys-i386 / registers.c

diff --git a/arch/um/os-Linux/sys-i386/registers.c b/arch/um/os-Linux/sys-i386/registers.c
index 84b44f9cd42a48e0299d0e3e5caeb940a5544a94..b613473b3ec1c1ef9ba83da234a207ef6f08aa38 100644 (file)
--- a/arch/um/os-Linux/sys-i386/registers.c
+++ b/arch/um/os-Linux/sys-i386/registers.c
@@ -1,144 +1,89 @@
 /*
  * Copyright (C) 2004 PathScale, Inc
+ * Copyright (C) 2004 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Licensed under the GPL
  */
 
 #include <errno.h>
-#include <string.h>
-#include "sysdep/ptrace_user.h"
-#include "sysdep/ptrace.h"
-#include "uml-config.h"
-#include "skas_ptregs.h"
-#include "registers.h"
+#include "kern_constants.h"
 #include "longjmp.h"
 #include "user.h"
+#include "sysdep/ptrace_user.h"
 
-/* These are set once at boot time and not changed thereafter */
-
-static unsigned long exec_regs[MAX_REG_NR];
-static unsigned long exec_fp_regs[HOST_FP_SIZE];
-static unsigned long exec_fpx_regs[HOST_XFP_SIZE];
-static int have_fpx_regs = 1;
-
-void init_thread_registers(union uml_pt_regs *to)
-{
-       memcpy(to->skas.regs, exec_regs, sizeof(to->skas.regs));
-       memcpy(to->skas.fp, exec_fp_regs, sizeof(to->skas.fp));
-       if(have_fpx_regs)
-               memcpy(to->skas.xfp, exec_fpx_regs, sizeof(to->skas.xfp));
-}
-
-/* XXX These need to use [GS]ETFPXREGS and copy_sc_{to,from}_user_skas needs
- * to pass in a sufficiently large buffer
- */
 int save_fp_registers(int pid, unsigned long *fp_regs)
 {
-       if(ptrace(PTRACE_GETFPREGS, pid, 0, fp_regs) < 0)
+       if (ptrace(PTRACE_GETFPREGS, pid, 0, fp_regs) < 0)
                return -errno;
        return 0;
 }
 
 int restore_fp_registers(int pid, unsigned long *fp_regs)
 {
-       if(ptrace(PTRACE_SETFPREGS, pid, 0, fp_regs) < 0)
+       if (ptrace(PTRACE_SETFPREGS, pid, 0, fp_regs) < 0)
                return -errno;
        return 0;
 }
 
-static int move_registers(int pid, int int_op, union uml_pt_regs *regs,
-                         int fp_op, unsigned long *fp_regs)
+int save_fpx_registers(int pid, unsigned long *fp_regs)
 {
-       if(ptrace(int_op, pid, 0, regs->skas.regs) < 0)
+       if (ptrace(PTRACE_GETFPXREGS, pid, 0, fp_regs) < 0)
                return -errno;
+       return 0;
+}
 
-       if(ptrace(fp_op, pid, 0, fp_regs) < 0)
+int restore_fpx_registers(int pid, unsigned long *fp_regs)
+{
+       if (ptrace(PTRACE_SETFPXREGS, pid, 0, fp_regs) < 0)
                return -errno;
-
        return 0;
 }
 
-void save_registers(int pid, union uml_pt_regs *regs)
+unsigned long get_thread_reg(int reg, jmp_buf *buf)
 {
-       unsigned long *fp_regs;
-       int err, fp_op;
-
-       if(have_fpx_regs){
-               fp_op = PTRACE_GETFPXREGS;
-               fp_regs = regs->skas.xfp;
-       }
-       else {
-               fp_op = PTRACE_GETFPREGS;
-               fp_regs = regs->skas.fp;
+       switch (reg) {
+       case EIP:
+               return buf[0]->__eip;
+       case UESP:
+               return buf[0]->__esp;
+       case EBP:
+               return buf[0]->__ebp;
+       default:
+               printk(UM_KERN_ERR "get_thread_regs - unknown register %d\n",
+                      reg);
+               return 0;
        }
-
-       err = move_registers(pid, PTRACE_GETREGS, regs, fp_op, fp_regs);
-       if(err)
-               panic("save_registers - saving registers failed, errno = %d\n",
-                     -err);
 }
 
-void restore_registers(int pid, union uml_pt_regs *regs)
-{
-       unsigned long *fp_regs;
-       int err, fp_op;
+int have_fpx_regs = 1;
 
-       if(have_fpx_regs){
-               fp_op = PTRACE_SETFPXREGS;
-               fp_regs = regs->skas.xfp;
-       }
-       else {
-               fp_op = PTRACE_SETFPREGS;
-               fp_regs = regs->skas.fp;
-       }
+int get_fp_registers(int pid, unsigned long *regs)
+{
+       if (have_fpx_regs)
+               return save_fpx_registers(pid, regs);
+       else
+               return save_fp_registers(pid, regs);
+}
 
-       err = move_registers(pid, PTRACE_SETREGS, regs, fp_op, fp_regs);
-       if(err)
-               panic("restore_registers - saving registers failed, "
-                     "errno = %d\n", -err);
+int put_fp_registers(int pid, unsigned long *regs)
+{
+       if (have_fpx_regs)
+               return restore_fpx_registers(pid, regs);
+       else
+               return restore_fp_registers(pid, regs);
 }
 
-void init_registers(int pid)
+void arch_init_registers(int pid)
 {
+       unsigned long fpx_regs[HOST_XFP_SIZE];
        int err;
 
-       memset(exec_regs, 0, sizeof(exec_regs));
-       err = ptrace(PTRACE_GETREGS, pid, 0, exec_regs);
-       if(err)
-               panic("check_ptrace : PTRACE_GETREGS failed, errno = %d",
-                     errno);
-
-       errno = 0;
-       err = ptrace(PTRACE_GETFPXREGS, pid, 0, exec_fpx_regs);
-       if(!err)
+       err = ptrace(PTRACE_GETFPXREGS, pid, 0, fpx_regs);
+       if (!err)
                return;
-       if(errno != EIO)
+
+       if (errno != EIO)
                panic("check_ptrace : PTRACE_GETFPXREGS failed, errno = %d",
                      errno);
 
        have_fpx_regs = 0;
-
-       err = ptrace(PTRACE_GETFPREGS, pid, 0, exec_fp_regs);
-       if(err)
-               panic("check_ptrace : PTRACE_GETFPREGS failed, errno = %d",
-                     errno);
-}
-
-void get_safe_registers(unsigned long *regs, unsigned long *fp_regs)
-{
-       memcpy(regs, exec_regs, sizeof(exec_regs));
-       if(fp_regs != NULL)
-               memcpy(fp_regs, exec_fp_regs,
-                      HOST_FP_SIZE * sizeof(unsigned long));
-}
-
-unsigned long get_thread_reg(int reg, jmp_buf *buf)
-{
-       switch(reg){
-       case EIP: return buf[0]->__eip;
-       case UESP: return buf[0]->__esp;
-       case EBP: return buf[0]->__ebp;
-       default:
-               printk("get_thread_regs - unknown register %d\n", reg);
-               return 0;
-       }
 }