diff options
| author | Xavier Leroy <xavierleroy@users.noreply.github.com> | 2016-10-27 16:26:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-27 16:26:08 +0200 |
| commit | 9922feea537ced718a3822dd50eabc87da060338 (patch) | |
| tree | 6f67bb6707ef59e50d6bb81c61b2ed0b3c6097ab /cparser | |
| parent | f2d6637c7d4a11f961ff289e64f70bf4de93d0aa (diff) | |
| parent | d50773e537ec6729f9152b545c6f938ab19eb7b8 (diff) | |
| download | compcert-9922feea537ced718a3822dd50eabc87da060338.tar.gz compcert-9922feea537ced718a3822dd50eabc87da060338.zip | |
Merge pull request #145 from AbsInt/64
Support for 64-bit target processors + support for x86 in 64-bit mode
Diffstat (limited to 'cparser')
| -rw-r--r-- | cparser/PackedStructs.ml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cparser/PackedStructs.ml b/cparser/PackedStructs.ml index a921e2d8..b74a29d4 100644 --- a/cparser/PackedStructs.ml +++ b/cparser/PackedStructs.ml @@ -36,7 +36,7 @@ let byteswapped_fields : (ident * string, unit) Hashtbl.t let rec can_byte_swap env ty = match unroll env ty with - | TInt(ik, _) -> (sizeof_ikind ik <= 4, sizeof_ikind ik > 1) + | TInt(ik, _) -> (sizeof_ikind ik <= !config.sizeof_ptr (*FIXME*), sizeof_ikind ik > 1) | TEnum(_, _) -> (true, sizeof_ikind enum_ikind > 1) | TPtr(_, _) -> (true, true) (* tolerance? *) | TArray(ty_elt, _, _) -> can_byte_swap env ty_elt @@ -155,7 +155,7 @@ let use_reversed = ref false let bswap_read loc env lval = let ty = lval.etyp in let (bsize, aty) = accessor_type loc env ty in - assert (bsize = 16 || bsize = 32); + assert (bsize = 16 || bsize = 32 || (bsize = 64 && !config.sizeof_ptr = 8)); try if !use_reversed then begin let (id, fty) = @@ -182,7 +182,7 @@ let bswap_write loc env lhs rhs = let ty = lhs.etyp in let (bsize, aty) = accessor_type loc env ty in - assert (bsize = 16 || bsize = 32); + assert (bsize = 16 || bsize = 32 || (bsize = 64 && !config.sizeof_ptr = 8)); try if !use_reversed then begin let (id, fty) = |