diff options
| -rw-r--r-- | src/buildvm_asm.c | 2 | ||||
| -rw-r--r-- | src/lib_jit.c | 2 | ||||
| -rw-r--r-- | src/lj_arch.h | 3 | ||||
| -rw-r--r-- | src/lj_ctype.h | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/src/buildvm_asm.c b/src/buildvm_asm.c index 5cfa7ae8..94e62ce7 100644 --- a/src/buildvm_asm.c +++ b/src/buildvm_asm.c | |||
| @@ -107,7 +107,7 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n, | |||
| 107 | ins, sym); | 107 | ins, sym); |
| 108 | exit(1); | 108 | exit(1); |
| 109 | } | 109 | } |
| 110 | #elif LJ_TARGET_PPC | 110 | #elif LJ_TARGET_PPC || LJ_TARGET_PPCSPE |
| 111 | if ((ins >> 26) == 16) { | 111 | if ((ins >> 26) == 16) { |
| 112 | fprintf(ctx->fp, "\t%s %d, %d, %s\n", | 112 | fprintf(ctx->fp, "\t%s %d, %d, %s\n", |
| 113 | (ins & 1) ? "bcl" : "bc", (ins >> 21) & 31, (ins >> 16) & 31, sym); | 113 | (ins & 1) ? "bcl" : "bc", (ins >> 21) & 31, (ins >> 16) & 31, sym); |
diff --git a/src/lib_jit.c b/src/lib_jit.c index d1f24f52..9b28520d 100644 --- a/src/lib_jit.c +++ b/src/lib_jit.c | |||
| @@ -598,7 +598,7 @@ static uint32_t jit_cpudetect(lua_State *L) | |||
| 598 | } | 598 | } |
| 599 | } | 599 | } |
| 600 | #endif | 600 | #endif |
| 601 | #elif LJ_TARGET_PPC | 601 | #elif LJ_TARGET_PPC || LJ_TARGET_PPCSPE |
| 602 | /* Nothing to do. */ | 602 | /* Nothing to do. */ |
| 603 | #else | 603 | #else |
| 604 | #error "Missing CPU detection for this architecture" | 604 | #error "Missing CPU detection for this architecture" |
diff --git a/src/lj_arch.h b/src/lj_arch.h index ff4628df..fff40838 100644 --- a/src/lj_arch.h +++ b/src/lj_arch.h | |||
| @@ -157,7 +157,6 @@ | |||
| 157 | #define LJ_ARCH_HASFPU 1 | 157 | #define LJ_ARCH_HASFPU 1 |
| 158 | #define LJ_ABI_SOFTFP 1 | 158 | #define LJ_ABI_SOFTFP 1 |
| 159 | #define LJ_ABI_EABI 1 | 159 | #define LJ_ABI_EABI 1 |
| 160 | #define LJ_TARGET_PPC 1 | ||
| 161 | #define LJ_TARGET_PPCSPE 1 | 160 | #define LJ_TARGET_PPCSPE 1 |
| 162 | #define LJ_TARGET_EHRETREG 3 | 161 | #define LJ_TARGET_EHRETREG 3 |
| 163 | #define LJ_TARGET_JUMPRANGE 25 /* +-2^25 = +-32MB */ | 162 | #define LJ_TARGET_JUMPRANGE 25 /* +-2^25 = +-32MB */ |
| @@ -206,7 +205,7 @@ | |||
| 206 | #if !(__ARM_EABI__ || LJ_TARGET_OSX) | 205 | #if !(__ARM_EABI__ || LJ_TARGET_OSX) |
| 207 | #error "Only ARM EABI or iOS 3.0+ ABI is supported" | 206 | #error "Only ARM EABI or iOS 3.0+ ABI is supported" |
| 208 | #endif | 207 | #endif |
| 209 | #elif LJ_TARGET_PPC | 208 | #elif LJ_TARGET_PPC || LJ_TARGET_PPCSPE |
| 210 | #if defined(_SOFT_FLOAT) || defined(_SOFT_DOUBLE) | 209 | #if defined(_SOFT_FLOAT) || defined(_SOFT_DOUBLE) |
| 211 | #error "No support for PowerPC CPUs without double-precision FPU" | 210 | #error "No support for PowerPC CPUs without double-precision FPU" |
| 212 | #endif | 211 | #endif |
diff --git a/src/lj_ctype.h b/src/lj_ctype.h index f7a7121b..82c4427a 100644 --- a/src/lj_ctype.h +++ b/src/lj_ctype.h | |||
| @@ -243,7 +243,7 @@ typedef struct CTState { | |||
| 243 | /* -- Predefined types ---------------------------------------------------- */ | 243 | /* -- Predefined types ---------------------------------------------------- */ |
| 244 | 244 | ||
| 245 | /* Target-dependent types. */ | 245 | /* Target-dependent types. */ |
| 246 | #if LJ_TARGET_PPC | 246 | #if LJ_TARGET_PPC || LJ_TARGET_PPCSPE |
| 247 | #define CTTYDEFP(_) \ | 247 | #define CTTYDEFP(_) \ |
| 248 | _(LINT32, 4, CT_NUM, CTF_LONG|CTALIGN(2)) | 248 | _(LINT32, 4, CT_NUM, CTF_LONG|CTALIGN(2)) |
| 249 | #else | 249 | #else |
