diff: `do_runnext'-related bug fixes
Fergus Henderson
fjh at cs.mu.OZ.AU
Mon Sep 21 20:20:36 AEST 1998
runtime/mercury_context.c:
Add `Define_external_entry(do_runnext)', which somehow got
lost when the definition of `do_runnext' was moved from
mercury_thread.c to mercury_context.c.
runtime/mercury_context.c:
runtime/mercury_thread.c:
Move the definition of the stack layout for the label `do_runnext'
into the same C module that the label is defined in.
runtime/mercury_wrapper.c:
Delete an unnecessary declaration of `do_runnext'.
Index: runtime/mercury_context.c
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_context.c,v
retrieving revision 1.13
diff -u -r1.13 mercury_context.c
--- mercury_context.c 1998/08/26 02:58:27 1.13
+++ mercury_context.c 1998/09/21 10:02:22
@@ -160,6 +160,8 @@
fatal_error("computation floundered");
}
+Define_extern_entry(do_runnext);
+
BEGIN_MODULE(scheduler_module)
init_entry(do_runnext);
BEGIN_CODE
Index: runtime/mercury_thread.c
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_thread.c,v
retrieving revision 1.6
diff -u -r1.6 mercury_thread.c
--- mercury_thread.c 1998/08/26 02:58:29 1.6
+++ mercury_thread.c 1998/09/21 10:07:41
@@ -8,6 +8,7 @@
#include "mercury_regs.h"
#include "mercury_engine.h"
#include "mercury_memory.h"
+#include "mercury_context.h" /* for do_runnext */
#include "mercury_thread.h"
#include <stdio.h>
@@ -19,10 +20,6 @@
#endif
bool MR_exit_now;
-
-Declare_entry(do_runnext);
-
-MR_MAKE_STACK_LAYOUT_ENTRY(do_runnext)
#ifdef MR_THREAD_SAFE
Index: runtime/mercury_wrapper.c
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_wrapper.c,v
retrieving revision 1.24
diff -u -r1.24 mercury_wrapper.c
--- mercury_wrapper.c 1998/08/24 08:24:58 1.24
+++ mercury_wrapper.c 1998/09/21 10:08:04
@@ -165,7 +165,6 @@
#endif
Declare_entry(do_interpreter);
-Declare_entry(do_runnext);
/*---------------------------------------------------------------------------*/
--
Fergus Henderson <fjh at cs.mu.oz.au> | "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh> | of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3 | -- the last words of T. S. Garp.
More information about the developers
mailing list