Fix spaces that crept into vm/ cpp files

diff --git a/vm/Config.macosx b/vm/Config.macosx
index 07629f72bbdd0a400dd98e954b07d200500c36ff..89fe239668bd53f2c1af3b78ff49c05d14cbbcc7 100644 (file)
--- a/vm/Config.macosx
+++ b/vm/Config.macosx
@@ -11,7 +11,7 @@ SHARED_FLAG = -dynamiclib
 ifdef X11
        LIBS = -lm -framework Cocoa -L/opt/local/lib $(X11_UI_LIBS) -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
 else
-    LIBS = -lm -framework Cocoa -framework AppKit
+       LIBS = -lm -framework Cocoa -framework AppKit
 endif
 
 LINKER = $(CPP) $(CFLAGS) -dynamiclib -single_module -std=gnu99 \

diff --git a/vm/bignumint.hpp b/vm/bignumint.hpp
index 57c71959c3d5a7891a8ddf040f594b39da97b4a4..ff0d86a681076f835d029bc7e0cc1061b7534a26 100644 (file)
--- a/vm/bignumint.hpp
+++ b/vm/bignumint.hpp
@@ -96,7 +96,7 @@ typedef fixnum bignum_length_type;
 #define BIGNUM_ASSERT(expression)                                      \
 {                                                                      \
   if (! (expression))                                                  \
-    BIGNUM_EXCEPTION ();                                               \
+       BIGNUM_EXCEPTION ();                                            \
 }
 
 #endif /* not BIGNUM_DISABLE_ASSERTION_CHECKS */

diff --git a/vm/cpu-ppc.hpp b/vm/cpu-ppc.hpp
index d284cbce78e4c7f6f7bb7b267a3ad13249413437..d09fc173ea5bcc1348d783ec811b825cac9df6d9 100644 (file)
--- a/vm/cpu-ppc.hpp
+++ b/vm/cpu-ppc.hpp
@@ -58,20 +58,20 @@ inline static bool tail_call_site_p(cell return_address)
 
 inline static unsigned int fpu_status(unsigned int status)
 {
-        unsigned int r = 0;
+       unsigned int r = 0;
 
-        if (status & 0x20000000)
+       if (status & 0x20000000)
                r |= FP_TRAP_INVALID_OPERATION;
-        if (status & 0x10000000)
+       if (status & 0x10000000)
                r |= FP_TRAP_OVERFLOW;
-        if (status & 0x08000000)
+       if (status & 0x08000000)
                r |= FP_TRAP_UNDERFLOW;
-        if (status & 0x04000000)
+       if (status & 0x04000000)
                r |= FP_TRAP_ZERO_DIVIDE;
-        if (status & 0x02000000)
+       if (status & 0x02000000)
                r |= FP_TRAP_INEXACT;
 
-        return r;
+       return r;
 }
 
 /* Defined in assembly */

diff --git a/vm/cpu-x86.hpp b/vm/cpu-x86.hpp
index 5f9fa15740d1e89ecca66a4a439bc25f00c2a5c5..ac8ac51ade6b3abc13960f32bbb6be0ca7e49c47 100644 (file)
--- a/vm/cpu-x86.hpp
+++ b/vm/cpu-x86.hpp
@@ -55,20 +55,20 @@ inline static bool tail_call_site_p(cell return_address)
 
 inline static unsigned int fpu_status(unsigned int status)
 {
-        unsigned int r = 0;
+       unsigned int r = 0;
        
-        if (status & 0x01)
+       if (status & 0x01)
                r |= FP_TRAP_INVALID_OPERATION;
-        if (status & 0x04)
+       if (status & 0x04)
                r |= FP_TRAP_ZERO_DIVIDE;
-        if (status & 0x08)
+       if (status & 0x08)
                r |= FP_TRAP_OVERFLOW;
-        if (status & 0x10)
+       if (status & 0x10)
                r |= FP_TRAP_UNDERFLOW;
-        if (status & 0x20)
+       if (status & 0x20)
                r |= FP_TRAP_INEXACT;
 
-        return r;
+       return r;
 }
 
 }

