Merge branch 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[pandora-kernel.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 7a6f6b9..79cd93c 100644 (file)
--- a/arch/um/os-Linux/sys-i386/registers.c
+++ b/arch/um/os-Linux/sys-i386/registers.c
@@ -5,12 +5,12 @@
 
 #include <errno.h>
 #include <string.h>
-#include <setjmp.h>
 #include "sysdep/ptrace_user.h"
 #include "sysdep/ptrace.h"
 #include "uml-config.h"
 #include "skas_ptregs.h"
 #include "registers.h"
+#include "longjmp.h"
 #include "user.h"
 
 /* These are set once at boot time and not changed thereafter */
@@ -34,27 +34,27 @@ void init_thread_registers(union uml_pt_regs *to)
 int save_fp_registers(int pid, unsigned long *fp_regs)
 {
        if(ptrace(PTRACE_GETFPREGS, pid, 0, fp_regs) < 0)
-               return(-errno);
-       return(0);
+               return -errno;
+       return 0;
 }
 
 int restore_fp_registers(int pid, unsigned long *fp_regs)
 {
        if(ptrace(PTRACE_SETFPREGS, pid, 0, fp_regs) < 0)
-               return(-errno);
-       return(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)
 {
        if(ptrace(int_op, pid, 0, regs->skas.regs) < 0)
-               return(-errno);
+               return -errno;
 
        if(ptrace(fp_op, pid, 0, fp_regs) < 0)
-               return(-errno);
+               return -errno;
 
-       return(0);
+       return 0;
 }
 
 void save_registers(int pid, union uml_pt_regs *regs)
@@ -104,7 +104,7 @@ void init_registers(int pid)
        err = ptrace(PTRACE_GETREGS, pid, 0, exec_regs);
        if(err)
                panic("check_ptrace : PTRACE_GETREGS failed, errno = %d",
-                     err);
+                     errno);
 
        errno = 0;
        err = ptrace(PTRACE_GETFPXREGS, pid, 0, exec_fpx_regs);
@@ -119,7 +119,7 @@ void init_registers(int pid)
        err = ptrace(PTRACE_GETFPREGS, pid, 0, exec_fp_regs);
        if(err)
                panic("check_ptrace : PTRACE_GETFPREGS failed, errno = %d",
-                     err);
+                     errno);
 }
 
 void get_safe_registers(unsigned long *regs, unsigned long *fp_regs)
@@ -130,11 +130,14 @@ void get_safe_registers(unsigned long *regs, unsigned long *fp_regs)
                       HOST_FP_SIZE * sizeof(unsigned long));
 }
 
-void get_thread_regs(union uml_pt_regs *uml_regs, void *buffer)
+unsigned long get_thread_reg(int reg, jmp_buf *buf)
 {
-       struct __jmp_buf_tag *jmpbuf = buffer;
-
-       UPT_SET(uml_regs, EIP, jmpbuf->__jmpbuf[JB_PC]);
-       UPT_SET(uml_regs, UESP, jmpbuf->__jmpbuf[JB_SP]);
-       UPT_SET(uml_regs, EBP, jmpbuf->__jmpbuf[JB_BP]);
+       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;
+       }
 }