X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fp-valprint.c;h=284dc85bf8c816434c241f44d2d259c164bd6b4b;hb=1f704f761b34e145f5eabdc222301ce6e9ec9102;hp=7a54d30e980e8a941bbd4c8a97e3394f27ca6013;hpb=64d64d3a76bb57305b278082ed1a29f0982b664d;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c index 7a54d30e98..284dc85bf8 100644 --- a/gdb/p-valprint.c +++ b/gdb/p-valprint.c @@ -42,11 +42,8 @@ #include "cli/cli-style.h" -static void pascal_object_print_value_fields (struct type *, const gdb_byte *, - LONGEST, - CORE_ADDR, struct ui_file *, +static void pascal_object_print_value_fields (struct value *, struct ui_file *, int, - struct value *, const struct value_print_options *, struct type **, int); @@ -64,368 +61,6 @@ static const struct generic_val_print_decorations p_decorations = "}" }; -/* See val_print for a description of the various parameters of this - function; they are identical. */ - -void -pascal_val_print (struct type *type, - int embedded_offset, CORE_ADDR address, - struct ui_file *stream, int recurse, - struct value *original_value, - const struct value_print_options *options) -{ - struct gdbarch *gdbarch = get_type_arch (type); - enum bfd_endian byte_order = type_byte_order (type); - unsigned int i = 0; /* Number of characters printed */ - unsigned len; - struct type *elttype; - unsigned eltlen; - int length_pos, length_size, string_pos; - struct type *char_type; - CORE_ADDR addr; - int want_space = 0; - const gdb_byte *valaddr = value_contents_for_printing (original_value); - - type = check_typedef (type); - switch (TYPE_CODE (type)) - { - case TYPE_CODE_ARRAY: - { - LONGEST low_bound, high_bound; - - if (get_array_bounds (type, &low_bound, &high_bound)) - { - len = high_bound - low_bound + 1; - elttype = check_typedef (TYPE_TARGET_TYPE (type)); - eltlen = TYPE_LENGTH (elttype); - if (options->prettyformat_arrays) - { - print_spaces_filtered (2 + 2 * recurse, stream); - } - /* If 's' format is used, try to print out as string. - If no format is given, print as string if element type - is of TYPE_CODE_CHAR and element size is 1,2 or 4. */ - if (options->format == 's' - || ((eltlen == 1 || eltlen == 2 || eltlen == 4) - && TYPE_CODE (elttype) == TYPE_CODE_CHAR - && options->format == 0)) - { - /* If requested, look for the first null char and only print - elements up to it. */ - if (options->stop_print_at_null) - { - unsigned int temp_len; - - /* Look for a NULL char. */ - for (temp_len = 0; - extract_unsigned_integer (valaddr + embedded_offset + - temp_len * eltlen, eltlen, - byte_order) - && temp_len < len && temp_len < options->print_max; - temp_len++); - len = temp_len; - } - - LA_PRINT_STRING (stream, TYPE_TARGET_TYPE (type), - valaddr + embedded_offset, len, NULL, 0, - options); - i = len; - } - else - { - fprintf_filtered (stream, "{"); - /* If this is a virtual function table, print the 0th - entry specially, and the rest of the members normally. */ - if (pascal_object_is_vtbl_ptr_type (elttype)) - { - i = 1; - fprintf_filtered (stream, "%d vtable entries", len - 1); - } - else - { - i = 0; - } - val_print_array_elements (type, embedded_offset, - address, stream, recurse, - original_value, options, i); - fprintf_filtered (stream, "}"); - } - break; - } - /* Array of unspecified length: treat like pointer to first elt. */ - addr = address + embedded_offset; - } - goto print_unpacked_pointer; - - case TYPE_CODE_PTR: - if (options->format && options->format != 's') - { - val_print_scalar_formatted (type, embedded_offset, - original_value, options, 0, stream); - break; - } - if (options->vtblprint && pascal_object_is_vtbl_ptr_type (type)) - { - /* Print the unmangled name if desired. */ - /* Print vtable entry - we only get here if we ARE using - -fvtable_thunks. (Otherwise, look under TYPE_CODE_STRUCT.) */ - /* Extract the address, assume that it is unsigned. */ - addr = extract_unsigned_integer (valaddr + embedded_offset, - TYPE_LENGTH (type), byte_order); - print_address_demangle (options, gdbarch, addr, stream, demangle); - break; - } - check_typedef (TYPE_TARGET_TYPE (type)); - - addr = unpack_pointer (type, valaddr + embedded_offset); - print_unpacked_pointer: - elttype = check_typedef (TYPE_TARGET_TYPE (type)); - - if (TYPE_CODE (elttype) == TYPE_CODE_FUNC) - { - /* Try to print what function it points to. */ - print_address_demangle (options, gdbarch, addr, stream, demangle); - return; - } - - if (options->addressprint && options->format != 's') - { - fputs_filtered (paddress (gdbarch, addr), stream); - want_space = 1; - } - - /* For a pointer to char or unsigned char, also print the string - pointed to, unless pointer is null. */ - if (((TYPE_LENGTH (elttype) == 1 - && (TYPE_CODE (elttype) == TYPE_CODE_INT - || TYPE_CODE (elttype) == TYPE_CODE_CHAR)) - || ((TYPE_LENGTH (elttype) == 2 || TYPE_LENGTH (elttype) == 4) - && TYPE_CODE (elttype) == TYPE_CODE_CHAR)) - && (options->format == 0 || options->format == 's') - && addr != 0) - { - if (want_space) - fputs_filtered (" ", stream); - /* No wide string yet. */ - i = val_print_string (elttype, NULL, addr, -1, stream, options); - } - /* Also for pointers to pascal strings. */ - /* Note: this is Free Pascal specific: - as GDB does not recognize stabs pascal strings - Pascal strings are mapped to records - with lowercase names PM. */ - if (is_pascal_string_type (elttype, &length_pos, &length_size, - &string_pos, &char_type, NULL) - && addr != 0) - { - ULONGEST string_length; - gdb_byte *buffer; - - if (want_space) - fputs_filtered (" ", stream); - buffer = (gdb_byte *) xmalloc (length_size); - read_memory (addr + length_pos, buffer, length_size); - string_length = extract_unsigned_integer (buffer, length_size, - byte_order); - xfree (buffer); - i = val_print_string (char_type, NULL, - addr + string_pos, string_length, - stream, options); - } - else if (pascal_object_is_vtbl_member (type)) - { - /* Print vtbl's nicely. */ - CORE_ADDR vt_address = unpack_pointer (type, - valaddr + embedded_offset); - struct bound_minimal_symbol msymbol = - lookup_minimal_symbol_by_pc (vt_address); - - /* If 'symbol_print' is set, we did the work above. */ - if (!options->symbol_print - && (msymbol.minsym != NULL) - && (vt_address == BMSYMBOL_VALUE_ADDRESS (msymbol))) - { - if (want_space) - fputs_filtered (" ", stream); - fputs_filtered ("<", stream); - fputs_filtered (msymbol.minsym->print_name (), stream); - fputs_filtered (">", stream); - want_space = 1; - } - if (vt_address && options->vtblprint) - { - struct value *vt_val; - struct symbol *wsym = NULL; - struct type *wtype; - - if (want_space) - fputs_filtered (" ", stream); - - if (msymbol.minsym != NULL) - { - const char *search_name = msymbol.minsym->search_name (); - wsym = lookup_symbol_search_name (search_name, NULL, - VAR_DOMAIN).symbol; - } - - if (wsym) - { - wtype = SYMBOL_TYPE (wsym); - } - else - { - wtype = TYPE_TARGET_TYPE (type); - } - vt_val = value_at (wtype, vt_address); - common_val_print (vt_val, stream, recurse + 1, options, - current_language); - if (options->prettyformat) - { - fprintf_filtered (stream, "\n"); - print_spaces_filtered (2 + 2 * recurse, stream); - } - } - } - - return; - - case TYPE_CODE_REF: - case TYPE_CODE_ENUM: - case TYPE_CODE_FLAGS: - case TYPE_CODE_FUNC: - case TYPE_CODE_RANGE: - case TYPE_CODE_INT: - case TYPE_CODE_FLT: - case TYPE_CODE_VOID: - case TYPE_CODE_ERROR: - case TYPE_CODE_UNDEF: - case TYPE_CODE_BOOL: - case TYPE_CODE_CHAR: - generic_val_print (type, embedded_offset, address, - stream, recurse, original_value, options, - &p_decorations); - break; - - case TYPE_CODE_UNION: - if (recurse && !options->unionprint) - { - fprintf_filtered (stream, "{...}"); - break; - } - /* Fall through. */ - case TYPE_CODE_STRUCT: - if (options->vtblprint && pascal_object_is_vtbl_ptr_type (type)) - { - /* Print the unmangled name if desired. */ - /* Print vtable entry - we only get here if NOT using - -fvtable_thunks. (Otherwise, look under TYPE_CODE_PTR.) */ - /* Extract the address, assume that it is unsigned. */ - print_address_demangle - (options, gdbarch, - extract_unsigned_integer (valaddr + embedded_offset - + TYPE_FIELD_BITPOS (type, - VTBL_FNADDR_OFFSET) / 8, - TYPE_LENGTH (TYPE_FIELD_TYPE (type, - VTBL_FNADDR_OFFSET)), - byte_order), - stream, demangle); - } - else - { - if (is_pascal_string_type (type, &length_pos, &length_size, - &string_pos, &char_type, NULL)) - { - len = extract_unsigned_integer (valaddr + embedded_offset - + length_pos, length_size, - byte_order); - LA_PRINT_STRING (stream, char_type, - valaddr + embedded_offset + string_pos, - len, NULL, 0, options); - } - else - pascal_object_print_value_fields (type, valaddr, embedded_offset, - address, stream, recurse, - original_value, options, - NULL, 0); - } - break; - - case TYPE_CODE_SET: - elttype = TYPE_INDEX_TYPE (type); - elttype = check_typedef (elttype); - if (TYPE_STUB (elttype)) - { - fprintf_styled (stream, metadata_style.style (), ""); - break; - } - else - { - struct type *range = elttype; - LONGEST low_bound, high_bound; - int need_comma = 0; - - fputs_filtered ("[", stream); - - int bound_info = get_discrete_bounds (range, &low_bound, &high_bound); - if (low_bound == 0 && high_bound == -1 && TYPE_LENGTH (type) > 0) - { - /* If we know the size of the set type, we can figure out the - maximum value. */ - bound_info = 0; - high_bound = TYPE_LENGTH (type) * TARGET_CHAR_BIT - 1; - TYPE_HIGH_BOUND (range) = high_bound; - } - maybe_bad_bstring: - if (bound_info < 0) - { - fputs_styled ("", metadata_style.style (), stream); - goto done; - } - - for (i = low_bound; i <= high_bound; i++) - { - int element = value_bit_index (type, - valaddr + embedded_offset, i); - - if (element < 0) - { - i = element; - goto maybe_bad_bstring; - } - if (element) - { - if (need_comma) - fputs_filtered (", ", stream); - print_type_scalar (range, i, stream); - need_comma = 1; - - if (i + 1 <= high_bound - && value_bit_index (type, - valaddr + embedded_offset, ++i)) - { - int j = i; - - fputs_filtered ("..", stream); - while (i + 1 <= high_bound - && value_bit_index (type, - valaddr + embedded_offset, - ++i)) - j = i; - print_type_scalar (range, j, stream); - } - } - } - done: - fputs_filtered ("]", stream); - } - break; - - default: - error (_("Invalid pascal type code %d in symbol table."), - TYPE_CODE (type)); - } -} - /* See p-lang.h. */ void @@ -447,7 +82,7 @@ pascal_value_print_inner (struct value *val, struct ui_file *stream, int want_space = 0; const gdb_byte *valaddr = value_contents_for_printing (val); - switch (TYPE_CODE (type)) + switch (type->code ()) { case TYPE_CODE_ARRAY: { @@ -458,16 +93,12 @@ pascal_value_print_inner (struct value *val, struct ui_file *stream, len = high_bound - low_bound + 1; elttype = check_typedef (TYPE_TARGET_TYPE (type)); eltlen = TYPE_LENGTH (elttype); - if (options->prettyformat_arrays) - { - print_spaces_filtered (2 + 2 * recurse, stream); - } /* If 's' format is used, try to print out as string. If no format is given, print as string if element type is of TYPE_CODE_CHAR and element size is 1,2 or 4. */ if (options->format == 's' || ((eltlen == 1 || eltlen == 2 || eltlen == 4) - && TYPE_CODE (elttype) == TYPE_CODE_CHAR + && elttype->code () == TYPE_CODE_CHAR && options->format == 0)) { /* If requested, look for the first null char and only print @@ -536,7 +167,7 @@ pascal_value_print_inner (struct value *val, struct ui_file *stream, print_unpacked_pointer: elttype = check_typedef (TYPE_TARGET_TYPE (type)); - if (TYPE_CODE (elttype) == TYPE_CODE_FUNC) + if (elttype->code () == TYPE_CODE_FUNC) { /* Try to print what function it points to. */ print_address_demangle (options, gdbarch, addr, stream, demangle); @@ -552,10 +183,10 @@ pascal_value_print_inner (struct value *val, struct ui_file *stream, /* For a pointer to char or unsigned char, also print the string pointed to, unless pointer is null. */ if (((TYPE_LENGTH (elttype) == 1 - && (TYPE_CODE (elttype) == TYPE_CODE_INT - || TYPE_CODE (elttype) == TYPE_CODE_CHAR)) - || ((TYPE_LENGTH (elttype) == 2 || TYPE_LENGTH (elttype) == 4) - && TYPE_CODE (elttype) == TYPE_CODE_CHAR)) + && (elttype->code () == TYPE_CODE_INT + || elttype->code () == TYPE_CODE_CHAR)) + || ((TYPE_LENGTH (elttype) == 2 || TYPE_LENGTH (elttype) == 4) + && elttype->code () == TYPE_CODE_CHAR)) && (options->format == 0 || options->format == 's') && addr != 0) { @@ -693,10 +324,8 @@ pascal_value_print_inner (struct value *val, struct ui_file *stream, len, NULL, 0, options); } else - pascal_object_print_value_fields (type, valaddr, 0, - value_address (val), stream, - recurse, val, options, - NULL, 0); + pascal_object_print_value_fields (val, stream, recurse, + options, NULL, 0); } break; @@ -768,7 +397,7 @@ pascal_value_print_inner (struct value *val, struct ui_file *stream, default: error (_("Invalid pascal type code %d in symbol table."), - TYPE_CODE (type)); + type->code ()); } } @@ -788,15 +417,15 @@ pascal_value_print (struct value *val, struct ui_file *stream, Object pascal: if it is a member pointer, we will take care of that when we print it. */ - if (TYPE_CODE (type) == TYPE_CODE_PTR - || TYPE_CODE (type) == TYPE_CODE_REF) + if (type->code () == TYPE_CODE_PTR + || type->code () == TYPE_CODE_REF) { /* Hack: remove (char *) for char strings. Their type is indicated by the quoted string anyway. */ - if (TYPE_CODE (type) == TYPE_CODE_PTR - && TYPE_NAME (type) == NULL - && TYPE_NAME (TYPE_TARGET_TYPE (type)) != NULL - && strcmp (TYPE_NAME (TYPE_TARGET_TYPE (type)), "char") == 0) + if (type->code () == TYPE_CODE_PTR + && type->name () == NULL + && TYPE_TARGET_TYPE (type)->name () != NULL + && strcmp (TYPE_TARGET_TYPE (type)->name (), "char") == 0) { /* Print nothing. */ } @@ -826,10 +455,7 @@ static void pascal_object_print_static_field (struct value *, struct ui_file *, int, const struct value_print_options *); -static void pascal_object_print_value (struct type *, const gdb_byte *, - LONGEST, - CORE_ADDR, struct ui_file *, int, - struct value *, +static void pascal_object_print_value (struct value *, struct ui_file *, int, const struct value_print_options *, struct type **); @@ -843,7 +469,7 @@ const char pascal_vtbl_ptr_name[] = int pascal_object_is_vtbl_ptr_type (struct type *type) { - const char *type_name = TYPE_NAME (type); + const char *type_name = type->name (); return (type_name != NULL && strcmp (type_name, pascal_vtbl_ptr_name) == 0); @@ -855,15 +481,15 @@ pascal_object_is_vtbl_ptr_type (struct type *type) int pascal_object_is_vtbl_member (struct type *type) { - if (TYPE_CODE (type) == TYPE_CODE_PTR) + if (type->code () == TYPE_CODE_PTR) { type = TYPE_TARGET_TYPE (type); - if (TYPE_CODE (type) == TYPE_CODE_ARRAY) + if (type->code () == TYPE_CODE_ARRAY) { type = TYPE_TARGET_TYPE (type); - if (TYPE_CODE (type) == TYPE_CODE_STRUCT /* If not using + if (type->code () == TYPE_CODE_STRUCT /* If not using thunks. */ - || TYPE_CODE (type) == TYPE_CODE_PTR) /* If using thunks. */ + || type->code () == TYPE_CODE_PTR) /* If using thunks. */ { /* Virtual functions tables are full of pointers to virtual functions. */ @@ -875,21 +501,18 @@ pascal_object_is_vtbl_member (struct type *type) } /* Mutually recursive subroutines of pascal_object_print_value and - c_val_print to print out a structure's fields: + pascal_value_print to print out a structure's fields: pascal_object_print_value_fields and pascal_object_print_value. - TYPE, VALADDR, ADDRESS, STREAM, RECURSE, and OPTIONS have the - same meanings as in pascal_object_print_value and c_val_print. + VAL, STREAM, RECURSE, and OPTIONS have the same meanings as in + pascal_object_print_value and c_value_print. DONT_PRINT is an array of baseclass types that we should not print, or zero if called from top level. */ static void -pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr, - LONGEST offset, - CORE_ADDR address, struct ui_file *stream, +pascal_object_print_value_fields (struct value *val, struct ui_file *stream, int recurse, - struct value *val, const struct value_print_options *options, struct type **dont_print_vb, int dont_print_statmem) @@ -898,17 +521,16 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr, char *last_dont_print = (char *) obstack_next_free (&dont_print_statmem_obstack); - type = check_typedef (type); + struct type *type = check_typedef (value_type (val)); fprintf_filtered (stream, "{"); - len = TYPE_NFIELDS (type); + len = type->num_fields (); n_baseclasses = TYPE_N_BASECLASSES (type); /* Print out baseclasses such that we don't print duplicates of virtual baseclasses. */ if (n_baseclasses > 0) - pascal_object_print_value (type, valaddr, offset, address, - stream, recurse + 1, val, + pascal_object_print_value (val, stream, recurse + 1, options, dont_print_vb); if (!len && n_baseclasses == 1) @@ -917,6 +539,7 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr, { struct obstack tmp_obstack = dont_print_statmem_obstack; int fields_seen = 0; + const gdb_byte *valaddr = value_contents_for_printing (val); if (dont_print_statmem == 0) { @@ -941,7 +564,7 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr, fprintf_filtered (stream, "\n"); print_spaces_filtered (2 + 2 * recurse, stream); fputs_filtered ("members of ", stream); - fputs_filtered (TYPE_NAME (type), stream); + fputs_filtered (type->name (), stream); fputs_filtered (": ", stream); } } @@ -999,7 +622,7 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr, { struct value_print_options opts = *options; - v = value_field_bitfield (type, i, valaddr, offset, val); + v = value_field_bitfield (type, i, valaddr, 0, val); opts.deref_ref = 0; common_val_print (v, stream, recurse + 1, &opts, @@ -1019,7 +642,7 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr, v4.17 specific. */ struct value *v; - v = value_field_bitfield (type, i, valaddr, offset, val); + v = value_field_bitfield (type, i, valaddr, 0, val); if (v == NULL) val_print_optimized_out (NULL, stream); @@ -1032,14 +655,11 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr, struct value_print_options opts = *options; opts.deref_ref = 0; - /* val_print (TYPE_FIELD_TYPE (type, i), - valaddr + TYPE_FIELD_BITPOS (type, i) / 8, - address + TYPE_FIELD_BITPOS (type, i) / 8, 0, - stream, format, 0, recurse + 1, pretty); */ - val_print (TYPE_FIELD_TYPE (type, i), - offset + TYPE_FIELD_BITPOS (type, i) / 8, - address, stream, recurse + 1, val, &opts, - current_language); + + struct value *v = value_primitive_field (val, 0, i, + value_type (val)); + common_val_print (v, stream, recurse + 1, &opts, + current_language); } } annotate_field_end (); @@ -1066,17 +686,15 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr, baseclasses. */ static void -pascal_object_print_value (struct type *type, const gdb_byte *valaddr, - LONGEST offset, - CORE_ADDR address, struct ui_file *stream, +pascal_object_print_value (struct value *val, struct ui_file *stream, int recurse, - struct value *val, const struct value_print_options *options, struct type **dont_print_vb) { struct type **last_dont_print = (struct type **) obstack_next_free (&dont_print_vb_obstack); struct obstack tmp_obstack = dont_print_vb_obstack; + struct type *type = check_typedef (value_type (val)); int i, n_baseclasses = TYPE_N_BASECLASSES (type); if (dont_print_vb == 0) @@ -1092,11 +710,8 @@ pascal_object_print_value (struct type *type, const gdb_byte *valaddr, { LONGEST boffset = 0; struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i)); - const char *basename = TYPE_NAME (baseclass); - const gdb_byte *base_valaddr = NULL; - LONGEST thisoffset; + const char *basename = baseclass->name (); int skip = 0; - gdb::byte_vector buf; if (BASETYPE_VIA_VIRTUAL (type, i)) { @@ -1113,14 +728,14 @@ pascal_object_print_value (struct type *type, const gdb_byte *valaddr, obstack_ptr_grow (&dont_print_vb_obstack, baseclass); } - thisoffset = offset; - + struct value *base_value; try { - boffset = baseclass_offset (type, i, valaddr, offset, address, val); + base_value = value_primitive_field (val, 0, i, type); } catch (const gdb_exception_error &ex) { + base_value = nullptr; if (ex.error == NOT_AVAILABLE_ERROR) skip = -1; else @@ -1135,18 +750,18 @@ pascal_object_print_value (struct type *type, const gdb_byte *valaddr, if (boffset < 0 || boffset >= TYPE_LENGTH (type)) { - buf.resize (TYPE_LENGTH (baseclass)); + CORE_ADDR address= value_address (val); + gdb::byte_vector buf (TYPE_LENGTH (baseclass)); - base_valaddr = buf.data (); if (target_read_memory (address + boffset, buf.data (), TYPE_LENGTH (baseclass)) != 0) skip = 1; - address = address + boffset; - thisoffset = 0; + base_value = value_from_contents_and_address (baseclass, + buf.data (), + address + boffset); + baseclass = value_type (base_value); boffset = 0; } - else - base_valaddr = valaddr; } if (options->prettyformat) @@ -1166,11 +781,10 @@ pascal_object_print_value (struct type *type, const gdb_byte *valaddr, else if (skip > 0) val_print_invalid_address (stream); else - pascal_object_print_value_fields (baseclass, base_valaddr, - thisoffset + boffset, address, - stream, recurse, val, options, - (struct type **) obstack_base (&dont_print_vb_obstack), - 0); + pascal_object_print_value_fields + (base_value, stream, recurse, options, + (struct type **) obstack_base (&dont_print_vb_obstack), + 0); fputs_filtered (", ", stream); flush_it: @@ -1212,7 +826,7 @@ pascal_object_print_static_field (struct value *val, return; } - if (TYPE_CODE (type) == TYPE_CODE_STRUCT) + if (type->code () == TYPE_CODE_STRUCT) { CORE_ADDR *first_dont_print, addr; int i; @@ -1238,12 +852,8 @@ pascal_object_print_static_field (struct value *val, sizeof (CORE_ADDR)); type = check_typedef (type); - pascal_object_print_value_fields (type, - value_contents_for_printing (val), - value_embedded_offset (val), - addr, - stream, recurse, - val, options, NULL, 1); + pascal_object_print_value_fields (val, stream, recurse, + options, NULL, 1); return; }