diff options
| author | Cyril SIX <cyril.six@kalray.eu> | 2018-05-11 17:13:14 +0200 |
|---|---|---|
| committer | Cyril SIX <cyril.six@kalray.eu> | 2018-05-11 17:13:14 +0200 |
| commit | b81dbb863781a5f450cad0b01f90f729fb1a2244 (patch) | |
| tree | 2260b5bb9afbaef9867c472b0149afd9bcf9af8e /backend | |
| parent | a44f224bfa7c340188b54b3bd26a61e94567729b (diff) | |
| download | compcert-kvx-b81dbb863781a5f450cad0b01f90f729fb1a2244.tar.gz compcert-kvx-b81dbb863781a5f450cad0b01f90f729fb1a2244.zip | |
MPPA - refactored instructions
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/Asmexpandaux.ml | 12 | ||||
| -rw-r--r-- | backend/Asmgenproof0.v | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/backend/Asmexpandaux.ml b/backend/Asmexpandaux.ml index 07e33efa..23fef3f2 100644 --- a/backend/Asmexpandaux.ml +++ b/backend/Asmexpandaux.ml @@ -39,7 +39,7 @@ let new_label () = List.fold_left (fun next instr -> match instr with - | Plabel l -> if P.lt l next then next else P.succ l + | PExpand (Plabel l) -> if P.lt l next then next else P.succ l | _ -> next) P.one (!current_function).fn_code in @@ -100,17 +100,17 @@ let expand_debug id sp preg simple l = let get_lbl = function | None -> let lbl = new_label () in - emit (Plabel lbl); + emit (PExpand (Plabel lbl)); lbl | Some lbl -> lbl in let rec aux lbl scopes = function | [] -> () - | (Pbuiltin(EF_debug (kind,txt,_x),args,_) as i)::rest -> + | (PExpand (Pbuiltin(EF_debug (kind,txt,_x),args,_) as i))::rest -> let kind = (P.to_int kind) in begin match kind with | 1-> - emit i;aux lbl scopes rest + emit (PExpand i);aux lbl scopes rest | 2 -> aux lbl scopes rest | 3 -> @@ -142,11 +142,11 @@ let expand_debug id sp preg simple l = | _ -> aux None scopes rest end - | (Plabel lbl)::rest -> simple (Plabel lbl); aux (Some lbl) scopes rest + | (PExpand (Plabel lbl))::rest -> simple (PExpand (Plabel lbl)); aux (Some lbl) scopes rest | i::rest -> simple i; aux None scopes rest in (* We need to move all closing debug annotations before the last real statement *) let rec move_debug acc bcc = function - | (Pbuiltin(EF_debug (kind,_,_),_,_) as i)::rest -> + | (PExpand (Pbuiltin(EF_debug (kind,_,_),_,_)) as i)::rest -> let kind = (P.to_int kind) in if kind = 1 then move_debug acc (i::bcc) rest (* Do not move debug line *) diff --git a/backend/Asmgenproof0.v b/backend/Asmgenproof0.v index b1b7453a..8dfa8828 100644 --- a/backend/Asmgenproof0.v +++ b/backend/Asmgenproof0.v @@ -739,7 +739,7 @@ Lemma tail_nolabel_cons: Proof. intros. destruct H0. split. constructor; auto. - intros. simpl. rewrite <- H1. destruct i; reflexivity || contradiction. + intros. simpl. rewrite <- H1. destruct i; destruct i; reflexivity || contradiction. Qed. Hint Resolve tail_nolabel_refl: labels. |