diff options
| author | kr.angelov <kr.angelov@gmail.com> | 2014-10-14 09:09:26 +0000 |
|---|---|---|
| committer | kr.angelov <kr.angelov@gmail.com> | 2014-10-14 09:09:26 +0000 |
| commit | 1c2e02ad5026e92ac9b82c6c876bde4281754f21 (patch) | |
| tree | c49c962074286290ec138cb281266f4fb64def35 /src | |
| parent | 2b881397c554d9aa17877c9686bf3bbfd6f4020f (diff) | |
simplify jit_bare_ret
Diffstat (limited to 'src')
| -rw-r--r-- | src/runtime/c/pgf/jit.c | 10 | ||||
| -rw-r--r-- | src/runtime/c/pgf/lightning/arm/core.h | 4 | ||||
| -rw-r--r-- | src/runtime/c/pgf/lightning/i386/core-32.h | 2 | ||||
| -rw-r--r-- | src/runtime/c/pgf/lightning/i386/core-64.h | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/runtime/c/pgf/jit.c b/src/runtime/c/pgf/jit.c index 6b182003a..ab8eae1c6 100644 --- a/src/runtime/c/pgf/jit.c +++ b/src/runtime/c/pgf/jit.c @@ -344,7 +344,7 @@ pgf_jit_gates(PgfReader* rdr) gates->evaluate_value = jit_get_ip().ptr; jit_movr_p(JIT_VHEAP, JIT_VCLOS); jit_ldxi_p(JIT_RET, JIT_VHEAP, offsetof(PgfValue, con)); - jit_bare_ret(0); + jit_bare_ret(); pgf_jit_make_space(rdr, JIT_CODE_WINDOW*2); @@ -353,7 +353,7 @@ pgf_jit_gates(PgfReader* rdr) jit_subi_p(JIT_R0, JIT_R0, sizeof(void*)); ref = jit_bnei_i(jit_forward(), JIT_R0, 0); jit_movr_p(JIT_VHEAP, JIT_VCLOS); - jit_bare_ret(0); + jit_bare_ret(); jit_patch(ref); jit_pushr_i(JIT_R0); jit_prepare(2); @@ -401,7 +401,7 @@ pgf_jit_gates(PgfReader* rdr) jit_subi_p(JIT_R0, JIT_R0, sizeof(void*)); ref = jit_bnei_i(jit_forward(), JIT_R0, 0); jit_movr_p(JIT_VHEAP, JIT_VCLOS); - jit_bare_ret(0); + jit_bare_ret(); jit_patch(ref); jit_pushr_i(JIT_R0); jit_prepare(2); @@ -450,7 +450,7 @@ pgf_jit_gates(PgfReader* rdr) jit_ldxi_p(JIT_R0, JIT_VHEAP, offsetof(PgfValueLit, lit)); jit_pusharg_p(JIT_R0); jit_finish(gu_variant_data); - jit_bare_ret(0); + jit_bare_ret(); pgf_jit_make_space(rdr, JIT_CODE_WINDOW); @@ -500,7 +500,7 @@ pgf_jit_gates(PgfReader* rdr) jit_movi_p(JIT_R1, gates->evaluate_indirection); jit_str_p(JIT_VCLOS, JIT_R1); jit_stxi_p(offsetof(PgfIndirection, val), JIT_VCLOS, JIT_VHEAP); - jit_bare_ret(0); + jit_bare_ret(); pgf_jit_make_space(rdr, JIT_CODE_WINDOW*2); diff --git a/src/runtime/c/pgf/lightning/arm/core.h b/src/runtime/c/pgf/lightning/arm/core.h index a84c1d05e..02b3c6431 100644 --- a/src/runtime/c/pgf/lightning/arm/core.h +++ b/src/runtime/c/pgf/lightning/arm/core.h @@ -2174,9 +2174,9 @@ next: \ #endif #ifdef USE_THUMB_CODE -#define jit_bare_ret(IM) T2_POP(1<<JIT_PC) +#define jit_bare_ret() T2_POP(1<<JIT_PC) #else -#define jit_bare_ret(IM) _POP(1<<JIT_PC) +#define jit_bare_ret() _POP(1<<JIT_PC) #endif /* just to pass make check... */ diff --git a/src/runtime/c/pgf/lightning/i386/core-32.h b/src/runtime/c/pgf/lightning/i386/core-32.h index 9de85b86e..11e0128af 100644 --- a/src/runtime/c/pgf/lightning/i386/core-32.h +++ b/src/runtime/c/pgf/lightning/i386/core-32.h @@ -101,7 +101,7 @@ struct jit_local_state { #define jit_ret() jit_base_ret (_jitl.alloca_offset) #endif -#define jit_bare_ret(IM) ((IM == 0) ? RET_() : RETi(IM)) +#define jit_bare_ret() RET_() #define jit_calli(label) (CALLm( ((unsigned long) (label))), _jit.x.pc) #define jit_callr(reg) CALLsr(reg) diff --git a/src/runtime/c/pgf/lightning/i386/core-64.h b/src/runtime/c/pgf/lightning/i386/core-64.h index bd53d9744..848fb283b 100644 --- a/src/runtime/c/pgf/lightning/i386/core-64.h +++ b/src/runtime/c/pgf/lightning/i386/core-64.h @@ -265,7 +265,7 @@ static int jit_arg_reg_order[] = { _EDI, _ESI, _EDX, _ECX, _R8D, _R9D }; #define jit_patch_at(jump_pc,v) (_jitl.long_jumps ? jit_patch_long_at((jump_pc)-3, v) : jit_patch_short_at(jump_pc, v)) #define jit_patch_calli(pa,pv) (*_PSL((pa) - sizeof(long)) = _jit_SL((pv))) #define jit_ret() (LEAVE_(), POPQr(_R14), POPQr(_R13), POPQr(_R12), POPQr(_EBX), RET_()) -#define jit_bare_ret(IM) ((IM == 0) ? RET_() : RETi(IM)) +#define jit_bare_ret() RET_() /* Memory */ |
