Put brackets around ipv6 addresses in `inet6 present`

[factor.git] / vm / os-macosx-x86.64.hpp

diff --git a/vm/os-macosx-x86.64.hpp b/vm/os-macosx-x86.64.hpp
index fd6db4d68cc02a093901c4aaf68650f415c8a001..b7ab0b5983c64447d5076da6038ff8cb14d1dd3c 100644 (file)
--- a/vm/os-macosx-x86.64.hpp
+++ b/vm/os-macosx-x86.64.hpp
@@ -1,18 +1,17 @@
 #include <sys/ucontext.h>
 
-namespace factor
-{
+namespace factor {
 
-/* Fault handler information.  MacOSX version.
-Copyright (C) 1993-1999, 2002-2003  Bruno Haible <clisp.org at bruno>
-Copyright (C) 2003  Paolo Bonzini <gnu.org at bonzini>
+// Fault handler information.  MacOSX version.
+// Copyright (C) 1993-1999, 2002-2003  Bruno Haible <clisp.org at bruno>
+// Copyright (C) 2003  Paolo Bonzini <gnu.org at bonzini>
 
-Used under BSD license with permission from Paolo Bonzini and Bruno Haible,
-2005-03-10:
+// Used under BSD license with permission from Paolo Bonzini and Bruno Haible,
+// 2005-03-10:
 
-http://sourceforge.net/mailarchive/message.php?msg_name=200503102200.32002.bruno%40clisp.org
+// http://sourceforge.net/mailarchive/message.php?msg_name=200503102200.32002.bruno%40clisp.org
 
-Modified for Factor by Slava Pestov and Daniel Ehrenberg */
+// Modified for Factor by Slava Pestov and Daniel Ehrenberg
 #define MACH_EXC_STATE_TYPE x86_exception_state64_t
 #define MACH_EXC_STATE_FLAVOR x86_EXCEPTION_STATE64
 #define MACH_EXC_STATE_COUNT x86_EXCEPTION_STATE64_COUNT
@@ -28,54 +27,48 @@ Modified for Factor by Slava Pestov and Daniel Ehrenberg */
 #define MACH_FLOAT_STATE_COUNT x86_FLOAT_STATE64_COUNT
 
 #if __DARWIN_UNIX03
-       #define MACH_EXC_STATE_FAULT(exc_state) (exc_state)->__faultvaddr
-       #define MACH_STACK_POINTER(thr_state) (thr_state)->__rsp
-       #define MACH_PROGRAM_COUNTER(thr_state) (thr_state)->__rip
-        #define UAP_SS(ucontext) &(((ucontext_t *)(ucontext))->uc_mcontext->__ss)
-        #define UAP_FS(ucontext) &(((ucontext_t *)(ucontext))->uc_mcontext->__fs)
-
-        #define MXCSR(float_state) (float_state)->__fpu_mxcsr
-        #define X87SW(float_state) (float_state)->__fpu_fsw
+#define MACH_EXC_STATE_FAULT(exc_state) (exc_state)->__faultvaddr
+#define MACH_STACK_POINTER(thr_state) (thr_state)->__rsp
+#define MACH_PROGRAM_COUNTER(thr_state) (thr_state)->__rip
+#define UAP_SS(ucontext) &(((ucontext_t*)(ucontext))->uc_mcontext->__ss)
+#define UAP_FS(ucontext) &(((ucontext_t*)(ucontext))->uc_mcontext->__fs)
+
+#define MXCSR(float_state) (float_state)->__fpu_mxcsr
+#define X87SW(float_state) (float_state)->__fpu_fsw
 #else
-       #define MACH_EXC_STATE_FAULT(exc_state) (exc_state)->faultvaddr
-       #define MACH_STACK_POINTER(thr_state) (thr_state)->rsp
-       #define MACH_PROGRAM_COUNTER(thr_state) (thr_state)->rip
-        #define UAP_SS(ucontext) &(((ucontext_t *)(ucontext))->uc_mcontext->ss)
-        #define UAP_FS(ucontext) &(((ucontext_t *)(ucontext))->uc_mcontext->fs)
-
-        #define MXCSR(float_state) (float_state)->fpu_mxcsr
-        #define X87SW(float_state) (float_state)->fpu_fsw
+#define MACH_EXC_STATE_FAULT(exc_state) (exc_state)->faultvaddr
+#define MACH_STACK_POINTER(thr_state) (thr_state)->rsp
+#define MACH_PROGRAM_COUNTER(thr_state) (thr_state)->rip
+#define UAP_SS(ucontext) &(((ucontext_t*)(ucontext))->uc_mcontext->ss)
+#define UAP_FS(ucontext) &(((ucontext_t*)(ucontext))->uc_mcontext->fs)
+
+#define MXCSR(float_state) (float_state)->fpu_mxcsr
+#define X87SW(float_state) (float_state)->fpu_fsw
 #endif
 
-#define UAP_PROGRAM_COUNTER(ucontext) \
-        MACH_PROGRAM_COUNTER(UAP_SS(ucontext))
+#define UAP_PROGRAM_COUNTER(ucontext) MACH_PROGRAM_COUNTER(UAP_SS(ucontext))
 
-inline static unsigned int mach_fpu_status(x86_float_state64_t *float_state)
-{
-       unsigned short x87sw;
-       memcpy(&x87sw, &X87SW(float_state), sizeof(x87sw));
-       return MXCSR(float_state) | x87sw;
+inline static unsigned int mach_fpu_status(x86_float_state64_t* float_state) {
+  unsigned short x87sw;
+  memcpy(&x87sw, &X87SW(float_state), sizeof(x87sw));
+  return MXCSR(float_state) | x87sw;
 }
 
-inline static unsigned int uap_fpu_status(void *uap)
-{
-       return mach_fpu_status(UAP_FS(uap));
+inline static unsigned int uap_fpu_status(void* uap) {
+  return mach_fpu_status(UAP_FS(uap));
 }
 
-inline static cell fix_stack_pointer(cell sp)
-{
-       return ((sp + 8) & ~15) - 8;
+inline static void mach_clear_fpu_status(x86_float_state64_t* float_state) {
+  MXCSR(float_state) &= 0xffffffc0;
+  memset(&X87SW(float_state), 0, sizeof(X87SW(float_state)));
 }
 
-inline static void mach_clear_fpu_status(x86_float_state64_t *float_state)
-{
-       MXCSR(float_state) &= 0xffffffc0;
-       memset(&X87SW(float_state), 0, sizeof(X87SW(float_state)));
+inline static void uap_clear_fpu_status(void* uap) {
+  mach_clear_fpu_status(UAP_FS(uap));
 }
 
-inline static void uap_clear_fpu_status(void *uap)
-{
-       mach_clear_fpu_status(UAP_FS(uap));
-}
+// Must match the stack-frame-size constant in
+// basis/bootstrap/assembler/x86.64.unix.factor
+static const unsigned JIT_FRAME_SIZE = 32;
 
 }