diff options
author | Jacques-Henri Jourdan <jacques-henri.jourdan@inria.fr> | 2015-11-04 03:04:21 +0100 |
---|---|---|
committer | Jacques-Henri Jourdan <jacques-henri.jourdan@inria.fr> | 2015-11-04 03:04:21 +0100 |
commit | 5664fddcab15ef4482d583673c75e07bd1e96d0a (patch) | |
tree | 878b22860e69405ba5cf6fd2798731dac8ce660c /cparser/Bitfields.ml | |
parent | b960c83725d7e185ac5c6e3c0d6043c7dcd2f556 (diff) | |
parent | fe73ed58ef80da7c53c124302a608948fb190229 (diff) | |
download | compcert-5664fddcab15ef4482d583673c75e07bd1e96d0a.tar.gz compcert-5664fddcab15ef4482d583673c75e07bd1e96d0a.zip |
Merge remote-tracking branch 'origin/master' into parser_fix
Diffstat (limited to 'cparser/Bitfields.ml')
-rw-r--r-- | cparser/Bitfields.ml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cparser/Bitfields.ml b/cparser/Bitfields.ml index d064f4b1..223ee3ca 100644 --- a/cparser/Bitfields.ml +++ b/cparser/Bitfields.ml @@ -191,12 +191,12 @@ let transf_composite env su id attr ml = (* Bitfield manipulation expressions *) let left_shift_count bf = - intconst + intconst (Int64.of_int (8 * !config.sizeof_int - (bf.bf_pos + bf.bf_size))) IInt let right_shift_count bf = - intconst + intconst (Int64.of_int (8 * !config.sizeof_int - bf.bf_size)) IInt @@ -303,7 +303,7 @@ let bitfield_initializer bf i = (* Associate to the left so that it prints more nicely *) let or_expr_list = function - | [] -> intconst 0L IUInt + | [] -> intconst 0L IUInt | [e] -> e | e1 :: el -> List.fold_left @@ -409,7 +409,7 @@ let rec transf_exp env ctx e = | Some(ex, bf) -> transf_post env ctx (op_for_incr_decr op) ex bf e1.etyp end - | EUnop(op, e1) -> + | EUnop(op, e1) -> {edesc = EUnop(op, transf_exp env Val e1); etyp = e.etyp} | EBinop(Oassign, e1, e2, ty) -> @@ -433,7 +433,7 @@ let rec transf_exp env ctx e = transf_assignop env ctx (op_for_assignop op) ex bf e2 ty end | EBinop(Ocomma, e1, e2, ty) -> - {edesc = EBinop(Ocomma, transf_exp env Effects e1, + {edesc = EBinop(Ocomma, transf_exp env Effects e1, transf_exp env Val e2, ty); etyp = e.etyp} | EBinop(op, e1, e2, ty) -> @@ -534,5 +534,5 @@ let program p = Transform.program ~composite:transf_composite ~decl: transf_decl - ~fundef:transf_fundef + ~fundef:transf_fundef p |