diff options
Diffstat (limited to 'src/lj_opt_fold.c')
| -rw-r--r-- | src/lj_opt_fold.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lj_opt_fold.c b/src/lj_opt_fold.c index e5d98162..2102561d 100644 --- a/src/lj_opt_fold.c +++ b/src/lj_opt_fold.c | |||
| @@ -138,7 +138,7 @@ typedef IRRef (LJ_FASTCALL *FoldFunc)(jit_State *J); | |||
| 138 | /* Macros for the fold specs, so buildvm can recognize them. */ | 138 | /* Macros for the fold specs, so buildvm can recognize them. */ |
| 139 | #define LJFOLD(x) | 139 | #define LJFOLD(x) |
| 140 | #define LJFOLDX(x) | 140 | #define LJFOLDX(x) |
| 141 | #define LJFOLDF(name) static TRef LJ_FASTCALL name(jit_State *J) | 141 | #define LJFOLDF(name) static TRef LJ_FASTCALL fold_##name(jit_State *J) |
| 142 | /* Note: They must be at the start of a line or buildvm ignores them! */ | 142 | /* Note: They must be at the start of a line or buildvm ignores them! */ |
| 143 | 143 | ||
| 144 | /* Barrier to prevent using operands across PHIs. */ | 144 | /* Barrier to prevent using operands across PHIs. */ |
| @@ -979,7 +979,7 @@ LJFOLDF(comm_equal) | |||
| 979 | /* For non-numbers only: x == x ==> drop; x ~= x ==> fail */ | 979 | /* For non-numbers only: x == x ==> drop; x ~= x ==> fail */ |
| 980 | if (fins->op1 == fins->op2 && !irt_isnum(fins->t)) | 980 | if (fins->op1 == fins->op2 && !irt_isnum(fins->t)) |
| 981 | return CONDFOLD(fins->o == IR_EQ); | 981 | return CONDFOLD(fins->o == IR_EQ); |
| 982 | return comm_swap(J); | 982 | return fold_comm_swap(J); |
| 983 | } | 983 | } |
| 984 | 984 | ||
| 985 | LJFOLD(LT any any) | 985 | LJFOLD(LT any any) |
| @@ -1013,7 +1013,7 @@ LJFOLDF(comm_dup) | |||
| 1013 | { | 1013 | { |
| 1014 | if (fins->op1 == fins->op2) /* x o x ==> x */ | 1014 | if (fins->op1 == fins->op2) /* x o x ==> x */ |
| 1015 | return LEFTFOLD; | 1015 | return LEFTFOLD; |
| 1016 | return comm_swap(J); | 1016 | return fold_comm_swap(J); |
| 1017 | } | 1017 | } |
| 1018 | 1018 | ||
| 1019 | LJFOLD(BXOR any any) | 1019 | LJFOLD(BXOR any any) |
| @@ -1021,7 +1021,7 @@ LJFOLDF(comm_bxor) | |||
| 1021 | { | 1021 | { |
| 1022 | if (fins->op1 == fins->op2) /* i xor i ==> 0 */ | 1022 | if (fins->op1 == fins->op2) /* i xor i ==> 0 */ |
| 1023 | return INTFOLD(0); | 1023 | return INTFOLD(0); |
| 1024 | return comm_swap(J); | 1024 | return fold_comm_swap(J); |
| 1025 | } | 1025 | } |
| 1026 | 1026 | ||
| 1027 | /* -- Simplification of compound expressions ------------------------------ */ | 1027 | /* -- Simplification of compound expressions ------------------------------ */ |
