Put brackets around ipv6 addresses in `inet6 present`

[factor.git] / vm / master.hpp

diff --git a/vm/master.hpp b/vm/master.hpp
old mode 100755 (executable)
new mode 100644 (file)
index 9a920ef..653b9fd
--- a/vm/master.hpp
+++ b/vm/master.hpp
@@ -1,121 +1,151 @@
 #ifndef __FACTOR_MASTER_H__
 #define __FACTOR_MASTER_H__
 
+#ifndef _THREAD_SAFE
 #define _THREAD_SAFE
-#define _REENTRANT
-
-#ifndef WINCE
-#include <errno.h>
 #endif
 
-#ifdef FACTOR_DEBUG
-#include <assert.h>
+#ifndef _REENTRANT
+#define _REENTRANT
 #endif
 
-/* C headers */
+#include <errno.h>
+
+// C headers
 #include <fcntl.h>
 #include <limits.h>
 #include <math.h>
-#include <stdbool.h>
-#include <setjmp.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include <wchar.h>
+#include <stdint.h>
 
-/* C++ headers */
+// C++ headers
 #include <algorithm>
+#include <list>
 #include <map>
 #include <set>
 #include <vector>
 #include <iostream>
+#include <iomanip>
+#include <limits>
+#include <sstream>
+#include <string>
 
-/* Detect target CPU type */
+#define FACTOR_STRINGIZE_I(x) #x
+#define FACTOR_STRINGIZE(x) FACTOR_STRINGIZE_I(x)
+
+// Record compiler version
+#if defined(__clang__)
+#define FACTOR_COMPILER_VERSION "Clang (GCC " __VERSION__ ")"
+#elif defined(__INTEL_COMPILER)
+#define FACTOR_COMPILER_VERSION \
+  "Intel C Compiler " FACTOR_STRINGIZE(__INTEL_COMPILER)
+#elif defined(__MINGW32__)
+#define FACTOR_COMPILER_VERSION "MinGW (GCC " __VERSION__ ")"
+#elif defined(__GNUC__)
+#define FACTOR_COMPILER_VERSION "GCC " __VERSION__
+#elif defined(_MSC_FULL_VER)
+#define FACTOR_COMPILER_VERSION \
+  "Microsoft Visual C++ " FACTOR_STRINGIZE(_MSC_FULL_VER)
+#else
+#define FACTOR_COMPILER_VERSION "unknown"
+#endif
+
+#if defined(FACTOR_REPRODUCIBLE)
+  #define FACTOR_COMPILE_TIME "[reproducible]"
+#else
+  // Record compilation time
+  #define FACTOR_COMPILE_TIME  __DATE__ " " __TIME__
+#endif
+
+// Detect target CPU type
 #if defined(__arm__)
-       #define FACTOR_ARM
-#elif defined(__amd64__) || defined(__x86_64__)
-       #define FACTOR_AMD64
-       #define FACTOR_64
-#elif defined(i386) || defined(__i386) || defined(__i386__) || defined(WIN32)
-       #define FACTOR_X86
+#define FACTOR_ARM
+#elif defined(__aarch64__)
+#define FACTOR_ARM64
+#define FACTOR_64
+#elif defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64)
+#define FACTOR_AMD64
+#define FACTOR_64
+#elif defined(i386) || defined(__i386) || defined(__i386__) || defined(_M_IX86)
+#define FACTOR_X86
+#elif(defined(__POWERPC__) || defined(__ppc__) || defined(_ARCH_PPC)) && \
+    (defined(__PPC64__) || defined(__64BIT__))
+#define FACTOR_PPC64
+#define FACTOR_PPC
+#define FACTOR_64
 #elif defined(__POWERPC__) || defined(__ppc__) || defined(_ARCH_PPC)
-       #define FACTOR_PPC
+#define FACTOR_PPC32
+#define FACTOR_PPC
 #else
-       #error "Unsupported architecture"
+#error "Unsupported architecture"
 #endif
 
-#ifdef WIN32
-       #define WINDOWS
+#if defined(_MSC_VER) || defined (__MINGW32__)
+#define WINDOWS
+#define WINNT
+#elif defined(WIN32)
+#define WINDOWS
 #endif
 
-/* Forward-declare this since it comes up in function prototypes */
-namespace factor
-{
-       struct factor_vm;
-}
+// Forward-declare this since it comes up in function prototypes
+namespace factor { struct factor_vm; }
 
-/* Factor headers */
+// Factor headers
+#include "assert.hpp"
+#include "debug.hpp"
 #include "layouts.hpp"
 #include "platform.hpp"
+#include "utilities.hpp"
 #include "primitives.hpp"
+#include "errors.hpp"
 #include "segments.hpp"
+#include "gc_info.hpp"
 #include "contexts.hpp"
 #include "run.hpp"
 #include "objects.hpp"
-#include "profiler.hpp"
-#include "errors.hpp"
+#include "sampling_profiler.hpp"
 #include "bignumint.hpp"
 #include "bignum.hpp"
 #include "booleans.hpp"
 #include "instruction_operands.hpp"
+#include "tagged.hpp"
 #include "code_blocks.hpp"
 #include "bump_allocator.hpp"
 #include "bitwise_hacks.hpp"
 #include "mark_bits.hpp"
+#include "fixup.hpp"
 #include "free_list.hpp"
-#include "free_list_allocator.hpp"
 #include "write_barrier.hpp"
 #include "object_start_map.hpp"
-#include "nursery_space.hpp"
 #include "aging_space.hpp"
 #include "tenured_space.hpp"
 #include "data_heap.hpp"
 #include "code_heap.hpp"
 #include "gc.hpp"
-#include "debug.hpp"
-#include "strings.hpp"
-#include "tuples.hpp"
-#include "words.hpp"
 #include "float_bits.hpp"
 #include "io.hpp"
 #include "image.hpp"
-#include "alien.hpp"
 #include "callbacks.hpp"
 #include "dispatch.hpp"
-#include "entry_points.hpp"
 #include "vm.hpp"
 #include "allot.hpp"
-#include "tagged.hpp"
 #include "data_roots.hpp"
 #include "code_roots.hpp"
 #include "generic_arrays.hpp"
+#include "callstack.hpp"
 #include "slot_visitor.hpp"
-#include "collector.hpp"
-#include "copying_collector.hpp"
-#include "nursery_collector.hpp"
-#include "aging_collector.hpp"
 #include "to_tenured_collector.hpp"
-#include "code_block_visitor.hpp"
-#include "compaction.hpp"
-#include "full_collector.hpp"
-#include "callstack.hpp"
 #include "arrays.hpp"
 #include "math.hpp"
 #include "byte_arrays.hpp"
 #include "jit.hpp"
 #include "quotations.hpp"
 #include "inline_cache.hpp"
+#include "mvm.hpp"
 #include "factor.hpp"
-#include "utilities.hpp"
 
-#endif /* __FACTOR_MASTER_H__ */
+#endif // __FACTOR_MASTER_H__