ruby-changes:69218
From: Alan <ko1@a...>
Date: Thu, 21 Oct 2021 08:23:56 +0900 (JST)
Subject: [ruby-changes:69218] ec4998bd69 (master): style: switch statements indent
https://git.ruby-lang.org/ruby.git/commit/?id=ec4998bd69 From ec4998bd69e2d09d89440f27fc15be05f2a63f21 Mon Sep 17 00:00:00 2001 From: Alan Wu <XrXr@u...> Date: Wed, 29 Sep 2021 15:38:57 -0400 Subject: style: switch statements indent Case labels get half an indent and the opening brace is on the same line as "switch". --- yjit_asm.c | 46 +++++++------- yjit_codegen.c | 189 +++++++++++++++++++++++++++------------------------------ yjit_core.c | 97 ++++++++++++++--------------- 3 files changed, 160 insertions(+), 172 deletions(-) diff --git a/yjit_asm.c b/yjit_asm.c index 4b7205e14a..e589ca1703 100644 --- a/yjit_asm.c +++ b/yjit_asm.c @@ -62,19 +62,19 @@ x86opnd_t mem_opnd_sib(uint32_t num_bits, x86opnd_t base_reg, x86opnd_t index_re https://github.com/ruby/ruby/blob/trunk/yjit_asm.c#L62 { uint8_t scale_exp; switch (scale) { - case 8: + case 8: scale_exp = 3; break; - case 4: + case 4: scale_exp = 2; break; - case 2: + case 2: scale_exp = 1; break; - case 1: + case 1: scale_exp = 0; break; - default: + default: assert(false && "scale not one of 1,2,4,8"); break; } @@ -335,13 +335,12 @@ void cb_write_int(codeblock_t *cb, uint64_t val, uint32_t num_bits) https://github.com/ruby/ruby/blob/trunk/yjit_asm.c#L335 assert (num_bits % 8 == 0); // Switch on the number of bits - switch (num_bits) - { - case 8: + switch (num_bits) { + case 8: cb_write_byte(cb, (uint8_t)val); break; - case 16: + case 16: cb_write_bytes( cb, 2, @@ -350,7 +349,7 @@ void cb_write_int(codeblock_t *cb, uint64_t val, uint32_t num_bits) https://github.com/ruby/ruby/blob/trunk/yjit_asm.c#L349 ); break; - case 32: + case 32: cb_write_bytes( cb, 4, @@ -361,7 +360,7 @@ void cb_write_int(codeblock_t *cb, uint64_t val, uint32_t num_bits) https://github.com/ruby/ruby/blob/trunk/yjit_asm.c#L360 ); break; - default: + default: { // Compute the size in bytes uint32_t num_bytes = num_bits / 8; @@ -1439,57 +1438,56 @@ void neg(codeblock_t *cb, x86opnd_t opnd) https://github.com/ruby/ruby/blob/trunk/yjit_asm.c#L1438 // nop - Noop, one or multiple bytes long void nop(codeblock_t *cb, uint32_t length) { - switch (length) - { - case 0: + switch (length) { + case 0: break; - case 1: + case 1: //cb.writeASM("nop1"); cb_write_byte(cb, 0x90); break; - case 2: + case 2: //cb.writeASM("nop2"); cb_write_bytes(cb, 2, 0x66,0x90); break; - case 3: + case 3: //cb.writeASM("nop3"); cb_write_bytes(cb, 3, 0x0F,0x1F,0x00); break; - case 4: + case 4: //cb.writeASM("nop4"); cb_write_bytes(cb, 4, 0x0F,0x1F,0x40,0x00); break; - case 5: + case 5: //cb.writeASM("nop5"); cb_write_bytes(cb, 5, 0x0F,0x1F,0x44,0x00,0x00); break; - case 6: + case 6: //cb.writeASM("nop6"); cb_write_bytes(cb, 6, 0x66,0x0F,0x1F,0x44,0x00,0x00); break; - case 7: + case 7: //cb.writeASM("nop7"); cb_write_bytes(cb, 7, 0x0F,0x1F,0x80,0x00,0x00,0x00,0x00); break; - case 8: + case 8: //cb.writeASM("nop8"); cb_write_bytes(cb, 8, 0x0F,0x1F,0x84,0x00,0x00,0x00,0x00,0x00); break; - case 9: + case 9: //cb.writeASM("nop9"); cb_write_bytes(cb, 9, 0x66,0x0F,0x1F,0x84,0x00,0x00,0x00,0x00,0x00); break; - default: + default: { uint32_t written = 0; while (written + 9 <= length) diff --git a/yjit_codegen.c b/yjit_codegen.c index 7d1d7e31b5..97ad8d818c 100644 --- a/yjit_codegen.c +++ b/yjit_codegen.c @@ -1397,14 +1397,13 @@ guard_self_is_heap(codeblock_t *cb, x86opnd_t self_opnd, uint8_t *side_exit, ctx https://github.com/ruby/ruby/blob/trunk/yjit_codegen.c#L1397 static void gen_jnz_to_target0(codeblock_t *cb, uint8_t *target0, uint8_t *target1, uint8_t shape) { - switch (shape) - { - case SHAPE_NEXT0: - case SHAPE_NEXT1: + switch (shape) { + case SHAPE_NEXT0: + case SHAPE_NEXT1: RUBY_ASSERT(false); break; - case SHAPE_DEFAULT: + case SHAPE_DEFAULT: jnz_ptr(cb, target0); break; } @@ -1413,14 +1412,13 @@ gen_jnz_to_target0(codeblock_t *cb, uint8_t *target0, uint8_t *target1, uint8_t https://github.com/ruby/ruby/blob/trunk/yjit_codegen.c#L1412 static void gen_jz_to_target0(codeblock_t *cb, uint8_t *target0, uint8_t *target1, uint8_t shape) { - switch (shape) - { - case SHAPE_NEXT0: - case SHAPE_NEXT1: + switch (shape) { + case SHAPE_NEXT0: + case SHAPE_NEXT1: RUBY_ASSERT(false); break; - case SHAPE_DEFAULT: + case SHAPE_DEFAULT: jz_ptr(cb, target0); break; } @@ -1429,14 +1427,13 @@ gen_jz_to_target0(codeblock_t *cb, uint8_t *target0, uint8_t *target1, uint8_t s https://github.com/ruby/ruby/blob/trunk/yjit_codegen.c#L1427 static void gen_jbe_to_target0(codeblock_t *cb, uint8_t *target0, uint8_t *target1, uint8_t shape) { - switch (shape) - { - case SHAPE_NEXT0: - case SHAPE_NEXT1: + switch (shape) { + case SHAPE_NEXT0: + case SHAPE_NEXT1: RUBY_ASSERT(false); break; - case SHAPE_DEFAULT: + case SHAPE_DEFAULT: jbe_ptr(cb, target0); break; } @@ -1459,21 +1456,21 @@ jit_chain_guard(enum jcc_kinds jcc, jitstate_t *jit, const ctx_t *ctx, uint8_t d https://github.com/ruby/ruby/blob/trunk/yjit_codegen.c#L1456 branchgen_fn target0_gen_fn; switch (jcc) { - case JCC_JNE: - case JCC_JNZ: - target0_gen_fn = gen_jnz_to_target0; - break; - case JCC_JZ: - case JCC_JE: - target0_gen_fn = gen_jz_to_target0; - break; - case JCC_JBE: - case JCC_JNA: - target0_gen_fn = gen_jbe_to_target0; - break; - default: - RUBY_ASSERT(false && "unimplemented jump kind"); - break; + case JCC_JNE: + case JCC_JNZ: + target0_gen_fn = gen_jnz_to_target0; + break; + case JCC_JZ: + case JCC_JE: + target0_gen_fn = gen_jz_to_target0; + break; + case JCC_JBE: + case JCC_JNA: + target0_gen_fn = gen_jbe_to_target0; + break; + default: + RUBY_ASSERT(false && "unimplemented jump kind"); + break; }; if (ctx->chain_depth < depth_limit) { @@ -2598,17 +2595,16 @@ gen_opt_case_dispatch(jitstate_t *jit, ctx_t *ctx, codeblock_t *cb) https://github.com/ruby/ruby/blob/trunk/yjit_codegen.c#L2595 void gen_branchif_branch(codeblock_t *cb, uint8_t *target0, uint8_t *target1, uint8_t shape) { - switch (shape) - { - case SHAPE_NEXT0: + switch (shape) { + case SHAPE_NEXT0: jz_ptr(cb, target1); break; - case SHAPE_NEXT1: + case SHAPE_NEXT1: jnz_ptr(cb, target0); break; - case SHAPE_DEFAULT: + case SHAPE_DEFAULT: jnz_ptr(cb, target0); jmp_ptr(cb, target1); break; @@ -2655,17 +2651,16 @@ gen_branchif(jitstate_t *jit, ctx_t *ctx, codeblock_t *cb) https://github.com/ruby/ruby/blob/trunk/yjit_codegen.c#L2651 void gen_branchunless_branch(codeblock_t *cb, uint8_t *target0, uint8_t *target1, uint8_t shape) { - switch (shape) - { - case SHAPE_NEXT0: + switch (shape) { + case SHAPE_NEXT0: jnz_ptr(cb, target1); break; - case SHAPE_NEXT1: + case SHAPE_NEXT1: jz_ptr(cb, target0); break; - case SHAPE_DEFAULT: + case SHAPE_DEFAULT: jz_ptr(cb, target0); jmp_ptr(cb, target1); break; @@ -2712,17 +2707,16 @@ gen_branchunless(jitstate_t *jit, ctx_t *ctx, codeblock_t *cb) https://github.com/ruby/ruby/blob/trunk/yjit_codegen.c#L2707 void gen_branchnil_branch(codeblock_t *cb, uint8_t *target0, uint8_t *target1, uint8_t shape) { - switch (shape) - { - case SHAPE_NEXT0: + switch (shape) { + case SHAPE_NEXT0: jne_ptr(cb, target1); break; - case SHAPE_NEXT1: + case SHAPE_NEXT1: je_ptr(cb, target0); break; - case SHAPE_DEFAULT: + case SHAPE_DEFAULT: je_ptr(cb, target0); jmp_ptr(cb, target1); break; @@ -3303,14 +3297,13 @@ gen_send_cfunc(jitstate_t *jit, ctx_t *ctx, const struct rb_callinfo *ci, const https://github.com/ruby/ruby/blob/trunk/yjit_codegen.c#L3297 static void gen_return_branch(codeblock_t *cb, uint8_t *target0, uint8_t *target1, uint8_t shape) { - switch (shape) - { - case SHAPE_NEXT0: - case SHAPE_NEXT1: + switch (shape) { + case SHAPE_NEXT0: + case SHAPE_NEXT1: RUBY_ASSERT(false); break; - case SHAPE_DEFAULT: + case SHAPE_DEFAULT: mov(cb, REG0, const_ptr_opnd(target0)); mov(cb, member_opnd(REG_CFP, rb_control_frame_t, jit_return), REG0); break; @@ -3657,20 +3650,20 @@ gen_send_general(jitstate_t *jit, ctx_t *ctx, struct rb_call_data *cd, rb_iseq_t https://github.com/ruby/ruby/blob/trunk/yjit_codegen.c#L3650 } switch (METHOD_ENTRY_VISI(cme)) { - case METHOD_VISI_PUBLIC: + case METHOD_VISI_PUBLIC: // Can always call public methods break; - case METHOD_VISI_PRIVATE: + case METHOD_VISI_PRIVATE: if (!(vm_ci_flag(ci) & VM_CALL_FCALL)) { // Can only call private methods with FCALL callsites. // (... truncated) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/