[m-dev.] trivial diff: MLDS back-end fixes

[Fergus Henderson]

Estimated hours taken: 0.25

Minor fixes for the MLDS back-end.

runtime/mercury_conf_param.h:
	Fix a mistake in a comment:
	s/MR_GCC_NESTED_FUNCTIONS/MR_USE_GCC_NESTED_FUNCTIONS/
	                             ^^^^
runtime/mercury.h:
	#include "mercury_thread.h", for the MR_*_GLOBAL_LOCK() macros.
	The MLDS back-end generates calls to those macros for
	code using the C interface which is not declared `thread_safe'.

compiler/ml_code_gen.m:
	Make sure that we put a `;' after the user's C code fragment.
	This is to match what the LLDS back-end does.

Workspace: /d-drive/home/hg/fjh/mercury
Index: compiler/ml_code_gen.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/ml_code_gen.m,v
retrieving revision 1.23
diff -u -d -r1.23 ml_code_gen.m
--- compiler/ml_code_gen.m	1999/12/06 07:25:25	1.23
+++ compiler/ml_code_gen.m	1999/12/06 18:03:38
@@ -1470,7 +1470,7 @@
 				ObtainLock,
 				"\t\t{\n",
 				C_Code,
-				"\n\t\t}\n",
+				"\n\t\t;}\n",
 				ReleaseLock,
 				AssignOutputsCode,
 				"}\n"],
Index: runtime/mercury.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury.h,v
retrieving revision 1.1
diff -u -d -r1.1 mercury.h
--- runtime/mercury.h	1999/12/04 02:05:54	1.1
+++ runtime/mercury.h	1999/12/06 07:12:48
@@ -23,6 +23,7 @@
 #include "mercury_float.h"	/* for the `Float' type */
 #include "mercury_tags.h"
 #include "mercury_grade.h"
+#include "mercury_thread.h"	/* for the MR_*_GLOBAL_LOCK() macros */
 #include "mercury_std.h"
 
 #include "gc.h"
Index: runtime/mercury_conf_param.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_conf_param.h,v
retrieving revision 1.29
diff -u -d -r1.29 mercury_conf_param.h
--- runtime/mercury_conf_param.h	1999/12/21 10:10:08	1.29
+++ runtime/mercury_conf_param.h	1999/12/21 10:20:35
@@ -41,7 +41,7 @@
 **
 ** MR_HIGHLEVEL_CODE
 ** MR_HIGHLEVEL_DATA
-** MR_GCC_NESTED_FUNCTIONS
+** MR_USE_GCC_NESTED_FUNCTIONS
 ** USE_GCC_GLOBAL_REGISTERS
 ** USE_GCC_NONLOCAL_GOTOS
 ** USE_ASM_LABELS

-- 
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.
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------