Skip to content

Commit faa57ab

Browse files
dstogovdstogov
committed
white space fixes
1 parent 17d763f commit faa57ab

10 files changed

+238
-238
lines changed

‎ext/opcache/jit/zend_elf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ void zend_elf_load_symbols(void)
5858
size_t pathlen = sizeof(path);
5959
int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1};
6060
if (sysctl(mib, 4, path, &pathlen, NULL, 0) == -1) {
61-
return;
61+
return;
6262
}
6363
int fd = open(path, O_RDONLY);
6464
#else

‎ext/opcache/jit/zend_jit.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ zend_jit_globals jit_globals;
7070
} \
7171
} while(0)
7272

73-
#define DASM_M_FREE(ctx, p, sz) efree(p)
73+
#define DASM_M_FREE(ctx, p, sz) efree(p)
7474

7575
#include "dynasm/dasm_proto.h"
7676

@@ -254,7 +254,7 @@ static void *dasm_link_and_encode(dasm_State **dasm_state,
254254
zend_string *str = NULL;
255255
#endif
256256

257-
if (rt_opline && ssa && ssa->cfg.map) {
257+
if (rt_opline && ssa && ssa->cfg.map) {
258258
/* Create additional entry point, to switch from interpreter to JIT-ed
259259
* code at run-time.
260260
*/
@@ -291,7 +291,7 @@ static void *dasm_link_and_encode(dasm_State **dasm_state,
291291
}
292292
zend_jit_jmp(dasm_state, b);
293293
}
294-
}
294+
}
295295

