From: sewardj <unknown>
Date: Thu, 24 Feb 2000 17:26:12 +0000 (+0000)
Subject: [project @ 2000-02-24 17:26:12 by sewardj]
X-Git-Tag: Approximately_9120_patches~5104
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=589efbb119bfc7c8e45c142f9b0461f85ada40bb;p=ghc-hetmet.git

[project @ 2000-02-24 17:26:12 by sewardj]
primUnpackString --> hugsprimUnpackString
---

diff --git a/ghc/interpreter/storage.c b/ghc/interpreter/storage.c
index 39d969f..1743802 100644
--- a/ghc/interpreter/storage.c
+++ b/ghc/interpreter/storage.c
@@ -9,8 +9,8 @@
  * included in the distribution.
  *
  * $RCSfile: storage.c,v $
- * $Revision: 1.44 $
- * $Date: 2000/02/24 14:05:55 $
+ * $Revision: 1.45 $
+ * $Date: 2000/02/24 17:26:12 $
  * ------------------------------------------------------------------------*/
 
 #include "prelude.h"
@@ -768,7 +768,10 @@ void* getHugs_AsmObject_for ( char* s )
    Name   n = NIL;
    for (n = NAMEMIN; n < nameHw; n++)
       if (name(n).text == t) break;
-   if (n == nameHw) internal("getHugs_AsmObject_for(1)");
+   if (n == nameHw) {
+      fprintf ( stderr, "can't find `%s' in ...\n", s );
+      internal("getHugs_AsmObject_for(1)");
+   }
    v = name(n).stgVar;
    if (!isStgVar(v) || !isPtr(stgVarInfo(v)))
       internal("getHugs_AsmObject_for(2)");
diff --git a/ghc/rts/Evaluator.c b/ghc/rts/Evaluator.c
index 103d88b..7522bed 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.34 $
- * $Date: 2000/02/15 15:14:09 $
+ * $Revision: 1.35 $
+ * $Date: 2000/02/24 17:26:12 $
  * ---------------------------------------------------------------------------*/
 
 #include "Rts.h"
@@ -1791,7 +1791,7 @@ static StgClosure* makeErrorCall ( const char* msg )
    HaskellObj error 
       = asmClosureOfObject(getHugs_AsmObject_for("error"));
    HaskellObj unpack
-      = asmClosureOfObject(getHugs_AsmObject_for("primUnpackString"));
+      = asmClosureOfObject(getHugs_AsmObject_for("hugsprimUnpackString"));
    HaskellObj thunk
       = rts_apply ( unpack, rts_mkAddr ( (void*)msg ) );
    thunk