Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
uPython-mirror
Commits
73d57935
Commit
73d57935
authored
Mar 06, 2014
by
Damien George
Browse files
py: Small cosmetic changes to gc_realloc.
parent
7bf724da
Changes
1
Hide whitespace changes
Inline
Side-by-side
py/gc.c
View file @
73d57935
...
...
@@ -328,7 +328,7 @@ machine_uint_t gc_nbytes(void *ptr_in) {
void
*
gc_realloc
(
void
*
ptr_in
,
machine_uint_t
n_bytes
)
{
void
*
ptr_out
=
NULL
;
machine_uint_t
block
=
0
;
machine_uint_t
block
=
0
;
machine_uint_t
ptr
=
(
machine_uint_t
)
ptr_in
;
if
(
ptr_in
==
NULL
)
{
...
...
@@ -345,7 +345,7 @@ void *gc_realloc(void *ptr_in, machine_uint_t n_bytes) {
/* get the number of consecutive tail blocks and
the number of free blocks after last tail block */
do
{
do
{
block_type
=
ATB_GET_KIND
(
block
+
n_blocks
+
n_free
);
switch
(
block_type
)
{
case
AT_FREE
:
n_free
++
;
break
;
...
...
@@ -361,11 +361,9 @@ void *gc_realloc(void *ptr_in, machine_uint_t n_bytes) {
/* check if realloc'ing to a smaller size */
if
(
n_bytes
<=
n_existing
)
{
ptr_out
=
ptr_in
;
/* TODO should free remaining tail blocks ? */
machine_uint_t
last_block
=
block
+
n_blocks
;
while
(
ATB_GET_KIND
(
last_block
)
==
AT_TAIL
)
{
ATB_ANY_TO_FREE
(
last_block
);
last_block
++
;
/* free unneeded tail blocks */
for
(
machine_uint_t
bl
=
block
+
n_blocks
;
ATB_GET_KIND
(
bl
)
==
AT_TAIL
;
bl
++
)
{
ATB_ANY_TO_FREE
(
bl
);
}
/* check if we can expand in place */
...
...
@@ -378,14 +376,14 @@ void *gc_realloc(void *ptr_in, machine_uint_t n_bytes) {
n_existing
/
BYTES_PER_BLOCK
,
n_existing
,
n_existing
/
BYTES_PER_BLOCK
+
n_diff
,
n_existing
+
n_diff
*
BYTES_PER_BLOCK
);
/* mark rest of blocks as used tail */
for
(
machine_uint_t
bl
=
block
+
n_blocks
;
bl
<
(
block
+
n_blocks
+
n_diff
);
bl
++
)
{
for
(
machine_uint_t
bl
=
block
+
n_blocks
;
bl
<
(
block
+
n_blocks
+
n_diff
);
bl
++
)
{
ATB_FREE_TO_TAIL
(
bl
);
}
ptr_out
=
ptr_in
;
/* try to find a new contiguous chain */
}
else
if
((
ptr_out
=
gc_alloc
(
n_bytes
))
!=
NULL
)
{
printf
(
"gc_realloc: allocated new block
\n
"
);
DEBUG_
printf
(
"gc_realloc: allocated new block
\n
"
);
memcpy
(
ptr_out
,
ptr_in
,
n_existing
);
gc_free
(
ptr_in
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment