From 311879d2e6fddbe8d02a1bb6e7ba8f2686f6eeb3 Mon Sep 17 00:00:00 2001 From: sof Date: Thu, 28 Feb 2002 18:44:29 +0000 Subject: [PATCH] [project @ 2002-02-28 18:44:28 by sof] myThreadIdzh_fast: used bogus return convention --- ghc/rts/Exception.hc | 12 +----------- ghc/rts/PrimOps.hc | 13 ++++++++++++- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/ghc/rts/Exception.hc b/ghc/rts/Exception.hc index 817d6c2..e59cad9 100644 --- a/ghc/rts/Exception.hc +++ b/ghc/rts/Exception.hc @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: Exception.hc,v 1.23 2001/12/05 17:35:15 sewardj Exp $ + * $Id: Exception.hc,v 1.24 2002/02/28 18:44:28 sof Exp $ * * (c) The GHC Team, 1998-2000 * @@ -213,16 +213,6 @@ FN_(killThreadzh_fast) } -FN_(myThreadIdzh_fast) -{ - /* no args. */ - FB_ - R1.p = (P_)CurrentTSO; - JMP_(ENTRY_CODE(Sp[0])); - FE_ -} - - /* ----------------------------------------------------------------------------- Catch frames -------------------------------------------------------------------------- */ diff --git a/ghc/rts/PrimOps.hc b/ghc/rts/PrimOps.hc index d9fc609..ef07664 100644 --- a/ghc/rts/PrimOps.hc +++ b/ghc/rts/PrimOps.hc @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: PrimOps.hc,v 1.92 2002/02/28 08:53:58 sof Exp $ + * $Id: PrimOps.hc,v 1.93 2002/02/28 18:44:29 sof Exp $ * * (c) The GHC Team, 1998-2000 * @@ -1013,6 +1013,17 @@ FN_(yieldzh_fast) FE_ } +FN_(myThreadIdzh_fast) +{ + /* no args. */ + FB_ + RET_N((P_)CurrentTSO); + FE_ +} + + + + /* ----------------------------------------------------------------------------- * MVar primitives * -- 1.7.10.4