diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-04-14 15:15:51 +0200 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-04-14 15:15:51 +0200 |
| commit | b597ce896a8a9cd7c3ed028a34e0612229d1a36a (patch) | |
| tree | 92e3df204d3e27d6b4c0ac56c3f7b292a4143d01 /backend | |
| parent | 0ae69bc62cbe50e1fb426c4816aef689c359c75a (diff) | |
| parent | 1e19ffdc01a94b485b61b824ce2fa9e440e36ae7 (diff) | |
| download | compcert-b597ce896a8a9cd7c3ed028a34e0612229d1a36a.tar.gz compcert-b597ce896a8a9cd7c3ed028a34e0612229d1a36a.zip | |
Merge branch 'master' into dwarf
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/PrintXTL.ml | 3 | ||||
| -rw-r--r-- | backend/RTLgenaux.ml | 1 | ||||
| -rw-r--r-- | backend/Stacking.v | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/backend/PrintXTL.ml b/backend/PrintXTL.ml index 08ccf129..b9813db0 100644 --- a/backend/PrintXTL.ml +++ b/backend/PrintXTL.ml @@ -102,6 +102,9 @@ let print_instruction pp succ = function | Xbuiltin(ef, args, res) -> fprintf pp "%a = %s(%a)" vars res (name_of_external ef) vars args + | Xannot(ef, args) -> + fprintf pp "%s(%a)" + (name_of_external ef) (print_annot_args var) args | Xbranch s -> print_succ pp s succ | Xcond(cond, args, s1, s2) -> diff --git a/backend/RTLgenaux.ml b/backend/RTLgenaux.ml index 27a4908e..40bb5c41 100644 --- a/backend/RTLgenaux.ml +++ b/backend/RTLgenaux.ml @@ -73,6 +73,7 @@ let rec size_stmt = function | Stailcall(sg, eos, args) -> 3 + size_eos eos + size_exprs args + length_exprs args | Sbuiltin(optid, ef, args) -> 1 + size_exprs args + | Sannot(txt, args) -> 0 | Sseq(s1, s2) -> size_stmt s1 + size_stmt s2 | Sifthenelse(ce, s1, s2) -> size_condexpr ce + max (size_stmt s1) (size_stmt s2) diff --git a/backend/Stacking.v b/backend/Stacking.v index c17dc038..21cf6b73 100644 --- a/backend/Stacking.v +++ b/backend/Stacking.v @@ -135,7 +135,7 @@ Fixpoint transl_annot_arg (fe: frame_env) (a: annot_arg loc) : annot_arg mreg := | AA_base (R r) => AA_base r | AA_base (S Local ofs ty) => AA_loadstack (chunk_of_type ty) (Int.repr (offset_of_index fe (FI_local ofs ty))) - | AA_base (S _ _ __) => AA_int Int.zero (**r never happens *) + | AA_base (S _ _ _) => AA_int Int.zero (**r never happens *) | AA_int n => AA_int n | AA_long n => AA_long n | AA_float n => AA_float n |