projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Big collection of patches for the new codegen branch.
[ghc-hetmet.git]
/
rts
/
PrimOps.cmm
diff --git
a/rts/PrimOps.cmm
b/rts/PrimOps.cmm
index
55ada8c
..
f75b8aa
100644
(file)
--- a/
rts/PrimOps.cmm
+++ b/
rts/PrimOps.cmm
@@
-52,6
+52,7
@@
import pthread_mutex_unlock;
import base_ControlziExceptionziBase_nestedAtomically_closure;
import EnterCriticalSection;
import LeaveCriticalSection;
import base_ControlziExceptionziBase_nestedAtomically_closure;
import EnterCriticalSection;
import LeaveCriticalSection;
+import ghczmprim_GHCziBool_False_closure;
/*-----------------------------------------------------------------------------
Array Primitives
/*-----------------------------------------------------------------------------
Array Primitives
@@
-1083,7
+1084,7
@@
INFO_TABLE_RET(stg_catch_retry_frame, CATCH_RETRY_FRAME,
#if defined(PROFILING)
W_ unused1, W_ unused2,
#endif
#if defined(PROFILING)
W_ unused1, W_ unused2,
#endif
- W_ unused3, "ptr" W_ unused4, "ptr" W_ unused5)
+ W_ unused3, P_ unused4, P_ unused5)
{
W_ r, frame, trec, outer;
{
W_ r, frame, trec, outer;
@@
-1117,7
+1118,7
@@
INFO_TABLE_RET(stg_atomically_frame, ATOMICALLY_FRAME,
#if defined(PROFILING)
W_ unused1, W_ unused2,
#endif
#if defined(PROFILING)
W_ unused1, W_ unused2,
#endif
- "ptr" W_ unused3, "ptr" W_ unused4)
+ P_ unused3, P_ unused4)
{
W_ frame, trec, valid, next_invariant, q, outer;
{
W_ frame, trec, valid, next_invariant, q, outer;
@@
-1179,7
+1180,7
@@
INFO_TABLE_RET(stg_atomically_waiting_frame, ATOMICALLY_FRAME,
#if defined(PROFILING)
W_ unused1, W_ unused2,
#endif
#if defined(PROFILING)
W_ unused1, W_ unused2,
#endif
- "ptr" W_ unused3, "ptr" W_ unused4)
+ P_ unused3, P_ unused4)
{
W_ frame, trec, valid;
{
W_ frame, trec, valid;
@@
-1213,7
+1214,7
@@
INFO_TABLE_RET(stg_catch_stm_frame, CATCH_STM_FRAME,
#if defined(PROFILING)
W_ unused1, W_ unused2,
#endif
#if defined(PROFILING)
W_ unused1, W_ unused2,
#endif
- "ptr" W_ unused3, "ptr" W_ unused4)
+ P_ unused3, P_ unused4)
{
W_ r, frame, trec, outer;
frame = Sp;
{
W_ r, frame, trec, outer;
frame = Sp;
@@
-2295,17
+2296,11
@@
getSparkzh_fast
#ifndef THREADED_RTS
RET_NP(0,ghczmprim_GHCziBool_False_closure);
#else
#ifndef THREADED_RTS
RET_NP(0,ghczmprim_GHCziBool_False_closure);
#else
- (spark) = foreign "C" tryStealSpark(MyCapability());
+ (spark) = foreign "C" findSpark(MyCapability());
if (spark != 0) {
RET_NP(1,spark);
} else {
if (spark != 0) {
RET_NP(1,spark);
} else {
- (spark) = foreign "C" stealWork (MyCapability());
- if (spark != 0) {
- RET_NP(1,spark);
- } else {
- RET_NP(0,ghczmprim_GHCziBool_False_closure);
-
- }
+ RET_NP(0,ghczmprim_GHCziBool_False_closure);
}
#endif
}
}
#endif
}