Skip to content
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

Jump to bottom

Berry minor fixes from upstream #19091

Merged
merged 1 commit into from
Jul 11, 2023
Merged

Berry minor fixes from upstream #19091

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
1 change: 0 additions & 1 deletion lib/libesp32/berry/src/be_vector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ void be_vector_remove_end(bvector *vector);
void be_vector_resize(bvm *vm, bvector *vector, int count);
void be_vector_clear(bvector *vector);
void* be_vector_release(bvm *vm, bvector *vector);
void* be_vector_release_32(bvm *vm, bvector *vector); /* specialized call for 32 bits aligned accesses */
int be_nextsize(int value);

#endif
15 changes: 9 additions & 6 deletions lib/libesp32/berry/src/berry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,15 +478,18 @@ typedef bclass_ptr bclass_array[];
#endif

/**
* @def PROTO_RUNTIME_BLOCK
* @def BE_DEBUG_SOURCE_FILE
* @brief conditional block in bproto depending on compilation options
*
*/
#if BE_SOURCE_FILE
#if BE_DEBUG_SOURCE_FILE
#define PROTO_SOURCE_FILE(n) \
((bstring*) _source), /**< source */
((bstring*) n), /**< source */
#define PROTO_SOURCE_FILE_STR(n) \
be_local_const_str(n##_str_source), /**< source */
#else
#define PROTO_SOURCE_FILE(n)
#define PROTO_SOURCE_FILE_STR(n)
#endif

/**
Expand All @@ -496,8 +499,8 @@ typedef bclass_ptr bclass_array[];
*/
#if BE_DEBUG_RUNTIME_INFO
#define PROTO_RUNTIME_BLOCK \
NULL, /**< varinfo */ \
0, /**< nvarinfo */
NULL, /**< lineinfo */ \
0, /**< nlineinfo */
#else
#define PROTO_RUNTIME_BLOCK
#endif
Expand Down Expand Up @@ -538,7 +541,7 @@ typedef bclass_ptr bclass_array[];
BE_IIF(_is_subproto)((struct bproto**)&_name##_subproto,NULL), /**< bproto **ptab */ \
(binstruction*) &_name##_code, /**< code */ \
be_local_const_str(_name##_str_name), /**< name */ \
be_local_const_str(_name##_str_source), /**< source */ \
PROTO_SOURCE_FILE_STR(_name) /**< source */ \
PROTO_RUNTIME_BLOCK /**< */ \
PROTO_VAR_INFO_BLOCK /**< */ \
}
Expand Down