[m-rev.] diff: minor style fixes
Zoltan Somogyi
zs at csse.unimelb.edu.au
Mon Jun 2 12:33:06 AEST 2008
compiler/call_gen.m:
compiler/code_info.m:
compiler/proc_gen.m:
compiler/trace_gen.m:
Minor style fixes.
Zoltan.
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/libatomic_ops-1.2
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/doc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/hpc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/ibmc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/icc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/msftc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/sunc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/tests
cvs diff: Diffing boehm_gc/tests
cvs diff: Diffing boehm_gc/windows-untested
cvs diff: Diffing boehm_gc/windows-untested/vc60
cvs diff: Diffing boehm_gc/windows-untested/vc70
cvs diff: Diffing boehm_gc/windows-untested/vc71
cvs diff: Diffing browser
cvs diff: Diffing bytecode
cvs diff: Diffing compiler
Index: compiler/call_gen.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/call_gen.m,v
retrieving revision 1.193
diff -u -b -r1.193 call_gen.m
--- compiler/call_gen.m 23 Nov 2007 07:34:54 -0000 1.193
+++ compiler/call_gen.m 31 May 2008 10:15:39 -0000
@@ -99,7 +99,8 @@
% Figure out what the call model is.
call_gen.prepare_for_call(CodeModel, CallModel, TraceCode, !CI),
- % Make the call.
+ % Make the call. Note that the construction of CallCode will be moved
+ % *after* the code that computes ReturnLiveLvalues.
get_module_info(!.CI, ModuleInfo),
Address = make_proc_entry_label(!.CI, ModuleInfo, PredId, ProcId, yes),
get_next_label(ReturnLabel, !CI),
Index: compiler/code_info.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/code_info.m,v
retrieving revision 1.362
diff -u -b -r1.362 code_info.m
--- compiler/code_info.m 2 Jun 2008 02:27:25 -0000 1.362
+++ compiler/code_info.m 2 Jun 2008 02:31:52 -0000
@@ -3945,9 +3945,9 @@
list.filter(key_var_is_of_dummy_type(ModuleInfo, VarTypes), InArgInfos,
_DummyInArgInfos, RealInArgInfos),
var_arg_info_to_lval(RealInArgInfos, RealInArgLocs),
- list.append(RealStackVarLocs, RealInArgLocs, AllRealLocs),
- var_locn_place_vars(ModuleInfo, DummyStackVarLocs ++ AllRealLocs, Code,
- VarLocnInfo0, VarLocnInfo),
+ AllRealLocs = RealStackVarLocs ++ RealInArgLocs,
+ AllLocs = DummyStackVarLocs ++ AllRealLocs,
+ var_locn_place_vars(ModuleInfo, AllLocs, Code, VarLocnInfo0, VarLocnInfo),
set_var_locn_info(VarLocnInfo, !CI),
assoc_list.values(AllRealLocs, LiveLocList),
set.list_to_set(LiveLocList, LiveLocs).
Index: compiler/proc_gen.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/proc_gen.m,v
retrieving revision 1.25
diff -u -b -r1.25 proc_gen.m
--- compiler/proc_gen.m 26 Nov 2007 05:13:21 -0000 1.25
+++ compiler/proc_gen.m 31 May 2008 10:15:39 -0000
@@ -418,8 +418,7 @@
),
NeedsAllNames = eff_trace_needs_all_var_names(ModuleInfo, PredInfo,
ProcInfo, TraceLevel, TraceSuppress),
- proc_info_get_maybe_deep_profile_info(ProcInfo,
- MaybeHLDSDeepInfo),
+ proc_info_get_maybe_deep_profile_info(ProcInfo, MaybeHLDSDeepInfo),
(
MaybeHLDSDeepInfo = yes(HLDSDeepInfo),
DeepProfInfo = generate_deep_prof_info(ProcInfo, HLDSDeepInfo),
Index: compiler/trace_gen.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/trace_gen.m,v
retrieving revision 1.23
diff -u -b -r1.23 trace_gen.m
--- compiler/trace_gen.m 11 Feb 2008 21:26:10 -0000 1.23
+++ compiler/trace_gen.m 31 May 2008 10:15:39 -0000
@@ -608,8 +608,7 @@
),
(
MaybeFromFullSlot = yes(CallFromFullSlot),
- stackref_to_string(CallFromFullSlot,
- CallFromFullSlotStr),
+ stackref_to_string(CallFromFullSlot, CallFromFullSlotStr),
TraceStmt1 =
"\t\t" ++ CallFromFullSlotStr ++ " = MR_trace_from_full;\n" ++
"\t\tif (MR_trace_from_full) {\n" ++
@@ -623,11 +622,10 @@
),
TraceComponents1 = [foreign_proc_raw_code(cannot_branch_away,
proc_does_not_affect_liveness, live_lvals_info(set.init), TraceStmt1)],
- MD = proc_may_not_duplicate,
TraceCode1 = node([
llds_instr(foreign_proc_code([], TraceComponents1,
- proc_will_not_call_mercury, no, no, MaybeLayoutLabel, no, yes, MD),
- "")
+ proc_will_not_call_mercury, no, no, MaybeLayoutLabel,
+ no, yes, proc_may_not_duplicate), "")
]),
(
MaybeMaxfrLval = yes(MaxfrLval),
@@ -647,7 +645,8 @@
TraceStmt3)],
TraceCode3 = node([
llds_instr(foreign_proc_code([], TraceComponents3,
- proc_will_not_call_mercury, no, no, no, no, yes, MD), "")
+ proc_will_not_call_mercury, no, no, no, no, yes,
+ proc_may_not_duplicate), "")
])
;
MaybeCallTableLval = no,
@@ -909,16 +908,15 @@
MaybeTraceInfo = yes(TraceInfo),
TraceInfo ^ redo_label = yes(RedoLabel)
->
- % The layout information for the redo event is the same as
- % for the fail event; all the non-clobbered inputs in their
- % stack slots. It is convenient to generate this common layout
- % when the code generator state is set up for the fail event;
- % generating it for the redo event would be much harder.
- % On the other hand, the address of the layout structure
- % for the redo event should be put into its fixed stack slot
- % at procedure entry. Therefore setup reserves a label
- % for the redo event, whose layout information is filled in
- % when we get to the fail event.
+ % The layout information for the redo event is the same as for the
+ % fail event; all the non-clobbered inputs in their stack slots.
+ % It is convenient to generate this common layout when the code
+ % generator state is set up for the fail event; generating it for
+ % the redo event would be much harder. On the other hand, the address
+ % of the layout structure for the redo event should be put into its
+ % fixed stack slot at procedure entry. Therefore setup reserves a label
+ % for the redo event, whose layout information is filled in when
+ % we get to the fail event.
add_trace_layout_for_label(RedoLabel, Context, port_redo,
HideEvent, Path, no, LayoutLabelInfo, !CI)
;
@@ -927,7 +925,6 @@
TraceComponents = [foreign_proc_raw_code(cannot_branch_away,
proc_does_not_affect_liveness, live_lvals_info(LiveLvalSet),
TraceStmt)],
- MD = proc_may_not_duplicate,
TraceCode =
node([
llds_instr(label(Label),
@@ -938,7 +935,8 @@
% pair is preceded by another label, and this way we can
% eliminate this other label.
llds_instr(foreign_proc_code([], TraceComponents,
- proc_may_call_mercury, no, no, yes(Label), no, yes, MD), "")
+ proc_may_call_mercury, no, no, yes(Label), no, yes,
+ proc_may_not_duplicate), "")
]),
Code = tree(ProduceCode, TraceCode).
cvs diff: Diffing compiler/notes
cvs diff: Diffing debian
cvs diff: Diffing debian/patches
cvs diff: Diffing deep_profiler
cvs diff: Diffing deep_profiler/notes
cvs diff: Diffing doc
cvs diff: Diffing extras
cvs diff: Diffing extras/base64
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/fixed
cvs diff: Diffing extras/gator
cvs diff: Diffing extras/gator/generations
cvs diff: Diffing extras/gator/generations/1
cvs diff: Diffing extras/graphics
cvs diff: Diffing extras/graphics/easyx
cvs diff: Diffing extras/graphics/easyx/samples
cvs diff: Diffing extras/graphics/mercury_allegro
cvs diff: Diffing extras/graphics/mercury_allegro/examples
cvs diff: Diffing extras/graphics/mercury_allegro/samples
cvs diff: Diffing extras/graphics/mercury_allegro/samples/demo
cvs diff: Diffing extras/graphics/mercury_allegro/samples/mandel
cvs diff: Diffing extras/graphics/mercury_allegro/samples/pendulum2
cvs diff: Diffing extras/graphics/mercury_allegro/samples/speed
cvs diff: Diffing extras/graphics/mercury_glut
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/gears
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/log4m
cvs diff: Diffing extras/logged_output
cvs diff: Diffing extras/moose
cvs diff: Diffing extras/moose/samples
cvs diff: Diffing extras/moose/tests
cvs diff: Diffing extras/mopenssl
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/net
cvs diff: Diffing extras/odbc
cvs diff: Diffing extras/posix
cvs diff: Diffing extras/posix/samples
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/solver_types
cvs diff: Diffing extras/solver_types/library
cvs diff: Diffing extras/trailed_update
cvs diff: Diffing extras/trailed_update/samples
cvs diff: Diffing extras/trailed_update/tests
cvs diff: Diffing extras/windows_installer_generator
cvs diff: Diffing extras/windows_installer_generator/sample
cvs diff: Diffing extras/windows_installer_generator/sample/images
cvs diff: Diffing extras/xml
cvs diff: Diffing extras/xml/samples
cvs diff: Diffing extras/xml_stylesheets
cvs diff: Diffing java
cvs diff: Diffing java/runtime
cvs diff: Diffing library
cvs diff: Diffing mdbcomp
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/c_interface/standalone_c
cvs diff: Diffing samples/diff
cvs diff: Diffing samples/muz
cvs diff: Diffing samples/rot13
cvs diff: Diffing samples/solutions
cvs diff: Diffing samples/solver_types
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 slice
cvs diff: Diffing ssdb
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/par_conj
cvs diff: Diffing tests/recompilation
cvs diff: Diffing tests/tabling
cvs diff: Diffing tests/term
cvs diff: Diffing tests/trailing
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 messages to: mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions: mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------
More information about the reviews
mailing list