[m-dev.] diff: MLDS back-end: fix bugs in scripts/*

Fergus Henderson fjh at cs.mu.OZ.AU
Wed Feb 9 02:32:02 AEDT 2000


Estimated hours taken: 0.75

Fix some bugs in the MLDS back-end support.

scripts/parse_grade_options.sh-subr:
	Fix a bug: s/high_level/highlevel/g

scripts/final_grade_options.sh-subr:
	Ensure that --high-level-code disables the use of the low-level
	gcc extensions, as is done in compiler/handle_options.m.

Workspace: /mnt/ender/home/ender2/fjh/mercury
Index: scripts/final_grade_options.sh-subr
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/final_grade_options.sh-subr,v
retrieving revision 1.3
diff -u -d -r1.3 final_grade_options.sh-subr
--- scripts/final_grade_options.sh-subr	1999/11/09 01:45:41	1.3
+++ scripts/final_grade_options.sh-subr	2000/02/08 15:12:52
@@ -38,4 +38,14 @@
 		use_trail=true ;;
 esac
 
+#
+# --high-level-code disables the use of low-level gcc extensions
+#
+case $highlevel_code in true)
+	non_local_gotos=false
+	asm_labels=false
+	global_regs=false
+	;;
+esac
+
 #---------------------------------------------------------------------------#
Index: scripts/parse_grade_options.sh-subr
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/parse_grade_options.sh-subr,v
retrieving revision 1.13
diff -u -d -r1.13 parse_grade_options.sh-subr
--- scripts/parse_grade_options.sh-subr	1999/12/21 09:56:46	1.13
+++ scripts/parse_grade_options.sh-subr	2000/02/08 15:12:52
@@ -20,14 +20,14 @@
 #---------------------------------------------------------------------------#
 
 	--high-level-code)
-		high_level_code=true ;;
+		highlevel_code=true ;;
 	--no-high-level-code)
-		high_level_code=false ;;
+		highlevel_code=false ;;
 
 	--high-level-data)
-		high_level_data=true ;;
+		highlevel_data=true ;;
 	--no-high-level-data)
-		high_level_data=false ;;
+		highlevel_data=false ;;
 
 	--gcc-nested-functions)
 		gcc_nested_functions=true ;;
@@ -148,9 +148,9 @@
 		# may also require changes to all the files indicated by
 		# runtime/mercury_grade.h.
 
-		high_level_code=false
+		highlevel_code=false
 		gcc_nested_functions=false
-		high_level_data=false
+		highlevel_data=false
 		asm_labels=false
 		non_local_gotos=false
 		global_regs=false
@@ -174,81 +174,81 @@
 					asm_labels=false
 					non_local_gotos=false
 					global_regs=false
-					high_level_code=true
+					highlevel_code=true
 					gcc_nested_functions=false
-					high_level_data=true
+					highlevel_data=true
 					;;
 				hlc)
 					asm_labels=false
 					non_local_gotos=false
 					global_regs=false
-					high_level_code=true
+					highlevel_code=true
 					gcc_nested_functions=false
-					high_level_data=false
+					highlevel_data=false
 					;;
 				hl_nest)
 					asm_labels=false
 					non_local_gotos=false
 					global_regs=false
-					high_level_code=true
+					highlevel_code=true
 					gcc_nested_functions=true
-					high_level_data=true
+					highlevel_data=true
 					;;
 				hlc_nest)
 					asm_labels=false
 					non_local_gotos=false
 					global_regs=false
-					high_level_code=true
+					highlevel_code=true
 					gcc_nested_functions=true
-					high_level_data=false
+					highlevel_data=false
 					;;
 				asm_fast)
 					asm_labels=true
 					non_local_gotos=true
 					global_regs=true
-					high_level_code=false
+					highlevel_code=false
 					gcc_nested_functions=false
-					high_level_data=false
+					highlevel_data=false
 					;;
 				asm_jump)
 					asm_labels=true
 					non_local_gotos=true
 					global_regs=false
-					high_level_code=false
+					highlevel_code=false
 					gcc_nested_functions=false
-					high_level_data=false
+					highlevel_data=false
 					;;
 				fast)
 					asm_labels=false
 					non_local_gotos=true
 					global_regs=true
-					high_level_code=false
+					highlevel_code=false
 					gcc_nested_functions=false
-					high_level_data=false
+					highlevel_data=false
 					;;
 				jump)
 					asm_labels=false
 					non_local_gotos=true
 					global_regs=false
-					high_level_code=false
+					highlevel_code=false
 					gcc_nested_functions=false
-					high_level_data=false
+					highlevel_data=false
 					;;
 				reg)
 					asm_labels=false
 					non_local_gotos=false
 					global_regs=true
-					high_level_code=false
+					highlevel_code=false
 					gcc_nested_functions=false
-					high_level_data=false
+					highlevel_data=false
 					;;
 				none)
 					asm_labels=false
 					non_local_gotos=false
 					global_regs=false
-					high_level_code=false
+					highlevel_code=false
 					gcc_nested_functions=false
-					high_level_data=false
+					highlevel_data=false
 					;;
 
 				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
--------------------------------------------------------------------------



More information about the developers mailing list