[commit: ghc] master: [skip ci] rts: Detabify HeapStackCheck.cmm (a7ab7d3)
git at git.haskell.org
git at git.haskell.org
Tue Oct 21 21:51:38 UTC 2014
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/a7ab7d385e6097e0ea1fd4729a9ef1041f9710a8/ghc
>---------------------------------------------------------------
commit a7ab7d385e6097e0ea1fd4729a9ef1041f9710a8
Author: Austin Seipp <austin at well-typed.com>
Date: Tue Oct 21 16:39:44 2014 -0500
[skip ci] rts: Detabify HeapStackCheck.cmm
Signed-off-by: Austin Seipp <austin at well-typed.com>
>---------------------------------------------------------------
a7ab7d385e6097e0ea1fd4729a9ef1041f9710a8
rts/HeapStackCheck.cmm | 52 +++++++++++++++++++++++++-------------------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/rts/HeapStackCheck.cmm b/rts/HeapStackCheck.cmm
index f090bff..0659fed 100644
--- a/rts/HeapStackCheck.cmm
+++ b/rts/HeapStackCheck.cmm
@@ -73,9 +73,9 @@ import LeaveCriticalSection;
* the stack is already too big.
*/
-#define PRE_RETURN(why,what_next) \
- StgTSO_what_next(CurrentTSO) = what_next::I16; \
- StgRegTable_rRet(BaseReg) = why; \
+#define PRE_RETURN(why,what_next) \
+ StgTSO_what_next(CurrentTSO) = what_next::I16; \
+ StgRegTable_rRet(BaseReg) = why; \
R1 = BaseReg;
/* Remember that the return address is *removed* when returning to a
@@ -122,24 +122,24 @@ stg_gc_noregs
jump stg_returnToSched [R1];
}
-#define HP_GENERIC \
+#define HP_GENERIC \
PRE_RETURN(HeapOverflow, ThreadRunGHC) \
jump stg_returnToSched [R1];
-#define BLOCK_GENERIC \
+#define BLOCK_GENERIC \
PRE_RETURN(ThreadBlocked, ThreadRunGHC) \
jump stg_returnToSched [R1];
-#define YIELD_GENERIC \
+#define YIELD_GENERIC \
PRE_RETURN(ThreadYielding, ThreadRunGHC) \
jump stg_returnToSched [R1];
-#define BLOCK_BUT_FIRST(c) \
+#define BLOCK_BUT_FIRST(c) \
PRE_RETURN(ThreadBlocked, ThreadRunGHC) \
R2 = c; \
jump stg_returnToSchedButFirst [R1,R2,R3];
-#define YIELD_TO_INTERPRETER \
+#define YIELD_TO_INTERPRETER \
PRE_RETURN(ThreadYielding, ThreadInterpret) \
jump stg_returnToSchedNotPaused [R1];
@@ -368,13 +368,13 @@ stg_gc_pppp return (P_ arg1, P_ arg2, P_ arg3, P_ arg4)
| .... |
| args |
- +---------------------+
+ +---------------------+
| f_closure |
- +---------------------+
+ +---------------------+
| size |
- +---------------------+
+ +---------------------+
| stg_gc_fun_info |
- +---------------------+
+ +---------------------+
The size is the number of words of arguments on the stack, and is cached
in the frame in order to simplify stack walking: otherwise the size of
@@ -393,19 +393,19 @@ __stg_gc_fun /* explicit stack */
// cache the size
type = TO_W_(StgFunInfoExtra_fun_type(info));
if (type == ARG_GEN) {
- size = BITMAP_SIZE(StgFunInfoExtra_bitmap(info));
+ size = BITMAP_SIZE(StgFunInfoExtra_bitmap(info));
} else {
- if (type == ARG_GEN_BIG) {
+ if (type == ARG_GEN_BIG) {
#ifdef TABLES_NEXT_TO_CODE
// bitmap field holds an offset
size = StgLargeBitmap_size( StgFunInfoExtra_bitmap(info)
+ %GET_ENTRY(UNTAG(R1)) /* ### */ );
#else
- size = StgLargeBitmap_size( StgFunInfoExtra_bitmap(info) );
+ size = StgLargeBitmap_size( StgFunInfoExtra_bitmap(info) );
#endif
- } else {
- size = BITMAP_SIZE(W_[stg_arg_bitmaps + WDS(type)]);
- }
+ } else {
+ size = BITMAP_SIZE(W_[stg_arg_bitmaps + WDS(type)]);
+ }
}
#ifdef NO_ARG_REGS
@@ -429,7 +429,7 @@ __stg_gc_fun /* explicit stack */
jump stg_gc_noregs [];
} else {
jump W_[stg_stack_save_entries + WDS(type)] [*]; // all regs live
- // jumps to stg_gc_noregs after saving stuff
+ // jumps to stg_gc_noregs after saving stuff
}
#endif /* !NO_ARG_REGS */
}
@@ -461,15 +461,15 @@ INFO_TABLE_RET ( stg_gc_fun, RET_FUN )
if (type == ARG_GEN || type == ARG_GEN_BIG) {
jump StgFunInfoExtra_slow_apply(info) [R1];
} else {
- if (type == ARG_BCO) {
- // cover this case just to be on the safe side
- Sp_adj(-2);
- Sp(1) = R1;
- Sp(0) = stg_apply_interp_info;
+ if (type == ARG_BCO) {
+ // cover this case just to be on the safe side
+ Sp_adj(-2);
+ Sp(1) = R1;
+ Sp(0) = stg_apply_interp_info;
jump stg_yield_to_interpreter [];
- } else {
+ } else {
jump W_[stg_ap_stack_entries + WDS(type)] [R1];
- }
+ }
}
#endif
}
More information about the ghc-commits
mailing list