Skip to content

remove the c++ syntax, struct::xxx #836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

remove the c++ syntax, struct::xxx #836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions jerry-core/ecma/base/ecma-helpers-values-collection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ ecma_new_values_collection (const ecma_value_t values_buffer[], /**< ecma-values
{
JERRY_ASSERT (values_buffer != NULL || values_number == 0);

const size_t values_in_chunk = sizeof (ecma_collection_chunk_t::data) / sizeof (ecma_value_t);
const size_t values_in_chunk = JERRY_SIZE_OF_STRUCT_MEMBER (ecma_collection_chunk_t, data) / sizeof (ecma_value_t);

ecma_collection_header_t *header_p = ecma_alloc_collection_header ();

Expand Down Expand Up @@ -86,7 +86,7 @@ ecma_free_values_collection (ecma_collection_header_t *header_p, /**< collection
{
JERRY_ASSERT (header_p != NULL);

const size_t values_in_chunk = sizeof (ecma_collection_chunk_t::data) / sizeof (ecma_value_t);
const size_t values_in_chunk = JERRY_SIZE_OF_STRUCT_MEMBER (ecma_collection_chunk_t, data) / sizeof (ecma_value_t);

ecma_collection_chunk_t *chunk_p = ECMA_GET_POINTER (ecma_collection_chunk_t,
header_p->first_chunk_cp);
Expand Down Expand Up @@ -128,7 +128,7 @@ ecma_append_to_values_collection (ecma_collection_header_t *header_p, /**< colle
bool do_ref_if_object) /**< if the value is object value,
increase reference counter of the object */
{
const size_t values_in_chunk = sizeof (ecma_collection_chunk_t::data) / sizeof (ecma_value_t);
const size_t values_in_chunk = JERRY_SIZE_OF_STRUCT_MEMBER (ecma_collection_chunk_t, data) / sizeof (ecma_value_t);

size_t values_number = header_p->unit_number;
size_t pos_of_new_value_in_chunk = values_number % values_in_chunk;
Expand Down Expand Up @@ -199,7 +199,7 @@ ecma_remove_last_value_from_values_collection (ecma_collection_header_t *header_
{
JERRY_ASSERT (header_p != NULL && header_p->unit_number > 0);

const size_t values_in_chunk = sizeof (ecma_collection_chunk_t::data) / sizeof (ecma_value_t);
const size_t values_in_chunk = JERRY_SIZE_OF_STRUCT_MEMBER (ecma_collection_chunk_t, data) / sizeof (ecma_value_t);
size_t values_number = header_p->unit_number;
size_t pos_of_value_to_remove_in_chunk = (values_number - 1u) % values_in_chunk;

Expand Down Expand Up @@ -305,7 +305,7 @@ ecma_collection_iterator_next (ecma_collection_iterator_t *iterator_p) /**< cont
return false;
}

const size_t values_in_chunk = sizeof (ecma_collection_chunk_t::data) / sizeof (ecma_value_t);
const size_t values_in_chunk = JERRY_SIZE_OF_STRUCT_MEMBER (ecma_collection_chunk_t, data) / sizeof (ecma_value_t);

if (iterator_p->current_value_p == NULL)
{
Expand Down
32 changes: 16 additions & 16 deletions jerry-core/mem/mem-heap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,13 @@ void mem_heap_valgrind_freya_mempool_request (void)
*/
typedef enum : uint8_t
{
GENERAL = 0, /**< general (may be multi-chunk) block
*
* Note:
* As zero is used for initialization in mem_heap_init,
* 0 value for the GENERAL is necessary
*/
ONE_CHUNKED = 1 /**< one-chunked block (See also: mem_heap_alloc_chunked_block) */
MEM_BLOCK_LENGTH_TYPE_GENERAL = 0, /**< general (may be multi-chunk) block
*
* Note:
* As zero is used for initialization in mem_heap_init,
* 0 value for the MEM_BLOCK_LENGTH_TYPE_GENERAL is necessary
*/
MEM_BLOCK_LENGTH_TYPE_ONE_CHUNKED = 1 /**< one-chunked block (See also: mem_heap_alloc_chunked_block) */
} mem_block_length_type_t;

/**
Expand Down Expand Up @@ -244,7 +244,7 @@ ssize_t mem_heap_allocated_bytes[MEM_HEAP_CHUNKS_NUM];
*
* The array contains one entry per heap chunk with:
* - length type of corresponding block, if the chunk is at start of an allocated block;
* - GENERAL length type for rest chunks.
* - MEM_BLOCK_LENGTH_TYPE_GENERAL length type for rest chunks.
*/
mem_block_length_type_t mem_heap_length_types[MEM_HEAP_CHUNKS_NUM];
#endif /* !JERRY_NDEBUG */
Expand Down Expand Up @@ -349,7 +349,7 @@ mem_heap_init (void)
for (size_t i = 0; i < MEM_HEAP_CHUNKS_NUM; i++)
{
#ifndef JERRY_NDEBUG
JERRY_ASSERT (mem_heap_length_types[i] == mem_block_length_type_t::GENERAL);
JERRY_ASSERT (mem_heap_length_types[i] == MEM_BLOCK_LENGTH_TYPE_GENERAL);
#endif /* !JERRY_NDEBUG */

JERRY_ASSERT (mem_heap_allocated_bytes[i] == -1);
Expand Down Expand Up @@ -388,7 +388,7 @@ void* mem_heap_alloc_block_internal (size_t size_in_bytes, /**< size of region t
mem_heap_alloc_term_t alloc_term) /**< expected allocation term */
{
JERRY_ASSERT (size_in_bytes != 0);
JERRY_ASSERT (length_type != mem_block_length_type_t::ONE_CHUNKED
JERRY_ASSERT (length_type != MEM_BLOCK_LENGTH_TYPE_ONE_CHUNKED
|| size_in_bytes == mem_heap_get_chunked_block_data_size ());

mem_check_heap ();
Expand Down Expand Up @@ -490,7 +490,7 @@ void* mem_heap_alloc_block_internal (size_t size_in_bytes, /**< size of region t
mem_heap_mark_chunk_allocated (chunk_index, false);

#ifndef JERRY_NDEBUG
JERRY_ASSERT (length_type == mem_block_length_type_t::GENERAL
JERRY_ASSERT (length_type == MEM_BLOCK_LENGTH_TYPE_GENERAL
&& mem_heap_length_types[chunk_index] == length_type);
#endif /* !JERRY_NDEBUG */
}
Expand Down Expand Up @@ -593,7 +593,7 @@ mem_heap_alloc_block (size_t size_in_bytes, /**< size of region to a
else
{
return mem_heap_alloc_block_try_give_memory_back (size_in_bytes,
mem_block_length_type_t::GENERAL,
MEM_BLOCK_LENGTH_TYPE_GENERAL,
alloc_term);
}
} /* mem_heap_alloc_block */
Expand All @@ -617,7 +617,7 @@ void*
mem_heap_alloc_chunked_block (mem_heap_alloc_term_t alloc_term) /**< expected allocation term */
{
return mem_heap_alloc_block_try_give_memory_back (mem_heap_get_chunked_block_data_size (),
mem_block_length_type_t::ONE_CHUNKED,
MEM_BLOCK_LENGTH_TYPE_ONE_CHUNKED,
alloc_term);
} /* mem_heap_alloc_chunked_block */

Expand Down Expand Up @@ -734,7 +734,7 @@ mem_heap_free_block (void *ptr) /**< pointer to beginning of data space of the b
#endif /* MEM_HEAP_ENABLE_ALLOCATED_BYTES_ARRAY */

#ifndef JERRY_NDEBUG
mem_heap_length_types[chunk_index] = mem_block_length_type_t::GENERAL;
mem_heap_length_types[chunk_index] = MEM_BLOCK_LENGTH_TYPE_GENERAL;
#endif /* !JERRY_NDEBUG */

mem_check_heap ();
Expand Down Expand Up @@ -769,7 +769,7 @@ mem_heap_get_chunked_block_start (void *ptr) /**< pointer into a block */

#ifndef JERRY_NDEBUG
size_t chunk_index = mem_heap_get_chunk_from_address ((void*) uintptr_chunk_aligned);
JERRY_ASSERT (mem_heap_length_types[chunk_index] == mem_block_length_type_t::ONE_CHUNKED);
JERRY_ASSERT (mem_heap_length_types[chunk_index] == MEM_BLOCK_LENGTH_TYPE_ONE_CHUNKED);
#endif /* !JERRY_NDEBUG */

return (void*) uintptr_chunk_aligned;
Expand Down Expand Up @@ -993,7 +993,7 @@ mem_check_heap (void)

if ((MEM_HEAP_IS_ALLOCATED_BITMAP[bitmap_item_index] & bit) != 0)
{
if (mem_heap_length_types[chunk_index] == mem_block_length_type_t::ONE_CHUNKED)
if (mem_heap_length_types[chunk_index] == MEM_BLOCK_LENGTH_TYPE_ONE_CHUNKED)
{
JERRY_ASSERT ((MEM_HEAP_IS_FIRST_IN_BLOCK_BITMAP[bitmap_item_index] & bit) != 0);
}
Expand Down