diff options
author | Nick Alcock <nick.alcock@oracle.com> | 2021-03-18 12:37:52 +0000 |
---|---|---|
committer | Nick Alcock <nick.alcock@oracle.com> | 2021-03-18 12:40:40 +0000 |
commit | 77d724a7ecdb3fa84557b0ee5c8b7ea949ce56a5 (patch) | |
tree | 0758feb039a9f6e4785f552a594d54cf14631c5e /libctf/testsuite | |
parent | 986e9e3aa03f854bedacef7fac38fe8f009a416c (diff) | |
download | gdb-77d724a7ecdb3fa84557b0ee5c8b7ea949ce56a5.zip gdb-77d724a7ecdb3fa84557b0ee5c8b7ea949ce56a5.tar.gz gdb-77d724a7ecdb3fa84557b0ee5c8b7ea949ce56a5.tar.bz2 |
libctf: eliminate dtd_u, part 4: enums
This is the first tricky one, the first complex multi-entry vlen
containing strings. To handle this in vlen form, we have to handle
pending refs moving around on realloc.
We grow vlen regions using a new ctf_grow_vlen function, and iterate
through the existing enums every time a grow happens, telling the string
machinery the distance between the old and new vlen region and letting
it adjust the pending refs accordingly. (This avoids traversing all
outstanding refs to find the refs that need adjusting, at the cost of
having to traverse one enum: an obvious major performance win.)
Addition of enums themselves (and also structs/unions later) is a bit
trickier than earlier forms, because the type might be being promoted
from a forward, and forwards have no vlen: so we have to spot that and
create it if needed.
Serialization of enums simplifies down to just telling the string
machinery about the string refs; all the enum type-lookup code loses all
its dynamic member lookup complexity entirely.
A new test is added that iterates over (and gets values of) an enum with
enough members to force a round of vlen growth.
libctf/ChangeLog
2021-03-18 Nick Alcock <nick.alcock@oracle.com>
* ctf-impl.h (ctf_dtdef_t) <dtd_vlen_alloc>: New.
(ctf_str_move_pending): Declare.
* ctf-string.c (ctf_str_add_ref_internal): Fix error return.
(ctf_str_move_pending): New.
* ctf-create.c (ctf_grow_vlen): New.
(ctf_dtd_delete): Zero out the vlen_alloc after free. Free the
vlen later: iterate over it and free enum name refs first.
(ctf_add_generic): Populate dtd_vlen_alloc from vlen.
(ctf_add_enum): populate the vlen; do it by hand if promoting
forwards.
(ctf_add_enumerator): Set up the vlen rather than the dmd. Expand
it as needed, repointing string refs via ctf_str_move_pending. Add
the enumerand names as pending strings.
* ctf-serialize.c (ctf_copy_emembers): Remove.
(ctf_emit_type_sect): Copy the vlen into place and ref the
strings.
* ctf-types.c (ctf_enum_next): The dynamic portion now uses
the same code as the non-dynamic.
(ctf_enum_name): Likewise.
(ctf_enum_value): Likewise.
* testsuite/libctf-lookup/enum-many-ctf.c: New test.
* testsuite/libctf-lookup/enum-many.lk: New test.
Diffstat (limited to 'libctf/testsuite')
-rw-r--r-- | libctf/testsuite/libctf-lookup/enum-many-ctf.c | 10 | ||||
-rw-r--r-- | libctf/testsuite/libctf-lookup/enum-many.lk | 101 |
2 files changed, 111 insertions, 0 deletions
diff --git a/libctf/testsuite/libctf-lookup/enum-many-ctf.c b/libctf/testsuite/libctf-lookup/enum-many-ctf.c new file mode 100644 index 0000000..f2297d7 --- /dev/null +++ b/libctf/testsuite/libctf-lookup/enum-many-ctf.c @@ -0,0 +1,10 @@ +/* Looked up item by item. */ +enum e { ENUMSAMPLE_1 = 0, ENUMSAMPLE_2 = 1 }; + +/* Looked up via both sorts of iterator in turn. */ +enum ie { IE_0 = -10, IE_1, IE_2, IE_3, IE_4, IE_5, IE_6, IE_7, IE_8, IE_9, IE_A, IE_B, IE_C, IE_D, IE_E, IE_F, + IE_10, IE_11, IE_12, IE_13, IE_14, IE_15, IE_16, IE_17, IE_18, IE_19, IE_1A, IE_1B, IE_1C, IE_1D, IE_1E, IE_1F, + IE_20, IE_21, IE_22, IE_23, IE_24, IE_25, IE_26, IE_27, IE_28, IE_29, IE_2A, IE_2B, IE_2C, IE_2D, IE_2E, IE_2F}; + +enum e foo; +enum ie bar; diff --git a/libctf/testsuite/libctf-lookup/enum-many.lk b/libctf/testsuite/libctf-lookup/enum-many.lk new file mode 100644 index 0000000..17eca66 --- /dev/null +++ b/libctf/testsuite/libctf-lookup/enum-many.lk @@ -0,0 +1,101 @@ +# source: enum-many-ctf.c +# lookup: enum.c +# link: on +Enum e enumerand ENUMSAMPLE_1 has value 0 +Enum e enumerand ENUMSAMPLE_2 has value 1 +iter test: IE_0 has value -10 +iter test: IE_1 has value -9 +iter test: IE_2 has value -8 +iter test: IE_3 has value -7 +iter test: IE_4 has value -6 +iter test: IE_5 has value -5 +iter test: IE_6 has value -4 +iter test: IE_7 has value -3 +iter test: IE_8 has value -2 +iter test: IE_9 has value -1 +iter test: IE_A has value 0 +iter test: IE_B has value 1 +iter test: IE_C has value 2 +iter test: IE_D has value 3 +iter test: IE_E has value 4 +iter test: IE_F has value 5 +iter test: IE_10 has value 6 +iter test: IE_11 has value 7 +iter test: IE_12 has value 8 +iter test: IE_13 has value 9 +iter test: IE_14 has value 10 +iter test: IE_15 has value 11 +iter test: IE_16 has value 12 +iter test: IE_17 has value 13 +iter test: IE_18 has value 14 +iter test: IE_19 has value 15 +iter test: IE_1A has value 16 +iter test: IE_1B has value 17 +iter test: IE_1C has value 18 +iter test: IE_1D has value 19 +iter test: IE_1E has value 20 +iter test: IE_1F has value 21 +iter test: IE_20 has value 22 +iter test: IE_21 has value 23 +iter test: IE_22 has value 24 +iter test: IE_23 has value 25 +iter test: IE_24 has value 26 +iter test: IE_25 has value 27 +iter test: IE_26 has value 28 +iter test: IE_27 has value 29 +iter test: IE_28 has value 30 +iter test: IE_29 has value 31 +iter test: IE_2A has value 32 +iter test: IE_2B has value 33 +iter test: IE_2C has value 34 +iter test: IE_2D has value 35 +iter test: IE_2E has value 36 +iter test: IE_2F has value 37 +next test: IE_0 has value -10 +next test: IE_1 has value -9 +next test: IE_2 has value -8 +next test: IE_3 has value -7 +next test: IE_4 has value -6 +next test: IE_5 has value -5 +next test: IE_6 has value -4 +next test: IE_7 has value -3 +next test: IE_8 has value -2 +next test: IE_9 has value -1 +next test: IE_A has value 0 +next test: IE_B has value 1 +next test: IE_C has value 2 +next test: IE_D has value 3 +next test: IE_E has value 4 +next test: IE_F has value 5 +next test: IE_10 has value 6 +next test: IE_11 has value 7 +next test: IE_12 has value 8 +next test: IE_13 has value 9 +next test: IE_14 has value 10 +next test: IE_15 has value 11 +next test: IE_16 has value 12 +next test: IE_17 has value 13 +next test: IE_18 has value 14 +next test: IE_19 has value 15 +next test: IE_1A has value 16 +next test: IE_1B has value 17 +next test: IE_1C has value 18 +next test: IE_1D has value 19 +next test: IE_1E has value 20 +next test: IE_1F has value 21 +next test: IE_20 has value 22 +next test: IE_21 has value 23 +next test: IE_22 has value 24 +next test: IE_23 has value 25 +next test: IE_24 has value 26 +next test: IE_25 has value 27 +next test: IE_26 has value 28 +next test: IE_27 has value 29 +next test: IE_28 has value 30 +next test: IE_29 has value 31 +next test: IE_2A has value 32 +next test: IE_2B has value 33 +next test: IE_2C has value 34 +next test: IE_2D has value 35 +next test: IE_2E has value 36 +next test: IE_2F has value 37 |