VM: Refactor os-* to Factor style

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

diff --git a/vm/os-macosx-x86.32.hpp b/vm/os-macosx-x86.32.hpp
index 12a351ae58e264ab29a870c30695eaa0efc1ce5a..58c63081b6e90d621a63ad08c81308c5947f745e 100644 (file)
--- a/vm/os-macosx-x86.32.hpp
+++ b/vm/os-macosx-x86.32.hpp
@@ -1,7 +1,6 @@
 #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>
@@ -28,51 +27,46 @@ Modified for Factor by Slava Pestov */
 #define MACH_FLOAT_STATE_COUNT i386_FLOAT_STATE_COUNT
 
 #if __DARWIN_UNIX03
-       #define MACH_EXC_STATE_FAULT(exc_state) (exc_state)->__faultvaddr
-       #define MACH_STACK_POINTER(thr_state) (thr_state)->__esp
-       #define MACH_PROGRAM_COUNTER(thr_state) (thr_state)->__eip
+#define MACH_EXC_STATE_FAULT(exc_state) (exc_state)->__faultvaddr
+#define MACH_STACK_POINTER(thr_state) (thr_state)->__esp
+#define MACH_PROGRAM_COUNTER(thr_state) (thr_state)->__eip
 
-       #define UAP_SS(ucontext) &(((ucontext_t *)(ucontext))->uc_mcontext->__ss)
-       #define UAP_FS(ucontext) &(((ucontext_t *)(ucontext))->uc_mcontext->__fs)
+#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 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)->esp
-       #define MACH_PROGRAM_COUNTER(thr_state) (thr_state)->eip
+#define MACH_EXC_STATE_FAULT(exc_state) (exc_state)->faultvaddr
+#define MACH_STACK_POINTER(thr_state) (thr_state)->esp
+#define MACH_PROGRAM_COUNTER(thr_state) (thr_state)->eip
 
-       #define UAP_SS(ucontext) &(((ucontext_t *)(ucontext))->uc_mcontext->ss)
-       #define UAP_FS(ucontext) &(((ucontext_t *)(ucontext))->uc_mcontext->fs)
+#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 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(i386_float_state_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(i386_float_state_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 void mach_clear_fpu_status(i386_float_state_t *float_state)
-{
-       MXCSR(float_state) &= 0xffffffc0;
-       memset(&X87SW(float_state), 0, sizeof(X87SW(float_state)));
+inline static void mach_clear_fpu_status(i386_float_state_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));
 }
 
 }