diff --git a/vm/data_heap.cpp b/vm/data_heap.cpp
index d1809f09cebf92d7c1b306f733f9c76b58fe9e78..22ef39e8681f54d3f9f886bf1f04c5da5cc2b598 100755 (executable)
--- a/vm/data_heap.cpp
+++ b/vm/data_heap.cpp
@@ -201,7 +201,7 @@ cell object::binary_payload_start() const
                return sizeof(wrapper);
        default:
                critical_error("Invalid header",(cell)this);
-                return 0; /* can't happen */
+               return 0; /* can't happen */
        }
 }
 

diff --git a/vm/full_collector.cpp b/vm/full_collector.cpp
index ec0972e952b709ea20eb8b8889bc0e9b37225023..849ef07084493e7d31a81437e77c4c3106e9ebbc 100644 (file)
--- a/vm/full_collector.cpp
+++ b/vm/full_collector.cpp
@@ -67,7 +67,7 @@ void factor_vm::collect_mark_impl(bool trace_contexts_p)
        data->tenured->clear_mark_bits();
 
        collector.trace_roots();
-        if(trace_contexts_p)
+       if(trace_contexts_p)
        {
                collector.trace_contexts();
                collector.trace_context_code_blocks();

diff --git a/vm/gc.hpp b/vm/gc.hpp
index d80d57dafefefb0fd74c4028976da401251b4b8f..5224dec3e296c21b515b4d4766095733a028eb0d 100755 (executable)
--- a/vm/gc.hpp
+++ b/vm/gc.hpp
@@ -45,7 +45,7 @@ struct gc_event {
 struct gc_state {
        gc_op op;
        u64 start_time;
-        jmp_buf gc_unwind;
+       jmp_buf gc_unwind;
        gc_event *event;
 
        explicit gc_state(gc_op op_, factor_vm *parent);

diff --git a/vm/jit.hpp b/vm/jit.hpp
index 3889d92fc504fb589dee45c90a5b0b378624cb50..a9716cab79a8b93f003b1b176b4da28505029b86 100644 (file)
--- a/vm/jit.hpp
+++ b/vm/jit.hpp
@@ -61,7 +61,7 @@ struct jit {
                        return position;
        }
 
-        void set_position(fixnum position_)
+       void set_position(fixnum position_)
        {
                if(computing_offset_p)
                        position = position_;

diff --git a/vm/math.cpp b/vm/math.cpp
index ef4a59933167b2a51cd06745361cc60bce91227c..2ff6f28d2a17979a881f2cb63ae5228c78398a2a 100755 (executable)
--- a/vm/math.cpp
+++ b/vm/math.cpp
@@ -168,7 +168,7 @@ void factor_vm::primitive_bignum_xor()
 void factor_vm::primitive_bignum_shift()
 {
        fixnum y = untag_fixnum(ctx->pop());
-        bignum* x = untag<bignum>(ctx->pop());
+       bignum* x = untag<bignum>(ctx->pop());
        ctx->push(tag<bignum>(bignum_arithmetic_shift(x,y)));
 }
 

diff --git a/vm/os-freebsd-x86.32.hpp b/vm/os-freebsd-x86.32.hpp
index 5ed5cf0e81668f80b1318b8d3b1fe8a3534986b4..664da1e997b56ca6bf4a3dde20d4c0611046cc46 100644 (file)
--- a/vm/os-freebsd-x86.32.hpp
+++ b/vm/os-freebsd-x86.32.hpp
@@ -6,35 +6,35 @@ namespace factor
 
 inline static unsigned int uap_fpu_status(void *uap)
 {
-        ucontext_t *ucontext = (ucontext_t *)uap;
-        if (ucontext->uc_mcontext.mc_fpformat == _MC_FPFMT_387)
+       ucontext_t *ucontext = (ucontext_t *)uap;
+       if (ucontext->uc_mcontext.mc_fpformat == _MC_FPFMT_387)
        {
                struct save87 *x87 = (struct save87 *)(&ucontext->uc_mcontext.mc_fpstate);
                return x87->sv_env.en_sw;
-        }
+       }
        else if (ucontext->uc_mcontext.mc_fpformat == _MC_FPFMT_XMM)
        {
                struct savexmm *xmm = (struct savexmm *)(&ucontext->uc_mcontext.mc_fpstate);
                return xmm->sv_env.en_sw | xmm->sv_env.en_mxcsr;
-        }
+       }
        else
                return 0;
 }
 
 inline static void uap_clear_fpu_status(void *uap)
 {
-        ucontext_t *ucontext = (ucontext_t *)uap;
-        if (ucontext->uc_mcontext.mc_fpformat == _MC_FPFMT_387)
+       ucontext_t *ucontext = (ucontext_t *)uap;
+       if (ucontext->uc_mcontext.mc_fpformat == _MC_FPFMT_387)
        {
                struct save87 *x87 = (struct save87 *)(&ucontext->uc_mcontext.mc_fpstate);
                x87->sv_env.en_sw = 0;
-        }
+       }
        else if (ucontext->uc_mcontext.mc_fpformat == _MC_FPFMT_XMM)
        {
                struct savexmm *xmm = (struct savexmm *)(&ucontext->uc_mcontext.mc_fpstate);
                xmm->sv_env.en_sw = 0;
                xmm->sv_env.en_mxcsr &= 0xffffffc0;
-        }
+       }
 }
 
 

