From 85cc3996c63bd36dabda875beb3ce19a94e38b1e Mon Sep 17 00:00:00 2001
From: sewardj <unknown>
Date: Mon, 13 Mar 2000 13:00:00 +0000
Subject: [PATCH] [project @ 2000-03-13 13:00:00 by sewardj] Track recent
re-homing of Prelude.h for INTERPRETER.
---
ghc/rts/Evaluator.c | 5 +++--
ghc/rts/Prelude.h | 5 ++++-
ghc/rts/PrimOps.hc | 7 ++++++-
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ghc/rts/Evaluator.c b/ghc/rts/Evaluator.c
index 7aef8ef31339..bd1b14c67074 100644
--- a/ghc/rts/Evaluator.c
+++ b/ghc/rts/Evaluator.c
@@ -5,8 +5,8 @@
* Copyright (c) 1994-1998.
*
* $RCSfile: Evaluator.c,v $
- * $Revision: 1.38 $
- * $Date: 2000/03/13 10:39:11 $
+ * $Revision: 1.39 $
+ * $Date: 2000/03/13 13:00:00 $
* ---------------------------------------------------------------------------*/
#include "Rts.h"
@@ -23,6 +23,7 @@
#include "Assembler.h" /* for CFun stuff */
#include "ForeignCall.h"
#include "PrimOps.h" /* for __{encode,decode}{Float,Double} */
+#include "Prelude.h"
#include "Evaluator.h"
#include "sainteger.h"
diff --git a/ghc/rts/Prelude.h b/ghc/rts/Prelude.h
index 82123195b8f1..0e3aeec15f54 100644
--- a/ghc/rts/Prelude.h
+++ b/ghc/rts/Prelude.h
@@ -1,5 +1,5 @@
/* -----------------------------------------------------------------------------
- * $Id: Prelude.h,v 1.1 2000/03/13 10:53:56 simonmar Exp $
+ * $Id: Prelude.h,v 1.2 2000/03/13 13:00:00 sewardj Exp $
*
* (c) The GHC Team, 1998-1999
*
@@ -96,6 +96,9 @@ extern const StgInfoTable StablePtr_static_info;
#define W64zh_con_info I64zh_con_info
#define W64zh_static_info I64zh_con_info
+#define PutFullMVar_closure PrelException_PutFullMVar_static_closure
+extern const StgInfoTable PutFullMVar_closure;
+
#endif
#endif /* COMPILING_RTS */
diff --git a/ghc/rts/PrimOps.hc b/ghc/rts/PrimOps.hc
index ff672a02d7e4..2355569a59c4 100644
--- a/ghc/rts/PrimOps.hc
+++ b/ghc/rts/PrimOps.hc
@@ -1,5 +1,5 @@
/* -----------------------------------------------------------------------------
- * $Id: PrimOps.hc,v 1.44 2000/03/13 10:53:56 simonmar Exp $
+ * $Id: PrimOps.hc,v 1.45 2000/03/13 13:00:00 sewardj Exp $
*
* (c) The GHC Team, 1998-1999
*
@@ -904,8 +904,13 @@ FN_(putMVarzh_fast)
#endif
if (info == &FULL_MVAR_info) {
+#ifdef INTERPRETER
+ fprintf(stderr, "fatal: put on a full MVar in Hugs; aborting\n" );
+ exit(1);
+#else
R1.cl = (StgClosure *)&PutFullMVar_closure;
JMP_(raisezh_fast);
+#endif
}
mvar->value = R2.cl;
--
GitLab