mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-22 04:30:19 +02:00
Code Activity

Move add, sub slow paths out of line

Browse source 
* libguile/jit.c (compile_call_scm_from_scm_sc)
  (compile_call_scm_from_scm_scm_slow): Move non-fixnum path out of
  line.
This commit is contained in:
Andy Wingo 2019-12-10 17:08:05 +01:00
parent fafa502875
commit 9c329776df
1 changed files with 34 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

71
libguile/jit.c
View file

@ -2537,67 +2537,64 @@ compile_long_fmov_slow (scm_jit_state *j, uint32_t dst, uint32_t src)
static void static void
compile_call_scm_from_scm_scm (scm_jit_state *j, uint8_t dst, uint8_t a, uint8_t b, uint32_t idx) compile_call_scm_from_scm_scm (scm_jit_state *j, uint8_t dst, uint8_t a, uint8_t b, uint32_t idx)
{ {
void *intrinsic = ((void **) &scm_vm_intrinsics)[idx];
int has_fast = 0;
jit_reloc_t fast;
jit_operand_t op_a = sp_scm_operand (j, a);
jit_operand_t op_b = sp_scm_operand (j, b);
switch ((enum scm_vm_intrinsic) idx) switch ((enum scm_vm_intrinsic) idx)
{ {
case SCM_VM_INTRINSIC_ADD: case SCM_VM_INTRINSIC_ADD:
{ {
emit_sp_ref_scm (j, T0, a); emit_sp_ref_scm (j, T0, a);
emit_sp_ref_scm (j, T1, b); emit_sp_ref_scm (j, T1, b);
op_a = jit_operand_gpr (JIT_OPERAND_ABI_POINTER, T0); add_slow_path_patch (j, jit_bmci (j->jit, T0, scm_tc2_int));
op_b = jit_operand_gpr (JIT_OPERAND_ABI_POINTER, T1); add_slow_path_patch (j, jit_bmci (j->jit, T1, scm_tc2_int));
jit_reloc_t a_not_inum = jit_bmci (j->jit, T0, scm_tc2_int);
jit_reloc_t b_not_inum = jit_bmci (j->jit, T1, scm_tc2_int);
jit_subi (j->jit, T0, T0, scm_tc2_int); jit_subi (j->jit, T0, T0, scm_tc2_int);
fast = jit_bxaddr (j->jit, T0, T1); add_slow_path_patch (j, jit_boaddr (j->jit, T0, T1));
has_fast = 1;
/* Restore previous value before slow path. */
jit_subr (j->jit, T0, T0, T1);
jit_addi (j->jit, T0, T0, scm_tc2_int);
jit_patch_here (j->jit, a_not_inum);
jit_patch_here (j->jit, b_not_inum);
break; break;
} }
case SCM_VM_INTRINSIC_SUB: case SCM_VM_INTRINSIC_SUB:
{ {
emit_sp_ref_scm (j, T0, a); emit_sp_ref_scm (j, T0, a);
emit_sp_ref_scm (j, T1, b); emit_sp_ref_scm (j, T1, b);
op_a = jit_operand_gpr (JIT_OPERAND_ABI_POINTER, T0); add_slow_path_patch (j, jit_bmci (j->jit, T0, scm_tc2_int));
op_b = jit_operand_gpr (JIT_OPERAND_ABI_POINTER, T1); add_slow_path_patch (j, jit_bmci (j->jit, T1, scm_tc2_int));
jit_reloc_t a_not_inum = jit_bmci (j->jit, T0, scm_tc2_int);
jit_reloc_t b_not_inum = jit_bmci (j->jit, T1, scm_tc2_int);
jit_subi (j->jit, T1, T1, scm_tc2_int); jit_subi (j->jit, T1, T1, scm_tc2_int);
fast = jit_bxsubr (j->jit, T0, T1); add_slow_path_patch (j, jit_bosubr (j->jit, T0, T1));
has_fast = 1;
/* Restore previous values before slow path. */
jit_addr (j->jit, T0, T0, T1);
jit_addi (j->jit, T1, T1, scm_tc2_int);
jit_patch_here (j->jit, a_not_inum);
jit_patch_here (j->jit, b_not_inum);
break; break;
} }
default: default:
break; {
void *intrinsic = ((void **) &scm_vm_intrinsics)[idx];
jit_operand_t op_a = sp_scm_operand (j, a);
jit_operand_t op_b = sp_scm_operand (j, b);
emit_store_current_ip (j, T2);
emit_call_2 (j, intrinsic, op_a, op_b);
emit_retval (j, T0);
emit_reload_sp (j);
}
} }
emit_store_current_ip (j, T2);
emit_call_2 (j, intrinsic, op_a, op_b);
emit_retval (j, T0);
emit_reload_sp (j);
if (has_fast)
jit_patch_here (j->jit, fast);
emit_sp_set_scm (j, dst, T0); emit_sp_set_scm (j, dst, T0);
} }
static void static void
compile_call_scm_from_scm_scm_slow (scm_jit_state *j, uint8_t dst, uint8_t a, uint8_t b, uint32_t idx) compile_call_scm_from_scm_scm_slow (scm_jit_state *j, uint8_t dst, uint8_t a, uint8_t b, uint32_t idx)
{ {
switch ((enum scm_vm_intrinsic) idx)
{
case SCM_VM_INTRINSIC_ADD:
case SCM_VM_INTRINSIC_SUB:
{
void *intrinsic = ((void **) &scm_vm_intrinsics)[idx];
jit_operand_t op_a = sp_scm_operand (j, a);
jit_operand_t op_b = sp_scm_operand (j, b);
emit_store_current_ip (j, T1);
emit_call_2 (j, intrinsic, op_a, op_b);
emit_retval (j, T0);
emit_reload_sp (j);
emit_sp_set_scm (j, dst, T0);
continue_after_slow_path (j, j->next_ip);
break;
}
default:
break;
}
} }
static void static void