[m-rev.] diff: MR_STATIC

[Zoltan Somogyi]

Delete a distinction that makes no difference. While MR_define_static_entry
differs from MR_define_entry, references to the entry labels they define
are identical (and have always been).

runtime/mercury_goto.h:
	Delete MR_STATIC and MR_GOTO_STATIC, since they are identical
	under all circumstances to MR_ENTRY and MR_GOTO_ENTRY respectively.

runtime/mercury_bootstrap.h:
	Provide bootstrap definitions of the deleted macros.

runtime/mercury_stack_layout.h:
	Change an MR_STATIC to an MR_ENTRY. (This reference could always
	refer either to a static or an exported procedure label, and worked
	only because MR_ENTRY and MR_STATIC are always identical.)

compiler/llds_out.m:
	Generate only MR_ENTRY, not MR_STATIC.

cvs diff: Diffing .
cvs diff: Diffing analysis
cvs diff: Diffing bindist
cvs diff: Diffing boehm_gc
cvs diff: Diffing boehm_gc/Mac_files
cvs diff: Diffing boehm_gc/cord
cvs diff: Diffing boehm_gc/cord/private
cvs diff: Diffing boehm_gc/doc
cvs diff: Diffing boehm_gc/include
cvs diff: Diffing boehm_gc/include/private
cvs diff: Diffing boehm_gc/tests
cvs diff: Diffing browser
cvs diff: Diffing bytecode
cvs diff: Diffing compiler
Index: compiler/llds_out.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/llds_out.m,v
retrieving revision 1.211
diff -u -b -r1.211 llds_out.m
--- compiler/llds_out.m	1 May 2003 22:50:49 -0000	1.211
+++ compiler/llds_out.m	6 May 2003 07:26:48 -0000
@@ -3074,16 +3074,9 @@
 	output_label(exported(ProcLabel)),
 	io__write_string(")").
 output_label_as_code_addr(local(ProcLabel)) -->
-	globals__io_lookup_bool_option(split_c_files, SplitFiles),
-	( { SplitFiles = no } ->
-		io__write_string("MR_STATIC("),
-		output_label(local(ProcLabel)),
-		io__write_string(")")
-	;
 		io__write_string("MR_ENTRY("),
 		output_label(local(ProcLabel)),
-		io__write_string(")")
-	).
+	io__write_string(")").
 output_label_as_code_addr(c_local(ProcLabel)) -->
 	io__write_string("MR_LABEL("),
 	output_label(c_local(ProcLabel)),
cvs diff: Diffing compiler/notes
cvs diff: Diffing debian
cvs diff: Diffing deep_profiler
cvs diff: Diffing deep_profiler/notes
cvs diff: Diffing doc
cvs diff: Diffing extras
cvs diff: Diffing extras/aditi
cvs diff: Diffing extras/cgi
cvs diff: Diffing extras/complex_numbers
cvs diff: Diffing extras/complex_numbers/samples
cvs diff: Diffing extras/complex_numbers/tests
cvs diff: Diffing extras/concurrency
cvs diff: Diffing extras/curs
cvs diff: Diffing extras/curs/samples
cvs diff: Diffing extras/curses
cvs diff: Diffing extras/curses/sample
cvs diff: Diffing extras/dynamic_linking
cvs diff: Diffing extras/error
cvs diff: Diffing extras/graphics
cvs diff: Diffing extras/graphics/mercury_opengl
cvs diff: Diffing extras/graphics/mercury_tcltk
cvs diff: Diffing extras/graphics/samples
cvs diff: Diffing extras/graphics/samples/calc
cvs diff: Diffing extras/graphics/samples/maze
cvs diff: Diffing extras/graphics/samples/pent
cvs diff: Diffing extras/lazy_evaluation
cvs diff: Diffing extras/lex
cvs diff: Diffing extras/lex/samples
cvs diff: Diffing extras/lex/tests
cvs diff: Diffing extras/logged_output
cvs diff: Diffing extras/moose
cvs diff: Diffing extras/moose/samples
cvs diff: Diffing extras/morphine
cvs diff: Diffing extras/morphine/non-regression-tests
cvs diff: Diffing extras/morphine/scripts
cvs diff: Diffing extras/morphine/source
cvs diff: Diffing extras/odbc
cvs diff: Diffing extras/posix
cvs diff: Diffing extras/quickcheck
cvs diff: Diffing extras/quickcheck/tutes
cvs diff: Diffing extras/references
cvs diff: Diffing extras/references/samples
cvs diff: Diffing extras/references/tests
cvs diff: Diffing extras/stream
cvs diff: Diffing extras/trailed_update
cvs diff: Diffing extras/trailed_update/samples
cvs diff: Diffing extras/trailed_update/tests
cvs diff: Diffing extras/xml
cvs diff: Diffing extras/xml/samples
cvs diff: Diffing java
cvs diff: Diffing java/library
cvs diff: Diffing java/runtime
cvs diff: Diffing library
cvs diff: Diffing profiler
cvs diff: Diffing robdd
cvs diff: Diffing runtime
Index: runtime/mercury_bootstrap.h
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/runtime/mercury_bootstrap.h,v
retrieving revision 1.32
diff -u -b -r1.32 mercury_bootstrap.h
--- runtime/mercury_bootstrap.h	9 Sep 2002 05:52:37 -0000	1.32
+++ runtime/mercury_bootstrap.h	6 May 2003 07:28:39 -0000
@@ -22,6 +22,9 @@
 
 #ifndef MR_NO_BACKWARDS_COMPAT
 
