steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

VM: Refactor master.hpp to Factor style

db4
Erik Charlebois 2013-05-11 22:13:10 -04:00
parent ce6ffe91dd
commit 38802ce173
1 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
vm/master.hpp
View File

@ -33,54 +33,53 @@
#include <iomanip> #include <iomanip>
#include <limits> #include <limits>
#define FACTOR_STRINGIZE_I(x) #x #define FACTOR_STRINGIZE_I(x) #x
#define FACTOR_STRINGIZE(x) FACTOR_STRINGIZE_I(x) #define FACTOR_STRINGIZE(x) FACTOR_STRINGIZE_I(x)
/* Record compiler version */ /* Record compiler version */
#if defined(__clang__) #if defined(__clang__)
#define FACTOR_COMPILER_VERSION "Clang (GCC " __VERSION__ ")" #define FACTOR_COMPILER_VERSION "Clang (GCC " __VERSION__ ")"
#elif defined(__INTEL_COMPILER) #elif defined(__INTEL_COMPILER)
#define FACTOR_COMPILER_VERSION "Intel C Compiler " FACTOR_STRINGIZE(__INTEL_COMPILER) #define FACTOR_COMPILER_VERSION \
"Intel C Compiler " FACTOR_STRINGIZE(__INTEL_COMPILER)
#elif defined(__GNUC__) #elif defined(__GNUC__)
#define FACTOR_COMPILER_VERSION "GCC " __VERSION__ #define FACTOR_COMPILER_VERSION "GCC " __VERSION__
#elif defined(_MSC_FULL_VER) #elif defined(_MSC_FULL_VER)
#define FACTOR_COMPILER_VERSION "Microsoft Visual C++ " FACTOR_STRINGIZE(_MSC_FULL_VER) #define FACTOR_COMPILER_VERSION \
"Microsoft Visual C++ " FACTOR_STRINGIZE(_MSC_FULL_VER)
#else #else
#define FACTOR_COMPILER_VERSION "unknown" #define FACTOR_COMPILER_VERSION "unknown"
#endif #endif
/* Detect target CPU type */ /* Detect target CPU type */
#if defined(__arm__) #if defined(__arm__)
#define FACTOR_ARM #define FACTOR_ARM
#elif defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64) #elif defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64)
#define FACTOR_AMD64 #define FACTOR_AMD64
#define FACTOR_64 #define FACTOR_64
#elif defined(i386) || defined(__i386) || defined(__i386__) || defined(_M_IX86) #elif defined(i386) || defined(__i386) || defined(__i386__) || defined(_M_IX86)
#define FACTOR_X86 #define FACTOR_X86
#elif (defined(__POWERPC__) || defined(__ppc__) || defined(_ARCH_PPC)) && (defined(__PPC64__) || defined(__64BIT__)) #elif(defined(__POWERPC__) || defined(__ppc__) || defined(_ARCH_PPC)) && \
#define FACTOR_PPC64 (defined(__PPC64__) || defined(__64BIT__))
#define FACTOR_PPC #define FACTOR_PPC64
#define FACTOR_64 #define FACTOR_PPC
#define FACTOR_64
#elif defined(__POWERPC__) || defined(__ppc__) || defined(_ARCH_PPC) #elif defined(__POWERPC__) || defined(__ppc__) || defined(_ARCH_PPC)
#define FACTOR_PPC32 #define FACTOR_PPC32
#define FACTOR_PPC #define FACTOR_PPC
#else #else
#error "Unsupported architecture" #error "Unsupported architecture"
#endif #endif
#if defined(_MSC_VER) #if defined(_MSC_VER)
#define WINDOWS #define WINDOWS
#define WINNT #define WINNT
#elif defined(WIN32) #elif defined(WIN32)
#define WINDOWS #define WINDOWS
#endif #endif
/* Forward-declare this since it comes up in function prototypes */ /* Forward-declare this since it comes up in function prototypes */
namespace factor namespace factor { struct factor_vm; }
{
struct factor_vm;
}
/* Factor headers */ /* Factor headers */
#include "assert.hpp" #include "assert.hpp"