erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-09-19 06:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

fix(common): kmx struct alignment 🙀

Browse source 
- move KMX struct alignment to km_types.h

For: #9138
This commit is contained in:
Steven R. Loomis 2023-11-08 13:17:51 -06:00
parent af3f128b41
commit dc5ac44369
2 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
common/include/km_types.h
View file

@ -67,3 +67,23 @@ typedef wchar_t KMX_UCHAR;
#endif
typedef KMX_UCHAR* KMX_PUCHAR;
// Alignment
/*
When we read .kmx files, they have no alignment guarantees, so we need to tell
the compiler to generate unaligned-safe code for accesses to COMP_ structure
members. Note we are assuming that COMP_KEYBOARD is aligned because it is
always the start of the file, so will be at the start of any buffer which will
automatically be aligned correctly.
*/
#ifdef __EMSCRIPTEN__
typedef KMX_DWORD __attribute__((aligned(1))) KMX_DWORD_unaligned;
typedef KMX_BOOL __attribute__((aligned(1))) KMX_BOOL_unaligned;
typedef KMX_WORD __attribute__((aligned(1))) KMX_WORD_unaligned;
#else
// TODO: consider other platforms
#define KMX_DWORD_unaligned KMX_DWORD
#define KMX_BOOL_unaligned KMX_BOOL
#define KMX_WORD_unaligned KMX_WORD
#endif

18
common/include/kmx_file.h
View file

@ -7,24 +7,6 @@
#include <km_types.h>
/*
When we read .kmx files, they have no alignment guarantees, so we need to tell
the compiler to generate unaligned-safe code for accesses to COMP_ structure
members. Note we are assuming that COMP_KEYBOARD is aligned because it is
always the start of the file, so will be at the start of any buffer which will
automatically be aligned correctly.
*/
#ifdef __EMSCRIPTEN__
typedef KMX_DWORD __attribute__((aligned(1))) KMX_DWORD_unaligned;
typedef KMX_BOOL __attribute__((aligned(1))) KMX_BOOL_unaligned;
typedef KMX_WORD __attribute__((aligned(1))) KMX_WORD_unaligned;
#else
// TODO: consider other platforms
#define KMX_DWORD_unaligned KMX_DWORD
#define KMX_BOOL_unaligned KMX_BOOL
#define KMX_WORD_unaligned KMX_WORD
#endif
#ifdef KM_CORE_LIBRARY
// TODO: move this to a common namespace keyman::common::kmx_file or similar in the future
namespace km {