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

Freaking FINALLY: postparser

Browse Source
This commit is contained in:
Ilmir Usmanov
2014-10-12 20:33:37 +04:00
parent 63662dfb35
commit 18618c6501
13 changed files with 132 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libjsparser/scopes-tree.c
+39 -55
View File
@@ -20,28 +20,28 @@
#define NAME_TO_ID(op) (__op__idx_##op)
static void
assert_tree (scopes_tree *t)
assert_tree (scopes_tree t)
{
JERRY_ASSERT (t != NULL);
JERRY_ASSERT (t->t.magic == TREE_MAGIC);
}
opcode_counter_t
scopes_tree_opcodes_num (scopes_tree *t)
scopes_tree_opcodes_num (scopes_tree t)
{
assert_tree (t);
return t->opcodes_num;
}
void
scopes_tree_add_opcode (scopes_tree *tree, opcode_t op)
scopes_tree_add_opcode (scopes_tree tree, opcode_t op)
{
assert_tree (tree);
linked_list_set_element (tree->opcodes, sizeof (opcode_t), tree->opcodes_num++, &op);
}
void
scopes_tree_set_opcode (scopes_tree *tree, opcode_counter_t oc, opcode_t op)
scopes_tree_set_opcode (scopes_tree tree, opcode_counter_t oc, opcode_t op)
{
assert_tree (tree);
JERRY_ASSERT (oc < tree->opcodes_num);
@@ -49,7 +49,7 @@ scopes_tree_set_opcode (scopes_tree *tree, opcode_counter_t oc, opcode_t op)
}
void
scopes_tree_set_opcodes_num (scopes_tree *tree, opcode_counter_t oc)
scopes_tree_set_opcodes_num (scopes_tree tree, opcode_counter_t oc)
{
assert_tree (tree);
JERRY_ASSERT (oc < tree->opcodes_num);
@@ -57,76 +57,57 @@ scopes_tree_set_opcodes_num (scopes_tree *tree, opcode_counter_t oc)
}
opcode_t
scopes_tree_opcode (scopes_tree *tree, opcode_counter_t oc)
scopes_tree_opcode (scopes_tree tree, opcode_counter_t oc)
{
assert_tree (tree);
JERRY_ASSERT (oc < tree->opcodes_num);
return *(opcode_t *) linked_list_element (tree->opcodes, sizeof (opcode_t), oc);
}
static opcode_counter_t
count_opcodes_in_tree (scopes_tree *t)
opcode_counter_t
scopes_tree_count_opcodes (scopes_tree t)
{
assert_tree (t);
opcode_counter_t res = t->opcodes_num;
for (uint8_t i = 0; i < t->t.children_num; i++)
{
res = (opcode_counter_t) (res
+ count_opcodes_in_tree ((scopes_tree *) linked_list_element (t->t.children,
sizeof (scopes_tree *),
i)));
+ scopes_tree_count_opcodes (*(scopes_tree *) linked_list_element (t->t.children,
sizeof (scopes_tree),
i)));
}
return res;
}
static opcode_counter_t
merge_subscopes (scopes_tree *tree, opcode_t *data)
merge_subscopes (scopes_tree tree, opcode_t *data)
{
assert_tree (tree);
JERRY_ASSERT (data);
bool header = true;
opcode_counter_t opc_index, data_index;
bool header = true;
for (opc_index = 0, data_index = 0; opc_index < tree->opcodes_num; opc_index++, data_index++)
{
opcode_t *op = (opcode_t *) linked_list_element (tree->opcodes, sizeof (opcode_t), opc_index);
JERRY_ASSERT (op);
switch (opc_index)
{
case 0:
{
JERRY_ASSERT (op->op_idx == NAME_TO_ID (reg_var_decl));
data[data_index] = *op;
break;
}
case 1:
{
JERRY_ASSERT (op->op_idx == NAME_TO_ID (nop) || op->op_idx == NAME_TO_ID (meta));
data[data_index] = *op;
break;
}
default:
{
if (op->op_idx == NAME_TO_ID (var_decl))
{
data[data_index] = *op;
}
else
{
header = false;
}
}
}
if (!header)
if (op->op_idx != NAME_TO_ID (var_decl)
&& op->op_idx != NAME_TO_ID (nop)
&& op->op_idx != NAME_TO_ID (meta) && !header)
{
break;
}
if (op->op_idx == NAME_TO_ID (reg_var_decl))
{
header = false;
}
data[data_index] = *op;
}
for (uint8_t child_id = 0; child_id < tree->t.children_num; child_id++)
{
data_index = (opcode_counter_t) (data_index
+ merge_subscopes ((scopes_tree *) linked_list_element (tree->t.children,
sizeof (scopes_tree *),
child_id),
+ merge_subscopes (*(scopes_tree *) linked_list_element (tree->t.children,
sizeof (scopes_tree),
child_id),
data + data_index));
}
for (; opc_index < tree->opcodes_num; opc_index++, data_index++)
@@ -138,10 +119,10 @@ merge_subscopes (scopes_tree *tree, opcode_t *data)
}
opcode_t *
scopes_tree_raw_data (scopes_tree *tree, opcode_counter_t *num)
scopes_tree_raw_data (scopes_tree tree, opcode_counter_t *num)
{
assert_tree (tree);
opcode_counter_t res = count_opcodes_in_tree (tree);
opcode_counter_t res = scopes_tree_count_opcodes (tree);
size_t size = ((size_t) (res + 1) * sizeof (opcode_t)); // +1 for valgrind
opcode_t *opcodes = (opcode_t *) mem_heap_alloc_block (size, MEM_HEAP_ALLOC_LONG_TERM);
__memset (opcodes, 0, size);
@@ -151,10 +132,10 @@ scopes_tree_raw_data (scopes_tree *tree, opcode_counter_t *num)
return opcodes;
}
scopes_tree *
scopes_tree_init (scopes_tree *parent)
scopes_tree
scopes_tree_init (scopes_tree parent)
{
scopes_tree *tree = (scopes_tree *) mem_heap_alloc_block (sizeof (scopes_tree), MEM_HEAP_ALLOC_SHORT_TERM);
scopes_tree tree = (scopes_tree) mem_heap_alloc_block (sizeof (scopes_tree_int), MEM_HEAP_ALLOC_SHORT_TERM);
__memset (tree, 0, sizeof (scopes_tree));
tree->t.magic = TREE_MAGIC;
tree->t.parent = (tree_header *) parent;
@@ -164,9 +145,12 @@ scopes_tree_init (scopes_tree *parent)
{
if (parent->t.children_num == 0)
{
parent->t.children = linked_list_init (sizeof (scopes_tree *));
parent->t.children = linked_list_init (sizeof (scopes_tree));
}
linked_list_set_element (parent->t.children, sizeof (scopes_tree *), parent->t.children_num++, tree);
linked_list_set_element (parent->t.children, sizeof (scopes_tree), parent->t.children_num, &tree);
void *added = linked_list_element (parent->t.children, sizeof (scopes_tree), parent->t.children_num);
JERRY_ASSERT (*(scopes_tree *) added == tree);
parent->t.children_num++;
}
tree->opcodes_num = 0;
tree->opcodes = linked_list_init (sizeof (opcode_t));
@@ -174,15 +158,15 @@ scopes_tree_init (scopes_tree *parent)
}
void
scopes_tree_free (scopes_tree *tree)
scopes_tree_free (scopes_tree tree)
{
assert_tree (tree);
for (uint8_t i = 0; i < tree->t.children_num; ++i)
{
scopes_tree_free ((scopes_tree *) linked_list_element (tree->t.children, sizeof (scopes_tree *), i));
}
if (tree->t.children_num != 0)
{
for (uint8_t i = 0; i < tree->t.children_num; ++i)
{
scopes_tree_free (*(scopes_tree *) linked_list_element (tree->t.children, sizeof (scopes_tree), i));
}
linked_list_free (tree->t.children);
}
linked_list_free (tree->opcodes);