diff options
author | Mike Pall <mike> | 2012-06-12 17:26:55 +0200 |
---|---|---|
committer | Mike Pall <mike> | 2012-06-12 17:26:55 +0200 |
commit | 0b3d8375f7df74651bbadb8f18a8dd8124e88203 (patch) | |
tree | c55fae824f448deb0d1707f6fcdf0a0d2fc04786 | |
parent | c2159f8624c99d18e2c5b8a090e741008062a0c1 (diff) | |
download | luajit-0b3d8375f7df74651bbadb8f18a8dd8124e88203.tar.gz luajit-0b3d8375f7df74651bbadb8f18a8dd8124e88203.tar.bz2 luajit-0b3d8375f7df74651bbadb8f18a8dd8124e88203.zip |
PPC: Remove lj_vm_floor/ceil/trunc assembler wrappers.
-rw-r--r-- | src/lj_vm.h | 10 | ||||
-rw-r--r-- | src/vm_ppc.dasc | 10 |
2 files changed, 8 insertions, 12 deletions
diff --git a/src/lj_vm.h b/src/lj_vm.h index 2cf04184..a13a8ce0 100644 --- a/src/lj_vm.h +++ b/src/lj_vm.h | |||
@@ -49,9 +49,9 @@ LJ_ASMF void lj_vm_exit_handler(void); | |||
49 | LJ_ASMF void lj_vm_exit_interp(void); | 49 | LJ_ASMF void lj_vm_exit_interp(void); |
50 | 50 | ||
51 | /* Internal math helper functions. */ | 51 | /* Internal math helper functions. */ |
52 | #if LJ_TARGET_X86ORX64 | 52 | #if LJ_TARGET_X86ORX64 || LJ_TARGET_PPC |
53 | #define lj_vm_floor(x) floor(x) | 53 | #define lj_vm_floor floor |
54 | #define lj_vm_ceil(x) ceil(x) | 54 | #define lj_vm_ceil ceil |
55 | #else | 55 | #else |
56 | LJ_ASMF double lj_vm_floor(double); | 56 | LJ_ASMF double lj_vm_floor(double); |
57 | LJ_ASMF double lj_vm_ceil(double); | 57 | LJ_ASMF double lj_vm_ceil(double); |
@@ -67,7 +67,11 @@ LJ_ASMF void lj_vm_exp2_x87(void); | |||
67 | LJ_ASMF void lj_vm_pow_sse(void); | 67 | LJ_ASMF void lj_vm_pow_sse(void); |
68 | LJ_ASMF void lj_vm_powi_sse(void); | 68 | LJ_ASMF void lj_vm_powi_sse(void); |
69 | #else | 69 | #else |
70 | #if LJ_TARGET_PPC | ||
71 | #define lj_vm_trunc trunc | ||
72 | #else | ||
70 | LJ_ASMF double lj_vm_trunc(double); | 73 | LJ_ASMF double lj_vm_trunc(double); |
74 | #endif | ||
71 | LJ_ASMF double lj_vm_powi(double, int32_t); | 75 | LJ_ASMF double lj_vm_powi(double, int32_t); |
72 | #ifdef LUAJIT_NO_LOG2 | 76 | #ifdef LUAJIT_NO_LOG2 |
73 | LJ_ASMF double lj_vm_log2(double); | 77 | LJ_ASMF double lj_vm_log2(double); |
diff --git a/src/vm_ppc.dasc b/src/vm_ppc.dasc index bf46f694..db946190 100644 --- a/src/vm_ppc.dasc +++ b/src/vm_ppc.dasc | |||
@@ -2447,15 +2447,7 @@ static void build_subroutines(BuildCtx *ctx) | |||
2447 | |//-- Math helper functions ---------------------------------------------- | 2447 | |//-- Math helper functions ---------------------------------------------- |
2448 | |//----------------------------------------------------------------------- | 2448 | |//----------------------------------------------------------------------- |
2449 | | | 2449 | | |
2450 | | // NYI: Use internal implementation. | 2450 | |// NYI: Use internal implementations of floor, ceil, trunc. |
2451 | |->vm_floor: | ||
2452 | | b extern floor | ||
2453 | |->vm_ceil: | ||
2454 | | b extern ceil | ||
2455 | |->vm_trunc: | ||
2456 | |.if JIT | ||
2457 | | b extern trunc | ||
2458 | |.endif | ||
2459 | | | 2451 | | |
2460 | |->vm_modi: | 2452 | |->vm_modi: |
2461 | | divwo. TMP0, CARG1, CARG2 | 2453 | | divwo. TMP0, CARG1, CARG2 |