Browse Source

PPC: Untangle PPC vs. PPCSPE target defines.

Mike Pall 14 years ago
parent
commit
8addfefb33
4 changed files with 4 additions and 5 deletions
  1. 1 1
      src/buildvm_asm.c
  2. 1 1
      src/lib_jit.c
  3. 1 2
      src/lj_arch.h
  4. 1 1
      src/lj_ctype.h

+ 1 - 1
src/buildvm_asm.c

@@ -107,7 +107,7 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
 	    ins, sym);
 	    ins, sym);
     exit(1);
     exit(1);
   }
   }
-#elif LJ_TARGET_PPC
+#elif LJ_TARGET_PPC || LJ_TARGET_PPCSPE
   if ((ins >> 26) == 16) {
   if ((ins >> 26) == 16) {
     fprintf(ctx->fp, "\t%s %d, %d, %s\n",
     fprintf(ctx->fp, "\t%s %d, %d, %s\n",
 	    (ins & 1) ? "bcl" : "bc", (ins >> 21) & 31, (ins >> 16) & 31, sym);
 	    (ins & 1) ? "bcl" : "bc", (ins >> 21) & 31, (ins >> 16) & 31, sym);

+ 1 - 1
src/lib_jit.c

@@ -598,7 +598,7 @@ static uint32_t jit_cpudetect(lua_State *L)
     }
     }
   }
   }
 #endif
 #endif
-#elif LJ_TARGET_PPC
+#elif LJ_TARGET_PPC || LJ_TARGET_PPCSPE
   /* Nothing to do. */
   /* Nothing to do. */
 #else
 #else
 #error "Missing CPU detection for this architecture"
 #error "Missing CPU detection for this architecture"

+ 1 - 2
src/lj_arch.h

@@ -157,7 +157,6 @@
 #define LJ_ARCH_HASFPU		1
 #define LJ_ARCH_HASFPU		1
 #define LJ_ABI_SOFTFP		1
 #define LJ_ABI_SOFTFP		1
 #define LJ_ABI_EABI		1
 #define LJ_ABI_EABI		1
-#define LJ_TARGET_PPC		1
 #define LJ_TARGET_PPCSPE	1
 #define LJ_TARGET_PPCSPE	1
 #define LJ_TARGET_EHRETREG	3
 #define LJ_TARGET_EHRETREG	3
 #define LJ_TARGET_JUMPRANGE	25	/* +-2^25 = +-32MB */
 #define LJ_TARGET_JUMPRANGE	25	/* +-2^25 = +-32MB */
@@ -206,7 +205,7 @@
 #if !(__ARM_EABI__ || LJ_TARGET_OSX)
 #if !(__ARM_EABI__ || LJ_TARGET_OSX)
 #error "Only ARM EABI or iOS 3.0+ ABI is supported"
 #error "Only ARM EABI or iOS 3.0+ ABI is supported"
 #endif
 #endif
-#elif LJ_TARGET_PPC
+#elif LJ_TARGET_PPC || LJ_TARGET_PPCSPE
 #if defined(_SOFT_FLOAT) || defined(_SOFT_DOUBLE)
 #if defined(_SOFT_FLOAT) || defined(_SOFT_DOUBLE)
 #error "No support for PowerPC CPUs without double-precision FPU"
 #error "No support for PowerPC CPUs without double-precision FPU"
 #endif
 #endif

+ 1 - 1
src/lj_ctype.h

@@ -243,7 +243,7 @@ typedef struct CTState {
 /* -- Predefined types ---------------------------------------------------- */
 /* -- Predefined types ---------------------------------------------------- */
 
 
 /* Target-dependent types. */
 /* Target-dependent types. */
-#if LJ_TARGET_PPC
+#if LJ_TARGET_PPC || LJ_TARGET_PPCSPE
 #define CTTYDEFP(_) \
 #define CTTYDEFP(_) \
   _(LINT32,		4,	CT_NUM, CTF_LONG|CTALIGN(2))
   _(LINT32,		4,	CT_NUM, CTF_LONG|CTALIGN(2))
 #else
 #else