Ignore:
Timestamp:
Jan 19, 2011, 6:23:27 PM (9 years ago)
Author:
campbell
Message:

Port memory spaces changes to latest prototype compiler.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Deliverables/D2.3/8051-memoryspaces-branch/cparser/Ceval.ml

    r453 r460  
    100100      then F(normalize_float (Int64.to_float n) fk)
    101101      else F(normalize_float (int64_unsigned_to_float n) fk)
    102   | TPtr(ty, _), I n ->
     102  | TPtr(_, ty, _), I n ->
    103103      I (normalize_int n ptr_t_ikind)
    104   | TPtr(ty, _), F n ->
     104  | TPtr(_, ty, _), F n ->
    105105      if n = 0.0 then I 0L else raise Notconst
    106   | TPtr(ty, _), (S _ | WS _) ->
     106  | TPtr(_, ty, _), (S _ | WS _) ->
    107107      v
    108108  | _, _ ->
     
    271271    | TInt(ik, _), I n -> Some(CInt(n, ik, ""))
    272272    | TFloat(fk, _), F n -> Some(CFloat(n, fk, ""))
    273     | TPtr(_, _), I 0L -> Some(CInt(0L, IInt, ""))
    274     | TPtr(_, _), S s -> Some(CStr s)
    275     | TPtr(_, _), WS s -> Some(CWStr s)
     273    | TPtr(_, _, _), I 0L -> Some(CInt(0L, IInt, ""))
     274    | TPtr(_, _, _), S s -> Some(CStr s)
     275    | TPtr(_, _, _), WS s -> Some(CWStr s)
    276276    | _   -> None
    277277  with Notconst -> None
Note: See TracChangeset for help on using the changeset viewer.