projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
emit a helpful message if you say 'make html' and BUILD_DOCBOOK_HTML=NO
[ghc-hetmet.git]
/
rts
/
StgStartup.cmm
diff --git
a/rts/StgStartup.cmm
b/rts/StgStartup.cmm
index
5b0f7e2
..
c3c0bc3
100644
(file)
--- a/
rts/StgStartup.cmm
+++ b/
rts/StgStartup.cmm
@@
-28,9
+28,7
@@
ASSERT(Hp != 0); \
ASSERT(Sp != 0); \
ASSERT(SpLim != 0); \
ASSERT(Hp != 0); \
ASSERT(Sp != 0); \
ASSERT(SpLim != 0); \
- ASSERT(HpLim != 0); \
- ASSERT(SpLim - WDS(RESERVED_STACK_WORDS) <= Sp); \
- ASSERT(HpLim >= Hp);
+ ASSERT(SpLim - WDS(RESERVED_STACK_WORDS) <= Sp);
/* -----------------------------------------------------------------------------
Returning from the STG world.
/* -----------------------------------------------------------------------------
Returning from the STG world.
@@
-142,22
+140,15
@@
stg_threadFinished
forceIO takes care of this, performing the IO action and entering the
results that comes back.
forceIO takes care of this, performing the IO action and entering the
results that comes back.
+
------------------------------------------------------------------------- */
INFO_TABLE_RET( stg_forceIO, RET_SMALL)
------------------------------------------------------------------------- */
INFO_TABLE_RET( stg_forceIO, RET_SMALL)
-#ifdef REG_R1
{
Sp_adj(1);
ENTER();
}
{
Sp_adj(1);
ENTER();
}
-#else
-{
- R1 = Sp(0);
- Sp_adj(2);
- ENTER();
-}
-#endif
/* -----------------------------------------------------------------------------
Non-strict IO application.
/* -----------------------------------------------------------------------------
Non-strict IO application.
@@
-170,18
+161,10
@@
INFO_TABLE_RET( stg_forceIO, RET_SMALL)
INFO_TABLE_RET( stg_noforceIO, RET_SMALL )
INFO_TABLE_RET( stg_noforceIO, RET_SMALL )
-#ifdef REG_R1
{
Sp_adj(1);
jump %ENTRY_CODE(Sp(0));
}
{
Sp_adj(1);
jump %ENTRY_CODE(Sp(0));
}
-#else
-{
- R1 = Sp(0);
- Sp_adj(2);
- jump %ENTRY_CODE(Sp(0));
-}
-#endif
/* -----------------------------------------------------------------------------
Special STG entry points for module registration.
/* -----------------------------------------------------------------------------
Special STG entry points for module registration.