btf_encoder: Adopt btf__encode_enum_val() as btf_encoder__add_enum_val()

As it is just prep work to call libbpf's btf__add_enum_val for an
enumeration entry using pahole's data structures populated from another
format, normally DWARF.

So that we can eventually ditch the btf_encoder__verbose and
btf_gen_float globals, making them members of 'struct btf_encoder'.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2021-06-09 09:31:26 -03:00
parent 4371b3cd5b
commit 1aece1e7e6
3 changed files with 4 additions and 5 deletions

View File

@ -216,7 +216,7 @@ static int32_t btf_encoder__add_enum_type(struct btf_encoder *encoder, struct cu
type__for_each_enumerator(etype, pos) {
name = dwarves__active_loader->strings__ptr(cu, pos->name);
if (btf__encode_enum_val(encoder->btf, name, pos->value))
if (btf_encoder__add_enum_val(encoder, name, pos->value))
return -1;
}

View File

@ -437,11 +437,10 @@ int32_t btf_encoder__add_enum(struct btf_encoder *encoder, const char *name, uin
return id;
}
int btf__encode_enum_val(struct btf *btf, const char *name, int32_t value)
int btf_encoder__add_enum_val(struct btf_encoder *encoder, const char *name, int32_t value)
{
int err;
int err = btf__add_enum_value(encoder->btf, name, value);
err = btf__add_enum_value(btf, name, value);
if (!err) {
if (btf_encoder__verbose)
printf("\t%s val=%d\n", name, value);

View File

@ -28,7 +28,7 @@ int btf_encoder__add_field(struct btf_encoder *encoder, const char *name, uint32
int32_t btf_encoder__add_struct(struct btf_encoder *encoder, uint8_t kind, const char *name, uint32_t size);
int32_t btf_encoder__add_array(struct btf_encoder *encoder, uint32_t type, uint32_t index_type, uint32_t nelems);
int32_t btf_encoder__add_enum(struct btf_encoder *encoder, const char *name, uint32_t size);
int btf__encode_enum_val(struct btf *btf, const char *name, int32_t value);
int btf_encoder__add_enum_val(struct btf_encoder *encoder, const char *name, int32_t value);
int32_t btf_encoder__add_func_proto(struct btf_encoder *encoder, struct cu *cu, struct ftype *ftype, uint32_t type_id_off);
int32_t btf__encode_var_type(struct btf *btf, uint32_t type, const char *name, uint32_t linkage);
int32_t btf__encode_var_secinfo(struct gobuffer *buf, uint32_t type, uint32_t offset, uint32_t size);