[m-dev.] diff: more MLDS grade changes

[Fergus Henderson]

Estimated hours taken: 0.5

runtime/mercury_grade.h:
runtime/mercury_conf_param.h:
	Support new grades and options for the MLDS back-end.

Workspace: /d-drive/home/hg/fjh/mercury
Index: runtime/mercury_conf_param.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_conf_param.h,v
retrieving revision 1.28
diff -u -d -w -r1.28 mercury_conf_param.h
--- runtime/mercury_conf_param.h	1999/11/09 01:45:37	1.28
+++ runtime/mercury_conf_param.h	1999/12/21 10:05:57
@@ -39,6 +39,9 @@
 /*
 ** Code generation options:
 **
+** MR_HIGHLEVEL_CODE
+** MR_HIGHLEVEL_DATA
+** MR_GCC_NESTED_FUNCTIONS
 ** USE_GCC_GLOBAL_REGISTERS
 ** USE_GCC_NONLOCAL_GOTOS
 ** USE_ASM_LABELS
@@ -49,6 +52,9 @@
 ** MR_USE_TRAIL
 ** MR_USE_MINIMAL_MODEL
 **	See the documentation for
+**		--high-level-code
+**		--high-level-data
+**		--gcc-nested-functions
 **		--gcc-global-registers
 **		--gcc-non-local-gotos
 **		--gcc-asm-labels
Index: runtime/mercury_grade.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_grade.h,v
retrieving revision 1.24
diff -u -d -w -r1.24 mercury_grade.h
--- runtime/mercury_grade.h	1999/12/11 15:32:29	1.24
+++ runtime/mercury_grade.h	1999/12/20 18:27:16
@@ -61,6 +61,22 @@
 
 #define MR_GRADE_PART_0		v2_
 
+#ifdef MR_HIGHLEVEL_CODE
+
+  #ifdef MR_HIGHLEVEL_DATA
+    #define MR_GRADE_PART_1	MR_PASTE2(MR_GRADE_PART_0, hl)
+  #else
+    #define MR_GRADE_PART_1	MR_PASTE2(MR_GRADE_PART_0, hlc)
+  #endif
+
+  #ifdef MR_USE_GCC_NESTED_FUNCTIONS
+    #define MR_GRADE_PART_2	MR_PASTE2(MR_GRADE_PART_1, _nest)
+  #else
+    #define MR_GRADE_PART_2	MR_GRADE_PART_1
+  #endif
+
+#else /* ! MR_HIGHLEVEL_CODE */
+
 #ifdef USE_ASM_LABELS
   #define MR_GRADE_PART_1	MR_PASTE2(MR_GRADE_PART_0, asm_)
 #else
@@ -80,6 +96,8 @@
     #define MR_GRADE_PART_2	MR_PASTE2(MR_GRADE_PART_1, none)
   #endif
 #endif
+
+#endif /* ! MR_HIGHLEVEL_CODE */
 
 #ifdef MR_THREAD_SAFE
   #define MR_GRADE_PART_3	MR_PASTE2(MR_GRADE_PART_2, _par)

-- 
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
--------------------------------------------------------------------------