kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Rename variables for clarity

Browse source
This commit is contained in:
Maxime Chevalier-Boisvert 2020-11-09 16:38:50 -05:00 committed by Alan Wu
parent b75169a440
commit 64072dd3a6
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
ujit_compile.c
View file

@ -47,10 +47,12 @@ typedef struct ctx_struct
// The iseq that owns the region that is compiling // The iseq that owns the region that is compiling
const rb_iseq_t *iseq; const rb_iseq_t *iseq;
// Index in the iseq to the opcode we are replacing
size_t replacement_idx; // Index in the iseq of the opcode we are replacing
// The start of output code size_t start_idx;
uint8_t *region_start;
// The start of the generated code
uint8_t *code_ptr;
} ctx_t; } ctx_t;
@ -109,14 +111,14 @@ struct compiled_region_array {
int32_t capa; int32_t capa;
struct compiled_region { struct compiled_region {
const rb_iseq_t *iseq; const rb_iseq_t *iseq;
size_t replacement_idx; size_t start_idx;
uint8_t *code; uint8_t *code;
}data[]; }data[];
}; };
// Add an element to a region array, or allocate a new region array. // Add an element to a region array, or allocate a new region array.
static struct compiled_region_array * static struct compiled_region_array *
add_compiled_region(struct compiled_region_array *array, const rb_iseq_t *iseq, size_t replacement_idx, uint8_t *code) add_compiled_region(struct compiled_region_array *array, const rb_iseq_t *iseq, size_t start_idx, uint8_t *code)
{ {
if (!array) { if (!array) {
// Allocate a brand new array with space for one // Allocate a brand new array with space for one
@ -132,7 +134,7 @@ add_compiled_region(struct compiled_region_array *array, const rb_iseq_t *iseq,
} }
// Check if the region is already present // Check if the region is already present
for (int32_t i = 0; i < array->size; i++) { for (int32_t i = 0; i < array->size; i++) {
if (array->data[i].iseq == iseq && array->data[i].replacement_idx == replacement_idx) { if (array->data[i].iseq == iseq && array->data[i].start_idx == start_idx) {
return array; return array;
} }
} }
@ -152,7 +154,7 @@ add_compiled_region(struct compiled_region_array *array, const rb_iseq_t *iseq,
int32_t size = array->size; int32_t size = array->size;
array->data[size].iseq = iseq; array->data[size].iseq = iseq;
array->data[size].replacement_idx = replacement_idx; array->data[size].start_idx = start_idx;
array->data[size].code = code; array->data[size].code = code;
array->size++; array->size++;
return array; return array;
@ -166,7 +168,7 @@ add_lookup_dependency_i(st_data_t *key, st_data_t *value, st_data_t data, int ex
if (existing) { if (existing) {
regions = (struct compiled_region_array *)*value; regions = (struct compiled_region_array *)*value;
} }
regions = add_compiled_region(regions, ctx->iseq, ctx->replacement_idx, ctx->region_start); regions = add_compiled_region(regions, ctx->iseq, ctx->start_idx, ctx->code_ptr);
if (!regions) { if (!regions) {
rb_bug("ujit: failed to add method lookup dependency"); // TODO: we could bail out of compiling instead rb_bug("ujit: failed to add method lookup dependency"); // TODO: we could bail out of compiling instead
} }
@ -247,7 +249,6 @@ ctx_get_opcode(ctx_t *ctx)
return opcode_at_pc(ctx->iseq, ctx->pc); return opcode_at_pc(ctx->iseq, ctx->pc);
} }
// Get an instruction argument from the context object // Get an instruction argument from the context object
static VALUE static VALUE
ctx_get_arg(ctx_t* ctx, size_t arg_idx) ctx_get_arg(ctx_t* ctx, size_t arg_idx)
@ -398,8 +399,8 @@ ujit_compile_insn(const rb_iseq_t *iseq, unsigned int insn_idx, unsigned int *ne
ctx.pc = NULL; ctx.pc = NULL;
ctx.stack_diff = 0; ctx.stack_diff = 0;
ctx.iseq = iseq; ctx.iseq = iseq;
ctx.region_start = code_ptr; ctx.code_ptr = code_ptr;
ctx.replacement_idx = insn_idx; ctx.start_idx = insn_idx;
// For each instruction to compile // For each instruction to compile
unsigned num_instrs = 0; unsigned num_instrs = 0;
@ -975,14 +976,14 @@ rb_ujit_method_lookup_change(VALUE cme_or_cc)
for (int32_t i = 0; i < array->size; i++) { for (int32_t i = 0; i < array->size; i++) {
struct compiled_region *region = &array->data[i]; struct compiled_region *region = &array->data[i];
const struct rb_iseq_constant_body *body = region->iseq->body; const struct rb_iseq_constant_body *body = region->iseq->body;
RUBY_ASSERT((unsigned int)region->replacement_idx < body->iseq_size); RUBY_ASSERT((unsigned int)region->start_idx < body->iseq_size);
// Restore region address to interpreter address in bytecode sequence // Restore region address to interpreter address in bytecode sequence
if (body->iseq_encoded[region->replacement_idx] == (VALUE)region->code) { if (body->iseq_encoded[region->start_idx] == (VALUE)region->code) {
const void *const *code_threading_table = rb_vm_get_insns_address_table(); const void *const *code_threading_table = rb_vm_get_insns_address_table();
int opcode = rb_vm_insn_addr2insn(region->code); int opcode = rb_vm_insn_addr2insn(region->code);
body->iseq_encoded[region->replacement_idx] = (VALUE)code_threading_table[opcode]; body->iseq_encoded[region->start_idx] = (VALUE)code_threading_table[opcode];
if (UJIT_DUMP_MODE > 0) { if (UJIT_DUMP_MODE > 0) {
fprintf(stderr, "cc_or_cme=%p now out of date. Restored idx=%u in iseq=%p\n", (void *)cme_or_cc, (unsigned)region->replacement_idx, (void *)region->iseq); fprintf(stderr, "cc_or_cme=%p now out of date. Restored idx=%u in iseq=%p\n", (void *)cme_or_cc, (unsigned)region->start_idx, (void *)region->iseq);
} }
} }
} }