Changeset 2790 for driver

Timestamp:

Mar 6, 2013, 3:48:20 PM (7 years ago)

Author:

campbell

Message:

Some null handling in conversion from CIL.

File:

• driver/clightFromC.ml (modified) (2 diffs)

driver/clightFromC.ml

@@ -321 +321 @@
 let ezero = Expr(Econst_int(I32, zero (convertIntNat 32)), Tint(I32, Signed))
 
+let is_pointer = function
+| Tpointer _ -> true
+| _ -> false
+
 let rec convertExpr env e =
   let ty = convertTyp env e.etyp in
   match e.edesc with
+  | C.EConst(C.CInt(i, _, _)) when i = Int64.zero && is_pointer ty -> 
+      Expr(Ecast (ty, Expr (Econst_int (I8,zero (convertIntNat 8)), Tint (I8, Unsigned))), ty)
   | C.EConst(C.CInt(i, k, _)) ->
       let (_,sz) = convertIkind k in
@@ -694 +700 @@
       match Ceval.constant_expr env ty e with
       | Some(C.CInt(v, ik, _)) ->
-          begin match convertIkind ik with
-          | (_, I8) ->
-              emit 1 (Init_int8(convertInt I8 v))
-          | (_, I16) ->
-              check_align 2;
-              emit 2 (Init_int16(convertInt I16 v))
-          | (_, I32) ->
-              check_align 4;
-              emit 4 (Init_int32(convertInt I32 v))
+          begin match ty with
+          | TPtr(_,_) ->
+              (* The only integer constant that is a pointer is zero *)
+              emit 2 Init_null
+          | _ ->
+            begin match convertIkind ik with
+            | (_, I8) ->
+                emit 1 (Init_int8(convertInt I8 v))
+            | (_, I16) ->
+                check_align 2;
+                emit 2 (Init_int16(convertInt I16 v))
+            | (_, I32) ->
+                check_align 4;
+                emit 4 (Init_int32(convertInt I32 v))
+            end
           end
       | Some(C.CFloat(v, fk, _)) ->