1 files changed, 44 insertions, 3 deletions

diff --git a/src/lj_arch.h b/src/lj_arch.h
index 86a2d5ed..d87575ed 100644
--- a/src/lj_arch.h
+++ b/src/lj_arch.h
@@ -18,6 +18,10 @@
 #define LUAJIT_ARCH_x86         1
 #define LUAJIT_ARCH_X64         2
 #define LUAJIT_ARCH_x64         2
+#define LUAJIT_ARCH_PPC         3
+#define LUAJIT_ARCH_ppc         3
+#define LUAJIT_ARCH_PPCSPE      4
+#define LUAJIT_ARCH_ppcspe      4
 
 
 /* Select native target if no target defined. */
@@ -27,6 +31,12 @@
 #define LUAJIT_TARGET   LUAJIT_ARCH_X86
 #elif defined(__x86_64__) || defined(__x86_64) || defined(_M_X64) || defined(_M_AMD64)
 #define LUAJIT_TARGET   LUAJIT_ARCH_X64
+#elif defined(__ppc__) || defined(__ppc) || defined(__PPC__) || defined(__PPC) || defined(__powerpc__) || defined(__powerpc) || defined(__POWERPC__) || defined(__POWERPC) || defined(_M_PPC)
+#ifdef __NO_FPRS__
+#define LUAJIT_TARGET   LUAJIT_ARCH_PPCSPE
+#else
+#define LUAJIT_TARGET   LUAJIT_ARCH_PPC
+#endif
 #else
 #error "No support for this architecture (yet)"
 #endif
@@ -35,23 +45,56 @@
 
 /* Set target properties. */
 #if LUAJIT_TARGET == LUAJIT_ARCH_X86
+
 #define LJ_ARCH_NAME            "x86"
 #define LJ_ARCH_BITS            32
 #define LJ_ARCH_ENDIAN          LUAJIT_LE
 #define LJ_TARGET_X86           1
 #define LJ_TARGET_X86ORX64      1
 #define LJ_PAGESIZE             4096
+#define LJ_TARGET_MASKEDSHIFT   1
+
 #elif LUAJIT_TARGET == LUAJIT_ARCH_X64
+
 #define LJ_ARCH_NAME            "x64"
 #define LJ_ARCH_BITS            64
 #define LJ_ARCH_ENDIAN          LUAJIT_LE
 #define LJ_TARGET_X64           1
 #define LJ_TARGET_X86ORX64      1
 #define LJ_PAGESIZE             4096
+#define LJ_TARGET_MASKEDSHIFT   1
+
+#elif LUAJIT_TARGET == LUAJIT_ARCH_PPC
+
+#error "No support for plain PowerPC CPUs (yet)"
+
+#elif LUAJIT_TARGET == LUAJIT_ARCH_PPCSPE
+
+#define LJ_ARCH_NAME            "ppcspe"
+#define LJ_ARCH_BITS            32
+#define LJ_ARCH_ENDIAN          LUAJIT_BE
+#define LJ_TARGET_PPC           1
+#define LJ_TARGET_PPCSPE        1
+#define LJ_PAGESIZE             4096
+#define LJ_TARGET_MASKEDSHIFT   1
+#define LJ_ARCH_NOJIT           1
+
 #else
 #error "No target architecture defined"
 #endif
 
+/* Check target-specific constraints. */
+#ifndef _BUILDVM_H
+#if LJ_TARGET_PPC
+#if defined(_SOFT_FLOAT) || defined(_SOFT_DOUBLE)
+#error "No support for PowerPC CPUs without double-precision FPU"
+#endif
+#if defined(_LITTLE_ENDIAN)
+#error "No support for little-endian PowerPC"
+#endif
+#endif
+#endif
+
 /* Disable or enable the JIT compiler. */
 #if defined(LUAJIT_DISABLE_JIT) || defined(LJ_ARCH_NOJIT)
 #define LJ_HASJIT               0
@@ -78,9 +121,7 @@
 #endif
 
 /* Whether target CPU masks the shift count by the operand length or not. */
-#if LJ_TARGET_X86ORX64
-#define LJ_TARGET_MASKEDSHIFT   1
-#else
+#ifndef LJ_TARGET_MASKEDSHIFT
 #define LJ_TARGET_MASKEDSHIFT   0
 #endif