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

Refactoring rizin type system: introduce type scope. #4464

Draft
wants to merge 3 commits into
base: dev
Choose a base branch
from
+132 −41
Draft

Refactoring rizin type system: introduce type scope. #4464

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0fb1009
Added RzTypeScope
rockrid3r Apr 27, 2024
f16a321
make hashtables attached to compilation unit: type_by_offset, base_ty…
rockrid3r Apr 28, 2024
fc3c757
Change API implementation
rockrid3r Apr 28, 2024
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
42 changes: 28 additions & 14 deletions librz/arch/dwarf_process.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,8 @@ static bool RzBaseType_eq(const RzBaseType *a, const RzBaseType *b) {
if (a == NULL || b == NULL) {
return a == NULL && b == NULL;
}
printf("CU(a): %s", a->scope.cu_name);
printf("CU(b): %s", b->scope.cu_name);
if (a->scope.cu_name && b->scope.cu_name && RZ_STR_NE(a->scope.cu_name, b->scope.cu_name)) {
printf("types '%s' and '%s' are not equal\n", a->name, b->name);
return false;
Expand Down Expand Up @@ -1730,6 +1732,8 @@ static RzBinDwarfDie *die_end(RzBinDwarfCompUnit *unit) {
return (RzBinDwarfDie *)((char *)vec->a + vec->elem_size * vec->len);
}

static bool store_base_type(void *u, const char *k, const void *v);

/**
* \brief Parses type and function information out of DWARF entries
* and stores them to analysis->debug_info
Expand All @@ -1751,7 +1755,12 @@ RZ_API void rz_analysis_dwarf_preprocess_info(
.unit = NULL,
};
RzBinDwarfCompUnit *unit;
RzAnalysisDebugInfo *debug_info = analysis->debug_info;
rz_vector_foreach (&dw->info->units, unit) {
debug_info->type_by_offset = ht_up_new(NULL, (HtUPFreeValue)rz_type_free);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a bit awkward here.

Copy link
Contributor Author

@rockrid3r rockrid3r Apr 29, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kind of. But there is no need to have it until the rizin shuts down.

  • it is not used anywhere except dwarf_process.c.
  • we have copy of all types in typedb->types.

so it just takes RAM for nothing.
The same for debug_info->base_type_by_offset and debug_info->base_types_by_name.

debug_info->base_type_by_offset = ht_up_new(NULL, (HtUPFreeValue)rz_type_base_type_free);
debug_info->base_types_by_name = ht_sp_new(HT_STR_DUP, NULL, (HtSPFreeValue)rz_pvector_free);

if (rz_vector_empty(&unit->dies)) {
continue;
}
Expand All @@ -1762,6 +1771,12 @@ RZ_API void rz_analysis_dwarf_preprocess_info(

die_parse(&ctx, die);
}

ht_sp_foreach(analysis->debug_info->base_types_by_name, store_base_type, (void *)analysis);

ht_up_free(debug_info->type_by_offset);
ht_up_free(debug_info->base_type_by_offset);
ht_sp_free(debug_info->base_types_by_name);
}
ht_up_free(ctx.str_escaped);
}
Expand All @@ -1773,26 +1788,32 @@ RZ_API void rz_analysis_dwarf_preprocess_info(
b = temp; \
} while (0)

static inline void update_base_type(const RzTypeDB *typedb, RzBaseType *type) {
/**
* \brief
*/
static inline void update_base_type(const RzTypeDB *typedb, RZ_BORROW RzBaseType *type) {
RzBaseType *t = rz_type_db_get_base_type(typedb, type->name);
if (t && t == type) {
return;
}
rz_type_db_update_base_type(typedb, rz_base_type_clone(type));
}

static void db_save_renamed(RzTypeDB *db, RzBaseType *b, char *name) {
static void db_save_renamed(RzTypeDB *db, RZ_BORROW RzBaseType *b, RZ_OWN char *name) {
if (!name) {
rz_warn_if_reached();
return;
}
RzBaseType *t = rz_type_db_get_base_type(db, b->name);
if (t == b) {
free(t->name);
t->name = name;
return;
}
free(b->name);
b->name = name;
rz_type_db_update_base_type(db, b);
RzBaseType *newb = rz_base_type_clone(b);
free(newb->name);
newb->name = name;
rz_type_db_update_base_type(db, newb);
}

static bool store_base_type(void *u, const char *k, const void *v) {
Expand All @@ -1813,7 +1834,7 @@ static bool store_base_type(void *u, const char *k, const void *v) {
}
if (a->kind != RZ_BASE_TYPE_KIND_TYPEDEF) {
update_base_type(analysis->typedb, a);
db_save_renamed(analysis->typedb, rz_base_type_clone(b), rz_str_newf("%s_0", name));
db_save_renamed(analysis->typedb, b, rz_str_newf("%s_0", name));
goto beach;
}
if (a->type->kind != RZ_TYPE_KIND_IDENTIFIER) {
Expand All @@ -1829,7 +1850,7 @@ static bool store_base_type(void *u, const char *k, const void *v) {
a->type->identifier.name = rz_str_dup(newname);
update_base_type(analysis->typedb, a);
}
db_save_renamed(analysis->typedb, rz_base_type_clone(b), newname);
db_save_renamed(analysis->typedb, b, newname);
} else {
RZ_LOG_WARN("BaseType: same name [%s] type count is more than 3\n", name);
}
Expand All @@ -1856,7 +1877,6 @@ static bool store_callable(void *u, ut64 k, const void *v) {
RZ_API void rz_analysis_dwarf_process_info(RzAnalysis *analysis, RzBinDWARF *dw) {
rz_return_if_fail(analysis && dw);
rz_analysis_dwarf_preprocess_info(analysis, dw);
ht_sp_foreach(analysis->debug_info->base_types_by_name, store_base_type, (void *)analysis);
ht_up_foreach(analysis->debug_info->callable_by_offset, store_callable, (void *)analysis);
}

Expand Down Expand Up @@ -2081,10 +2101,7 @@ RZ_API RzAnalysisDebugInfo *rz_analysis_debug_info_new() {
debug_info->function_by_offset = ht_up_new(NULL, (HtUPFreeValue)function_free);
debug_info->function_by_addr = ht_up_new(NULL, NULL);
debug_info->variable_by_offset = ht_up_new(NULL, NULL);
debug_info->type_by_offset = ht_up_new(NULL, (HtUPFreeValue)rz_type_free);
debug_info->callable_by_offset = ht_up_new(NULL, (HtUPFreeValue)rz_type_callable_free);
debug_info->base_type_by_offset = ht_up_new(NULL, (HtUPFreeValue)rz_type_base_type_free);
debug_info->base_types_by_name = ht_sp_new(HT_STR_DUP, NULL, (HtSPFreeValue)rz_pvector_free);
debug_info->visited = set_u_new();
return debug_info;
}
Expand All @@ -2100,10 +2117,7 @@ RZ_API void rz_analysis_debug_info_free(RzAnalysisDebugInfo *debuginfo) {
ht_up_free(debuginfo->function_by_offset);
ht_up_free(debuginfo->function_by_addr);
ht_up_free(debuginfo->variable_by_offset);
ht_up_free(debuginfo->type_by_offset);
ht_up_free(debuginfo->callable_by_offset);
ht_up_free(debuginfo->base_type_by_offset);
ht_sp_free(debuginfo->base_types_by_name);
rz_bin_dwarf_free(debuginfo->dw);
set_u_free(debuginfo->visited);
free(debuginfo);
Expand Down
1 change: 1 addition & 0 deletions librz/type/base.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ RZ_API bool rz_base_type_clone_into(
rz_mem_copy(dst, sizeof(RzBaseType), src, sizeof(RzBaseType));
dst->name = rz_str_dup(src->name);
dst->type = src->type ? rz_type_clone(src->type) : NULL;
dst->scope.cu_name = rz_str_dup(src->scope.cu_name);

switch (src->kind) {
case RZ_BASE_TYPE_KIND_ENUM:
Expand Down
Loading