libs/rt-thread-official
libs/rt-thread-official
4
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-02-28 03:47:11 +08:00
Code Issues Releases Wiki Activity

[modify][components][utilities]add qemu-a9 section information for var export and fix some problems.

Browse Source 
Signed-off-by: WillianChan <chentingwei@rt-thread.com>
This commit is contained in:
WillianChan 2021-09-02 17:47:44 +08:00
parent a3ef89071b
commit 4b2913a898
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bsp/qemu-vexpress-a9/link.lds
View File

@ -26,7 +26,12 @@ SECTIONS
__vsymtab_start = .; __vsymtab_start = .;
KEEP(*(VSymTab)) KEEP(*(VSymTab))
__vsymtab_end = .; __vsymtab_end = .;
/* section information for var export */
. = ALIGN(4); . = ALIGN(4);
__ve_table_start = .;
KEEP(*(SORT(*.VarExpTab.*)))
__ve_table_end = .;
/* section information for modules */ /* section information for modules */
. = ALIGN(4); . = ALIGN(4);

26
components/utilities/var_export/var_export.c
View File

@ -30,8 +30,6 @@ RT_SECTION("2.""VarExpTab") = {"ve_end", "ve_end", 2};
/* for MS VC++ compiler */ /* for MS VC++ compiler */
#if defined(_MSC_VER) #if defined(_MSC_VER)
static ve_exporter_t ve_exporter_tab[2048];
#pragma section("VarExpTab$a", read) #pragma section("VarExpTab$a", read)
__declspec(allocate("VarExpTab$a")) __declspec(allocate("VarExpTab$a"))
RT_USED const struct ve_exporter __ve_table_start = { "ve_start", "ve_start", 0}; RT_USED const struct ve_exporter __ve_table_start = { "ve_start", "ve_start", 0};
@ -59,6 +57,9 @@ int var_export_init(void)
#elif defined (_MSC_VER) /* for MS VC++ compiler */ #elif defined (_MSC_VER) /* for MS VC++ compiler */
unsigned int *ptr_begin = (unsigned int *)&__ve_table_start; unsigned int *ptr_begin = (unsigned int *)&__ve_table_start;
unsigned int *ptr_end = (unsigned int *)&__ve_table_end; unsigned int *ptr_end = (unsigned int *)&__ve_table_end;
static ve_exporter_t ve_exporter_tab[2048];
ve_exporter_t ve_exporter_temp;
int index_i, index_j, index_min;
/* past the three members in first ptr_begin */ /* past the three members in first ptr_begin */
ptr_begin += (sizeof(struct ve_exporter) / sizeof(unsigned int)); ptr_begin += (sizeof(struct ve_exporter) / sizeof(unsigned int));
@ -68,8 +69,6 @@ int var_export_init(void)
ve_exporter_table = (const ve_exporter_t *)ptr_begin; ve_exporter_table = (const ve_exporter_t *)ptr_begin;
ve_exporter_num = (ptr_end - ptr_begin) / (sizeof(struct ve_exporter) / sizeof(unsigned int)) + 1; ve_exporter_num = (ptr_end - ptr_begin) / (sizeof(struct ve_exporter) / sizeof(unsigned int)) + 1;
int index_i, index_j, index_min;
for (index_i = 0; index_i < ve_exporter_num; index_i++) for (index_i = 0; index_i < ve_exporter_num; index_i++)
{ {
ve_exporter_tab[index_i] = ve_exporter_table[index_i]; ve_exporter_tab[index_i] = ve_exporter_table[index_i];
@ -81,16 +80,18 @@ int var_export_init(void)
for (index_j = index_i + 1; index_j < ve_exporter_num; index_j++) for (index_j = index_i + 1; index_j < ve_exporter_num; index_j++)
{ {
if (rt_strcmp(ve_exporter_tab[index_j].module, ve_exporter_tab[index_min].module) < 0) if (rt_strcmp(ve_exporter_tab[index_j].module, ve_exporter_tab[index_min].module) < 0 &&
rt_strcmp(ve_exporter_tab[index_j].identifier, ve_exporter_tab[index_min].identifier) < 0)
{ {
index_min = index_j; index_min = index_j;
ve_exporter_t ve_exporter_temp[1] = {ve_exporter_tab[index_min]}; ve_exporter_temp = ve_exporter_tab[index_min];
ve_exporter_tab[index_min] = ve_exporter_tab[index_i]; ve_exporter_tab[index_min] = ve_exporter_tab[index_i];
ve_exporter_tab[index_i] = ve_exporter_temp[0]; ve_exporter_tab[index_i] = ve_exporter_temp;
} }
} }
} }
#endif ve_exporter_table = ve_exporter_tab;
#endif /* __CC_ARM || __CLANG_ARM */
return ve_exporter_num; return ve_exporter_num;
} }
@ -99,11 +100,7 @@ INIT_PREV_EXPORT(var_export_init);
/* initialize module */ /* initialize module */
int ve_module_init(ve_module_t *mod, const char *module) int ve_module_init(ve_module_t *mod, const char *module)
{ {
#if defined(_MSC_VER)
const ve_exporter_t *exporter = ve_exporter_tab;
#else
const ve_exporter_t *exporter = ve_exporter_table; const ve_exporter_t *exporter = ve_exporter_table;
#endif
rt_bool_t first_exist = RT_FALSE; rt_bool_t first_exist = RT_FALSE;
rt_size_t found_index; rt_size_t found_index;
@ -155,13 +152,8 @@ const ve_exporter_t *ve_iter_next(ve_iterator_t *iter)
/* binary search based on identifier */ /* binary search based on identifier */
static const ve_exporter_t *ve_binary_search(ve_module_t *mod, const char *identifier) static const ve_exporter_t *ve_binary_search(ve_module_t *mod, const char *identifier)
{ {
#if defined(_MSC_VER)
rt_size_t ve_low_num = mod->begin - ve_exporter_tab;
rt_size_t ve_high_num = mod->end - ve_exporter_tab;
#else
rt_size_t ve_low_num = mod->begin - ve_exporter_table; rt_size_t ve_low_num = mod->begin - ve_exporter_table;
rt_size_t ve_high_num = mod->end - ve_exporter_table; rt_size_t ve_high_num = mod->end - ve_exporter_table;
#endif
rt_size_t ve_mid_num; rt_size_t ve_mid_num;
int strcmp_rst; int strcmp_rst;