+#define	MR_STATIC(l)		MR_ENTRY(l)
+#define	MR_GOTO_STATIC(l)	MR_GOTO_ENTRY(l)
+
 /*
 ** bool, TRUE and FALSE appear in the generated code.
 ** Once the installed compilers no longer generate these, they should
Index: runtime/mercury_goto.h
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/runtime/mercury_goto.h,v
retrieving revision 1.35
diff -u -b -r1.35 mercury_goto.h
--- runtime/mercury_goto.h	14 Feb 2003 09:57:29 -0000	1.35
+++ runtime/mercury_goto.h	6 May 2003 07:27:50 -0000
@@ -593,7 +593,6 @@
 	MR_make_entry_sl(MR_STRINGIFY(label), label, label)
 
     #define MR_ENTRY(label) 		(&label)
-    #define MR_STATIC(label) 		(&label)
 
     #ifndef MR_JUMP
     #define MR_JUMP(label)		MR_ASM_JUMP(label)
@@ -628,7 +627,6 @@
 	MR_make_entry_sl(MR_STRINGIFY(label), &&label, label);	\
 	MR_entry(label) = &&label
     #define MR_ENTRY(label) 		(MR_entry(label))
-    #define MR_STATIC(label) 		(MR_entry(label))
 
     #ifndef MR_JUMP
     #define MR_JUMP(label)		goto *(label)
@@ -668,7 +666,6 @@
 					MR_JUMP(label);			\
   				} while(0)
   #define MR_GOTO_ENTRY(label) 	MR_GOTO(MR_ENTRY(label))
-  #define MR_GOTO_STATIC(label)	MR_GOTO(MR_STATIC(label))
   #define MR_GOTO_LOCAL(label) 	MR_GOTO_LABEL(label)
   #define MR_GOTO_LABEL(label) 	do {					\
   					MR_debuggoto(MR_LABEL(label));	\
@@ -741,7 +738,6 @@
 		  				label, label)
 
   #define MR_ENTRY(label) 	((MR_Code *) (label))
-  #define MR_STATIC(label) 	((MR_Code *) (label))
   #define MR_LOCAL(label)	((MR_Code *) (label))
   #define MR_LABEL(label)	((MR_Code *) (label))
   /*
@@ -750,7 +746,6 @@
   */
   #define MR_GOTO(label)	return (label)
   #define MR_GOTO_ENTRY(label) 	MR_GOTO(MR_ENTRY(label))
-  #define MR_GOTO_STATIC(label) MR_GOTO(MR_STATIC(label))
   #define MR_GOTO_LOCAL(label) 	MR_GOTO(MR_LOCAL(label))
   #define MR_GOTO_LABEL(label) 	MR_GOTO(MR_LABEL(label))
 