diff --git a/vm/os-freebsd-x86.64.hpp b/vm/os-freebsd-x86.64.hpp
index 02f7fb3ad2ae45b6361f329dec688f7f6d21f62f..c691409dd10415f38be1601f9f3dbbf5f516de88 100644 (file)
--- a/vm/os-freebsd-x86.64.hpp
+++ b/vm/os-freebsd-x86.64.hpp
@@ -6,25 +6,25 @@ namespace factor
 
 inline static unsigned int uap_fpu_status(void *uap)
 {
-        ucontext_t *ucontext = (ucontext_t *)uap;
-        if (ucontext->uc_mcontext.mc_fpformat == _MC_FPFMT_XMM)
+       ucontext_t *ucontext = (ucontext_t *)uap;
+       if (ucontext->uc_mcontext.mc_fpformat == _MC_FPFMT_XMM)
        {
                struct savefpu *xmm = (struct savefpu *)(&ucontext->uc_mcontext.mc_fpstate);
                return xmm->sv_env.en_sw | xmm->sv_env.en_mxcsr;
-        }
+       }
        else
                return 0;
 }
 
 inline static void uap_clear_fpu_status(void *uap)
 {
-        ucontext_t *ucontext = (ucontext_t *)uap;
-        if (ucontext->uc_mcontext.mc_fpformat == _MC_FPFMT_XMM)
+       ucontext_t *ucontext = (ucontext_t *)uap;
+       if (ucontext->uc_mcontext.mc_fpformat == _MC_FPFMT_XMM)
        {
                struct savefpu *xmm = (struct savefpu *)(&ucontext->uc_mcontext.mc_fpstate);
                xmm->sv_env.en_sw = 0;
                xmm->sv_env.en_mxcsr &= 0xffffffc0;
-        }
+       }
 }
 
 

diff --git a/vm/os-linux-x86.64.hpp b/vm/os-linux-x86.64.hpp
index 14ba9fb00255485b994926d8ef4de64dc6aade25..7d764d61e34ddd4ab63a500e9f39e68303c68f93 100644 (file)
--- a/vm/os-linux-x86.64.hpp
+++ b/vm/os-linux-x86.64.hpp
@@ -5,16 +5,16 @@ namespace factor
 
 inline static unsigned int uap_fpu_status(void *uap)
 {
-        ucontext_t *ucontext = (ucontext_t *)uap;
-        return ucontext->uc_mcontext.fpregs->swd
-             | ucontext->uc_mcontext.fpregs->mxcsr;
+       ucontext_t *ucontext = (ucontext_t *)uap;
+       return ucontext->uc_mcontext.fpregs->swd
+               | ucontext->uc_mcontext.fpregs->mxcsr;
 }
 
 inline static void uap_clear_fpu_status(void *uap)
 {
-        ucontext_t *ucontext = (ucontext_t *)uap;
-        ucontext->uc_mcontext.fpregs->swd = 0;
-        ucontext->uc_mcontext.fpregs->mxcsr &= 0xffffffc0;
+       ucontext_t *ucontext = (ucontext_t *)uap;
+       ucontext->uc_mcontext.fpregs->swd = 0;
+       ucontext->uc_mcontext.fpregs->mxcsr &= 0xffffffc0;
 }
 
 #define UAP_STACK_POINTER(ucontext) (((ucontext_t *)ucontext)->uc_mcontext.gregs[15])

