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

Add another 'out of memory' error message

Browse Source
This commit is contained in:
Ilmir Usmanov
2014-10-09 17:48:36 +04:00
parent d272a36acc
commit a902a97025
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libintstructs/stack.h
+5
View File
@@ -226,6 +226,11 @@ static TYPE *convert_##NAME##_to_raw_data (void) { \
size_t size = mem_heap_recommend_allocation_size ( \ size_t size = mem_heap_recommend_allocation_size ( \
((size_t) (NAME.current + 1) * sizeof (NAME##_stack_value_type))); \ ((size_t) (NAME.current + 1) * sizeof (NAME##_stack_value_type))); \
TYPE *DATA = (TYPE *) mem_heap_alloc_block (size, MEM_HEAP_ALLOC_LONG_TERM); \ TYPE *DATA = (TYPE *) mem_heap_alloc_block (size, MEM_HEAP_ALLOC_LONG_TERM); \
if (DATA == NULL) \
{ \
__printf ("Out of memory\n"); \
JERRY_UNREACHABLE (); \
} \
__memset (DATA, 0, size); \ __memset (DATA, 0, size); \
for (NAME##_stack_data_type i = 0; i < NAME.current; i++) { \ for (NAME##_stack_data_type i = 0; i < NAME.current; i++) { \
DATA[i] = STACK_ELEMENT (NAME, i); \ DATA[i] = STACK_ELEMENT (NAME, i); \
src/liboptimizer/pretty-printer.c
+3 -3
View File
@@ -244,8 +244,8 @@ pp_opcode (opcode_counter_t oc, opcode_t opcode, bool is_rewrite)
PP_OP_1 (exitval, "exit %d;", status_code); PP_OP_1 (exitval, "exit %d;", status_code);
PP_OP_1 (retval, "return %d;", ret_value); PP_OP_1 (retval, "return %d;", ret_value);
PP_OP_0 (ret, "ret;"); PP_OP_0 (ret, "ret;");
PP_OP_3 (prop_getter, "%s = %s[\"%s\"];", lhs, obj, prop); PP_OP_3 (prop_getter, "%s = %s.%s;", lhs, obj, prop);
PP_OP_3 (prop_setter, "%s[\"%s\"] = %s;", obj, prop, rhs); PP_OP_3 (prop_setter, "%s.%s = %s;", obj, prop, rhs);
PP_OP_1 (this, "%s = this;", lhs); PP_OP_1 (this, "%s = this;", lhs);
PP_OP_2 (delete_var, "%s = delete %s;", lhs, name); PP_OP_2 (delete_var, "%s = delete %s;", lhs, name);
PP_OP_3 (delete_prop, "%s = delete %s[\"%s\"];", lhs, base, name); PP_OP_3 (delete_prop, "%s = delete %s[\"%s\"];", lhs, base, name);
@@ -537,7 +537,7 @@ pp_opcode (opcode_counter_t oc, opcode_t opcode, bool is_rewrite)
JERRY_UNREACHABLE (); JERRY_UNREACHABLE ();
} }
} }
for (opcode_counter_t counter = start; counter <= oc; counter++) for (opcode_counter_t counter = start; counter < oc; counter++)
{ {
opcode_t meta_op = deserialize_opcode (counter); opcode_t meta_op = deserialize_opcode (counter);
switch (meta_op.op_idx) switch (meta_op.op_idx)