diff options
author | Narayan Kamath <narayan@google.com> | 2014-06-03 13:29:00 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-03 13:29:00 +0000 |
commit | 26063a9155ddd18d858cea7fac7c1ddf71e1bcb7 (patch) | |
tree | 0ea7717b7ea4a8a010d615df62ff1086de532a0e /include | |
parent | ea3f1da9013b33ecf3f3f8771393c1754a9aec59 (diff) | |
parent | f1dd859baa114995bcbcfb7119e939d0b4f45ed5 (diff) | |
download | frameworks_native-26063a9155ddd18d858cea7fac7c1ddf71e1bcb7.zip frameworks_native-26063a9155ddd18d858cea7fac7c1ddf71e1bcb7.tar.gz frameworks_native-26063a9155ddd18d858cea7fac7c1ddf71e1bcb7.tar.bz2 |
am f1dd859b: Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"
* commit 'f1dd859baa114995bcbcfb7119e939d0b4f45ed5':
x86_64: Align uint64_t/int64_t structure member to 8 bytes
Diffstat (limited to 'include')
-rw-r--r-- | include/input/Input.h | 2 | ||||
-rw-r--r-- | include/input/InputTransport.h | 22 |
2 files changed, 16 insertions, 8 deletions
diff --git a/include/input/Input.h b/include/input/Input.h index 077a03b..793b414 100644 --- a/include/input/Input.h +++ b/include/input/Input.h @@ -195,7 +195,7 @@ struct PointerCoords { enum { MAX_AXES = 14 }; // 14 so that sizeof(PointerCoords) == 64 // Bitfield of axes that are present in this structure. - uint64_t bits; + uint64_t bits __attribute__((aligned(8))); // Values of axes that are stored in this structure packed in order by axis id // for each axis that is present in the structure according to 'bits'. diff --git a/include/input/InputTransport.h b/include/input/InputTransport.h index 8ffdfca..e7e383b 100644 --- a/include/input/InputTransport.h +++ b/include/input/InputTransport.h @@ -39,6 +39,9 @@ namespace android { /* * Intermediate representation used to send input events and related signals. + * + * Note that this structure is used for IPCs so its layout must be identical + * on 64 and 32 bit processes. This is tested in StructLayout_test.cpp. */ struct InputMessage { enum { @@ -49,13 +52,17 @@ struct InputMessage { struct Header { uint32_t type; - uint32_t padding; // 8 byte alignment for the body that follows + // We don't need this field in order to align the body below but we + // leave it here because InputMessage::size() and other functions + // compute the size of this structure as sizeof(Header) + sizeof(Body). + uint32_t padding; } header; + // Body *must* be 8 byte aligned. union Body { struct Key { uint32_t seq; - nsecs_t eventTime; + nsecs_t eventTime __attribute__((aligned(8))); int32_t deviceId; int32_t source; int32_t action; @@ -64,7 +71,7 @@ struct InputMessage { int32_t scanCode; int32_t metaState; int32_t repeatCount; - nsecs_t downTime; + nsecs_t downTime __attribute__((aligned(8))); inline size_t size() const { return sizeof(Key); @@ -73,7 +80,7 @@ struct InputMessage { struct Motion { uint32_t seq; - nsecs_t eventTime; + nsecs_t eventTime __attribute__((aligned(8))); int32_t deviceId; int32_t source; int32_t action; @@ -81,13 +88,14 @@ struct InputMessage { int32_t metaState; int32_t buttonState; int32_t edgeFlags; - nsecs_t downTime; + nsecs_t downTime __attribute__((aligned(8))); float xOffset; float yOffset; float xPrecision; float yPrecision; uint32_t pointerCount; - struct Pointer { + // Note that PointerCoords requires 8 byte alignment. + struct Pointer{ PointerProperties properties; PointerCoords coords; } pointers[MAX_POINTERS]; @@ -112,7 +120,7 @@ struct InputMessage { return sizeof(Finished); } } finished; - } body; + } __attribute__((aligned(8))) body; bool isValid(size_t actualSize) const; size_t size() const; |