T0b1/fadec
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix alignment warnings from Clang

Browse Source
This commit is contained in:
Alexis Engelke
2019-08-18 18:13:39 +02:00
parent 0f2681b138
commit bb3c7a4a4f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
decode.c
View File

@@ -14,7 +14,7 @@
#define UNLIKELY(x) __builtin_expect((x), 0) #define UNLIKELY(x) __builtin_expect((x), 0)
#define FD_DECODE_TABLE_DATA #define FD_DECODE_TABLE_DATA
static const uint8_t _decode_table[] = { static __attribute__((aligned(16))) const uint8_t _decode_table[] = {
#include <fadec-decode-table.inc> #include <fadec-decode-table.inc>
}; };
#undef FD_DECODE_TABLE_DATA #undef FD_DECODE_TABLE_DATA
@@ -42,7 +42,7 @@ typedef enum DecodeMode DecodeMode;
#define ENTRY_UNPACK(table,kind,entry) do { \ #define ENTRY_UNPACK(table,kind,entry) do { \
uint16_t entry_copy = entry; \ uint16_t entry_copy = entry; \
table = (uint16_t*) &_decode_table[entry_copy & ~7]; \ table = &((uint16_t*) _decode_table)[(entry_copy & ~7) >> 1]; \
kind = entry_copy & ENTRY_MASK; \ kind = entry_copy & ENTRY_MASK; \
} while (0) } while (0)
@@ -305,11 +305,11 @@ fd_decode(const uint8_t* buffer, size_t len_sz, int mode_int, uintptr_t address,
// Ensure that we can actually handle the decode request // Ensure that we can actually handle the decode request
#if defined(ARCH_386) #if defined(ARCH_386)
if (mode == DECODE_32) if (mode == DECODE_32)
table = (uint16_t*) &_decode_table[FD_TABLE_OFFSET_32]; table = &((uint16_t*) _decode_table)[FD_TABLE_OFFSET_32 >> 1];
#endif #endif
#if defined(ARCH_X86_64) #if defined(ARCH_X86_64)
if (mode == DECODE_64) if (mode == DECODE_64)
table = (uint16_t*) &_decode_table[FD_TABLE_OFFSET_64]; table = &((uint16_t*) _decode_table)[FD_TABLE_OFFSET_64 >> 1];
#endif #endif
if (UNLIKELY(table == NULL)) if (UNLIKELY(table == NULL))

2
format.c
View File

@@ -55,7 +55,7 @@ fd_format(const FdInstr* instr, char* buffer, size_t len)
if (op_type == FD_OT_NONE) if (op_type == FD_OT_NONE)
break; break;
const char* op_type_name = "reg\0imm\0mem" + op_type * 4 - 4; const char* op_type_name = &"reg\0imm\0mem"[op_type * 4] - 4;
FMT_CONCAT(buf, end, " %s%u:", op_type_name, FD_OP_SIZE(instr, i)); FMT_CONCAT(buf, end, " %s%u:", op_type_name, FD_OP_SIZE(instr, i));
switch (op_type) switch (op_type)