jeltz/heptagon
1
0
Fork 0
Code Issues Pull requests Releases Activity

Fixed code generated for alias types to arrays

Browse source
This commit is contained in:
Cédric Pasteur 2011-09-09 13:54:29 +02:00
parent 9427117fe1
commit c550b09805
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
compiler/obc/c/c.ml
View file

@ -345,13 +345,6 @@ let output_cfile dir (filen, cfile_desc) =
let output dir cprog =
List.iter (output_cfile dir) cprog
(** Returns the type of a pointer to a type, except for
types which are already pointers. *)
let pointer_to ty =
match ty with
| Cty_arr _ | Cty_ptr _ -> ty
| _ -> Cty_ptr ty
(** Returns whether a type is a pointer. *)
let is_pointer_type = function
| Cty_arr _ | Cty_ptr _ -> true

23
compiler/obc/c/cgen.ml
View file

@ -115,10 +115,24 @@ let copname = function
let cvar_of_vd vd =
name vd.v_ident, ctype_of_otype vd.v_type
(** Returns the type of a pointer to a type, except for
types which are already pointers. *)
let pointer_type ty cty =
match Modules.unalias_type ty with
| Tarray _ -> cty
| _ -> Cty_ptr cty
(** Returns the expression to use e as an argument of
a function expecting a pointer as argument. *)
let address_of ty e =
match Modules.unalias_type ty with
| Tarray _ -> e
| _ -> Caddrof e
let inputlist_of_ovarlist vl =
let cvar_of_ovar vd =
let ty = ctype_of_otype vd.v_type in
let ty = if vd.v_mutable then pointer_to ty else ty in
let ty = if vd.v_mutable then pointer_type vd.v_type ty else ty in
name vd.v_ident, ty
in
List.map cvar_of_ovar vl
@ -197,13 +211,6 @@ and create_affect_stm dest src ty =
| _ -> [Caffect (dest, src)])
| _ -> [Caffect (dest, src)]
(** Returns the expression to use e as an argument of
a function expecting a pointer as argument. *)
let address_of ty e =
match ty with
| Tarray _ -> e
| _ -> Caddrof e
let rec cexpr_of_static_exp se =
match se.se_desc with
| Sint i -> Cconst (Ccint i)