YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git-server:jerry

Browse Source
This commit is contained in:
e.gavrin
2014-08-05 15:09:29 +04:00
parent 96939be7ac 998a52b416
commit 8530cf6cd4
3 changed files with 59 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/liboptimizer/optimizer-passes.c
+31 -3
View File
@@ -322,6 +322,7 @@ optimizer_reorder_scope (uint16_t scope_start, uint16_t scope_end)
OPCODE *first_opcode = opcodes + scope_start; OPCODE *first_opcode = opcodes + scope_start;
OPCODE *last_opcode = opcodes + scope_end; OPCODE *last_opcode = opcodes + scope_end;
OPCODE *current_opcode, *processed_opcode = first_opcode; OPCODE *current_opcode, *processed_opcode = first_opcode;
OPCODE *var_decls_start;
for (current_opcode = processed_opcode; current_opcode != last_opcode; current_opcode++) for (current_opcode = processed_opcode; current_opcode != last_opcode; current_opcode++)
{ {
@@ -374,13 +375,40 @@ optimizer_reorder_scope (uint16_t scope_start, uint16_t scope_end)
current_opcode++; current_opcode++;
} }
var_decls_start = processed_opcode;
for (current_opcode = processed_opcode; current_opcode != last_opcode; current_opcode++) for (current_opcode = processed_opcode; current_opcode != last_opcode; current_opcode++)
{ {
if (current_opcode->op_idx == NAME_TO_ID (var_decl)) if (current_opcode->op_idx == NAME_TO_ID (var_decl))
{ {
optimizer_move_opcodes (current_opcode, processed_opcode, 1); // If variable already declared, replace it with nop
optimizer_adjust_jumps (processed_opcode + 1, current_opcode + 1, 1); bool was_decl = false;
processed_opcode++; if (var_decls_start->op_idx == NAME_TO_ID (var_decl) && var_decls_start != current_opcode)
{
OPCODE *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++;
}
} }
} }
} }
tests/unit/common.h
+6
View File
@@ -16,6 +16,8 @@
#ifndef COMMON_H #ifndef COMMON_H
#define COMMON_H #define COMMON_H
#define NAME_TO_ID(op) (__op__idx_##op)
#define OPCODE_SIZE(op) \ #define OPCODE_SIZE(op) \
sizeof (struct __op_##op) + 1, sizeof (struct __op_##op) + 1,
@@ -36,6 +38,10 @@ opcodes_equal (const OPCODE *opcodes1, OPCODE *opcodes2, uint16_t size)
if (opcode_num1 != opcode_num2) if (opcode_num1 != opcode_num2)
return false; return false;
if (opcode_num1 == NAME_TO_ID (nop) || opcode_num1 == NAME_TO_ID (ret)
|| opcode_num1 == NAME_TO_ID (end_with))
return true;
for (j = 1; j < opcode_sizes[opcode_num1]; j++) for (j = 1; j < opcode_sizes[opcode_num1]; j++)
if (((uint8_t*)&opcodes1[i])[j] != ((uint8_t*)&opcodes2[i])[j]) if (((uint8_t*)&opcodes1[i])[j] != ((uint8_t*)&opcodes2[i])[j])
return false; return false;
tests/unit/test_optimizer_for_loops.c
+21 -21
View File
@@ -65,27 +65,27 @@ main( int __unused argc,
[0] = getop_reg_var_decl (5, 8), // var tmp5 .. tmp8; [0] = getop_reg_var_decl (5, 8), // var tmp5 .. tmp8;
[1] = getop_var_decl (0), // var i; [1] = getop_var_decl (0), // var i;
[2] = getop_var_decl (1), // var j; [2] = getop_var_decl (1), // var j;
[3] = getop_var_decl (0), // var i; [3] = getop_assignment (5, 2, 2), // tmp5 = 0;
[4] = getop_var_decl (1), // var j; [4] = getop_assignment (0, 4, 5), // i = tmp5;
[5] = getop_assignment (5, 2, 2), // tmp5 = 0; [5] = getop_assignment (7, 2, 4), // tmp7 = 10;
[6] = getop_assignment (0, 4, 5), // i = tmp5; [6] = getop_less_than (6, 0, 7), // tmp6 = i < tmp7;
[7] = getop_assignment (7, 2, 4), // tmp7 = 10; [7] = getop_is_false_jmp (6, 14), // if (!tmp6) goto 14;
[8] = getop_less_than (6, 0, 7), // tmp6 = i < tmp7; [8] = getop_jmp_down (3), // goto 11;
[9] = getop_is_false_jmp (6, 16), // if (!tmp6) goto 16; [9] = getop_post_incr (8, 0), // tmp8 = i ++;
[10] = getop_jmp_down (3), // goto 13; [10] = getop_jmp_up (5), // goto 5;
[11] = getop_post_incr (8, 0), // tmp8 = i ++; [11] = getop_assignment (5, 2, 4), // tmp5 = 10;
[12] = getop_jmp_up (5), // goto 7; [12] = getop_assignment (1, 4, 5), // j = tmp5;
[13] = getop_assignment (5, 2, 4), // tmp5 = 10; [13] = getop_jmp_up (5), // goto 8;
[14] = getop_assignment (1, 4, 5), // j = tmp5; [14] = getop_nop (), // ;
[15] = getop_jmp_up (5), // goto 10; [15] = getop_assignment (5, 2, 2), // tmp5 = 0;
[16] = getop_assignment (5, 2, 2), // tmp5 = 0; [16] = getop_assignment (0, 4, 5), // i = tmp5;
[17] = getop_assignment (0, 4, 5), // i = tmp5; [17] = getop_assignment (7, 2, 4), // tmp7 = 10;
[18] = getop_assignment (7, 2, 4), // tmp7 = 10; [18] = getop_less_than (6, 0, 7), // tmp6 = i < tmp7;
[19] = getop_less_than (6, 0, 7), // tmp6 = i < tmp7; [19] = getop_is_false_jmp (6, 27), // if (!tmp6) goto 27;
[20] = getop_is_false_jmp (6, 27), // if (!tmp6) goto 27; [20] = getop_jmp_down (3), // goto 23;
[21] = getop_jmp_down (3), // goto 24; [21] = getop_post_incr (8, 0), // tmp8 = i ++;
[22] = getop_post_incr (8, 0), // tmp8 = i ++; [22] = getop_jmp_up (5), // goto 17;
[23] = getop_jmp_up (5), // goto 18; [23] = getop_nop (), // ;
[24] = getop_assignment (5, 2, 4), // tmp5 = 10; [24] = getop_assignment (5, 2, 4), // tmp5 = 10;
[25] = getop_assignment (1, 4, 5), // j = tmp5; [25] = getop_assignment (1, 4, 5), // j = tmp5;
[26] = getop_jmp_up (5), // goto 21; [26] = getop_jmp_up (5), // goto 21;