Add try-catch-finally support: parse and generate opcodes for this construct
Fix varg generation: generate *_n opcodes with parameters in following meta opcodes Add stack internal structure: dimanically allocated stack. Use dynamically allocated memory in parser: every local and global variables are stored in dinamically allocated stacks. Use dynamically allocated memory in serializer: opcodes are also stored in stack. Change is_true_jmp and is_false_jmp opcodes to relative. Change *jmp* opcodes to be able to store opcode_counter_t instead of idx_t.
This commit is contained in:
Ilmir Usmanov
@@ -52,382 +52,6 @@ optimize_calls (opcode_t *opcodes)
|
||||
}
|
||||
}
|
||||
|
||||
/* Move NUMBER opcodes from FROM to TO and adjust opcodes beetwen FROM and TO. */
|
||||
void
|
||||
optimizer_move_opcodes (opcode_t *from, opcode_t *to, uint16_t number)
|
||||
{
|
||||
opcode_t temp[number], *current_opcode;
|
||||
uint16_t i;
|
||||
|
||||
if (to == from)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
for (i = 0; i < number; i++)
|
||||
{
|
||||
temp[i] = from[i];
|
||||
}
|
||||
|
||||
if (to > from)
|
||||
{
|
||||
if (number <= to - from)
|
||||
{
|
||||
// Adjust opcodes up
|
||||
for (current_opcode = from; current_opcode != to; current_opcode++)
|
||||
{
|
||||
*current_opcode = *(current_opcode + number);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
optimizer_move_opcodes (from + number, from, (uint16_t) (to - from));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (number <= from - to)
|
||||
{
|
||||
// Adjust opcodes down
|
||||
for (current_opcode = from; current_opcode != to; current_opcode--)
|
||||
{
|
||||
*current_opcode = *(current_opcode - number);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
optimizer_move_opcodes (to, to + number, (uint16_t) (from - to));
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < number; i++)
|
||||
{
|
||||
to[i] = temp[i];
|
||||
}
|
||||
}
|
||||
|
||||
static uint16_t
|
||||
opcode_to_counter (opcode_t *opcode)
|
||||
{
|
||||
JERRY_ASSERT (opcode > (opcode_t *) deserialize_bytecode ());
|
||||
return (uint16_t) (opcode - (opcode_t *) deserialize_bytecode ());
|
||||
}
|
||||
|
||||
void
|
||||
optimizer_adjust_jumps (opcode_t *first_opcode, opcode_t *last_opcode, int16_t value)
|
||||
{
|
||||
opcode_t *current_opcode;
|
||||
|
||||
JERRY_ASSERT (first_opcode <= last_opcode);
|
||||
|
||||
for (current_opcode = first_opcode; current_opcode != last_opcode; current_opcode++)
|
||||
{
|
||||
if (current_opcode->op_idx == NAME_TO_ID (is_true_jmp))
|
||||
{
|
||||
/* 19: is_true_jmp 2
|
||||
20: var_decl ...
|
||||
|
||||
becomes
|
||||
|
||||
19: var_decl ...
|
||||
20: is_true_jmp 2
|
||||
*/
|
||||
if (current_opcode->data.is_true_jmp.opcode >= opcode_to_counter (last_opcode)
|
||||
|| current_opcode->data.is_true_jmp.opcode < opcode_to_counter (first_opcode) - value)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
/* 19: is_true_jmp 20
|
||||
20: assignment
|
||||
21: var_decl
|
||||
|
||||
becomes
|
||||
|
||||
19: var_decl
|
||||
20: is_true_jmp 21
|
||||
21: assignment
|
||||
*/
|
||||
if (current_opcode->data.is_true_jmp.opcode >= opcode_to_counter (first_opcode)
|
||||
&& current_opcode->data.is_true_jmp.opcode <= opcode_to_counter (last_opcode) - value)
|
||||
{
|
||||
current_opcode->data.is_true_jmp.opcode = (idx_t) (current_opcode->data.is_true_jmp.opcode + value);
|
||||
continue;
|
||||
}
|
||||
|
||||
/* 19: is_true_jmp 22
|
||||
20: assignment
|
||||
21: var_decl
|
||||
22: var_decl
|
||||
|
||||
becomes
|
||||
|
||||
19: var_decl
|
||||
20: var_decl
|
||||
21: is_true_jmp 23
|
||||
22: assignment
|
||||
*/
|
||||
if (current_opcode->data.is_true_jmp.opcode < opcode_to_counter (last_opcode))
|
||||
{
|
||||
current_opcode->data.is_true_jmp.opcode = (idx_t) opcode_to_counter (last_opcode);
|
||||
continue;
|
||||
}
|
||||
|
||||
JERRY_UNREACHABLE ();
|
||||
}
|
||||
|
||||
if (current_opcode->op_idx == NAME_TO_ID (is_false_jmp))
|
||||
{
|
||||
/* 19: is_false_jmp 2
|
||||
20: var_decl ...
|
||||
|
||||
becomes
|
||||
|
||||
19: var_decl ...
|
||||
20: is_false_jmp 2
|
||||
*/
|
||||
if (current_opcode->data.is_false_jmp.opcode >= opcode_to_counter (last_opcode)
|
||||
|| current_opcode->data.is_false_jmp.opcode < opcode_to_counter (first_opcode) - value)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
/* 19: is_false_jmp 20
|
||||
20: assignment
|
||||
21: var_decl
|
||||
|
||||
becomes
|
||||
|
||||
19: var_decl
|
||||
20: is_false_jmp 21
|
||||
21: assignment
|
||||
*/
|
||||
if (current_opcode->data.is_false_jmp.opcode >= opcode_to_counter (first_opcode)
|
||||
&& current_opcode->data.is_false_jmp.opcode <= opcode_to_counter (last_opcode) - value)
|
||||
{
|
||||
current_opcode->data.is_false_jmp.opcode = (idx_t) (current_opcode->data.is_false_jmp.opcode + value);
|
||||
continue;
|
||||
}
|
||||
|
||||
/* 19: is_false_jmp 22
|
||||
20: assignment
|
||||
21: var_decl
|
||||
22: var_decl
|
||||
|
||||
becomes
|
||||
|
||||
19: var_decl
|
||||
20: var_decl
|
||||
21: is_false_jmp 23
|
||||
22: assignment
|
||||
*/
|
||||
if (current_opcode->data.is_false_jmp.opcode < opcode_to_counter (last_opcode))
|
||||
{
|
||||
current_opcode->data.is_false_jmp.opcode = (idx_t) opcode_to_counter (last_opcode);
|
||||
continue;
|
||||
}
|
||||
|
||||
JERRY_UNREACHABLE ();
|
||||
}
|
||||
|
||||
if (current_opcode->op_idx == NAME_TO_ID (jmp_down))
|
||||
{
|
||||
/* 19: jmp_down 1
|
||||
20: assignment
|
||||
21: var_decl ...
|
||||
|
||||
becomes
|
||||
|
||||
19: var_decl ...
|
||||
20: jmp_down 1
|
||||
21: assignment
|
||||
*/
|
||||
if (current_opcode->data.jmp_down.opcode_count < last_opcode - current_opcode)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
/* 19: jmp_down 3
|
||||
20: assignment
|
||||
21: var_decl
|
||||
|
||||
becomes
|
||||
|
||||
19: var_decl
|
||||
20: jmp_down 2
|
||||
21: assignment
|
||||
*/
|
||||
if (current_opcode->data.jmp_down.opcode_count >= last_opcode - current_opcode + value)
|
||||
{
|
||||
current_opcode->data.jmp_down.opcode_count = (idx_t) (current_opcode->data.jmp_down.opcode_count - value);
|
||||
continue;
|
||||
}
|
||||
|
||||
/* 19: jmp_down 3
|
||||
20: assignment
|
||||
21: var_decl
|
||||
22: var_decl
|
||||
|
||||
becomes
|
||||
|
||||
19: var_decl
|
||||
20: var_decl
|
||||
21: jmp_down 2
|
||||
22: assignment
|
||||
*/
|
||||
if (current_opcode->data.jmp_down.opcode_count >= last_opcode - current_opcode
|
||||
&& current_opcode->data.jmp_down.opcode_count < last_opcode - current_opcode + value)
|
||||
{
|
||||
current_opcode->data.jmp_down.opcode_count = (idx_t) (last_opcode - current_opcode);
|
||||
continue;
|
||||
}
|
||||
|
||||
JERRY_UNREACHABLE ();
|
||||
}
|
||||
|
||||
if (current_opcode->op_idx == NAME_TO_ID (jmp_up))
|
||||
{
|
||||
/* 19: assignment
|
||||
20: jmp_up 1
|
||||
21: var_decl ...
|
||||
|
||||
becomes
|
||||
|
||||
19: var_decl ...
|
||||
20: assignment
|
||||
21: jmp_up 1
|
||||
*/
|
||||
if (current_opcode->data.jmp_up.opcode_count < current_opcode - first_opcode)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
/* 19: jmp_up 1
|
||||
20: assignment
|
||||
21: var_decl
|
||||
|
||||
becomes
|
||||
|
||||
19: var_decl
|
||||
20: jmp_up 2
|
||||
21: assignment
|
||||
*/
|
||||
if (current_opcode->data.jmp_up.opcode_count >= current_opcode - first_opcode)
|
||||
{
|
||||
current_opcode->data.jmp_up.opcode_count = (idx_t) (current_opcode->data.jmp_up.opcode_count + value);
|
||||
continue;
|
||||
}
|
||||
|
||||
JERRY_UNREACHABLE ();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Reorder scope like
|
||||
"use strict"
|
||||
func_decl
|
||||
var_decl
|
||||
other opcodes
|
||||
*/
|
||||
void
|
||||
optimizer_reorder_scope (uint16_t scope_start, uint16_t scope_end)
|
||||
{
|
||||
opcode_t *opcodes = (opcode_t *) deserialize_bytecode ();
|
||||
opcode_t *first_opcode = opcodes + scope_start;
|
||||
opcode_t *last_opcode = opcodes + scope_end;
|
||||
opcode_t *current_opcode, *processed_opcode = first_opcode;
|
||||
opcode_t *var_decls_start;
|
||||
|
||||
for (current_opcode = processed_opcode; current_opcode != last_opcode; current_opcode++)
|
||||
{
|
||||
if (current_opcode->op_idx == NAME_TO_ID (assignment)
|
||||
&& current_opcode->data.assignment.type_value_right == OPCODE_ARG_TYPE_STRING
|
||||
&& !__strcmp ("use strict", (char *) deserialize_string_by_id (current_opcode->data.assignment.value_right)))
|
||||
{
|
||||
optimizer_move_opcodes (current_opcode, processed_opcode, 1);
|
||||
optimizer_adjust_jumps (processed_opcode + 1, current_opcode + 1, 1);
|
||||
processed_opcode++;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
for (current_opcode = processed_opcode; current_opcode != last_opcode;)
|
||||
{
|
||||
if (current_opcode->op_idx == NAME_TO_ID (func_decl_0)
|
||||
|| current_opcode->op_idx == NAME_TO_ID (func_decl_1)
|
||||
|| current_opcode->op_idx == NAME_TO_ID (func_decl_2)
|
||||
|| current_opcode->op_idx == NAME_TO_ID (func_decl_n))
|
||||
{
|
||||
opcode_t *fun_opcode;
|
||||
int16_t value, jmp_offset = 0;
|
||||
for (fun_opcode = current_opcode + 1; fun_opcode != last_opcode; fun_opcode++)
|
||||
{
|
||||
if (fun_opcode->op_idx == NAME_TO_ID (jmp_down))
|
||||
{
|
||||
jmp_offset = (int16_t) (fun_opcode - current_opcode);
|
||||
fun_opcode += fun_opcode->data.jmp_down.opcode_count;
|
||||
break;
|
||||
}
|
||||
}
|
||||
JERRY_ASSERT (fun_opcode <= last_opcode);
|
||||
|
||||
value = (int16_t) (fun_opcode - current_opcode);
|
||||
optimizer_move_opcodes (current_opcode, processed_opcode, (uint16_t) value);
|
||||
// Adjust jumps inside func_decl except end's jmp_down
|
||||
optimizer_adjust_jumps (processed_opcode + jmp_offset + 1,
|
||||
processed_opcode + value,
|
||||
(int16_t) (processed_opcode - current_opcode));
|
||||
optimizer_adjust_jumps (processed_opcode + value,
|
||||
fun_opcode,
|
||||
value);
|
||||
processed_opcode += value;
|
||||
current_opcode = fun_opcode;
|
||||
continue;
|
||||
}
|
||||
else
|
||||
{
|
||||
current_opcode++;
|
||||
}
|
||||
}
|
||||
|
||||
var_decls_start = processed_opcode;
|
||||
for (current_opcode = processed_opcode; current_opcode != last_opcode; current_opcode++)
|
||||
{
|
||||
if (current_opcode->op_idx == NAME_TO_ID (var_decl))
|
||||
{
|
||||
// If variable already declared, replace it with nop
|
||||
bool was_decl = false;
|
||||
if (var_decls_start->op_idx == NAME_TO_ID (var_decl) && var_decls_start != current_opcode)
|
||||
{
|
||||
opcode_t *var_decls_iterator;
|
||||
for (var_decls_iterator = var_decls_start;
|
||||
var_decls_iterator != processed_opcode;
|
||||
var_decls_iterator++)
|
||||
{
|
||||
JERRY_ASSERT (var_decls_iterator->op_idx == NAME_TO_ID (var_decl));
|
||||
if (var_decls_iterator->data.var_decl.variable_name
|
||||
== current_opcode->data.var_decl.variable_name)
|
||||
{
|
||||
was_decl = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (was_decl)
|
||||
{
|
||||
current_opcode->op_idx = NAME_TO_ID (nop);
|
||||
}
|
||||
else
|
||||
{
|
||||
optimizer_move_opcodes (current_opcode, processed_opcode, 1);
|
||||
optimizer_adjust_jumps (processed_opcode + 1, current_opcode + 1, 1);
|
||||
processed_opcode++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
optimizer_run_passes (opcode_t *opcodes)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user