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

Style fixes in liballocator, libecmaobjects, libecmaoperations: space between function name and opening parenthesis, no space after opening parenthesis/before closing parenthesis.

Browse Source
This commit is contained in:
Ruben Ayrapetyan
2014-08-11 19:27:07 +04:00
parent e53be2b441
commit b02eefd4ae
16 changed files with 761 additions and 761 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libecmaobjects/ecma-gc.c
+99 -99
View File
@@ -36,19 +36,19 @@
*/
static ecma_object_t *ecma_gc_objects_lists[ ECMA_GC_GEN_COUNT ];
static void ecma_gc_mark( ecma_object_t *object_p, ecma_gc_gen_t maximum_gen_to_traverse);
static void ecma_gc_sweep( ecma_object_t *object_p);
static void ecma_gc_mark (ecma_object_t *object_p, ecma_gc_gen_t maximum_gen_to_traverse);
static void ecma_gc_sweep (ecma_object_t *object_p);
/**
* Initialize GC information for the object
*/
void
ecma_init_gc_info(ecma_object_t *object_p) /**< object */
ecma_init_gc_info (ecma_object_t *object_p) /**< object */
{
object_p->gc_info.refs = 1;
object_p->gc_info.generation = ECMA_GC_GEN_0;
ECMA_SET_POINTER( object_p->gc_info.next, ecma_gc_objects_lists[ ECMA_GC_GEN_0 ]);
ECMA_SET_POINTER(object_p->gc_info.next, ecma_gc_objects_lists[ ECMA_GC_GEN_0 ]);
ecma_gc_objects_lists[ ECMA_GC_GEN_0 ] = object_p;
/* Should be set to false at the beginning of garbage collection */
@@ -61,7 +61,7 @@ ecma_init_gc_info(ecma_object_t *object_p) /**< object */
* Increase reference counter of an object
*/
void
ecma_ref_object(ecma_object_t *object_p) /**< object */
ecma_ref_object (ecma_object_t *object_p) /**< object */
{
JERRY_ASSERT(object_p != NULL);
object_p->gc_info.refs++;
@@ -71,7 +71,7 @@ ecma_ref_object(ecma_object_t *object_p) /**< object */
*/
JERRY_ASSERT(object_p->gc_info.refs > 0);
if ( unlikely( object_p->gc_info.refs == 0 ) )
if (unlikely (object_p->gc_info.refs == 0))
{
JERRY_UNREACHABLE();
}
@@ -81,7 +81,7 @@ ecma_ref_object(ecma_object_t *object_p) /**< object */
* Decrease reference counter of an object
*/
void
ecma_deref_object(ecma_object_t *object_p) /**< object */
ecma_deref_object (ecma_object_t *object_p) /**< object */
{
JERRY_ASSERT(object_p != NULL);
JERRY_ASSERT(object_p->gc_info.refs > 0);
@@ -95,31 +95,31 @@ ecma_deref_object(ecma_object_t *object_p) /**< object */
* is less than generation of object specified by obj_p.
*/
void
ecma_gc_update_may_ref_younger_object_flag_by_value( ecma_object_t *obj_p, /**< object */
ecma_gc_update_may_ref_younger_object_flag_by_value (ecma_object_t *obj_p, /**< object */
ecma_value_t value) /**< value */
{
if ( value.value_type != ECMA_TYPE_OBJECT )
if (value.value_type != ECMA_TYPE_OBJECT)
{
return;
}
ecma_object_t *ref_obj_p = ECMA_GET_POINTER( value.value);
JERRY_ASSERT( ref_obj_p != NULL );
ecma_object_t *ref_obj_p = ECMA_GET_POINTER(value.value);
JERRY_ASSERT(ref_obj_p != NULL);
ecma_gc_update_may_ref_younger_object_flag_by_object( obj_p, ref_obj_p);
ecma_gc_update_may_ref_younger_object_flag_by_object (obj_p, ref_obj_p);
} /* ecma_gc_update_may_ref_younger_object_flag_by_value */
void
ecma_gc_update_may_ref_younger_object_flag_by_object( ecma_object_t *obj_p, /**< object */
ecma_gc_update_may_ref_younger_object_flag_by_object (ecma_object_t *obj_p, /**< object */
ecma_object_t *ref_obj_p) /**< referenced object
or NULL */
{
if ( ref_obj_p == NULL )
if (ref_obj_p == NULL)
{
return;
}
if ( ref_obj_p->gc_info.generation < obj_p->gc_info.generation )
if (ref_obj_p->gc_info.generation < obj_p->gc_info.generation)
{
obj_p->gc_info.may_ref_younger_objects = true;
}
@@ -129,9 +129,9 @@ ecma_gc_update_may_ref_younger_object_flag_by_object( ecma_object_t *obj_p, /**<
* Initialize garbage collector
*/
void
ecma_gc_init( void)
ecma_gc_init (void)
{
__memset( ecma_gc_objects_lists, 0, sizeof( ecma_gc_objects_lists));
__memset (ecma_gc_objects_lists, 0, sizeof (ecma_gc_objects_lists));
} /* ecma_gc_init */
/**
@@ -139,26 +139,26 @@ ecma_gc_init( void)
* if referenced object's generation is less or equal to maximum_gen_to_traverse.
*/
void
ecma_gc_mark( ecma_object_t *object_p, /**< start object */
ecma_gc_mark (ecma_object_t *object_p, /**< start object */
ecma_gc_gen_t maximum_gen_to_traverse) /**< start recursive traverse
if referenced object generation
is less or equal to maximum_gen_to_traverse */
{
JERRY_ASSERT( object_p != NULL );
JERRY_ASSERT(object_p != NULL);
object_p->gc_info.visited = true;
bool does_reference_object_to_traverse = false;
if ( object_p->is_lexical_environment )
if (object_p->is_lexical_environment)
{
ecma_object_t *lex_env_p = ECMA_GET_POINTER( object_p->u.lexical_environment.outer_reference_p);
if ( lex_env_p != NULL
&& lex_env_p->gc_info.generation <= maximum_gen_to_traverse )
ecma_object_t *lex_env_p = ECMA_GET_POINTER(object_p->u.lexical_environment.outer_reference_p);
if (lex_env_p != NULL
&& lex_env_p->gc_info.generation <= maximum_gen_to_traverse)
{
if ( !lex_env_p->gc_info.visited )
if (!lex_env_p->gc_info.visited)
{
ecma_gc_mark( lex_env_p, ECMA_GC_GEN_COUNT);
ecma_gc_mark (lex_env_p, ECMA_GC_GEN_COUNT);
}
does_reference_object_to_traverse = true;
@@ -166,40 +166,40 @@ ecma_gc_mark( ecma_object_t *object_p, /**< start object */
}
else
{
ecma_object_t *proto_p = ECMA_GET_POINTER( object_p->u.object.prototype_object_p);
if ( proto_p != NULL
&& proto_p->gc_info.generation <= maximum_gen_to_traverse )
ecma_object_t *proto_p = ECMA_GET_POINTER(object_p->u.object.prototype_object_p);
if (proto_p != NULL
&& proto_p->gc_info.generation <= maximum_gen_to_traverse)
{
if ( !proto_p->gc_info.visited )
if (!proto_p->gc_info.visited)
{
ecma_gc_mark( proto_p, ECMA_GC_GEN_COUNT);
ecma_gc_mark (proto_p, ECMA_GC_GEN_COUNT);
}
does_reference_object_to_traverse = true;
}
}
for ( ecma_property_t *property_p = ECMA_GET_POINTER( object_p->properties_p), *next_property_p;
for (ecma_property_t *property_p = ECMA_GET_POINTER(object_p->properties_p), *next_property_p;
property_p != NULL;
property_p = next_property_p )
property_p = next_property_p)
{
next_property_p = ECMA_GET_POINTER( property_p->next_property_p);
next_property_p = ECMA_GET_POINTER(property_p->next_property_p);
switch ( (ecma_property_type_t) property_p->type )
switch ((ecma_property_type_t) property_p->type)
{
case ECMA_PROPERTY_NAMEDDATA:
{
ecma_value_t value = property_p->u.named_data_property.value;
if ( value.value_type == ECMA_TYPE_OBJECT )
if (value.value_type == ECMA_TYPE_OBJECT)
{
ecma_object_t *value_obj_p = ECMA_GET_POINTER( value.value);
ecma_object_t *value_obj_p = ECMA_GET_POINTER(value.value);
if ( value_obj_p->gc_info.generation <= maximum_gen_to_traverse )
if (value_obj_p->gc_info.generation <= maximum_gen_to_traverse)
{
if ( !value_obj_p->gc_info.visited )
if (!value_obj_p->gc_info.visited)
{
ecma_gc_mark( value_obj_p, ECMA_GC_GEN_COUNT);
ecma_gc_mark (value_obj_p, ECMA_GC_GEN_COUNT);
}
does_reference_object_to_traverse = true;
@@ -211,29 +211,29 @@ ecma_gc_mark( ecma_object_t *object_p, /**< start object */
case ECMA_PROPERTY_NAMEDACCESSOR:
{
ecma_object_t *getter_obj_p = ECMA_GET_POINTER( property_p->u.named_accessor_property.get_p);
ecma_object_t *setter_obj_p = ECMA_GET_POINTER( property_p->u.named_accessor_property.set_p);
ecma_object_t *getter_obj_p = ECMA_GET_POINTER(property_p->u.named_accessor_property.get_p);
ecma_object_t *setter_obj_p = ECMA_GET_POINTER(property_p->u.named_accessor_property.set_p);
if ( getter_obj_p != NULL )
if (getter_obj_p != NULL)
{
if ( getter_obj_p->gc_info.generation <= maximum_gen_to_traverse )
if (getter_obj_p->gc_info.generation <= maximum_gen_to_traverse)
{
if ( !getter_obj_p->gc_info.visited )
if (!getter_obj_p->gc_info.visited)
{
ecma_gc_mark( getter_obj_p, ECMA_GC_GEN_COUNT);
ecma_gc_mark (getter_obj_p, ECMA_GC_GEN_COUNT);
}
does_reference_object_to_traverse = true;
}
}
if ( setter_obj_p != NULL )
if (setter_obj_p != NULL)
{
if ( setter_obj_p->gc_info.generation <= maximum_gen_to_traverse )
if (setter_obj_p->gc_info.generation <= maximum_gen_to_traverse)
{
if ( !setter_obj_p->gc_info.visited )
if (!setter_obj_p->gc_info.visited)
{
ecma_gc_mark( setter_obj_p, ECMA_GC_GEN_COUNT);
ecma_gc_mark (setter_obj_p, ECMA_GC_GEN_COUNT);
}
does_reference_object_to_traverse = true;
@@ -248,7 +248,7 @@ ecma_gc_mark( ecma_object_t *object_p, /**< start object */
ecma_internal_property_id_t property_id = property_p->u.internal_property.type;
uint32_t property_value = property_p->u.internal_property.value;
switch ( property_id )
switch (property_id)
{
case ECMA_INTERNAL_PROPERTY_NUMBER_INDEXED_ARRAY_VALUES: /* an array */
case ECMA_INTERNAL_PROPERTY_STRING_INDEXED_ARRAY_VALUES: /* an array */
@@ -265,13 +265,13 @@ ecma_gc_mark( ecma_object_t *object_p, /**< start object */
case ECMA_INTERNAL_PROPERTY_SCOPE: /* a lexical environment */
case ECMA_INTERNAL_PROPERTY_BINDING_OBJECT: /* an object */
{
ecma_object_t *obj_p = ECMA_GET_POINTER( property_value);
ecma_object_t *obj_p = ECMA_GET_POINTER(property_value);
if ( obj_p->gc_info.generation <= maximum_gen_to_traverse )
if (obj_p->gc_info.generation <= maximum_gen_to_traverse)
{
if ( !obj_p->gc_info.visited )
if (!obj_p->gc_info.visited)
{
ecma_gc_mark( obj_p, ECMA_GC_GEN_COUNT);
ecma_gc_mark (obj_p, ECMA_GC_GEN_COUNT);
}
does_reference_object_to_traverse = true;
@@ -286,7 +286,7 @@ ecma_gc_mark( ecma_object_t *object_p, /**< start object */
}
}
if ( !does_reference_object_to_traverse )
if (!does_reference_object_to_traverse)
{
object_p->gc_info.may_ref_younger_objects = false;
}
@@ -296,39 +296,39 @@ ecma_gc_mark( ecma_object_t *object_p, /**< start object */
* Free specified object
*/
void
ecma_gc_sweep( ecma_object_t *object_p) /**< object to free */
ecma_gc_sweep (ecma_object_t *object_p) /**< object to free */
{
JERRY_ASSERT( object_p != NULL
JERRY_ASSERT(object_p != NULL
&& !object_p->gc_info.visited
&& object_p->gc_info.refs == 0 );
&& object_p->gc_info.refs == 0);
for ( ecma_property_t *property = ECMA_GET_POINTER( object_p->properties_p),
for (ecma_property_t *property = ECMA_GET_POINTER(object_p->properties_p),
*next_property_p;
property != NULL;
property = next_property_p )
property = next_property_p)
{
next_property_p = ECMA_GET_POINTER( property->next_property_p);
next_property_p = ECMA_GET_POINTER(property->next_property_p);
ecma_free_property( property);
ecma_free_property (property);
}
ecma_dealloc_object( object_p);
ecma_dealloc_object (object_p);
} /* ecma_gc_sweep */
/**
* Run garbage collecting
*/
void
ecma_gc_run( ecma_gc_gen_t max_gen_to_collect) /**< maximum generation to run collection on */
ecma_gc_run (ecma_gc_gen_t max_gen_to_collect) /**< maximum generation to run collection on */
{
JERRY_ASSERT( max_gen_to_collect < ECMA_GC_GEN_COUNT );
JERRY_ASSERT(max_gen_to_collect < ECMA_GC_GEN_COUNT);
/* clearing visited flags for all objects of generations to be processed */
for ( ecma_gc_gen_t gen_id = 0; gen_id <= max_gen_to_collect; gen_id++ )
for (ecma_gc_gen_t gen_id = 0; gen_id <= max_gen_to_collect; gen_id++)
{
for ( ecma_object_t *obj_iter_p = ecma_gc_objects_lists[ gen_id ];
for (ecma_object_t *obj_iter_p = ecma_gc_objects_lists[ gen_id ];
obj_iter_p != NULL;
obj_iter_p = ECMA_GET_POINTER( obj_iter_p->gc_info.next) )
obj_iter_p = ECMA_GET_POINTER(obj_iter_p->gc_info.next))
{
obj_iter_p->gc_info.visited = false;
}
@@ -336,16 +336,16 @@ ecma_gc_run( ecma_gc_gen_t max_gen_to_collect) /**< maximum generation to run co
/* if some object is referenced from stack or globals (i.e. it is root),
* start recursive marking traverse from the object */
for ( ecma_gc_gen_t gen_id = 0; gen_id <= max_gen_to_collect; gen_id++ )
for (ecma_gc_gen_t gen_id = 0; gen_id <= max_gen_to_collect; gen_id++)
{
for ( ecma_object_t *obj_iter_p = ecma_gc_objects_lists[ gen_id ];
for (ecma_object_t *obj_iter_p = ecma_gc_objects_lists[ gen_id ];
obj_iter_p != NULL;
obj_iter_p = ECMA_GET_POINTER( obj_iter_p->gc_info.next) )
obj_iter_p = ECMA_GET_POINTER(obj_iter_p->gc_info.next))
{
if ( obj_iter_p->gc_info.refs > 0
&& !obj_iter_p->gc_info.visited )
if (obj_iter_p->gc_info.refs > 0
&& !obj_iter_p->gc_info.visited)
{
ecma_gc_mark( obj_iter_p, ECMA_GC_GEN_COUNT);
ecma_gc_mark (obj_iter_p, ECMA_GC_GEN_COUNT);
}
}
}
@@ -353,42 +353,42 @@ ecma_gc_run( ecma_gc_gen_t max_gen_to_collect) /**< maximum generation to run co
/* if some object from generations that are not processed during current session may reference
* younger generations, start recursive marking traverse from the object, but one the first level
* consider only references to object of at most max_gen_to_collect generation */
for ( ecma_gc_gen_t gen_id = max_gen_to_collect + 1; gen_id < ECMA_GC_GEN_COUNT; gen_id++ )
for (ecma_gc_gen_t gen_id = max_gen_to_collect + 1; gen_id < ECMA_GC_GEN_COUNT; gen_id++)
{
for ( ecma_object_t *obj_iter_p = ecma_gc_objects_lists[ gen_id ];
for (ecma_object_t *obj_iter_p = ecma_gc_objects_lists[ gen_id ];
obj_iter_p != NULL;
obj_iter_p = ECMA_GET_POINTER( obj_iter_p->gc_info.next) )
obj_iter_p = ECMA_GET_POINTER(obj_iter_p->gc_info.next))
{
if ( obj_iter_p->gc_info.may_ref_younger_objects > 0 )
if (obj_iter_p->gc_info.may_ref_younger_objects > 0)
{
ecma_gc_mark( obj_iter_p, max_gen_to_collect);
ecma_gc_mark (obj_iter_p, max_gen_to_collect);
}
}
}
ecma_object_t *gen_last_obj_p[ max_gen_to_collect + 1 ];
#ifndef JERRY_NDEBUG
__memset( gen_last_obj_p, 0, sizeof(gen_last_obj_p) );
__memset (gen_last_obj_p, 0, sizeof (gen_last_obj_p));
#endif /* !JERRY_NDEBUG */
for ( ecma_gc_gen_t gen_id = 0; gen_id <= max_gen_to_collect; gen_id++ )
for (ecma_gc_gen_t gen_id = 0; gen_id <= max_gen_to_collect; gen_id++)
{
ecma_object_t *obj_prev_p = NULL;
for ( ecma_object_t *obj_iter_p = ecma_gc_objects_lists[ gen_id ],
for (ecma_object_t *obj_iter_p = ecma_gc_objects_lists[ gen_id ],
*obj_next_p;
obj_iter_p != NULL;
obj_iter_p = obj_next_p )
obj_iter_p = obj_next_p)
{
obj_next_p = ECMA_GET_POINTER( obj_iter_p->gc_info.next);
obj_next_p = ECMA_GET_POINTER(obj_iter_p->gc_info.next);
if ( !obj_iter_p->gc_info.visited )
if (!obj_iter_p->gc_info.visited)
{
ecma_gc_sweep( obj_iter_p);
ecma_gc_sweep (obj_iter_p);
if ( likely( obj_prev_p != NULL ) )
if (likely (obj_prev_p != NULL))
{
ECMA_SET_POINTER( obj_prev_p->gc_info.next, obj_next_p);
ECMA_SET_POINTER(obj_prev_p->gc_info.next, obj_next_p);
}
else
{
@@ -399,7 +399,7 @@ ecma_gc_run( ecma_gc_gen_t max_gen_to_collect) /**< maximum generation to run co
{
obj_prev_p = obj_iter_p;
if ( obj_iter_p->gc_info.generation != ECMA_GC_GEN_COUNT - 1 )
if (obj_iter_p->gc_info.generation != ECMA_GC_GEN_COUNT - 1)
{
/* the object will be promoted to next generation */
obj_iter_p->gc_info.generation++;
@@ -411,38 +411,38 @@ ecma_gc_run( ecma_gc_gen_t max_gen_to_collect) /**< maximum generation to run co
}
ecma_gc_gen_t gen_to_promote = max_gen_to_collect;
if ( unlikely( gen_to_promote == ECMA_GC_GEN_COUNT - 1 ) )
if (unlikely (gen_to_promote == ECMA_GC_GEN_COUNT - 1))
{
/* not promoting last generation */
gen_to_promote--;
}
/* promoting to next generation */
if ( gen_last_obj_p[ gen_to_promote ] != NULL )
if (gen_last_obj_p[ gen_to_promote ] != NULL)
{
ECMA_SET_POINTER( gen_last_obj_p[ gen_to_promote ]->gc_info.next, ecma_gc_objects_lists[ gen_to_promote + 1 ]);
ECMA_SET_POINTER(gen_last_obj_p[ gen_to_promote ]->gc_info.next, ecma_gc_objects_lists[ gen_to_promote + 1 ]);
ecma_gc_objects_lists[ gen_to_promote + 1 ] = ecma_gc_objects_lists[ gen_to_promote ];
ecma_gc_objects_lists[ gen_to_promote ] = NULL;
}
for ( int32_t gen_id = (int32_t)gen_to_promote - 1;
for (int32_t gen_id = (int32_t)gen_to_promote - 1;
gen_id >= 0;
gen_id-- )
gen_id--)
{
ecma_gc_objects_lists[ gen_id + 1 ] = ecma_gc_objects_lists[ gen_id ];
ecma_gc_objects_lists[ gen_id ] = NULL;
}
#ifndef JERRY_NDEBUG
for ( ecma_gc_gen_t gen_id = ECMA_GC_GEN_0;
for (ecma_gc_gen_t gen_id = ECMA_GC_GEN_0;
gen_id < ECMA_GC_GEN_COUNT;
gen_id++ )
gen_id++)
{
for ( ecma_object_t *obj_iter_p = ecma_gc_objects_lists[ gen_id ];
for (ecma_object_t *obj_iter_p = ecma_gc_objects_lists[ gen_id ];
obj_iter_p != NULL;
obj_iter_p = ECMA_GET_POINTER( obj_iter_p->gc_info.next) )
obj_iter_p = ECMA_GET_POINTER(obj_iter_p->gc_info.next))
{
JERRY_ASSERT( obj_iter_p->gc_info.generation == gen_id );
JERRY_ASSERT(obj_iter_p->gc_info.generation == gen_id);
}
}
#endif /* !JERRY_NDEBUG */