summaryrefslogtreecommitdiff
path: root/arch/um/os-Linux/sys-i386
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2006-09-25 23:32:59 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-26 08:49:05 -0700
commit13c06be399902c9ebda08e092edb1614bb4a3761 (patch)
treec67134cfb7efd23ab7017fde32657fa3a7e58154 /arch/um/os-Linux/sys-i386
parentc5c6ba4e08ab9c9e390a0f3a7d9a5c332f5cc6ef (diff)
[PATCH] uml: Use klibc setjmp/longjmp
This patch adds an implementation of setjmp and longjmp to UML, allowing access to the inside of a jmpbuf without needing the access macros formerly provided by libc. The implementation is stolen from klibc. I copy the relevant files into arch/um. I have another patch which avoids the copying, but requires klibc be in the tree. setjmp and longjmp users required some tweaking. Includes of <setjmp.h> were removed and includes of the UML longjmp.h were added where necessary. There are also replacements of siglongjmp with UML_LONGJMP which I somehow missed earlier. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/os-Linux/sys-i386')
-rw-r--r--arch/um/os-Linux/sys-i386/registers.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/um/os-Linux/sys-i386/registers.c b/arch/um/os-Linux/sys-i386/registers.c
index 516f66dd87e3..1f90a2d71386 100644
--- 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 */
@@ -132,9 +132,9 @@ void get_safe_registers(unsigned long *regs, unsigned long *fp_regs)
void get_thread_regs(union uml_pt_regs *uml_regs, void *buffer)
{
- struct __jmp_buf_tag *jmpbuf = buffer;
+ struct __jmp_buf *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]);
+ UPT_SET(uml_regs, EIP, jmpbuf->__eip);
+ UPT_SET(uml_regs, UESP, jmpbuf->__esp);
+ UPT_SET(uml_regs, EBP, jmpbuf->__ebp);
}