[m-dev.] for review: proc_label.m
Zoltan Somogyi
zs at cs.mu.OZ.AU
Fri Mar 14 17:09:01 AEDT 2003
The change itself is trivial, if long. The main thing that needs review
is the policy that all imports of modules in the compiler directory are on
lines of their own, and in sorted order, to make CVS merges easier.
Zoltan.
Reduce the dependence of the MLDS backend on the LLDS backend by moving
functionality dealing with proc_labels from the LLDS backend (code_util.m)
to a new module, proc_label.m, which is part of backend_libs.
compiler/code_util.m:
compiler/proc_label.m:
Move a type and some code from code_util to the new module. Convert
predicates to functions as relevant. (The old code was written before
functions were available).
compiler/backend_libs.m:
Add proc_label to the list of submodules.
compiler/rtti.m:
Rename a function to avoid a name clash with a function in
proc_label.m.
compiler/*.m:
Conform to the changes above.
Ensure that all imports of modules in the compiler directory are on
lines of their own, to make CVS merges easier. Sort the imports.
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/backend_libs.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/backend_libs.m,v
retrieving revision 1.2
diff -u -r1.2 backend_libs.m
--- compiler/backend_libs.m 28 Mar 2002 03:42:41 -0000 1.2
+++ compiler/backend_libs.m 12 Mar 2003 12:15:01 -0000
@@ -1,5 +1,5 @@
%-----------------------------------------------------------------------------%
-% Copyright (C) 2002 The University of Melbourne.
+% Copyright (C) 2002-2003 The University of Melbourne.
% This file may only be copied under the terms of the GNU General
% Public License - see the file COPYING in the Mercury distribution.
%-----------------------------------------------------------------------------%
@@ -11,19 +11,27 @@
%
:- module backend_libs.
:- interface.
-:- import_module transform_hlds, check_hlds. % are these needed?
-:- import_module hlds, parse_tree, libs.
+:- import_module check_hlds. % is this needed?
+:- import_module hlds.
+:- import_module libs.
+:- import_module parse_tree.
+:- import_module transform_hlds. % is this needed?
% modules that provide functionality used by several different back-ends
+:- include_module base_typeclass_info.
:- include_module builtin_ops.
:- include_module bytecode_data.
:- include_module c_util.
:- include_module code_model.
-:- include_module switch_util.
-:- include_module rtti, type_ctor_info, pseudo_type_info, base_typeclass_info.
-:- include_module foreign, export.
:- include_module compile_target_code.
+:- include_module export.
+:- include_module foreign.
:- include_module matching.
+:- include_module proc_label.
+:- include_module pseudo_type_info.
+:- include_module rtti.
+:- include_module switch_util.
+:- include_module type_ctor_info.
%-----------------------------------------------------------------------------%
Index: compiler/base_typeclass_info.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/base_typeclass_info.m,v
retrieving revision 1.21
diff -u -r1.21 base_typeclass_info.m
--- compiler/base_typeclass_info.m 20 Mar 2002 12:35:51 -0000 1.21
+++ compiler/base_typeclass_info.m 12 Mar 2003 13:08:49 -0000
@@ -136,7 +136,7 @@
base_typeclass_info__construct_proc_labels([], _, []).
base_typeclass_info__construct_proc_labels([proc(PredId, ProcId) | Procs],
ModuleInfo, [ProcLabel | ProcLabels]) :-
- ProcLabel = rtti__make_proc_label(ModuleInfo, PredId, ProcId),
+ ProcLabel = rtti__make_rtti_proc_label(ModuleInfo, PredId, ProcId),
base_typeclass_info__construct_proc_labels(Procs, ModuleInfo,
ProcLabels).
Index: compiler/basic_block.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/basic_block.m,v
retrieving revision 1.13
diff -u -r1.13 basic_block.m
--- compiler/basic_block.m 20 Mar 2002 12:35:51 -0000 1.13
+++ compiler/basic_block.m 12 Mar 2003 12:19:13 -0000
@@ -1,5 +1,5 @@
%-----------------------------------------------------------------------------%
-% Copyright (C) 1997-2001 The University of Melbourne.
+% Copyright (C) 1997-2001,2003 The University of Melbourne.
% This file may only be copied under the terms of the GNU General
% Public License - see the file COPYING in the Mercury distribution.
%-----------------------------------------------------------------------------%
@@ -17,7 +17,9 @@
:- interface.
+:- import_module backend_libs__proc_label.
:- import_module ll_backend__llds.
+
:- import_module list, map, std_util, counter.
:- type block_map == map(label, block_info).
Index: compiler/code_gen.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/code_gen.m,v
retrieving revision 1.108
diff -u -r1.108 code_gen.m
--- compiler/code_gen.m 28 Feb 2003 06:40:40 -0000 1.108
+++ compiler/code_gen.m 12 Mar 2003 13:15:16 -0000
@@ -30,9 +30,12 @@
:- interface.
-:- import_module hlds__hlds_module, hlds__hlds_pred, hlds__hlds_goal.
:- import_module backend_libs__code_model.
-:- import_module ll_backend__llds, ll_backend__code_info.
+:- import_module hlds__hlds_goal.
+:- import_module hlds__hlds_module.
+:- import_module hlds__hlds_pred.
+:- import_module ll_backend__code_info.
+:- import_module ll_backend__llds.
:- import_module list, io, counter.
@@ -67,28 +70,42 @@
:- implementation.
% Parse tree modules
-:- import_module parse_tree__prog_data, parse_tree__prog_out.
+:- import_module parse_tree__prog_data.
+:- import_module parse_tree__prog_out.
:- import_module parse_tree__prog_util.
% HLDS modules
-:- import_module hlds__hlds_llds, hlds__hlds_out.
-:- import_module hlds__instmap, hlds__goal_util, hlds__special_pred.
-:- import_module check_hlds__type_util, check_hlds__mode_util.
+:- import_module check_hlds__mode_util.
+:- import_module check_hlds__type_util.
+:- import_module hlds__goal_util.
+:- import_module hlds__hlds_llds.
+:- import_module hlds__hlds_out.
+:- import_module hlds__instmap.
+:- import_module hlds__passes_aux.
+:- import_module hlds__special_pred.
% LLDS code generator modules.
-:- import_module ll_backend__call_gen, ll_backend__unify_gen.
-:- import_module ll_backend__ite_gen, ll_backend__switch_gen.
-:- import_module ll_backend__disj_gen.
-:- import_module ll_backend__par_conj_gen, ll_backend__pragma_c_gen.
+:- import_module ll_backend__call_gen.
+:- import_module ll_backend__code_aux.
+:- import_module ll_backend__code_util.
:- import_module ll_backend__commit_gen.
-:- import_module ll_backend__continuation_info, ll_backend__trace.
-:- import_module ll_backend__code_aux, ll_backend__code_util.
-:- import_module ll_backend__middle_rec, ll_backend__llds_out.
+:- import_module ll_backend__continuation_info.
+:- import_module ll_backend__disj_gen.
+:- import_module ll_backend__ite_gen.
+:- import_module ll_backend__llds_out.
+:- import_module ll_backend__middle_rec.
+:- import_module ll_backend__par_conj_gen.
+:- import_module ll_backend__pragma_c_gen.
+:- import_module ll_backend__switch_gen.
+:- import_module ll_backend__trace.
+:- import_module ll_backend__unify_gen.
% Misc compiler modules
-:- import_module backend_libs__builtin_ops, hlds__passes_aux.
+:- import_module backend_libs__builtin_ops.
+:- import_module backend_libs__proc_label.
:- import_module backend_libs__rtti.
-:- import_module libs__globals, libs__options.
+:- import_module libs__globals.
+:- import_module libs__options.
:- import_module libs__trace_params.
% Standard library modules
@@ -336,7 +353,7 @@
)
->
% Create the procedure layout structure.
- RttiProcLabel = rtti__make_proc_label(ModuleInfo,
+ RttiProcLabel = rtti__make_rtti_proc_label(ModuleInfo,
PredId, ProcId),
code_info__get_layout_info(InternalMap, CodeInfo, _),
code_util__make_local_entry_label(ModuleInfo, PredId, ProcId,
@@ -373,7 +390,7 @@
code_info__get_closure_layouts(ClosureLayouts, CodeInfo, _),
global_data_add_new_closure_layouts(GlobalData1, ClosureLayouts,
GlobalData2),
- code_util__make_proc_label(ModuleInfo, PredId, ProcId, ProcLabel),
+ ProcLabel = make_proc_label(ModuleInfo, PredId, ProcId),
maybe_add_tabling_pointer_var(ModuleInfo, PredId, ProcId, ProcInfo,
ProcLabel, GlobalData2, GlobalData),
Index: compiler/code_info.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/code_info.m,v
retrieving revision 1.271
diff -u -r1.271 code_info.m
--- compiler/code_info.m 30 Aug 2002 07:22:33 -0000 1.271
+++ compiler/code_info.m 12 Mar 2003 11:55:57 -0000
@@ -29,26 +29,36 @@
:- interface.
-:- import_module parse_tree__prog_data.
-:- import_module hlds__hlds_module, hlds__hlds_pred, hlds__hlds_goal.
-:- import_module hlds__hlds_data, hlds__hlds_llds, hlds__instmap.
-:- import_module ll_backend__llds, ll_backend__continuation_info.
-:- import_module ll_backend__trace.
:- import_module backend_libs__code_model.
+:- import_module backend_libs__proc_label.
+:- import_module hlds__hlds_data.
+:- import_module hlds__hlds_goal.
+:- import_module hlds__hlds_llds.
+:- import_module hlds__hlds_module.
+:- import_module hlds__hlds_pred.
+:- import_module hlds__instmap.
:- import_module libs__globals.
+:- import_module ll_backend__continuation_info.
+:- import_module ll_backend__llds.
+:- import_module ll_backend__trace.
+:- import_module parse_tree__prog_data.
:- import_module bool, set, list, map, std_util, assoc_list, counter.
:- implementation.
-:- import_module parse_tree__prog_out.
-:- import_module check_hlds__type_util, check_hlds__mode_util.
-:- import_module ll_backend__arg_info, ll_backend__code_util.
-:- import_module ll_backend__code_exprn, ll_backend__exprn_aux.
-:- import_module ll_backend__var_locn.
-:- import_module ll_backend__llds_out.
+:- import_module check_hlds__mode_util.
+:- import_module check_hlds__type_util.
+:- import_module libs__options.
:- import_module libs__trace_params.
-:- import_module libs__options, libs__tree.
+:- import_module libs__tree.
+:- import_module ll_backend__arg_info.
+:- import_module ll_backend__code_exprn.
+:- import_module ll_backend__code_util.
+:- import_module ll_backend__exprn_aux.
+:- import_module ll_backend__llds_out.
+:- import_module ll_backend__var_locn.
+:- import_module parse_tree__prog_out.
:- import_module term, varset.
:- import_module set, stack.
@@ -949,7 +959,7 @@
code_info__get_module_info(ModuleInfo),
code_info__get_pred_id(PredId),
code_info__get_proc_id(ProcId),
- { code_util__make_proc_label(ModuleInfo, PredId, ProcId, ProcLabel) }.
+ { ProcLabel = make_proc_label(ModuleInfo, PredId, ProcId) }.
code_info__get_next_closure_seq_no(SeqNo) -->
code_info__get_closure_seq_counter(C0),
Index: compiler/code_util.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/code_util.m,v
retrieving revision 1.142
diff -u -r1.142 code_util.m
--- compiler/code_util.m 28 Feb 2003 06:40:40 -0000 1.142
+++ compiler/code_util.m 12 Mar 2003 13:13:45 -0000
@@ -17,11 +17,16 @@
:- interface.
-:- import_module parse_tree__prog_data, hlds__hlds_module, hlds__hlds_pred.
-:- import_module hlds__hlds_goal, hlds__hlds_data.
-:- import_module backend_libs__rtti, ll_backend__llds.
+:- import_module backend_libs__proc_label.
+:- import_module backend_libs__rtti.
+:- import_module hlds__hlds_data.
+:- import_module hlds__hlds_goal.
+:- import_module hlds__hlds_module.
+:- import_module hlds__hlds_pred.
+:- import_module ll_backend__llds.
+:- import_module parse_tree__prog_data.
-:- import_module bool, list, std_util.
+:- import_module list, std_util.
% Create a code address which holds the address of the specified
% procedure.
@@ -60,26 +65,6 @@
label).
:- mode code_util__make_internal_label(in, in, in, in, out) is det.
-:- pred code_util__make_proc_label(module_info, pred_id, proc_id, proc_label).
-:- mode code_util__make_proc_label(in, in, in, out) is det.
-
-:- func code_util__make_proc_label_from_rtti(rtti_proc_label) = proc_label.
-
- % code_util__make_user_proc_label(ModuleName, PredIsImported,
- % PredOrFunc, ModuleName, PredName, Arity, ProcId, Label):
- % Make a proc_label for a user-defined procedure.
- %
- % The PredIsImported argument should be the result of
- % calling pred_info_is_imported.
-
-:- pred code_util__make_user_proc_label(module_name, bool,
- pred_or_func, module_name, string, arity, proc_id, proc_label).
-:- mode code_util__make_user_proc_label(in, in,
- in, in, in, in, in, out) is det.
-
-:- pred code_util__make_uni_label(module_info, type_ctor, proc_id, proc_label).
-:- mode code_util__make_uni_label(in, in, in, out) is det.
-
:- pred code_util__extract_proc_label_from_code_addr(code_addr, proc_label).
:- mode code_util__extract_proc_label_from_code_addr(in, out) is det.
@@ -175,18 +160,21 @@
:- implementation.
-:- import_module parse_tree__prog_util, check_hlds__type_util.
-:- import_module hlds__special_pred, backend_libs__builtin_ops.
+:- import_module backend_libs__builtin_ops.
:- import_module backend_libs__code_model.
-:- import_module libs__options, libs__globals.
+:- import_module check_hlds__type_util.
+:- import_module hlds__special_pred.
+:- import_module libs__globals.
+:- import_module libs__options.
+:- import_module parse_tree__prog_util.
-:- import_module char, int, string, set, map, term, varset.
+:- import_module bool, char, int, string, set, map, term, varset.
:- import_module require, std_util, assoc_list.
%---------------------------------------------------------------------------%
code_util__make_entry_label(ModuleInfo, PredId, ProcId, Immed, ProcAddr) :-
- RttiProcLabel = rtti__make_proc_label(ModuleInfo, PredId, ProcId),
+ RttiProcLabel = rtti__make_rtti_proc_label(ModuleInfo, PredId, ProcId),
code_util__make_entry_label_from_rtti(RttiProcLabel, Immed, ProcAddr).
code_util__make_entry_label_from_rtti(RttiProcLabel, Immed, ProcAddr) :-
@@ -200,8 +188,7 @@
RttiProcLabel^proc_id)
)
->
- code_util__make_proc_label_from_rtti(RttiProcLabel)
- = ProcLabel,
+ ProcLabel = make_proc_label_from_rtti(RttiProcLabel),
ProcAddr = imported(ProcLabel)
;
code_util__make_local_entry_label_from_rtti(RttiProcLabel,
@@ -210,7 +197,7 @@
).
code_util__make_local_entry_label(ModuleInfo, PredId, ProcId, Immed, Label) :-
- RttiProcLabel = rtti__make_proc_label(ModuleInfo, PredId, ProcId),
+ RttiProcLabel = rtti__make_rtti_proc_label(ModuleInfo, PredId, ProcId),
code_util__make_local_entry_label_from_rtti(RttiProcLabel,
Immed, Label).
@@ -219,7 +206,7 @@
:- mode code_util__make_local_entry_label_from_rtti(in, in, out) is det.
code_util__make_local_entry_label_from_rtti(RttiProcLabel, Immed, Label) :-
- code_util__make_proc_label_from_rtti(RttiProcLabel) = ProcLabel,
+ ProcLabel = make_proc_label_from_rtti(RttiProcLabel),
(
Immed = no,
% If we want to define the label or use it to put it
@@ -237,7 +224,6 @@
ProcLabel, Label)
).
-
:- pred choose_local_label_type(int, pred_id, proc_id,
pred_id, proc_id, proc_label, label).
:- mode choose_local_label_type(in, in, in, in, in, in, out) is det.
@@ -264,92 +250,8 @@
%-----------------------------------------------------------------------------%
code_util__make_internal_label(ModuleInfo, PredId, ProcId, LabelNum, Label) :-
- code_util__make_proc_label(ModuleInfo, PredId, ProcId, ProcLabel),
+ ProcLabel = make_proc_label(ModuleInfo, PredId, ProcId),
Label = local(LabelNum, ProcLabel).
-
-code_util__make_proc_label(ModuleInfo, PredId, ProcId, ProcLabel) :-
- RttiProcLabel = rtti__make_proc_label(ModuleInfo, PredId, ProcId),
- code_util__make_proc_label_from_rtti(RttiProcLabel) = ProcLabel.
-
-code_util__make_proc_label_from_rtti(RttiProcLabel) = ProcLabel :-
- RttiProcLabel = rtti_proc_label(PredOrFunc, ThisModule,
- PredModule, PredName, PredArity, ArgTypes, _PredId, ProcId,
- _HeadVarsWithNames, _ArgModes, _CodeModel,
- IsImported, _IsPseudoImported, _IsExported,
- IsSpecialPredInstance),
- (
- IsSpecialPredInstance = yes
- ->
- (
- special_pred_get_type(PredName, ArgTypes, Type),
- type_to_ctor_and_args(Type, TypeCtor, _),
- % All type_ctors other than tuples here should be
- % module qualified, since builtin types are
- % handled separately in polymorphism.m.
- (
- TypeCtor = unqualified(TypeName) - _,
- type_ctor_is_tuple(TypeCtor),
- mercury_public_builtin_module(TypeModule)
- ;
- TypeCtor = qualified(TypeModule, TypeName) - _
- )
- ->
- TypeCtor = _ - TypeArity,
- (
- ThisModule \= TypeModule,
- PredName = "__Unify__",
- \+ hlds_pred__in_in_unification_proc_id(ProcId)
- ->
- DefiningModule = ThisModule
- ;
- DefiningModule = TypeModule
- ),
- ProcLabel = special_proc(DefiningModule, PredName,
- TypeModule, TypeName, TypeArity, ProcId)
- ;
- string__append_list(["code_util__make_proc_label:\n",
- "cannot make label for special pred `",
- PredName, "'"], ErrorMessage),
- error(ErrorMessage)
- )
- ;
- code_util__make_user_proc_label(ThisModule, IsImported,
- PredOrFunc, PredModule, PredName, PredArity,
- ProcId, ProcLabel)
- ).
-
-code_util__make_user_proc_label(ThisModule, PredIsImported,
- PredOrFunc, PredModule, PredName, PredArity,
- ProcId, ProcLabel) :-
-
- (
- % Work out which module supplies the code for
- % the predicate.
- ThisModule \= PredModule,
- PredIsImported = no
- ->
- % This predicate is a specialized version of
- % a pred from a `.opt' file.
- DefiningModule = ThisModule
- ;
- DefiningModule = PredModule
- ),
- ProcLabel = proc(DefiningModule, PredOrFunc,
- PredModule, PredName, PredArity, ProcId).
-
-code_util__make_uni_label(ModuleInfo, TypeCtor, UniModeNum, ProcLabel) :-
- module_info_name(ModuleInfo, ModuleName),
- ( TypeCtor = qualified(TypeModule, TypeName) - Arity ->
- ( hlds_pred__in_in_unification_proc_id(UniModeNum) ->
- Module = TypeModule
- ;
- Module = ModuleName
- ),
- ProcLabel = special_proc(Module, "__Unify__", TypeModule,
- TypeName, Arity, UniModeNum)
- ;
- error("code_util__make_uni_label: unqualified type_ctor")
- ).
code_util__extract_proc_label_from_code_addr(CodeAddr, ProcLabel) :-
( code_util__proc_label_from_code_addr(CodeAddr, ProcLabelPrime) ->
Index: compiler/deep_profiling.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/deep_profiling.m,v
retrieving revision 1.15
diff -u -r1.15 deep_profiling.m
--- compiler/deep_profiling.m 28 Feb 2003 00:21:36 -0000 1.15
+++ compiler/deep_profiling.m 12 Mar 2003 13:14:19 -0000
@@ -595,7 +595,7 @@
PredProcId = proc(PredId, ProcId)
),
- RttiProcLabel = rtti__make_proc_label(ModuleInfo, PredId, ProcId),
+ RttiProcLabel = rtti__make_rtti_proc_label(ModuleInfo, PredId, ProcId),
IsInInterface = is_proc_in_interface(ModuleInfo, PredId, ProcId),
ProcStatic = proc_static_data(RttiProcLabel, FileName, LineNumber,
IsInInterface, CallSites),
@@ -683,7 +683,7 @@
PredProcId = proc(PredId, ProcId)
),
- RttiProcLabel = rtti__make_proc_label(ModuleInfo, PredId, ProcId),
+ RttiProcLabel = rtti__make_rtti_proc_label(ModuleInfo, PredId, ProcId),
IsInInterface = is_proc_in_interface(ModuleInfo, PredId, ProcId),
ProcStatic = proc_static_data(RttiProcLabel, FileName, LineNumber,
IsInInterface, CallSites),
@@ -785,7 +785,7 @@
CallSites = DeepInfo ^ call_sites,
PredProcId = proc(PredId, ProcId),
- RttiProcLabel = rtti__make_proc_label(ModuleInfo, PredId, ProcId),
+ RttiProcLabel = rtti__make_rtti_proc_label(ModuleInfo, PredId, ProcId),
IsInInterface = is_proc_in_interface(ModuleInfo, PredId, ProcId),
ProcStatic = proc_static_data(RttiProcLabel, FileName, LineNumber,
IsInInterface, CallSites),
@@ -1116,7 +1116,7 @@
PredProcId = DeepInfo1 ^ pred_proc_id
->
OuterPredProcId = proc(OuterPredId, OuterProcId),
- RttiProcLabel = rtti__make_proc_label(ModuleInfo,
+ RttiProcLabel = rtti__make_rtti_proc_label(ModuleInfo,
OuterPredId, OuterProcId)
;
MaybeRecInfo = yes(RecInfo2),
@@ -1125,10 +1125,10 @@
->
OuterPredProcId = DeepInfo1 ^ pred_proc_id,
OuterPredProcId = proc(OuterPredId, OuterProcId),
- RttiProcLabel = rtti__make_proc_label(ModuleInfo,
+ RttiProcLabel = rtti__make_rtti_proc_label(ModuleInfo,
OuterPredId, OuterProcId)
;
- RttiProcLabel = rtti__make_proc_label(ModuleInfo,
+ RttiProcLabel = rtti__make_rtti_proc_label(ModuleInfo,
PredId, ProcId)
),
CallSite = normal_call(RttiProcLabel, TypeSubst,
Index: compiler/dupelim.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/dupelim.m,v
retrieving revision 1.52
diff -u -r1.52 dupelim.m
--- compiler/dupelim.m 20 Mar 2002 12:36:07 -0000 1.52
+++ compiler/dupelim.m 12 Mar 2003 12:10:25 -0000
@@ -1,5 +1,5 @@
%-----------------------------------------------------------------------------%
-% Copyright (C) 1995-2002 The University of Melbourne.
+% Copyright (C) 1995-2003 The University of Melbourne.
% This file may only be copied under the terms of the GNU General
% Public License - see the file COPYING in the Mercury distribution.
%-----------------------------------------------------------------------------%
@@ -43,6 +43,7 @@
:- interface.
+:- import_module backend_libs__proc_label.
:- import_module ll_backend__llds.
:- import_module list, counter.
@@ -53,7 +54,9 @@
:- implementation.
-:- import_module ll_backend__basic_block, ll_backend__opt_util.
+:- import_module ll_backend__basic_block.
+:- import_module ll_backend__opt_util.
+
:- import_module bool, std_util, assoc_list, set, map, require.
% A std_map maps a list of standardized instructions to the list
Index: compiler/export.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/export.m,v
retrieving revision 1.64
diff -u -r1.64 export.m
--- compiler/export.m 30 Sep 2002 11:12:36 -0000 1.64
+++ compiler/export.m 12 Mar 2003 11:10:01 -0000
@@ -1,5 +1,5 @@
%-----------------------------------------------------------------------------%
-% Copyright (C) 1996-2002 The University of Melbourne.
+% Copyright (C) 1996-2003 The University of Melbourne.
% This file may only be copied under the terms of the GNU General
% Public License - see the file COPYING in the Mercury distribution.
%-----------------------------------------------------------------------------%
@@ -18,8 +18,10 @@
:- interface.
-:- import_module parse_tree__prog_data, hlds__hlds_module.
:- import_module backend_libs__foreign.
+:- import_module hlds__hlds_module.
+:- import_module parse_tree__prog_data.
+
:- import_module io.
% From the module_info, get a list of foreign_export_decls,
@@ -43,7 +45,6 @@
io__state, io__state).
:- mode export__produce_header_file(in, in, di, uo) is det.
-
%-----------------------------------------------------------------------------%
% Utilities for generating C code which interfaces with Mercury.
@@ -66,14 +67,19 @@
:- implementation.
+:- import_module backend_libs__code_model.
:- import_module backend_libs__foreign.
-:- import_module parse_tree__modules.
-:- import_module hlds__hlds_pred, check_hlds__type_util.
+:- import_module backend_libs__proc_label.
+:- import_module check_hlds__type_util.
:- import_module hlds__error_util.
-:- import_module backend_libs__code_model.
-:- import_module ll_backend__code_gen, ll_backend__code_util.
-:- import_module ll_backend__llds_out, ll_backend__arg_info.
-:- import_module libs__globals, libs__options.
+:- import_module hlds__hlds_pred.
+:- import_module libs__globals.
+:- import_module libs__options.
+:- import_module ll_backend__arg_info.
+:- import_module ll_backend__code_gen.
+:- import_module ll_backend__code_util.
+:- import_module ll_backend__llds_out.
+:- import_module parse_tree__modules.
:- import_module term, varset.
:- import_module library, map, int, string, std_util, assoc_list, require.
@@ -233,7 +239,7 @@
get_input_args(ArgInfoTypes, 0, Module, InputArgs),
copy_output_args(ArgInfoTypes, 0, Module, OutputArgs),
- code_util__make_proc_label(Module, PredId, ProcId, ProcLabel),
+ ProcLabel = make_proc_label(Module, PredId, ProcId),
llds_out__get_proc_label(ProcLabel, yes, ProcLabelString),
string__append_list([
Index: compiler/frameopt.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/frameopt.m,v
retrieving revision 1.80
diff -u -r1.80 frameopt.m
--- compiler/frameopt.m 20 Mar 2002 12:36:11 -0000 1.80
+++ compiler/frameopt.m 12 Mar 2003 12:19:07 -0000
@@ -1,5 +1,5 @@
%-----------------------------------------------------------------------------%
-% Copyright (C) 1994-2001 The University of Melbourne.
+% Copyright (C) 1994-2001,2003 The University of Melbourne.
% This file may only be copied under the terms of the GNU General
% Public License - see the file COPYING in the Mercury distribution.
%-----------------------------------------------------------------------------%
@@ -88,6 +88,7 @@
:- interface.
+:- import_module backend_libs__proc_label.
:- import_module ll_backend__llds.
:- import_module bool, list, counter.
@@ -104,9 +105,12 @@
:- implementation.
-:- import_module ll_backend__livemap, parse_tree__prog_data.
-:- import_module ll_backend__opt_util, ll_backend__code_util.
+:- import_module ll_backend__code_util.
+:- import_module ll_backend__livemap.
:- import_module ll_backend__opt_debug.
+:- import_module ll_backend__opt_util.
+:- import_module parse_tree__prog_data.
+
:- import_module int, string, require, std_util, assoc_list, set, map, queue.
frameopt_main(Instrs0, ProcLabel, C0, C, Instrs, Mod, Jumps) :-
Index: compiler/jumpopt.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/jumpopt.m,v
retrieving revision 1.62
diff -u -r1.62 jumpopt.m
--- compiler/jumpopt.m 30 Jul 2002 08:25:02 -0000 1.62
+++ compiler/jumpopt.m 12 Mar 2003 12:11:33 -0000
@@ -1,5 +1,5 @@
%-----------------------------------------------------------------------------%
-% Copyright (C) 1994-2002 The University of Melbourne.
+% Copyright (C) 1994-2003 The University of Melbourne.
% This file may only be copied under the terms of the GNU General
% Public License - see the file COPYING in the Mercury distribution.
%-----------------------------------------------------------------------------%
@@ -14,6 +14,7 @@
:- interface.
+:- import_module backend_libs__proc_label.
:- import_module ll_backend__llds.
:- import_module list, set, bool, counter.
@@ -49,8 +50,10 @@
:- implementation.
-:- import_module backend_libs__builtin_ops, ll_backend__code_util.
+:- import_module backend_libs__builtin_ops.
+:- import_module ll_backend__code_util.
:- import_module ll_backend__opt_util.
+
:- import_module int, std_util, map, string, require.
% We first build up a bunch of tables giving information about labels.
Index: compiler/layout.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/layout.m,v
retrieving revision 1.11
diff -u -r1.11 layout.m
--- compiler/layout.m 16 Feb 2003 02:14:15 -0000 1.11
+++ compiler/layout.m 12 Mar 2003 11:55:14 -0000
@@ -1,5 +1,5 @@
%-----------------------------------------------------------------------------%
-% Copyright (C) 2001-2002 The University of Melbourne.
+% Copyright (C) 2001-2003 The University of Melbourne.
% This file may only be copied under the terms of the GNU General
% Public License - see the file COPYING in the Mercury distribution.
%-----------------------------------------------------------------------------%
@@ -32,11 +32,14 @@
:- interface.
-:- import_module parse_tree__prog_data.
-:- import_module hlds__hlds_goal, hlds__hlds_pred.
-:- import_module ll_backend__llds.
+:- import_module backend_libs__proc_label.
:- import_module backend_libs__rtti.
+:- import_module hlds__hlds_goal.
+:- import_module hlds__hlds_pred.
:- import_module libs__trace_params.
+:- import_module ll_backend__llds.
+:- import_module parse_tree__prog_data.
+
:- import_module bool, std_util, list, assoc_list.
% This type is for strings which may contain embedded null characters.
Index: compiler/layout_out.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/layout_out.m,v
retrieving revision 1.18
diff -u -r1.18 layout_out.m
--- compiler/layout_out.m 16 Feb 2003 02:14:15 -0000 1.18
+++ compiler/layout_out.m 12 Mar 2003 12:28:59 -0000
@@ -1,5 +1,5 @@
%-----------------------------------------------------------------------------%
-% Copyright (C) 2001-2002 The University of Melbourne.
+% Copyright (C) 2001-2003 The University of Melbourne.
% This file may only be copied under the terms of the GNU General
% Public License - see the file COPYING in the Mercury distribution.
%-----------------------------------------------------------------------------%
@@ -21,7 +21,11 @@
:- interface.
-:- import_module ll_backend__layout, ll_backend__llds, ll_backend__llds_out.
+:- import_module backend_libs__proc_label.
+:- import_module ll_backend__layout.
+:- import_module ll_backend__llds.
+:- import_module ll_backend__llds_out.
+
:- import_module bool, io.
% Given a Mercury representation of a layout structure, output its
@@ -77,9 +81,15 @@
:- implementation.
-:- import_module parse_tree__prog_data, parse_tree__prog_out, hlds__hlds_pred.
-:- import_module libs__trace_params, backend_libs__c_util.
-:- import_module backend_libs__rtti, ll_backend__trace, ll_backend__code_util.
+:- import_module backend_libs__c_util.
+:- import_module backend_libs__rtti.
+:- import_module hlds__hlds_pred.
+:- import_module libs__trace_params.
+:- import_module ll_backend__code_util.
+:- import_module ll_backend__trace.
+:- import_module parse_tree__prog_data.
+:- import_module parse_tree__prog_out.
+
:- import_module int, char, string, require, std_util, list.
output_layout_data_defn(label_layout_data(Label, ProcLayoutAddr,
@@ -262,32 +272,32 @@
output_layout_name(proc_static(RttiProcLabel)) -->
io__write_string(mercury_data_prefix),
io__write_string("_proc_static__"),
- { ProcLabel = code_util__make_proc_label_from_rtti(RttiProcLabel) },
+ { ProcLabel = make_proc_label_from_rtti(RttiProcLabel) },
output_proc_label(ProcLabel).
output_layout_name(proc_static_call_sites(RttiProcLabel)) -->
io__write_string(mercury_data_prefix),
io__write_string("_proc_static_call_sites__"),
- { ProcLabel = code_util__make_proc_label_from_rtti(RttiProcLabel) },
+ { ProcLabel = make_proc_label_from_rtti(RttiProcLabel) },
output_proc_label(ProcLabel).
output_layout_name(table_io_decl(RttiProcLabel)) -->
io__write_string(mercury_data_prefix),
io__write_string("_table_io_decl__"),
- { ProcLabel = code_util__make_proc_label_from_rtti(RttiProcLabel) },
+ { ProcLabel = make_proc_label_from_rtti(RttiProcLabel) },
output_proc_label(ProcLabel).
output_layout_name(table_gen_info(RttiProcLabel)) -->
io__write_string(mercury_data_prefix),
io__write_string("_table_gen__"),
- { ProcLabel = code_util__make_proc_label_from_rtti(RttiProcLabel) },
+ { ProcLabel = make_proc_label_from_rtti(RttiProcLabel) },
output_proc_label(ProcLabel).
output_layout_name(table_gen_enum_params(RttiProcLabel)) -->
io__write_string(mercury_data_prefix),
io__write_string("_table_enum_params__"),
- { ProcLabel = code_util__make_proc_label_from_rtti(RttiProcLabel) },
+ { ProcLabel = make_proc_label_from_rtti(RttiProcLabel) },
output_proc_label(ProcLabel).
output_layout_name(table_gen_steps(RttiProcLabel)) -->
io__write_string(mercury_data_prefix),
io__write_string("_table_steps__"),
- { ProcLabel = code_util__make_proc_label_from_rtti(RttiProcLabel) },
+ { ProcLabel = make_proc_label_from_rtti(RttiProcLabel) },
output_proc_label(ProcLabel).
output_layout_name_storage_type_name(label_layout(Label, LabelVars),
@@ -1212,7 +1222,7 @@
io__write_string("\n"),
output_layout_name_storage_type_name(LayoutName, yes),
io__write_string(" = {\n"),
- { ProcLabel = code_util__make_proc_label_from_rtti(RttiProcLabel) },
+ { ProcLabel = make_proc_label_from_rtti(RttiProcLabel) },
output_layout_proc_id_group(ProcLabel),
io__write_string("\t"),
quote_and_write_string(FileName),
@@ -1328,7 +1338,7 @@
PTIVectorRval, TypeParamsRval, DeclSet0, DeclSet) -->
output_rval_decls(PTIVectorRval, "", "", 0, _, DeclSet0, DeclSet1),
{ LayoutName = table_io_decl(RttiProcLabel) },
- { ProcLabel = code_util__make_proc_label_from_rtti(RttiProcLabel) },
+ { ProcLabel = make_proc_label_from_rtti(RttiProcLabel) },
{ ProcLayoutName = proc_layout(ProcLabel, ProcLayoutKind) },
output_layout_decl(ProcLayoutName, DeclSet1, DeclSet2),
Index: compiler/ll_backend.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/ll_backend.m,v
retrieving revision 1.2
diff -u -r1.2 ll_backend.m
--- compiler/ll_backend.m 28 Mar 2002 03:43:10 -0000 1.2
+++ compiler/ll_backend.m 12 Mar 2003 12:14:27 -0000
@@ -1,5 +1,5 @@
%-----------------------------------------------------------------------------%
-% Copyright (C) 2002 The University of Melbourne.
+% Copyright (C) 2002,2003 The University of Melbourne.
% This file may only be copied under the terms of the GNU General
% Public License - see the file COPYING in the Mercury distribution.
%-----------------------------------------------------------------------------%
@@ -9,9 +9,14 @@
%
:- module ll_backend.
:- interface.
-:- import_module transform_hlds, check_hlds. % are these needed?
-:- import_module hlds, parse_tree, libs, backend_libs.
-:- import_module aditi_backend. % XXX for rl_file, used in llds_out.
+
+:- import_module aditi_backend. % XXX for rl_file, used in llds_out.
+:- import_module backend_libs.
+:- import_module check_hlds. % is this needed?
+:- import_module hlds.
+:- import_module libs.
+:- import_module parse_tree.
+:- import_module transform_hlds. % is this needed?
%-----------------------------------------------------------------------------%
@@ -34,13 +39,18 @@
% The HLDS->LLDS code generator.
:- include_module code_gen.
- :- include_module ite_gen, call_gen, disj_gen, unify_gen, commit_gen.
+ :- include_module ite_gen.
+ :- include_module call_gen.
+ :- include_module disj_gen.
+ :- include_module unify_gen.
+ :- include_module commit_gen.
:- include_module switch_gen.
:- include_module dense_switch.
:- include_module lookup_switch.
:- include_module string_switch.
:- include_module tag_switch.
- :- include_module pragma_c_gen, par_conj_gen.
+ :- include_module pragma_c_gen.
+ :- include_module par_conj_gen.
:- include_module middle_rec.
:- include_module trace.
@@ -57,15 +67,22 @@
%:- module llds_rtti.
:- include_module ll_pseudo_type_info.
:- include_module layout.
- :- include_module stack_layout, prog_rep.
+ :- include_module stack_layout.
+ :- include_module prog_rep.
:- include_module static_term.
%:- end_module llds_rtti.
% LLDS->LLDS optimization passes.
:- include_module optimize.
- :- include_module jumpopt, dupelim, frameopt, delay_slot, labelopt.
+ :- include_module jumpopt.
+ :- include_module dupelim.
+ :- include_module frameopt.
+ :- include_module delay_slot.
+ :- include_module labelopt.
:- include_module peephole.
- :- include_module reassign, wrap_blocks, use_local_vars.
+ :- include_module reassign.
+ :- include_module wrap_blocks.
+ :- include_module use_local_vars.
% :- include_module value_number.
% :- include_module vn_block.
% :- include_module vn_cost.
Index: compiler/llds.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/llds.m,v
retrieving revision 1.288
diff -u -r1.288 llds.m
--- compiler/llds.m 30 Sep 2002 06:08:12 -0000 1.288
+++ compiler/llds.m 12 Mar 2003 11:43:41 -0000
@@ -16,12 +16,17 @@
:- interface.
-:- import_module parse_tree__prog_data, parse_tree__inst.
-:- import_module hlds__hlds_pred, hlds__hlds_goal, hlds__hlds_data.
-:- import_module backend_libs__foreign, backend_libs__code_model.
-:- import_module backend_libs__rtti, backend_libs__builtin_ops.
-:- import_module ll_backend__layout.
+:- import_module backend_libs__builtin_ops.
+:- import_module backend_libs__code_model.
+:- import_module backend_libs__foreign.
+:- import_module backend_libs__proc_label.
+:- import_module backend_libs__rtti.
+:- import_module hlds__hlds_goal, hlds__hlds_data.
+:- import_module hlds__hlds_pred.
:- import_module libs__tree.
+:- import_module ll_backend__layout.
+:- import_module parse_tree__inst.
+:- import_module parse_tree__prog_data.
:- import_module bool, list, assoc_list, map, set, std_util, counter, term.
@@ -955,31 +960,6 @@
; do_aditi_bulk_delete
; do_aditi_bulk_modify
; do_not_reached. % We should never jump to this address.
-
- % A proc_label is a label used for the entry point to a procedure.
- % The defining module is the module that provides the code for the
- % predicate, the declaring module contains the `:- pred' declaration.
- % When these are different, as for specialised versions of predicates
- % from `.opt' files, the defining module's name is added as a
- % qualifier to the label.
-:- type proc_label
- ---> proc(
- module_name, % defining module
- pred_or_func,
- module_name, % declaring module
- string, % name
- int, % arity
- proc_id % mode number
- )
-
- ; special_proc(
- module_name, % defining module
- string, % pred name
- module_name, % type module
- string, % type name
- int, % type arity
- proc_id % mode number
- ).
% A tag (used in mkword, create and field expressions
% and in incr_hp instructions) is a small integer.
Index: compiler/llds_out.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/llds_out.m,v
retrieving revision 1.204
diff -u -r1.204 llds_out.m
--- compiler/llds_out.m 26 Feb 2003 06:36:23 -0000 1.204
+++ compiler/llds_out.m 12 Mar 2003 12:08:43 -0000
@@ -17,10 +17,14 @@
:- interface.
-:- import_module ll_backend__llds, backend_libs__builtin_ops.
-:- import_module parse_tree__prog_data, hlds__hlds_data.
:- import_module aditi_backend__rl_file.
+:- import_module backend_libs__builtin_ops.
+:- import_module backend_libs__proc_label.
+:- import_module hlds__hlds_data.
:- import_module libs__globals.
+:- import_module ll_backend__llds.
+:- import_module parse_tree__prog_data.
+
:- import_module bool, std_util, list, map, io.
% Given a 'c_file' structure, output the LLDS code inside it
Index: compiler/ml_code_util.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/ml_code_util.m,v
retrieving revision 1.68
diff -u -r1.68 ml_code_util.m
--- compiler/ml_code_util.m 28 Feb 2003 06:40:42 -0000 1.68
+++ compiler/ml_code_util.m 12 Mar 2003 13:16:37 -0000
@@ -16,8 +16,10 @@
:- interface.
:- import_module parse_tree__prog_data.
-:- import_module hlds__hlds_module, hlds__hlds_pred.
-:- import_module backend_libs__builtin_ops, backend_libs__rtti.
+:- import_module hlds__hlds_module.
+:- import_module hlds__hlds_pred.
+:- import_module backend_libs__builtin_ops.
+:- import_module backend_libs__rtti.
:- import_module backend_libs__code_model.
:- import_module ml_backend__mlds.
:- import_module libs__globals.
@@ -801,14 +803,22 @@
:- implementation.
-:- import_module parse_tree__prog_data, parse_tree__prog_io.
-:- import_module hlds__hlds_goal, (parse_tree__inst), hlds__instmap.
-:- import_module check_hlds__polymorphism.
:- import_module backend_libs__foreign.
-:- import_module parse_tree__prog_util, check_hlds__type_util.
-:- import_module check_hlds__mode_util, hlds__special_pred, hlds__error_util.
-:- import_module ml_backend__ml_code_gen, ml_backend__ml_call_gen.
-:- import_module libs__globals, libs__options.
+:- import_module check_hlds__mode_util.
+:- import_module check_hlds__polymorphism.
+:- import_module check_hlds__type_util.
+:- import_module hlds__error_util.
+:- import_module hlds__hlds_goal.
+:- import_module hlds__instmap.
+:- import_module hlds__special_pred.
+:- import_module libs__globals.
+:- import_module libs__options.
+:- import_module ml_backend__ml_call_gen.
+:- import_module ml_backend__ml_code_gen.
+:- import_module parse_tree__inst.
+:- import_module parse_tree__prog_data.
+:- import_module parse_tree__prog_io.
+:- import_module parse_tree__prog_util.
:- import_module counter, stack, string, require, set, term, varset.
@@ -1430,7 +1440,7 @@
% for a given procedure.
%
ml_gen_pred_label(ModuleInfo, PredId, ProcId, MLDS_PredLabel, MLDS_Module) :-
- RttiProcLabel = rtti__make_proc_label(ModuleInfo, PredId, ProcId),
+ RttiProcLabel = rtti__make_rtti_proc_label(ModuleInfo, PredId, ProcId),
ml_gen_pred_label_from_rtti(ModuleInfo, RttiProcLabel,
MLDS_PredLabel, MLDS_Module).
Index: compiler/opt_debug.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/opt_debug.m,v
retrieving revision 1.124
diff -u -r1.124 opt_debug.m
--- compiler/opt_debug.m 15 Nov 2002 04:50:28 -0000 1.124
+++ compiler/opt_debug.m 12 Mar 2003 12:08:08 -0000
@@ -1,5 +1,5 @@
%-----------------------------------------------------------------------------%
-% Copyright (C) 1994-2002 The University of Melbourne.
+% Copyright (C) 1994-2003 The University of Melbourne.
% This file may only be copied under the terms of the GNU General
% Public License - see the file COPYING in the Mercury distribution.
%-----------------------------------------------------------------------------%
@@ -14,9 +14,13 @@
:- interface.
-:- import_module ll_backend__llds, ll_backend__livemap.
-:- import_module backend_libs__code_model, backend_libs__rtti.
-:- import_module ll_backend__layout, backend_libs__builtin_ops.
+:- import_module backend_libs__builtin_ops.
+:- import_module backend_libs__code_model.
+:- import_module backend_libs__proc_label.
+:- import_module backend_libs__rtti.
+:- import_module ll_backend__layout.
+:- import_module ll_backend__livemap.
+:- import_module ll_backend__llds.
:- import_module io, bool, list, assoc_list, std_util.
@@ -120,11 +124,13 @@
:- implementation.
-:- import_module parse_tree__prog_out.
:- import_module hlds__hlds_pred.
-:- import_module ll_backend__llds_out, ll_backend__code_util.
+:- import_module libs__globals.
+:- import_module libs__options.
+:- import_module ll_backend__code_util.
+:- import_module ll_backend__llds_out.
:- import_module ll_backend__opt_util.
-:- import_module libs__globals, libs__options.
+:- import_module parse_tree__prog_out.
:- import_module int, set, map, string.
@@ -483,28 +489,28 @@
llds_out__sym_name_mangle(ModuleName, ModuleNameStr),
string__append_list(["module_layout(", ModuleNameStr, ")"], Str).
opt_debug__dump_layout_name(proc_static(RttiProcLabel), Str) :-
- ProcLabel = code_util__make_proc_label_from_rtti(RttiProcLabel),
+ ProcLabel = make_proc_label_from_rtti(RttiProcLabel),
opt_debug__dump_proclabel(ProcLabel, ProcLabelStr),
string__append_list(["proc_static(", ProcLabelStr, ")"], Str).
opt_debug__dump_layout_name(proc_static_call_sites(RttiProcLabel), Str) :-
- ProcLabel = code_util__make_proc_label_from_rtti(RttiProcLabel),
+ ProcLabel = make_proc_label_from_rtti(RttiProcLabel),
opt_debug__dump_proclabel(ProcLabel, ProcLabelStr),
string__append_list(["proc_static_call_sites(", ProcLabelStr, ")"],
Str).
opt_debug__dump_layout_name(table_io_decl(RttiProcLabel), Str) :-
- ProcLabel = code_util__make_proc_label_from_rtti(RttiProcLabel),
+ ProcLabel = make_proc_label_from_rtti(RttiProcLabel),
opt_debug__dump_proclabel(ProcLabel, ProcLabelStr),
string__append_list(["table_io_decl(", ProcLabelStr, ")"], Str).
opt_debug__dump_layout_name(table_gen_info(RttiProcLabel), Str) :-
- ProcLabel = code_util__make_proc_label_from_rtti(RttiProcLabel),
+ ProcLabel = make_proc_label_from_rtti(RttiProcLabel),
opt_debug__dump_proclabel(ProcLabel, ProcLabelStr),
string__append_list(["table_gen_info(", ProcLabelStr, ")"], Str).
opt_debug__dump_layout_name(table_gen_enum_params(RttiProcLabel), Str) :-
- ProcLabel = code_util__make_proc_label_from_rtti(RttiProcLabel),
+ ProcLabel = make_proc_label_from_rtti(RttiProcLabel),
opt_debug__dump_proclabel(ProcLabel, ProcLabelStr),
string__append_list(["table_gen_enum_params(", ProcLabelStr, ")"], Str).
opt_debug__dump_layout_name(table_gen_steps(RttiProcLabel), Str) :-
- ProcLabel = code_util__make_proc_label_from_rtti(RttiProcLabel),
+ ProcLabel = make_proc_label_from_rtti(RttiProcLabel),
opt_debug__dump_proclabel(ProcLabel, ProcLabelStr),
string__append_list(["table_gen_steps(", ProcLabelStr, ")"], Str).
Index: compiler/opt_util.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/opt_util.m,v
retrieving revision 1.115
diff -u -r1.115 opt_util.m
--- compiler/opt_util.m 7 May 2002 11:03:09 -0000 1.115
+++ compiler/opt_util.m 12 Mar 2003 13:00:10 -0000
@@ -1,5 +1,5 @@
%-----------------------------------------------------------------------------%
-% Copyright (C) 1994-2002 The University of Melbourne.
+% Copyright (C) 1994-2003 The University of Melbourne.
% This file may only be copied under the terms of the GNU General
% Public License - see the file COPYING in the Mercury distribution.
%-----------------------------------------------------------------------------%
@@ -13,8 +13,8 @@
:- module ll_backend__opt_util.
:- interface.
-:- import_module bool, map, list, std_util.
:- import_module ll_backend__llds.
+:- import_module bool, map, list, std_util.
:- type instrmap == map(label, instruction).
:- type lvalmap == map(label, maybe(instruction)).
@@ -321,8 +321,12 @@
:- implementation.
-:- import_module backend_libs__builtin_ops, ll_backend__exprn_aux.
-:- import_module ll_backend__llds_out, hlds__hlds_pred.
+:- import_module backend_libs__builtin_ops.
+:- import_module backend_libs__proc_label.
+:- import_module hlds__hlds_pred.
+:- import_module ll_backend__exprn_aux.
+:- import_module ll_backend__llds_out.
+
:- import_module int, string, set, require.
opt_util__get_prologue(Instrs0, LabelInstr, Comments, Instrs) :-
Index: compiler/optimize.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/optimize.m,v
retrieving revision 1.33
diff -u -r1.33 optimize.m
--- compiler/optimize.m 30 Jul 2002 08:25:09 -0000 1.33
+++ compiler/optimize.m 12 Mar 2003 13:01:37 -0000
@@ -1,5 +1,5 @@
%-----------------------------------------------------------------------------%
-% Copyright (C) 1996-2002 The University of Melbourne.
+% Copyright (C) 1996-2003 The University of Melbourne.
% This file may only be copied under the terms of the GNU General
% Public License - see the file COPYING in the Mercury distribution.
%-----------------------------------------------------------------------------%
@@ -27,15 +27,24 @@
:- implementation.
-:- import_module hlds__hlds_pred, hlds__passes_aux.
-:- import_module ll_backend__jumpopt, ll_backend__labelopt.
-:- import_module ll_backend__dupelim, ll_backend__peephole.
-:- import_module ll_backend__frameopt, ll_backend__delay_slot.
-:- import_module ll_backend__use_local_vars, ll_backend__reassign.
-:- import_module ll_backend__opt_util, ll_backend__opt_debug.
+:- import_module backend_libs__proc_label.
+:- import_module hlds__hlds_pred.
+:- import_module hlds__passes_aux.
+:- import_module libs__globals.
+:- import_module libs__options.
+:- import_module ll_backend__continuation_info.
+:- import_module ll_backend__delay_slot.
+:- import_module ll_backend__dupelim.
+:- import_module ll_backend__frameopt.
+:- import_module ll_backend__jumpopt.
+:- import_module ll_backend__labelopt.
+:- import_module ll_backend__llds_out.
+:- import_module ll_backend__opt_debug.
+:- import_module ll_backend__opt_util.
+:- import_module ll_backend__peephole.
+:- import_module ll_backend__reassign.
+:- import_module ll_backend__use_local_vars.
:- import_module ll_backend__wrap_blocks.
-:- import_module ll_backend__llds_out, ll_backend__continuation_info.
-:- import_module libs__options, libs__globals.
:- import_module bool, int, string.
:- import_module map, bimap, set, std_util, require, counter.
Index: compiler/rl.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/rl.m,v
retrieving revision 1.20
diff -u -r1.20 rl.m
--- compiler/rl.m 22 Mar 2002 07:10:40 -0000 1.20
+++ compiler/rl.m 12 Mar 2003 11:12:38 -0000
@@ -1,5 +1,5 @@
%-----------------------------------------------------------------------------%
-% Copyright (C) 1998-2002 University of Melbourne.
+% Copyright (C) 1998-2003 University of Melbourne.
% This file may only be copied under the terms of the GNU General
% Public License - see the file COPYING in the Mercury distribution.
%-----------------------------------------------------------------------------%
@@ -17,9 +17,13 @@
:- interface.
+:- import_module hlds__hlds_data.
+:- import_module hlds__hlds_goal.
+:- import_module hlds__hlds_module.
+:- import_module hlds__hlds_pred.
+:- import_module hlds__instmap.
:- import_module parse_tree__prog_data.
-:- import_module hlds__hlds_data, hlds__hlds_goal, hlds__hlds_module.
-:- import_module hlds__hlds_pred, hlds__instmap.
+
:- import_module assoc_list, list, std_util, map, set.
%-----------------------------------------------------------------------------%
@@ -671,12 +675,19 @@
%-----------------------------------------------------------------------------%
:- implementation.
-:- import_module parse_tree__prog_util, parse_tree__prog_out.
+:- import_module backend_libs__proc_label.
+:- import_module check_hlds__mode_util.
+:- import_module check_hlds__type_util.
:- import_module hlds__goal_form.
-:- import_module check_hlds__type_util, check_hlds__mode_util.
-:- import_module ll_backend__llds, ll_backend__llds_out.
-:- import_module ll_backend__code_util, ll_backend__code_aux.
-:- import_module libs__globals, libs__options.
+:- import_module libs__globals.
+:- import_module libs__options.
+:- import_module ll_backend__code_aux.
+:- import_module ll_backend__code_util.
+:- import_module ll_backend__llds.
+:- import_module ll_backend__llds_out.
+:- import_module parse_tree__prog_out.
+:- import_module parse_tree__prog_util.
+
:- import_module bool, int, require, string.
rl__default_temporary_state(ModuleInfo, TmpState) :-
@@ -1077,8 +1088,8 @@
pred_info_module(PredInfo, PredModule),
pred_info_get_aditi_owner(PredInfo, Owner),
IsImported = (pred_info_is_imported(PredInfo) -> yes ; no),
- code_util__make_user_proc_label(ModuleName, IsImported,
- PredOrFunc, PredModule, PredName, Arity, ProcId, ProcLabel),
+ ProcLabel = make_user_proc_label(ModuleName, IsImported,
+ PredOrFunc, PredModule, PredName, Arity, ProcId),
llds_out__get_proc_label(ProcLabel, no, ProcLabelStr),
prog_out__sym_name_to_string(PredModule, PredModuleStr),
ProcName = rl_proc_name(Owner, PredModuleStr, ProcLabelStr, 2).
Index: compiler/rtti.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/rtti.m,v
retrieving revision 1.25
diff -u -r1.25 rtti.m
--- compiler/rtti.m 13 Mar 2003 01:46:59 -0000 1.25
+++ compiler/rtti.m 14 Mar 2003 05:04:35 -0000
@@ -535,7 +535,8 @@
:- func rtti_name_is_exported(rtti_name) = bool.
% Construct an rtti_proc_label for a given procedure.
-:- func rtti__make_proc_label(module_info, pred_id, proc_id) = rtti_proc_label.
+:- func rtti__make_rtti_proc_label(module_info, pred_id, proc_id)
+ = rtti_proc_label.
% Construct an rtti_proc_label for a given procedure.
:- pred rtti__proc_label_pred_proc_id(rtti_proc_label::in,
@@ -737,7 +738,7 @@
pseudo_type_info_is_exported(var_arity_pseudo_type_info(_, _)) = no.
pseudo_type_info_is_exported(type_var(_)) = no.
-rtti__make_proc_label(ModuleInfo, PredId, ProcId) = ProcLabel :-
+rtti__make_rtti_proc_label(ModuleInfo, PredId, ProcId) = ProcLabel :-
module_info_name(ModuleInfo, ThisModule),
module_info_pred_proc_info(ModuleInfo, PredId, ProcId,
PredInfo, ProcInfo),
Index: compiler/stack_layout.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/stack_layout.m,v
retrieving revision 1.75
diff -u -r1.75 stack_layout.m
--- compiler/stack_layout.m 16 Feb 2003 04:57:32 -0000 1.75
+++ compiler/stack_layout.m 12 Mar 2003 12:30:44 -0000
@@ -29,8 +29,12 @@
:- interface.
-:- import_module parse_tree__prog_data, ll_backend__continuation_info.
-:- import_module hlds__hlds_module, ll_backend__llds.
+:- import_module backend_libs__proc_label.
+:- import_module hlds__hlds_module.
+:- import_module ll_backend__continuation_info.
+:- import_module ll_backend__llds.
+:- import_module parse_tree__prog_data.
+
:- import_module std_util, list, map, counter.
:- pred stack_layout__generate_llds(module_info::in, module_info::out,
@@ -49,15 +53,26 @@
:- implementation.
-:- import_module libs__globals, libs__options, ll_backend__llds_out.
-:- import_module libs__trace_params, ll_backend__trace.
-:- import_module hlds__hlds_data, hlds__hlds_goal, hlds__hlds_pred.
-:- import_module parse_tree__prog_util, parse_tree__prog_out, hlds__instmap.
-:- import_module ll_backend__prog_rep, ll_backend__static_term.
-:- import_module ll_backend__layout_out.
-:- import_module backend_libs__rtti, ll_backend__layout.
-:- import_module ll_backend__ll_pseudo_type_info, (parse_tree__inst).
+:- import_module backend_libs__rtti.
+:- import_module hlds__hlds_data.
+:- import_module hlds__hlds_goal.
+:- import_module hlds__hlds_pred.
+:- import_module hlds__instmap.
+:- import_module libs__globals.
+:- import_module libs__options.
+:- import_module libs__trace_params.
:- import_module ll_backend__code_util.
+:- import_module ll_backend__layout.
+:- import_module ll_backend__layout_out.
+:- import_module ll_backend__ll_pseudo_type_info.
+:- import_module ll_backend__llds_out.
+:- import_module ll_backend__prog_rep.
+:- import_module ll_backend__static_term.
+:- import_module ll_backend__trace.
+:- import_module parse_tree__inst.
+:- import_module parse_tree__prog_out.
+:- import_module parse_tree__prog_util.
+
:- import_module assoc_list, bool, char, string, int, require.
:- import_module map, term, set, varset.
Index: compiler/table_gen.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/table_gen.m,v
retrieving revision 1.44
diff -u -r1.44 table_gen.m
--- compiler/table_gen.m 28 Feb 2003 00:21:38 -0000 1.44
+++ compiler/table_gen.m 12 Mar 2003 13:44:37 -0000
@@ -640,7 +640,7 @@
TableDecl = table_io_decl,
PredId = TableInfo0 ^ table_cur_pred_id,
ProcId = TableInfo0 ^ table_cur_proc_id,
- RttiProcLabel = rtti__make_proc_label(ModuleInfo,
+ RttiProcLabel = rtti__make_rtti_proc_label(ModuleInfo,
PredId, ProcId),
TableIoDeclConsId = table_io_decl(RttiProcLabel),
make_const_construction(TableIoDeclConsId, node_type,
Index: compiler/transform_llds.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/transform_llds.m,v
retrieving revision 1.9
diff -u -r1.9 transform_llds.m
--- compiler/transform_llds.m 20 Mar 2002 12:37:30 -0000 1.9
+++ compiler/transform_llds.m 12 Mar 2003 13:00:59 -0000
@@ -1,5 +1,5 @@
%-----------------------------------------------------------------------------%
-% Copyright (C) 1998-2001 The University of Melbourne.
+% Copyright (C) 1998-2001,2003 The University of Melbourne.
% This file may only be copied under the terms of the GNU General
% Public License - see the file COPYING in the Mercury distribution.
%-----------------------------------------------------------------------------%
@@ -22,7 +22,8 @@
:- interface.
-:- import_module ll_backend__llds, io.
+:- import_module ll_backend__llds.
+:- import_module io.
:- pred transform_llds(c_file, c_file, io__state, io__state).
:- mode transform_llds(in, out, di, uo) is det.
@@ -31,8 +32,13 @@
:- implementation.
-:- import_module backend_libs__builtin_ops, libs__globals, libs__options.
-:- import_module ll_backend__opt_util, parse_tree__prog_data.
+:- import_module backend_libs__builtin_ops.
+:- import_module backend_libs__proc_label.
+:- import_module libs__globals.
+:- import_module libs__options.
+:- import_module ll_backend__opt_util.
+:- import_module parse_tree__prog_data.
+
:- import_module bool, int, list, require, std_util, counter.
transform_llds(LLDS0, LLDS) -->
Index: compiler/type_ctor_info.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/type_ctor_info.m,v
retrieving revision 1.35
diff -u -r1.35 type_ctor_info.m
--- compiler/type_ctor_info.m 13 Mar 2003 01:46:59 -0000 1.35
+++ compiler/type_ctor_info.m 14 Mar 2003 05:04:35 -0000
@@ -197,9 +197,9 @@
TypeCtorGenInfo = type_ctor_gen_info(_TypeCtor, ModuleName, TypeName,
TypeArity, _Status, HldsDefn, UnifyPredProcId,
ComparePredProcId),
- type_ctor_info__make_proc_label(UnifyPredProcId, ModuleInfo,
+ type_ctor_info__make_rtti_proc_label(UnifyPredProcId, ModuleInfo,
UnifyProcLabel),
- type_ctor_info__make_proc_label(ComparePredProcId, ModuleInfo,
+ type_ctor_info__make_rtti_proc_label(ComparePredProcId, ModuleInfo,
CompareProcLabel),
type_to_univ(UnifyProcLabel, UnifyUniv),
type_to_univ(CompareProcLabel, CompareUniv),
@@ -267,12 +267,12 @@
UnifyUniv, CompareUniv, Flags, Details),
RttiData = type_ctor_info(TypeCtorData).
-:- pred type_ctor_info__make_proc_label(pred_proc_id::in, module_info::in,
+:- pred type_ctor_info__make_rtti_proc_label(pred_proc_id::in, module_info::in,
rtti_proc_label::out) is det.
-type_ctor_info__make_proc_label(PredProcId, ModuleInfo, ProcLabel) :-
+type_ctor_info__make_rtti_proc_label(PredProcId, ModuleInfo, ProcLabel) :-
PredProcId = proc(PredId, ProcId),
- ProcLabel = rtti__make_proc_label(ModuleInfo, PredId, ProcId).
+ ProcLabel = rtti__make_rtti_proc_label(ModuleInfo, PredId, ProcId).
%---------------------------------------------------------------------------%
Index: compiler/unify_gen.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/unify_gen.m,v
retrieving revision 1.123
diff -u -r1.123 unify_gen.m
--- compiler/unify_gen.m 27 Jan 2003 09:20:53 -0000 1.123
+++ compiler/unify_gen.m 12 Mar 2003 11:13:42 -0000
@@ -18,10 +18,12 @@
:- interface.
-:- import_module parse_tree__prog_data.
-:- import_module hlds__hlds_goal, hlds__hlds_data.
:- import_module backend_libs__code_model.
-:- import_module ll_backend__llds, ll_backend__code_info.
+:- import_module hlds__hlds_data.
+:- import_module hlds__hlds_goal.
+:- import_module ll_backend__code_info.
+:- import_module ll_backend__llds.
+:- import_module parse_tree__prog_data.
:- type test_sense
---> branch_on_success
@@ -38,16 +40,28 @@
:- implementation.
-:- import_module backend_libs__rtti, ll_backend__layout.
+:- import_module aditi_backend__rl.
:- import_module backend_libs__builtin_ops.
-:- import_module hlds__hlds_module, hlds__hlds_pred, parse_tree__prog_data.
-:- import_module parse_tree__prog_out, ll_backend__code_util.
-:- import_module check_hlds__mode_util, check_hlds__type_util.
-:- import_module ll_backend__code_aux, hlds__hlds_out, libs__tree.
+:- import_module backend_libs__proc_label.
+:- import_module backend_libs__rtti.
+:- import_module check_hlds__mode_util.
+:- import_module check_hlds__type_util.
+:- import_module hlds__error_util.
+:- import_module hlds__hlds_module.
+:- import_module hlds__hlds_out.
+:- import_module hlds__hlds_pred.
+:- import_module libs__globals.
+:- import_module libs__options.
+:- import_module libs__tree.
:- import_module ll_backend__arg_info.
-:- import_module libs__globals, libs__options, ll_backend__continuation_info.
+:- import_module ll_backend__code_aux.
+:- import_module ll_backend__code_util.
+:- import_module ll_backend__continuation_info.
+:- import_module ll_backend__layout.
:- import_module ll_backend__stack_layout.
-:- import_module aditi_backend__rl, ll_backend__trace, hlds__error_util.
+:- import_module ll_backend__trace.
+:- import_module parse_tree__prog_data.
+:- import_module parse_tree__prog_out.
:- import_module term, bool, string, int, list, map, require, std_util.
@@ -412,7 +426,7 @@
{ error("unify_gen: tabling pointer constant has args") }
),
code_info__get_module_info(ModuleInfo),
- { code_util__make_proc_label(ModuleInfo, PredId, ProcId, ProcLabel) },
+ { ProcLabel = make_proc_label(ModuleInfo, PredId, ProcId) },
{ module_info_name(ModuleInfo, ModuleName) },
{ DataAddr = data_addr(ModuleName, tabling_pointer(ProcLabel)) },
code_info__assign_const_to_var(Var, const(data_addr_const(DataAddr))).
Index: compiler/use_local_vars.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/use_local_vars.m,v
retrieving revision 1.3
diff -u -r1.3 use_local_vars.m
--- compiler/use_local_vars.m 28 Mar 2002 03:43:47 -0000 1.3
+++ compiler/use_local_vars.m 12 Mar 2003 12:29:37 -0000
@@ -1,5 +1,5 @@
%-----------------------------------------------------------------------------%
-% Copyright (C) 2001-2002 The University of Melbourne.
+% Copyright (C) 2001-2003 The University of Melbourne.
% This file may only be copied under the terms of the GNU General
% Public License - see the file COPYING in the Mercury distribution.
%-----------------------------------------------------------------------------%
@@ -61,6 +61,7 @@
:- interface.
+:- import_module backend_libs__proc_label.
:- import_module ll_backend__llds.
:- import_module list, counter.
@@ -69,8 +70,10 @@
:- implementation.
-:- import_module ll_backend__basic_block, ll_backend__livemap.
-:- import_module ll_backend__exprn_aux, ll_backend__code_util.
+:- import_module ll_backend__basic_block.
+:- import_module ll_backend__code_util.
+:- import_module ll_backend__exprn_aux.
+:- import_module ll_backend__livemap.
:- import_module ll_backend__opt_util.
:- import_module int, set, map, std_util, require.
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/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 gcc
cvs diff: Diffing gcc/mercury
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
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-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