[m-rev.] for review: add MR_ prefixes

[Fergus Henderson]

On 12-Feb-2002, Simon Taylor <stayl at cs.mu.OZ.AU> wrote:
> 
> Add MR_ prefixes to uses of configuration macros.
> Bootcheck now succeeds with MR_NO_CONF_BACKWARDS_COMPAT.
> 
> Mmake.common.in:
> 	Define MR_NO_CONF_BACKWARDS_COMPAT when checking
> 	for namespace cleanliness.
> 
> configure.in:
> */*.c:
> */*.h:
> */*.m:
> 	Add MR_ prefixes.

> +++ runtime/RESERVED_MACRO_NAMES	11 Feb 2002 17:35:52 -0000
> @@ -48,87 +48,8 @@
>  # XXX we ought to add MR_ prefixes to all of these.
>  # XXX TAG_BITS is defined in mercury_tags.h
>  pid_t
> -BOXED_FLOAT
> -CONSERVATIVE_GC
> -LOW_TAG_BITS
> -NATIVE_GC
> -NO_TYPE_LAYOUT
> -PARALLEL
> -PC_ACCESS
> -PC_ACCESS_GREG
>  PIC
> -PROFILE_CALLS
> -PROFILE_MEMORY
> -PROFILE_TIME
> -SIGACTION_FIELD
>  TAG_BITS

This change is not mentioned in the log message.

Any particular reason why you didn't add MR_ prefixes to PIC and TAG_BITS?

> Index: runtime/mercury_conf_bootstrap.h
> ===================================================================
> RCS file: /home/mercury1/repository/mercury/runtime/mercury_conf_bootstrap.h,v
> retrieving revision 1.1
> diff -u -u -r1.1 mercury_conf_bootstrap.h
> --- runtime/mercury_conf_bootstrap.h	11 Feb 2002 12:11:43 -0000	1.1
> +++ runtime/mercury_conf_bootstrap.h	11 Feb 2002 15:57:19 -0000
> @@ -262,9 +262,6 @@
>  #ifdef MR_SYNC_TERM_SIZE
>    #define SYNC_TERM_SIZE MR_SYNC_TERM_SIZE
>  #endif
> -#ifdef MR_BOXED_FLOAT
> -  #define BOXED_FLOAT 1
> -#endif

That change isn't mentioned in the log message.

> Index: runtime/mercury_goto.h
...
> +#elif defined(MR_PIC_REG) && defined(MR_USE_GCC_GLOBAL_REGISTERS) && defined(__i386__)
...
> +#elif defined(MR_PIC_REG) && defined(MR_USE_GCC_GLOBAL_REGISTERS) && defined(__i386__)

Wrap these long lines (using \ at the end of the first line, of course).

> Index: trace/mercury_trace_internal.c
...
> +#if defined(MR_HAVE_OPEN) && defined(O_RDWR) && defined(MR_HAVE_FDOPEN) && \
> +	defined(MR_HAVE_CLOSE) && defined(MR_HAVE_DUP) && defined(MR_HAVE_DUP2) && \

Wrap that one too.

Otherwise that looks fine.  But it might be wise to also try bootstrapping
in grade hlc.gc with MR_NO_CONF_BACKWARDS_COMPAT before committing,
as well as grade asm_fast.gc.

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------