[m-rev.] for review: the second step in implementing event goals

[Mark Brown]

On 25-Sep-2006, Zoltan Somogyi <zs at csse.unimelb.edu.au> wrote:
> runtime/mercury_types.h:
> 	Add the typedefs new required for mercury_stack_layout.h.

s/new/now/

> 
> runtime/mercury_goto.h:
> 	Add a macro needed by mercury_stack_layout.h.
> 
> runtime/mercury_grade.h:
> 	Change the binary comptability version number for debug grades,

s/comptability/compatibility/

>  output_label_layout_data_defn(ProcLabel, LabelNum, ProcLayoutAddr, MaybePort,
> -        MaybeIsHidden, LabelNumberInModule, MaybeGoalPath, MaybeVarInfo,
> -        !DeclSet, !IO) :-
> +        MaybeIsHidden, LabelNumberInModule, MaybeGoalPath, MaybeSolverData,
> +        MaybeVarInfo, !DeclSet, !IO) :-
>      output_layout_decl(ProcLayoutAddr, !DeclSet, !IO),
>      (
> +        MaybeSolverData = no,
> +        SolverChars = ""
> +    ;
> +        MaybeSolverData = yes(SolverData),
> +        SolverChars = "_S",
> +        SolverData = solver_event_data(SolverEventName, SolverNumAttributes,
> +            SolverLocnsRval, SolverTypesRval, SolverAttrNames),
> +
> +        AttrNamesLayoutName = solver_event_attr_names(ProcLabel, LabelNum),
> +        AttrNamesDataAddr = layout_addr(AttrNamesLayoutName),
> +        AttrNamesRval = const(llconst_data_addr(AttrNamesDataAddr, no)),
> +        decl_set_insert(decl_data_addr(AttrNamesDataAddr), !DeclSet),
> +        output_layout_name_storage_type_name(SolverLayoutName, no, !IO),

s/SolverLayoutName/AttrNamesLayoutName/

?

> @@ -1488,16 +1568,16 @@
>  
>  :- pred locn_type_code(locn_type::in, int::out) is det.
>  
> -locn_type_code(lval_r_reg,    0).
> -locn_type_code(lval_f_reg,    1).
> -locn_type_code(lval_stackvar, 2).
> -locn_type_code(lval_framevar, 3).
> -locn_type_code(lval_succip,   4).
> -locn_type_code(lval_maxfr,    5).
> -locn_type_code(lval_curfr,    6).
> -locn_type_code(lval_hp,       7).
> -locn_type_code(lval_sp,       8).
> -locn_type_code(lval_indirect, 9).
> +locn_type_code(lval_r_reg,    1).
> +locn_type_code(lval_f_reg,    2).
> +locn_type_code(lval_stackvar, 3).
> +locn_type_code(lval_framevar, 5).
> +locn_type_code(lval_succip,   6).
> +locn_type_code(lval_maxfr,    7).
> +locn_type_code(lval_curfr,    9).
> +locn_type_code(lval_hp,       10).
> +locn_type_code(lval_sp,       11).
> +locn_type_code(lval_indirect, 13).

It's a bit hard to understand these numbers in isolation.  Some more comments,
or at least a reference to mercury_stack_layout.h, would be helpful.

Other than that, this diff looks fine.

Cheers,
Mark.

--------------------------------------------------------------------------
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
--------------------------------------------------------------------------