Skip to content

Commit 7b25cac

Browse files
committed
Update IR
IR commit: 8fb33ceccd39d0052c5949cf96fc135e7ba1fbcb
1 parent 15470bd commit 7b25cac

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

ext/opcache/jit/ir/ir.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ extern "C" {
2222

2323
#ifdef _WIN32
2424
/* TODO Handle ARM, too. */
25-
# if defined(_M_X64)
25+
# if defined(_M_X64) || defined(_M_ARM64)
2626
# define __SIZEOF_SIZE_T__ 8
2727
# elif defined(_M_IX86)
2828
# define __SIZEOF_SIZE_T__ 4

ext/opcache/jit/ir/ir_disasm.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
#include <capstone/capstone.h>
3030
#define HAVE_CAPSTONE_ITER
3131

32+
#ifndef IR_DISASM_INTEL_SYNTAX
33+
# define IR_DISASM_INTEL_SYNTAX 0
34+
#endif
35+
3236
typedef struct _ir_sym_node {
3337
uint64_t addr;
3438
uint64_t end;
@@ -365,7 +369,7 @@ int ir_disasm(const char *name,
365369
}
366370
# endif
367371
cs_option(cs, CS_OPT_DETAIL, CS_OPT_ON);
368-
# if DISASM_INTEL_SYNTAX
372+
# if IR_DISASM_INTEL_SYNTAX
369373
cs_option(cs, CS_OPT_SYNTAX, CS_OPT_SYNTAX_INTEL);
370374
# else
371375
cs_option(cs, CS_OPT_SYNTAX, CS_OPT_SYNTAX_ATT);

ext/opcache/jit/ir/ir_private.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ IR_ALWAYS_INLINE void ir_sparse_set_init(ir_sparse_set *set, uint32_t size)
494494
set->size = size;
495495
set->len = 0;
496496
set->data = (uint32_t*)ir_mem_malloc(sizeof(uint32_t) * 2 * size) + size;
497-
#if IR_DEBUG
497+
#ifdef IR_DEBUG
498498
/* initialize sparse part to avoid valgrind warnings */
499499
memset(&IR_SPARSE_SET_SPARSE(set, size - 1), 0, size * sizeof(uint32_t));
500500
#endif

0 commit comments

Comments
 (0)