When compiling the library directory, we used to get C compiler warnings
about assigning ints to pointers, because on many machines an int is 32 bits,
while pointers are 64. The problem was in robdd/bryant.c, which is bodily
robdd/robdd_conf.h.in:
New autoconfigured file that specifies what integer type to use
in robdd nodes (it is now given the typedef name MR_ROBDD_int),
and how many bits it has.
configure.ac:
Build robdd_conf.h from robdd_conf.h.in after gathering the info it needs.
robdd/bryant.[ch]:
Replace almost all uses of ints with MR_ROBDD_ints. The only exceptions
are the places where int is used as a bool, and where it is used
as a comparison result (where we need distinguish only between -1, 0, 1).
In places where MR_ROBDD_ints are printed out, print them with %ld
after casting them to long.
Replace the only use of unsigned long, in bitmasks, with MR_ROBDD_uint,
the unsigned version of MR_ROBDD_int. As far as I can tell, it always
should have been the same size as the signed ints (and on most 32 bit
architectures, it was, although by accident).
Note that bryant.c does NOT compile if e.g. MR_ROBDD_STATISTICS
is defined. However, that is not the fault of this diff; even the
version before this diff (from 2004!) had that problem.
Fix some obvious formatting issues.
Delete some functions that were declared but never called. (In fact,
one wasn't even defined :-()
library/Mmakefile:
Rebuild robdd.o if any of ../robdd/{bryant.[ch],robdd_conf.h} is modified.
This change set creates a new value 'hgc' for the garbage collector grade
component. This enables a new garbage collector included with the runtime
system. Note that this garbage collector is experimental and this grade does
not work yet.
This change set represents work done by both myself and Ralph Becket.
runtime/mercury_hgc.c:
runtime/mercury_hgc.h:
Include the new garbage collector.
runtime/mercury_expanding_array.h:
This new header file provides a template for a type safe expanding array,
it is used by HGC.
runtime/Mmakefile:
Include the new modules in the runtime directory mercury_hgc.[ch] and
mercury_expanding_array.h.
Sort the lists of source files and header files.
compiler/globals.m:
Include 'hgc' in the options for which garbage collector to use.
compiler/handle_options.m:
Handle the new 'hgc' value for the garbage collector type.
compiler/options.m:
Print out information about the new 'hgc' option in the --help text of the
compiler.
compiler/compile_target_code.m:
Pass the -DMR_HGC option to the C compiler for hgc grades.
compiler/add_pragma.m:
compiler/mercury_compile_mlds_back_end.m:
compiler/mlds_to_c.m:
compiler/peephole.m:
Conform to changes in globals.m.
library/benchmarking.m:
Fix a use of MR_CONSERVATIVE_GC that should have been MR_BOEHM_GC.
robdd/bryant.h:
Include the mercury_hgc.h header file when MR_HGC is defined.
runtime/mercury_init.h:
runtime/mercury_heap.h:
Include mercury_hgc.h when MR_HGC is defined.
runtime/mercury_memory_zones.c:
Use mercury_hgc_add_roots_range when appropriate.
runtime/mercury_wrapper.c:
Include initialisation code for HGC.
util/mkinit.c:
Include a call to mercury_hgc_set_stack_bot in init files in the HGC grade.
runtime/mercury_conf_param.h:
runtime/mercury_grade.h:
scripts/canonical_grade.sh-subr
scripts/init_grade_options.sh-subr
scripts/mgnuc.in
scripts/ml.in
scripts/parse_grade_options.sh-subr
Add the new hgc value for the garbage collector grade component.
Estimated hours taken: 3
Branches: main
Fix some warnings and type errors that show up on the x86_64 architecture.
browser/io_action.m:
Declare is_func in the C code for pickup_io_action to be MR_Bool
rather than MR_bool, since it is a (word sized) Mercury bool, not
a C boolean.
library/construct.m:
runtime/mercury_unify_compare_body.h:
Provide values for variables even when MR_fatal_error is called,
to avoid warnings about uninitialized variables. Add default
switch cases which call MR_fatal_error.
mdbcomp/rtti_access.m:
Pass an int* to MR_find_context, and cast the result to an MR_Integer
afterwards.
robdd/bryant.h:
This code incorrectly assumes that unsigned long will have 32 bits.
Flag the error with an XXX.
runtime/mercury_deconstruct.c:
trace/mercury_trace_internal.c:
Cast arity values to int before printing. We don't support
arity > 1024 anyway.
runtime/mercury_proc_id.h:
runtime/mercury_types.h:
Add an extra branch to the MR_Proc_Id union for the case when no
proc id is present, and add a macro to test for this case. We can't
test the enum directly as we did before, because C compilers may
report a warning that the test will never succeed (since -1 is not
one of the values in the enum).
Clarify the comment about the requirement of MR_PredFunc to match
prim_data.pred_or_func.
Define a macro for the value that indicates there is no proc id.
Fix a couple of out-of-date comments.
trace/mercury_trace_browse.h:
Clarify the comments about the requirement of MR_Browse_Caller_Type,
MR_Browse_Format and MR_Query_Type to match their corresponding
Mercury types.
runtime/mercury_tags.h:
Add a comment to point out that enums don't necessarily have the
same size as MR_words.
runtime/mercury_stack_layout.h:
Use the new macro instead of testing directly whether the proc id
exists.
runtime/mercury_stack_trace.c:
runtime/mercury_trace_base.c:
runtime/mercury_type_info.c:
trace/mercury_trace_internal.c:
Use MR_INTEGER_LENGTH_MODIFIER, which is set by `configure', to
get the right format specifier when printing integers with the same
size as MR_Word.
runtime/mercury_type_info.c:
Compare pseudo-typeinfos as MR_Integers rather than ints.
trace/mercury_trace.c:
trace/mercury_trace_tables.c:
Provide a dummy value for variables to avoid uninitialized variable
warnings.
trace/mercury_trace_completion.c:
Cast a void* to MR_Integer before casting it to int. It would be
nicer to avoid the second cast altogether, but the readline interface
requires it.
trace/mercury_trace_internal.c:
Use MR_trace_is_unsigned when working with MR_Unsigned values.
Cast pseudo-typeinfos which are variables to MR_Integer rather than
int, to avoid compiler warnings about pointer casts. We cast them
to int before printing them, but that is because we know they won't
be that big.
Parse the argument to the goto command as type MR_Unsigned instead
of int, to make it possible to goto an event with a number bigger
than 2^31, on 64-bit machines at least. (We already get 200M+
events when the compiler is in a debug grade.)
trace/mercury_trace_util.c:
trace/mercury_trace_util.h:
Provide MR_trace_is_unsigned, which is like MR_trace_is_natural_number
except that it works with MR_Unsigned values.
trace/mercury_trace_vars.c:
Cast void* to MR_Integer rather than int.
Estimated hours taken: unknown (but probably several weeks by dmo)
Branches: main
Move changes in the library on the mode-constraints branch onto the trunk.
library/eqvclass.m:
Add some utility functions and predicates.
library/map.m:
Add some utility functions and predicates, and some type
specialization directives.
library/tree234.m:
Add some utility functions and predicates.
library/robdd.m:
Add this module, which provides a Mercury interface to the C code in
robdd/bryant.c. In some places, robustness has been sacrificed for
speed, and the module is not (yet) as well documented as it could be;
therefore it is not (yet) included in the documentation.
library/pprint.m:
Print robdds nicely, since this is essential to debugging code handling
robdds. (This is why adding robdd.m in some other directory, e.g. the
compiler, wouldn't really work.)
library/term.m:
Add a function that returns the highest numbered vars created from
a var_supply.
library/varset.m:
Add a function that returns the highest numbered vars created from
a varset.
library/unsafe.m:
Add this module here, since it may be needed to debug code in the
library (e.g. in robdd.m.).
library/library.m:
Add a reference to the robdd module, and a commented out reference
to the unsafe module. If a developer needs to use unsafe.m anywhere
in the Mercury implementation, they can uncomment this reference
in the relevant workspace.
Make the list of modules easier to maintain (especially in the case
of CVS conflicts) by listing one module per line.
Fix formatting of some foreign_procs.
NEWS:
Mention the new predicates and functions.
Mmake.workspace:
Add a new make variable that specifies the location of the robdd
subdirectory.
Mmakefile:
Add rules for handling the robdd subdirectory.
configure.in:
Check whether the compiler can handle local foreign_decls, since
robdd.m now needs this.
tools/bootcheck:
Add the robdd subdirectory to the stage 2 & 3 directories.
deep_profiler/unsafe.m:
Remove this module from this directory.
doc/Mmakefile:
Do not include the robdd and unsafe modules in the documentation.
The robdd module because (in its present state) it is not stable
enough, the unsafe module because it is not enabled in installed
versions of the library.
robdd/Makefile:
Update the set of default compilation flags. The main code in this
directory, bryant.c, is #included in library/robdd.m, and the only
other programs in this directory are test programs.
robdd/Mmakefile:
New file. Includes a mechanism to compile bryant.c in the robdd
subdirectory, since this can give cleaner error messages than
compiling library/robdd.m.
robdd/bryant.[ch]:
Huge cleanup of these files. Add MR_ROBDD_ prefixes to global symbols,
make the formatting conform to our standards, and fix irregularities
in the uses of the macros that control the use of optional facilities.
robdd/bryantPrint.[ch]:
robdd/table.[ch]:
robdd/test_abexit.c:
robdd/test_abunify.c:
robdd/test_abglb.c:
robdd/test_iff.c:
robdd/test_rename.c:
robdd/test_restrict.c:
robdd/test_rglb.c:
robdd/test_upclose.c:
robdd/test_var.c:
robdd/test_vars.c:
robdd/timing.[ch]:
robdd/var.h:
Conform to the changes in bryant.h. Note that since the code in these
files won't end up in Mercury program code, they don't need to be
namespace clean.
runtime/mercury.h:
runtime/mercury_heap.h:
runtime/mercury_init.h:
runtime/mercury_memory.h:
#define GC_I_HIDE_POINTERS before each #include of gc.h (bryant.c
hides pointers). This impact of this #define is so small that it is
not measurable.
runtime/RESERVED_MACRO_NAMES:
library/RESERVED_MACRO_NAMES:
Add HIDE_POINTER and REVEAL_POINTER, since defining GC_I_HIDE_POINTERS
makes these macros from gc.h visible.
runtime/mercury_reg_workarounds.[ch]:
Add the MR_memset function.
tests/debugger/declarative/if_then_else.{inp,exp}:
tests/debugger/declarative/ite_2.{inp,exp,exp2}:
Avoid a name conflict with the predicate ite in robdd.m.
Estimated hours taken: 0.2
Import Peter Schachte's ROBDD package into the Mercury repository as
`mercury/robdd'.
Vendor tag is `robdd'. Release tag is `REL_1_0'.
