Changeset 15706 for release/1.9/source/lisp-kernel/x86-exceptions.c

Timestamp:

Feb 15, 2013, 7:24:29 AM (7 years ago)

Author:

gb

Message:

Propagate recent trunk changes.

Location:

release/1.9/source/lisp-kernel

Files:

• . (modified) (1 prop)
• x86-exceptions.c (modified) (4 diffs)

release/1.9/source/lisp-kernel/x86-exceptions.c

@@ -1506 +1506 @@
 #endif
 
+
+#ifdef FREEBSD
+typedef void *FPREGS;
+
+
+LispObj *
+copy_avx(ExceptionInformation *xp, LispObj *current, FPREGS *destptr)
+{
+  natural sp;
+
+  *destptr = (FPREGS)AVX_CONTEXT_PTR(xp);
+
+  if (AVX_CONTEXT_PRESENT(xp)) {
+    sp = (natural)current;
+    sp -= AVX_CONTEXT_SIZE(xp);
+    sp = truncate_to_power_of_2(sp,6);
+    memcpy((void *)sp,(void *)AVX_CONTEXT_PTR(xp),AVX_CONTEXT_SIZE(xp));
+    current = (LispObj *)sp;
+    *destptr = (FPREGS)current;
+  }
+  return current;
+}
+#endif
+
 #ifdef DARWIN
 LispObj *
@@ -1552 +1576 @@
 #ifdef LINUX
   dest->uc_mcontext.fpregs = (fpregset_t)fp;
+#endif
+#ifdef FREEBSD
+  if (AVX_CONTEXT_PRESENT(context)) {
+    AVX_CONTEXT_PTR(context) = (natural)fp;
+  }
 #endif
   dest->uc_stack.ss_sp = 0;
@@ -1664 +1693 @@
 #ifdef LINUX
   foreign_rsp = copy_fpregs(context, foreign_rsp, &fpregs);
+#endif
+#ifdef FREEBSD
+  foreign_rsp = copy_avx(context, foreign_rsp, &fpregs);
 #endif
 #ifdef DARWIN
@@ -2345 +2377 @@
   stack.ss_size = SIGSTKSZ*8;
   stack.ss_flags = 0;
-#ifdef SEPARATE_ALTSTACK
   stack.ss_sp = mmap(NULL,stack.ss_size, PROT_READ|PROT_WRITE|PROT_EXEC,MAP_ANON|MAP_PRIVATE,-1,0);
-#else
-  stack.ss_sp = a->low;
-  a->low += SIGSTKSZ*8;
-  mmap(stack.ss_sp,stack.ss_size, PROT_READ|PROT_WRITE|PROT_EXEC,MAP_FIXED|MAP_ANON|MAP_PRIVATE,-1,0);
-#endif
 #ifdef LINUX
   /* The ucontext pushed on the altstack may not contain the (largish)