296296
if (dasm_link(dasm_state, &size) != DASM_S_OK) {
297297
// TODO: dasm_link() failed ???
@@ -347,7 +347,7 @@ static void *dasm_link_and_encode(dasm_State **dasm_state,
347347
}
348348

349349
#if defined(HAVE_DISASM) || defined(HAVE_GDB) || defined(HAVE_OPROFILE) || defined(HAVE_PERFTOOLS) || defined(HAVE_VTUNE)
350-
if (!name) {
350+
if (!name) {
351351
if (ZCG(accel_directives).jit_debug & (ZEND_JIT_DEBUG_ASM|ZEND_JIT_DEBUG_GDB|ZEND_JIT_DEBUG_OPROFILE|ZEND_JIT_DEBUG_PERF|ZEND_JIT_DEBUG_VTUNE|ZEND_JIT_DEBUG_PERF_DUMP)) {
352352
str = zend_jit_func_name(op_array);
353353
if (str) {
@@ -1513,13 +1513,13 @@ static int zend_jit_try_allocate_free_reg(const zend_op_array *op_array, const z
15131513
}
15141514
#endif
15151515

1516-
if (hint != ZREG_NONE && freeUntilPos[hint] > zend_interval_end(current)) {
1516+
if (hint != ZREG_NONE && freeUntilPos[hint] > zend_interval_end(current)) {
15171517
current->reg = hint;
15181518
if (current->used_as_hint) {
15191519
ZEND_REGSET_INCL(*hints, hint);
15201520
}
15211521
return 1;
1522-
}
1522+
}
15231523

15241524
if (ZEND_REGSET_IS_EMPTY(available)) {
15251525
return 0;
@@ -3031,9 +3031,9 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
30313031
return SUCCESS;
30323032

30333033
jit_failure:
3034-
if (dasm_state) {
3034+
if (dasm_state) {
30353035
dasm_free(&dasm_state);
3036-
}
3036+
}
30373037
if (zend_jit_reg_alloc) {
30383038
zend_arena_release(&CG(arena), checkpoint);
30393039
}
@@ -3063,7 +3063,7 @@ static int zend_real_jit_func(zend_op_array *op_array, zend_script *script, cons
30633063

30643064
checkpoint = zend_arena_checkpoint(CG(arena));
30653065

3066-
/* Build SSA */
3066+
/* Build SSA */
30673067
memset(&ssa, 0, sizeof(zend_ssa));
30683068

30693069
if (zend_jit_op_array_analyze1(op_array, script, &ssa) != SUCCESS) {

‎ext/opcache/jit/zend_jit.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ struct _zend_lifetime_interval {
118118
struct {
119119
ZEND_ENDIAN_LOHI_3(
120120
int8_t reg,
121-
uint8_t flags,
122-
uint16_t reserved
121+
uint8_t flags,
122+
uint16_t reserved
123123
)};
124124
uint32_t reg_flags;
125125
};

‎ext/opcache/jit/zend_jit_disasm_x86.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ static int zend_jit_disasm_init(void)
390390
#undef REGISTER_EG
391391
#endif
392392

393-
/* Register JIT helper functions */
393+
/* Register JIT helper functions */
394394
#define REGISTER_HELPER(n) \
395395
zend_jit_disasm_add_symbol(#n, \
396396
(uint64_t)(uintptr_t)n, sizeof(void*));

‎ext/opcache/jit/zend_jit_gdb.c

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ enum {
9292
DW_REG_8, DW_REG_9, DW_REG_10, DW_REG_11,
9393
DW_REG_12, DW_REG_13, DW_REG_14, DW_REG_15,
9494
DW_REG_RA,
95-
/* TODO: ARM supports? */
95+
/* TODO: ARM supports? */
9696
#else
9797
#error "Unsupported target architecture"
9898
#endif
@@ -290,48 +290,48 @@ static void zend_gdbjit_symtab(zend_gdbjit_ctx *ctx)
290290
#define DSTR(str) (ctx->p = p, zend_gdbjit_strz(ctx, (str)), p = ctx->p)
291291
#define DALIGNNOP(s) while ((uintptr_t)p & ((s)-1)) *p++ = DW_CFA_nop
292292
#define DSECT(name, stmt) \
293-
{ uint32_t *szp_##name = (uint32_t *)p; p += 4; stmt \
294-
*szp_##name = (uint32_t)((p-(uint8_t *)szp_##name)-4); }
293+
{ uint32_t *szp_##name = (uint32_t *)p; p += 4; stmt \
294+
*szp_##name = (uint32_t)((p-(uint8_t *)szp_##name)-4); }
295295

296296
static void zend_gdbjit_ehframe(zend_gdbjit_ctx *ctx)
297297
{
298-
uint8_t *p = ctx->p;
299-
uint8_t *framep = p;
300-
301-
/* DWARF EH CIE (Common Information Entry) */
302-
DSECT(CIE,
303-
DU32(0); /* CIE ID. */
304-
DB(DW_CIE_VERSION); /* Version */
305-
DSTR("zR"); /* Augmentation String. */
306-
DUV(1); /* Code alignment factor. */
307-
DSV(-(int32_t)sizeof(uintptr_t)); /* Data alignment factor. */
308-
DB(DW_REG_RA); /* Return address register. */
309-
DB(1); DB(DW_EH_PE_textrel|DW_EH_PE_udata4); /* Augmentation data. */
310-
DB(DW_CFA_def_cfa); DUV(DW_REG_SP); DUV(sizeof(uintptr_t));
311-
DB(DW_CFA_offset|DW_REG_RA); DUV(1);
312-
DALIGNNOP(sizeof(uintptr_t));
313-
)
314-
315-
/* DWARF EH FDE (Frame Description Entry). */
316-
DSECT(FDE,
317-
DU32((uint32_t)(p-framep)); /* Offset to CIE Pointer. */
318-
DU32(0); /* Machine code offset relative to .text. */
319-
DU32(ctx->szmcode); /* Machine code length. */
320-
DB(0); /* Augmentation data. */
321-
DB(DW_CFA_def_cfa_offset); DUV(sizeof(uintptr_t));
298+
uint8_t *p = ctx->p;
299+
uint8_t *framep = p;
300+
301+
/* DWARF EH CIE (Common Information Entry) */
302+
DSECT(CIE,
303+
DU32(0); /* CIE ID. */
304+
DB(DW_CIE_VERSION); /* Version */
305+
DSTR("zR"); /* Augmentation String. */
306+
DUV(1); /* Code alignment factor. */
307+
DSV(-(int32_t)sizeof(uintptr_t)); /* Data alignment factor. */
308+
DB(DW_REG_RA); /* Return address register. */
309+
DB(1); DB(DW_EH_PE_textrel|DW_EH_PE_udata4); /* Augmentation data. */
310+
DB(DW_CFA_def_cfa); DUV(DW_REG_SP); DUV(sizeof(uintptr_t));
311+
DB(DW_CFA_offset|DW_REG_RA); DUV(1);
312+
DALIGNNOP(sizeof(uintptr_t));
313+
)
314+
315+
/* DWARF EH FDE (Frame Description Entry). */
316+
DSECT(FDE,
317+
DU32((uint32_t)(p-framep)); /* Offset to CIE Pointer. */
318+
DU32(0); /* Machine code offset relative to .text. */
319+
DU32(ctx->szmcode); /* Machine code length. */
320+
DB(0); /* Augmentation data. */
321+
DB(DW_CFA_def_cfa_offset); DUV(sizeof(uintptr_t));
322322
#if defined(__i386__)
323-
DB(DW_CFA_advance_loc|3); /* sub $0xc,%esp */
324-
DB(DW_CFA_def_cfa_offset); DUV(16); /* Aligned stack frame size. */
323+
DB(DW_CFA_advance_loc|3); /* sub $0xc,%esp */
324+
DB(DW_CFA_def_cfa_offset); DUV(16); /* Aligned stack frame size. */
325325
#elif defined(__x86_64__)
326-
DB(DW_CFA_advance_loc|4); /* sub $0x8,%rsp */
327-
DB(DW_CFA_def_cfa_offset); DUV(16); /* Aligned stack frame size. */
326+
DB(DW_CFA_advance_loc|4); /* sub $0x8,%rsp */
327+
DB(DW_CFA_def_cfa_offset); DUV(16); /* Aligned stack frame size. */
328328
#else
329329
# error "Unsupported target architecture"
330330
#endif
331-
DALIGNNOP(sizeof(uintptr_t));
332-
)
331+
DALIGNNOP(sizeof(uintptr_t));
332+
)
333333

334-
ctx->p = p;
334+
ctx->p = p;
335335
}
336336

337337
static void zend_gdbjit_debuginfo(zend_gdbjit_ctx *ctx)

‎ext/opcache/jit/zend_jit_perf_dump.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@
6363
#define PADDING8(size) (ALIGN8(size) - (size))
6464

6565
typedef struct zend_perf_jitdump_header {
66-
uint32_t magic;
67-
uint32_t version;
68-
uint32_t size;
69-
uint32_t elf_mach_target;
70-
uint32_t reserved;
71-
uint32_t process_id;
72-
uint64_t time_stamp;
73-
uint64_t flags;
66+
uint32_t magic;
67+
uint32_t version;
68+
uint32_t size;
69+
uint32_t elf_mach_target;
70+
uint32_t reserved;
71+
uint32_t process_id;
72+
uint64_t time_stamp;
73+
uint64_t flags;
7474
} zend_perf_jitdump_header;
7575

7676
typedef struct _zend_perf_jitdump_record {
@@ -123,7 +123,7 @@ static void zend_jit_perf_jitdump_open(void)
123123
size_t pathlen = sizeof(path);
124124
int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1};
125125
if (sysctl(mib, 4, path, &pathlen, NULL, 0) == -1) {
126-
return;
126+
return;
127127
}
128128
fd = open(path, O_RDONLY);
129129
#else

‎ext/opcache/jit/zend_jit_trace.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ static const void *zend_jit_trace_allocate_exit_group(uint32_t n)
8383
dasm_free(&dasm_state);
8484

8585
#ifdef HAVE_DISASM
86-
if (ZCG(accel_directives).jit_debug & ZEND_JIT_DEBUG_ASM) {
86+
if (ZCG(accel_directives).jit_debug & ZEND_JIT_DEBUG_ASM) {
8787
uint32_t i;
8888

8989
for (i = 0; i < ZEND_JIT_EXIT_POINTS_PER_GROUP; i++) {
@@ -112,7 +112,7 @@ static const void *zend_jit_trace_allocate_exit_point(uint32_t n)
112112
group;
113113
ZEND_JIT_EXIT_NUM += ZEND_JIT_EXIT_POINTS_PER_GROUP;
114114
} while (n >= ZEND_JIT_EXIT_NUM);
115-
return (const void*)
115+
return (const void*)
116116
((const char*)group +
117117
((n % ZEND_JIT_EXIT_POINTS_PER_GROUP) * ZEND_JIT_EXIT_POINTS_SPACING));
118118
}
@@ -122,7 +122,7 @@ static const void *zend_jit_trace_get_exit_addr(uint32_t n)
122122
if (UNEXPECTED(n >= ZEND_JIT_EXIT_NUM)) {
123123
return zend_jit_trace_allocate_exit_point(n);
124124
}
125-
return (const void*)
125+
return (const void*)
126126
((const char*)zend_jit_exit_groups[n / ZEND_JIT_EXIT_POINTS_PER_GROUP] +
127127
((n % ZEND_JIT_EXIT_POINTS_PER_GROUP) * ZEND_JIT_EXIT_POINTS_SPACING));
128128
}
@@ -1802,7 +1802,7 @@ static zend_lifetime_interval** zend_jit_trace_allocate_registers(zend_jit_trace
18021802
zend_jit_trace_stack *stack;
18031803
uint32_t parent_vars_count = parent_trace ?
18041804
zend_jit_traces[parent_trace].exit_info[exit_num].stack_size : 0;
1805-
zend_jit_trace_stack *parent_stack = parent_trace ?
1805+
zend_jit_trace_stack *parent_stack = parent_trace ?
18061806
zend_jit_traces[parent_trace].stack_map +
18071807
zend_jit_traces[parent_trace].exit_info[exit_num].stack_offset : NULL;
18081808
ALLOCA_FLAG(use_heap);
@@ -2620,7 +2620,7 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
26202620
uint32_t exit_point = zend_jit_trace_get_exit_point(NULL, NULL, NULL);
26212621

26222622
exit_addr = zend_jit_trace_get_exit_addr(exit_point);
2623-
if (!exit_addr) {
2623+
if (!exit_addr) {
26242624
goto jit_failure;
26252625
}
26262626
}

‎ext/opcache/jit/zend_jit_vm_helpers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ zend_jit_trace_stop ZEND_FASTCALL zend_jit_trace_execute(zend_execute_data *ex,
600600
ce1 = ce2 = NULL;
601601
op1_type = op2_type = op3_type = IS_UNKNOWN;
602602
if ((opline->op1_type & (IS_TMP_VAR|IS_VAR|IS_CV))
603-
&& (opline->opcode != ZEND_ROPE_ADD && opline->opcode != ZEND_ROPE_END)) {
603+
&& (opline->opcode != ZEND_ROPE_ADD && opline->opcode != ZEND_ROPE_END)) {
604604
zval *zv = EX_VAR(opline->op1.var);
605605
op1_type = Z_TYPE_P(zv);
606606
if (op1_type == IS_INDIRECT) {

0 commit comments

Comments
 (0)