suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

inline fixnum min and max

Browse Source 
svn: r4024
This commit is contained in:
Matthew Flatt 2006-08-10 20:41:48 +00:00
parent 314091946d
commit 558d3b9c4f
2 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/mzscheme/src/jit.c
View File

@ -2153,6 +2153,18 @@ static int generate_arith(mz_jit_state *jitter, Scheme_Object *rator, Scheme_Obj
jit_ori_l(JIT_R0, JIT_R2, 0x1);
mz_patch_ucbranch(refc);
} else if (arith == 9) {
/* min */
jit_insn *refc;
refc = jit_bltr_l(jit_forward(), JIT_R0, JIT_R1);
jit_movr_l(JIT_R0, JIT_R1);
mz_patch_branch(refc);
} else if (arith == 10) {
/* max */
jit_insn *refc;
refc = jit_bgtr_l(jit_forward(), JIT_R0, JIT_R1);
jit_movr_l(JIT_R0, JIT_R1);
mz_patch_branch(refc);
}
} else {
/* Non-constant arg is in JIT_R0 */
@ -2201,7 +2213,19 @@ static int generate_arith(mz_jit_state *jitter, Scheme_Object *rator, Scheme_Obj
} else if (arith == 7) {
jit_notr_ul(JIT_R0, JIT_R0);
jit_ori_ul(JIT_R0, JIT_R0, 0x1);
}
} else if (arith == 9) {
/* min */
jit_insn *refc;
refc = jit_blti_l(jit_forward(), JIT_R0, scheme_make_integer(v));
jit_movi_l(JIT_R0, scheme_make_integer(v));
mz_patch_branch(refc);
} else if (arith == 10) {
/* max */
jit_insn *refc;
refc = jit_bgti_l(jit_forward(), JIT_R0, scheme_make_integer(v));
jit_movi_l(JIT_R0, scheme_make_integer(v));
mz_patch_branch(refc);
}
}
}
jit_patch_movi(ref, (_jit.x.pc));
@ -2811,6 +2835,12 @@ static int generate_inlined_binary(mz_jit_state *jitter, Scheme_App3_Rec *app, i
} else if (IS_NAMED_PRIM(rator, "-")) {
generate_arith(jitter, rator, app->rand1, app->rand2, 2, -1, 0, 0, NULL, 1);
return 1;
} else if (IS_NAMED_PRIM(rator, "min")) {
generate_arith(jitter, rator, app->rand1, app->rand2, 2, 9, 0, 0, NULL, 1);
return 1;
} else if (IS_NAMED_PRIM(rator, "max")) {
generate_arith(jitter, rator, app->rand1, app->rand2, 2, 10, 0, 0, NULL, 1);
return 1;
} else if (IS_NAMED_PRIM(rator, "bitwise-and")) {
generate_arith(jitter, rator, app->rand1, app->rand2, 2, 3, 0, 0, NULL, 1);
return 1;

17
src/mzscheme/src/numcomp.c
View File

@ -72,16 +72,13 @@ void scheme_init_numcomp(Scheme_Env *env)
SCHEME_PRIM_PROC_FLAGS(p) |= SCHEME_PRIM_IS_UNARY_INLINED;
scheme_add_global_constant("negative?", p, env);
scheme_add_global_constant("max",
scheme_make_folding_prim(sch_max,
"max",
1, -1, 1),
env);
scheme_add_global_constant("min",
scheme_make_folding_prim(sch_min,
"min",
1, -1, 1),
env);
p = scheme_make_folding_prim(sch_max, "max", 1, -1, 1);
SCHEME_PRIM_PROC_FLAGS(p) |= SCHEME_PRIM_IS_BINARY_INLINED;
scheme_add_global_constant("max", p, env);
p = scheme_make_folding_prim(sch_min, "min", 1, -1, 1);
SCHEME_PRIM_PROC_FLAGS(p) |= SCHEME_PRIM_IS_BINARY_INLINED;
scheme_add_global_constant("min", p, env);
}
/* Prototype needed for 3m conversion: */