diff --git a/vm/os-windows-nt.cpp b/vm/os-windows-nt.cpp
index 644ff83b442653cf3e9dd7216229c2cb7a5a827f..07d428fb4925a7bd33b23f6aecb522945213ea98 100755 (executable)
--- a/vm/os-windows-nt.cpp
+++ b/vm/os-windows-nt.cpp
@@ -79,12 +79,12 @@ LONG factor_vm::exception_handler(PEXCEPTION_POINTERS pe)
        else
                signal_callstack_top = NULL;
 
-        switch (e->ExceptionCode)
-        {
-        case EXCEPTION_ACCESS_VIOLATION:
+       switch (e->ExceptionCode)
+       {
+       case EXCEPTION_ACCESS_VIOLATION:
                signal_fault_addr = e->ExceptionInformation[1];
                c->EIP = (cell)factor::memory_signal_handler_impl;
-                break;
+               break;
 
        case STATUS_FLOAT_DENORMAL_OPERAND:
        case STATUS_FLOAT_DIVIDE_BY_ZERO:

diff --git a/vm/vm.hpp b/vm/vm.hpp
index 5d9b3204d3babebdc807c9decaf6263c78d539c8..20a837a58a90efce91901b569f8ab21c43f834fe 100755 (executable)
--- a/vm/vm.hpp
+++ b/vm/vm.hpp
@@ -184,20 +184,20 @@ struct factor_vm
        void bignum_destructive_add(bignum * bignum, bignum_digit_type n);
        void bignum_destructive_scale_up(bignum * bignum, bignum_digit_type factor);
        void bignum_divide_unsigned_large_denominator(bignum * numerator, bignum * denominator,
-                                                     bignum * * quotient, bignum * * remainder, int q_negative_p, int r_negative_p);
+                                                       bignum * * quotient, bignum * * remainder, int q_negative_p, int r_negative_p);
        void bignum_divide_unsigned_normalized(bignum * u, bignum * v, bignum * q);
        bignum_digit_type bignum_divide_subtract(bignum_digit_type * v_start, bignum_digit_type * v_end,
-                                                bignum_digit_type guess, bignum_digit_type * u_start);
+                                                       bignum_digit_type guess, bignum_digit_type * u_start);
        void bignum_divide_unsigned_medium_denominator(bignum * numerator,bignum_digit_type denominator,
-                                                      bignum * * quotient, bignum * * remainder,int q_negative_p, int r_negative_p);
+                                                       bignum * * quotient, bignum * * remainder,int q_negative_p, int r_negative_p);
        void bignum_destructive_normalization(bignum * source, bignum * target, int shift_left);
        void bignum_destructive_unnormalization(bignum * bignum, int shift_right);
        bignum_digit_type bignum_digit_divide(bignum_digit_type uh, bignum_digit_type ul,
-                                             bignum_digit_type v, bignum_digit_type * q) /* return value */;
+                                                       bignum_digit_type v, bignum_digit_type * q) /* return value */;
        bignum_digit_type bignum_digit_divide_subtract(bignum_digit_type v1, bignum_digit_type v2,
-                                                      bignum_digit_type guess, bignum_digit_type * u);
+                                                       bignum_digit_type guess, bignum_digit_type * u);
        void bignum_divide_unsigned_small_denominator(bignum * numerator, bignum_digit_type denominator,
-                                                     bignum * * quotient, bignum * * remainder,int q_negative_p, int r_negative_p);
+                                                       bignum * * quotient, bignum * * remainder,int q_negative_p, int r_negative_p);
        bignum_digit_type bignum_destructive_scale_down(bignum * bignum, bignum_digit_type denominator);
        bignum * bignum_remainder_unsigned_small_denominator(bignum * n, bignum_digit_type d, int negative_p);
        bignum *bignum_digit_to_bignum(bignum_digit_type digit, int negative_p);
@@ -314,7 +314,7 @@ struct factor_vm
                if(!(current_gc && current_gc->op == collect_growing_heap_op))
                {
                        assert((cell)pointer >= data->seg->start
-                              && (cell)pointer < data->seg->end);
+                               && (cell)pointer < data->seg->end);
                }
        #endif
        }