GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-21 00:52:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

simplify jit_bare_ret

Browse Source
This commit is contained in:
kr.angelov
2014-10-14 09:09:26 +00:00
parent cc5199c710
commit 0e91de3b5f
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/runtime/c/pgf/jit.c
View File

@@ -344,7 +344,7 @@ pgf_jit_gates(PgfReader* rdr)
gates->evaluate_value = jit_get_ip().ptr; gates->evaluate_value = jit_get_ip().ptr;
jit_movr_p(JIT_VHEAP, JIT_VCLOS); jit_movr_p(JIT_VHEAP, JIT_VCLOS);
jit_ldxi_p(JIT_RET, JIT_VHEAP, offsetof(PgfValue, con)); 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); 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*)); jit_subi_p(JIT_R0, JIT_R0, sizeof(void*));
ref = jit_bnei_i(jit_forward(), JIT_R0, 0); ref = jit_bnei_i(jit_forward(), JIT_R0, 0);
jit_movr_p(JIT_VHEAP, JIT_VCLOS); jit_movr_p(JIT_VHEAP, JIT_VCLOS);
jit_bare_ret(0); jit_bare_ret();
jit_patch(ref); jit_patch(ref);
jit_pushr_i(JIT_R0); jit_pushr_i(JIT_R0);
jit_prepare(2); jit_prepare(2);
@@ -401,7 +401,7 @@ pgf_jit_gates(PgfReader* rdr)
jit_subi_p(JIT_R0, JIT_R0, sizeof(void*)); jit_subi_p(JIT_R0, JIT_R0, sizeof(void*));
ref = jit_bnei_i(jit_forward(), JIT_R0, 0); ref = jit_bnei_i(jit_forward(), JIT_R0, 0);
jit_movr_p(JIT_VHEAP, JIT_VCLOS); jit_movr_p(JIT_VHEAP, JIT_VCLOS);
jit_bare_ret(0); jit_bare_ret();
jit_patch(ref); jit_patch(ref);
jit_pushr_i(JIT_R0); jit_pushr_i(JIT_R0);
jit_prepare(2); jit_prepare(2);
@@ -450,7 +450,7 @@ pgf_jit_gates(PgfReader* rdr)
jit_ldxi_p(JIT_R0, JIT_VHEAP, offsetof(PgfValueLit, lit)); jit_ldxi_p(JIT_R0, JIT_VHEAP, offsetof(PgfValueLit, lit));
jit_pusharg_p(JIT_R0); jit_pusharg_p(JIT_R0);
jit_finish(gu_variant_data); jit_finish(gu_variant_data);
jit_bare_ret(0); jit_bare_ret();
pgf_jit_make_space(rdr, JIT_CODE_WINDOW); 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_movi_p(JIT_R1, gates->evaluate_indirection);
jit_str_p(JIT_VCLOS, JIT_R1); jit_str_p(JIT_VCLOS, JIT_R1);
jit_stxi_p(offsetof(PgfIndirection, val), JIT_VCLOS, JIT_VHEAP); 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); pgf_jit_make_space(rdr, JIT_CODE_WINDOW*2);

4
src/runtime/c/pgf/lightning/arm/core.h
View File

@@ -2174,9 +2174,9 @@ next: \
#endif #endif
#ifdef USE_THUMB_CODE #ifdef USE_THUMB_CODE
#define jit_bare_ret(IM) T2_POP(1<<JIT_PC) #define jit_bare_ret() T2_POP(1<<JIT_PC)
#else #else
#define jit_bare_ret(IM) _POP(1<<JIT_PC) #define jit_bare_ret() _POP(1<<JIT_PC)
#endif #endif
/* just to pass make check... */ /* just to pass make check... */

2
src/runtime/c/pgf/lightning/i386/core-32.h
View File

@@ -101,7 +101,7 @@ struct jit_local_state {
#define jit_ret() jit_base_ret (_jitl.alloca_offset) #define jit_ret() jit_base_ret (_jitl.alloca_offset)
#endif #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_calli(label) (CALLm( ((unsigned long) (label))), _jit.x.pc)
#define jit_callr(reg) CALLsr(reg) #define jit_callr(reg) CALLsr(reg)

2
src/runtime/c/pgf/lightning/i386/core-64.h
View File

@@ -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_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_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_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 */ /* Memory */