diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2012-10-03 09:30:56 +0100 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2012-10-08 09:04:40 +0100 |
| commit | a7c0387d20c1c9994d1100b14fbb8fb4e28a259e (patch) | |
| tree | b95d0a512f951a4a463f1aa5178b0cd5c4fdb410 /includes/stg/MiscClosures.h | |
| parent | aed37acd4d157791381800d5de960a2461bcbef3 (diff) | |
| download | haskell-a7c0387d20c1c9994d1100b14fbb8fb4e28a259e.tar.gz | |
Produce new-style Cmm from the Cmm parser
The main change here is that the Cmm parser now allows high-level cmm
code with argument-passing and function calls. For example:
foo ( gcptr a, bits32 b )
{
if (b > 0) {
// we can make tail calls passing arguments:
jump stg_ap_0_fast(a);
}
return (x,y);
}
More details on the new cmm syntax are in Note [Syntax of .cmm files]
in CmmParse.y.
The old syntax is still more-or-less supported for those occasional
code fragments that really need to explicitly manipulate the stack.
However there are a couple of differences: it is now obligatory to
give a list of live GlobalRegs on every jump, e.g.
jump %ENTRY_CODE(Sp(0)) [R1];
Again, more details in Note [Syntax of .cmm files].
I have rewritten most of the .cmm files in the RTS into the new
syntax, except for AutoApply.cmm which is generated by the genapply
program: this file could be generated in the new syntax instead and
would probably be better off for it, but I ran out of enthusiasm.
Some other changes in this batch:
- The PrimOp calling convention is gone, primops now use the ordinary
NativeNodeCall convention. This means that primops and "foreign
import prim" code must be written in high-level cmm, but they can
now take more than 10 arguments.
- CmmSink now does constant-folding (should fix #7219)
- .cmm files now go through the cmmPipeline, and as a result we
generate better code in many cases. All the object files generated
for the RTS .cmm files are now smaller. Performance should be
better too, but I haven't measured it yet.
- RET_DYN frames are removed from the RTS, lots of code goes away
- we now have some more canned GC points to cover unboxed-tuples with
2-4 pointers, which will reduce code size a little.
Diffstat (limited to 'includes/stg/MiscClosures.h')
| -rw-r--r-- | includes/stg/MiscClosures.h | 55 |
1 files changed, 16 insertions, 39 deletions
diff --git a/includes/stg/MiscClosures.h b/includes/stg/MiscClosures.h index c93cc319c0..b7b24a8632 100644 --- a/includes/stg/MiscClosures.h +++ b/includes/stg/MiscClosures.h @@ -169,23 +169,6 @@ RTS_RET(stg_noforceIO); /* standard selector thunks */ -RTS_RET(stg_sel_ret_0_upd); -RTS_RET(stg_sel_ret_1_upd); -RTS_RET(stg_sel_ret_2_upd); -RTS_RET(stg_sel_ret_3_upd); -RTS_RET(stg_sel_ret_4_upd); -RTS_RET(stg_sel_ret_5_upd); -RTS_RET(stg_sel_ret_6_upd); -RTS_RET(stg_sel_ret_7_upd); -RTS_RET(stg_sel_ret_8_upd); -RTS_RET(stg_sel_ret_9_upd); -RTS_RET(stg_sel_ret_10_upd); -RTS_RET(stg_sel_ret_11_upd); -RTS_RET(stg_sel_ret_12_upd); -RTS_RET(stg_sel_ret_13_upd); -RTS_RET(stg_sel_ret_14_upd); -RTS_RET(stg_sel_ret_15_upd); - RTS_ENTRY(stg_sel_0_upd); RTS_ENTRY(stg_sel_1_upd); RTS_ENTRY(stg_sel_2_upd); @@ -267,45 +250,39 @@ RTS_FUN_DECL(stg_PAP_apply); /* standard GC & stack check entry points, all defined in HeapStackCheck.hc */ -RTS_RET(stg_enter); +RTS_FUN_DECL(stg_gc_noregs); + RTS_RET(stg_enter_checkbh); -RTS_RET(stg_gc_void); +RTS_RET(stg_ret_v); +RTS_RET(stg_ret_p); +RTS_RET(stg_ret_n); +RTS_RET(stg_ret_f); +RTS_RET(stg_ret_d); +RTS_RET(stg_ret_l); +RTS_FUN_DECL(stg_gc_prim_p); +RTS_FUN_DECL(stg_gc_prim_pp); +RTS_FUN_DECL(stg_gc_prim_n); + +RTS_RET(stg_enter); RTS_FUN_DECL(__stg_gc_enter_1); -RTS_FUN_DECL(stg_gc_noregs); -RTS_RET(stg_gc_unpt_r1); RTS_FUN_DECL(stg_gc_unpt_r1); - -RTS_RET(stg_gc_unbx_r1); RTS_FUN_DECL(stg_gc_unbx_r1); - -RTS_RET(stg_gc_f1); RTS_FUN_DECL(stg_gc_f1); - -RTS_RET(stg_gc_d1); RTS_FUN_DECL(stg_gc_d1); - -RTS_RET(stg_gc_l1); RTS_FUN_DECL(stg_gc_l1); +RTS_FUN_DECL(stg_gc_pp); +RTS_FUN_DECL(stg_gc_ppp); +RTS_FUN_DECL(stg_gc_pppp); RTS_RET(stg_gc_fun); RTS_FUN_DECL(__stg_gc_fun); -RTS_RET(stg_gc_gen); -RTS_FUN_DECL(stg_gc_gen); - -RTS_RET(stg_ut_1_0_unreg); - -RTS_FUN_DECL(stg_gc_gen_hp); -RTS_FUN_DECL(stg_gc_ut); -RTS_FUN_DECL(stg_gen_yield); RTS_FUN_DECL(stg_yield_noregs); RTS_FUN_DECL(stg_yield_to_interpreter); -RTS_FUN_DECL(stg_gen_block); RTS_FUN_DECL(stg_block_noregs); -RTS_FUN_DECL(stg_block_1); RTS_FUN_DECL(stg_block_blackhole); RTS_FUN_DECL(stg_block_blackhole_finally); RTS_FUN_DECL(stg_block_takemvar); |
