diff options
| author |  xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2012-12-29 16:55:38 +0000 |
|---|---|---|
| committer | xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2012-12-29 16:55:38 +0000 |
| commit | 8539759095f95f2fbb680efc7633d868099114c8 (patch) | |
| tree | 3401d7cd91686026090a21f600cf70ea4372ebf3 /backend/RTLgenspec.v | |
| parent | 7e9c6fc9a51adc5e488c590d83c1e8ef5a256c9f (diff) | |
Merge of the clightgen branch:
- Alternate semantics for Clight where function parameters are temporaries,
not variables
- New pass SimplLocals that turns non-addressed local variables into
temporaries
- Simplified Csharpminor, Cshmgen and Cminorgen accordingly
- SimplExpr starts its temporaries above variable names, therefoe
Cminorgen no longer needs to encode variable names and temps names.
- Simplified Cminor parser & printer, as well as Errors, accordingly.
- New tool clightgen to produce Clight AST in Coq-parsable .v files.
- Removed side condition "return type is void" on rules skip_seq
in the semantics of CompCert C, Clight, C#minor, Cminor.
- Adapted RTLgenproof accordingly (now uses a memory extension).
git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@2083 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e
Diffstat (limited to 'backend/RTLgenspec.v')
| -rw-r--r-- | backend/RTLgenspec.v | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/backend/RTLgenspec.v b/backend/RTLgenspec.v index 579a6c2..5114390 100644 --- a/backend/RTLgenspec.v +++ b/backend/RTLgenspec.v @@ -901,8 +901,8 @@ Inductive tr_stmt (c: code) (map: mapping): tr_expr c map nil a ns n r None -> tr_switch c map r nexits t n -> tr_stmt c map (Sswitch a cases default) ns nd nexits ngoto nret rret - | tr_Sreturn_none: forall nret nd nexits ngoto, - tr_stmt c map (Sreturn None) nret nd nexits ngoto nret None + | tr_Sreturn_none: forall nret nd nexits ngoto rret, + tr_stmt c map (Sreturn None) nret nd nexits ngoto nret rret | tr_Sreturn_some: forall a ns nd nexits ngoto nret rret, tr_expr c map nil a ns nret rret None -> tr_stmt c map (Sreturn (Some a)) ns nd nexits ngoto nret (Some rret) @@ -1302,12 +1302,12 @@ Proof. eapply transl_switch_charact with (s := s0); eauto with rtlg. monadInv TR. (* Sreturn *) - destruct o; destruct rret; inv TR. - inv OK. + destruct o. + destruct rret; inv TR. inv OK. econstructor; eauto with rtlg. eapply transl_expr_charact; eauto with rtlg. constructor. auto. simpl; tauto. - constructor. + monadInv TR. constructor. (* Slabel *) generalize EQ0; clear EQ0. case_eq (ngoto!l); intros; monadInv EQ0. generalize EQ1; clear EQ1. unfold handle_error. |