[commit: ghc] ghc-lwc2: Added derived constants. Fixed a bug in PrimOps. (a019253)

[Ian Lynagh]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : ghc-lwc2

http://hackage.haskell.org/trac/ghc/changeset/a019253d82758934342c8d1ece834bafa250f5bc

>---------------------------------------------------------------

commit a019253d82758934342c8d1ece834bafa250f5bc
Author: KC Sivaramakrishnan <chandras at cs.purdue.edu>
Date:   Fri Feb 22 16:11:37 2013 -0500

    Added derived constants. Fixed a bug in PrimOps.

>---------------------------------------------------------------

 rts/PrimOps.cmm                          | 4 ++--
 utils/deriveConstants/DeriveConstants.hs | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/rts/PrimOps.cmm b/rts/PrimOps.cmm
index c13c5c7..54246ee 100644
--- a/rts/PrimOps.cmm
+++ b/rts/PrimOps.cmm
@@ -903,7 +903,7 @@ again: MAYBE_GC (again);
 stg_sleepCapabilityzh ()
 {
   StgTSO_is_sleeping (CurrentTSO) = 1::I32;
-  jump stg_retryzh;
+  jump stg_retryzh [];
 }
 
 
@@ -2294,7 +2294,7 @@ stg_noDuplicatezh /* no arg list: explicit stack layout */
     ccall threadPaused (MyCapability() "ptr", CurrentTSO "ptr");
 
     if (StgTSO_what_next(CurrentTSO) == ThreadKilled::I16) {
-        jump stg_threadFinished;
+        jump stg_threadFinished [];
     } else {
         LOAD_THREAD_STATE();
         ASSERT(StgTSO_what_next(CurrentTSO) == ThreadRunGHC::I16);
diff --git a/utils/deriveConstants/DeriveConstants.hs b/utils/deriveConstants/DeriveConstants.hs
index 77daf5c..90e99aa 100644
--- a/utils/deriveConstants/DeriveConstants.hs
+++ b/utils/deriveConstants/DeriveConstants.hs
@@ -396,6 +396,13 @@ wanteds = concat
           ,closureField  C    "StgTSO"      "bq"
           ,closureField_ Both "StgTSO_cccs" "StgTSO" "prof.cccs"
           ,closureField  Both "StgTSO"      "stackobj"
+          ,closureField  C    "StgTSO"      "schedule_scont_action"
+          ,closureField  C    "StgTSO"      "yield_control_action"
+          ,closureField  C    "StgTSO"      "finalizer"
+          ,closureField  C    "StgTSO"      "scont_status"
+          ,closureField  C    "StgTSO"      "tls"
+          ,closureField  C    "StgTSO"      "is_sleeping"
+          ,closureField  C    "StgTSO"      "is_upcall_thread"
 
           ,closureField       Both "StgStack" "sp"
           ,closureFieldOffset Both "StgStack" "stack"