Index: runtime/mercury_stack_layout.h
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/runtime/mercury_stack_layout.h,v
retrieving revision 1.70
diff -u -b -r1.70 mercury_stack_layout.h
--- runtime/mercury_stack_layout.h	10 Apr 2003 05:32:13 -0000	1.70
+++ runtime/mercury_stack_layout.h	6 May 2003 07:30:14 -0000
@@ -840,7 +840,7 @@
 #define	MR_PROC_NO_SLOT_COUNT		-1
 
 #ifdef	MR_STATIC_CODE_ADDRESSES
- #define	MR_MAKE_PROC_LAYOUT_ADDR(entry)		MR_STATIC(entry)
+ #define	MR_MAKE_PROC_LAYOUT_ADDR(entry)		MR_ENTRY(entry)
  #define	MR_INIT_PROC_LAYOUT_ADDR(entry)		do { } while (0)
 #else
  #define	MR_MAKE_PROC_LAYOUT_ADDR(entry)		((MR_Code *) NULL)
cvs diff: Diffing runtime/GETOPT
cvs diff: Diffing runtime/machdeps
cvs diff: Diffing samples
cvs diff: Diffing samples/c_interface
cvs diff: Diffing samples/c_interface/c_calls_mercury
cvs diff: Diffing samples/c_interface/cplusplus_calls_mercury
cvs diff: Diffing samples/c_interface/mercury_calls_c
cvs diff: Diffing samples/c_interface/mercury_calls_cplusplus
cvs diff: Diffing samples/c_interface/mercury_calls_fortran
cvs diff: Diffing samples/c_interface/simpler_c_calls_mercury
cvs diff: Diffing samples/c_interface/simpler_cplusplus_calls_mercury
cvs diff: Diffing samples/diff
cvs diff: Diffing samples/muz
cvs diff: Diffing samples/rot13
cvs diff: Diffing samples/solutions
cvs diff: Diffing samples/tests
cvs diff: Diffing samples/tests/c_interface
cvs diff: Diffing samples/tests/c_interface/c_calls_mercury
cvs diff: Diffing samples/tests/c_interface/cplusplus_calls_mercury
cvs diff: Diffing samples/tests/c_interface/mercury_calls_c
cvs diff: Diffing samples/tests/c_interface/mercury_calls_cplusplus
cvs diff: Diffing samples/tests/c_interface/mercury_calls_fortran
cvs diff: Diffing samples/tests/c_interface/simpler_c_calls_mercury
cvs diff: Diffing samples/tests/c_interface/simpler_cplusplus_calls_mercury
cvs diff: Diffing samples/tests/diff
cvs diff: Diffing samples/tests/muz
cvs diff: Diffing samples/tests/rot13
cvs diff: Diffing samples/tests/solutions
cvs diff: Diffing samples/tests/toplevel
cvs diff: Diffing scripts
cvs diff: Diffing tests
cvs diff: Diffing tests/benchmarks
cvs diff: Diffing tests/debugger
cvs diff: Diffing tests/debugger/declarative
cvs diff: Diffing tests/dppd
cvs diff: Diffing tests/general
cvs diff: Diffing tests/general/accumulator
cvs diff: Diffing tests/general/string_format
cvs diff: Diffing tests/general/structure_reuse
cvs diff: Diffing tests/grade_subdirs
cvs diff: Diffing tests/hard_coded
cvs diff: Diffing tests/hard_coded/exceptions
cvs diff: Diffing tests/hard_coded/purity
cvs diff: Diffing tests/hard_coded/sub-modules
cvs diff: Diffing tests/hard_coded/typeclasses
cvs diff: Diffing tests/invalid
cvs diff: Diffing tests/invalid/purity
cvs diff: Diffing tests/misc_tests
cvs diff: Diffing tests/mmc_make
cvs diff: Diffing tests/mmc_make/lib
cvs diff: Diffing tests/recompilation
cvs diff: Diffing tests/tabling
cvs diff: Diffing tests/term
cvs diff: Diffing tests/valid
cvs diff: Diffing tests/warnings
cvs diff: Diffing tools
cvs diff: Diffing trace
cvs diff: Diffing util
cvs diff: Diffing vim
cvs diff: Diffing vim/after
cvs diff: Diffing vim/ftplugin
cvs diff: Diffing vim/syntax
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------