vm: strip out call-counting profiler

[factor.git] / vm / master.hpp

diff --git a/vm/master.hpp b/vm/master.hpp
index d2b9a5f709c49041850c40629317a5c0d36ac0ac..5b0604fe33233ff82a1c94cf63f4dd0a6a9ad4dd 100755 (executable)
--- a/vm/master.hpp
+++ b/vm/master.hpp
@@ -1,8 +1,13 @@
 #ifndef __FACTOR_MASTER_H__
 #define __FACTOR_MASTER_H__
 
+#ifndef _THREAD_SAFE
 #define _THREAD_SAFE
+#endif
+
+#ifndef _REENTRANT
 #define _REENTRANT
+#endif
 
 #ifndef WINCE
 #include <errno.h>
@@ -21,16 +26,21 @@
 #include <string.h>
 #include <time.h>
 #include <wchar.h>
+#include <assert.h>
 
 /* C++ headers */
 #include <algorithm>
+#include <list>
 #include <map>
 #include <set>
 #include <vector>
 #include <iostream>
 #include <iomanip>
+#include <limits>
 
-#define FACTOR_STRINGIZE(x) #x
+
+#define FACTOR_STRINGIZE_I(x) #x
+#define FACTOR_STRINGIZE(x) FACTOR_STRINGIZE_I(x)
 
 /* Record compiler version */
 #if defined(__clang__)
@@ -53,7 +63,12 @@
        #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_PPC32
        #define FACTOR_PPC
 #else
        #error "Unsupported architecture"
@@ -81,7 +96,7 @@ namespace factor
 #include "contexts.hpp"
 #include "run.hpp"
 #include "objects.hpp"
-#include "profiler.hpp"
+#include "sampling_profiler.hpp"
 #include "errors.hpp"
 #include "bignumint.hpp"
 #include "bignum.hpp"
@@ -113,6 +128,7 @@ namespace factor
 #include "callbacks.hpp"
 #include "dispatch.hpp"
 #include "entry_points.hpp"
+#include "safepoints.hpp"
 #include "vm.hpp"
 #include "allot.hpp"
 #include "tagged.hpp"