projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2000-07-21 08:37:30 by rrt]
[ghc-hetmet.git]
/
ghc
/
rts
/
ForeignCall.c
diff --git
a/ghc/rts/ForeignCall.c
b/ghc/rts/ForeignCall.c
index
38158ce
..
a6a4646
100644
(file)
--- a/
ghc/rts/ForeignCall.c
+++ b/
ghc/rts/ForeignCall.c
@@
-1,6
+1,6
@@
/* -----------------------------------------------------------------------------
/* -----------------------------------------------------------------------------
- * $Id: ForeignCall.c,v 1.14 2000/04/11 16:49:20 sewardj Exp $
+ * $Id: ForeignCall.c,v 1.17 2000/05/26 10:14:34 sewardj Exp $
*
* (c) The GHC Team 1994-1999.
*
*
* (c) The GHC Team 1994-1999.
*
@@
-205,7
+205,8
@@
static void universal_call_c_generic
printf("%c",(char)argstr[i]);
}
printf("' [%d arg(s)]\n",n_args);
printf("%c",(char)argstr[i]);
}
printf("' [%d arg(s)]\n",n_args);
- assert(0);
+ barf("aborting");
+ ASSERT(0);
}
#undef CALL
#undef CMP
}
#undef CALL
#undef CMP
@@
-385,7
+386,7
@@
int ccall ( CFunDescriptor* d,
/* Make it possible for the evaluator to get hold of bytecode
for a given function by name. Useful but a hack. Sigh.
*/
/* Make it possible for the evaluator to get hold of bytecode
for a given function by name. Useful but a hack. Sigh.
*/
-extern void* getHugs_AsmObject_for ( char* s );
+extern void* /* StgClosure* */ getHugs_BCO_cptr_for ( char* s );
extern int /*Bool*/ combined;
/* ----------------------------------------------------------------*
extern int /*Bool*/ combined;
/* ----------------------------------------------------------------*
@@
-469,7
+470,7
@@
unpackArgsAndCallHaskell_x86_nocallconv_wrk ( StgStablePtr stableptr,
sstat = rts_evalIO ( node, &nodeOut );
} else {
node = rts_apply (
sstat = rts_evalIO ( node, &nodeOut );
} else {
node = rts_apply (
- asmClosureOfObject(getHugs_AsmObject_for("primRunST")),
+ getHugs_BCO_cptr_for("runST"),
node );
sstat = rts_eval ( node, &nodeOut );
}
node );
sstat = rts_eval ( node, &nodeOut );
}