From 7813437494ac39f3aef392d06ed5416e84fe386b Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Thu, 14 May 2020 13:46:38 -0400 Subject: gdb: remove TYPE_CODE macro Remove TYPE_CODE, changing all the call sites to use type::code directly. This is quite a big diff, but this was mostly done using sed and coccinelle. A few call sites were done by hand. gdb/ChangeLog: * gdbtypes.h (TYPE_CODE): Remove. Change all call sites to use type::code instead. --- gdb/infcall.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'gdb/infcall.c') diff --git a/gdb/infcall.c b/gdb/infcall.c index b13c781..818b6cb 100644 --- a/gdb/infcall.c +++ b/gdb/infcall.c @@ -169,7 +169,7 @@ value_arg_coerce (struct gdbarch *gdbarch, struct value *arg, saved by the called function. */ arg = value_coerce_to_target (arg); - switch (TYPE_CODE (type)) + switch (type->code ()) { case TYPE_CODE_REF: case TYPE_CODE_RVALUE_REF: @@ -184,7 +184,7 @@ value_arg_coerce (struct gdbarch *gdbarch, struct value *arg, if the value was not previously in memory - in some cases we should clearly be allowing this, but how? */ new_value = value_cast (TYPE_TARGET_TYPE (type), arg); - new_value = value_ref (new_value, TYPE_CODE (type)); + new_value = value_ref (new_value, type->code ()); return new_value; } case TYPE_CODE_INT: @@ -260,20 +260,20 @@ find_function_addr (struct value *function, part of it. */ /* Determine address to call. */ - if (TYPE_CODE (ftype) == TYPE_CODE_FUNC - || TYPE_CODE (ftype) == TYPE_CODE_METHOD) + if (ftype->code () == TYPE_CODE_FUNC + || ftype->code () == TYPE_CODE_METHOD) funaddr = value_address (function); - else if (TYPE_CODE (ftype) == TYPE_CODE_PTR) + else if (ftype->code () == TYPE_CODE_PTR) { funaddr = value_as_address (function); ftype = check_typedef (TYPE_TARGET_TYPE (ftype)); - if (TYPE_CODE (ftype) == TYPE_CODE_FUNC - || TYPE_CODE (ftype) == TYPE_CODE_METHOD) + if (ftype->code () == TYPE_CODE_FUNC + || ftype->code () == TYPE_CODE_METHOD) funaddr = gdbarch_convert_from_func_ptr_addr (gdbarch, funaddr, current_top_target ()); } - if (TYPE_CODE (ftype) == TYPE_CODE_FUNC - || TYPE_CODE (ftype) == TYPE_CODE_METHOD) + if (ftype->code () == TYPE_CODE_FUNC + || ftype->code () == TYPE_CODE_METHOD) { if (TYPE_GNU_IFUNC (ftype)) { @@ -303,7 +303,7 @@ find_function_addr (struct value *function, else value_type = TYPE_TARGET_TYPE (ftype); } - else if (TYPE_CODE (ftype) == TYPE_CODE_INT) + else if (ftype->code () == TYPE_CODE_INT) { /* Handle the case of functions lacking debugging info. Their values are characters since their addresses are char. */ @@ -438,7 +438,7 @@ get_call_return_value (struct call_return_meta_info *ri) thread_info *thr = inferior_thread (); bool stack_temporaries = thread_stack_temporaries_enabled_p (thr); - if (TYPE_CODE (ri->value_type) == TYPE_CODE_VOID) + if (ri->value_type->code () == TYPE_CODE_VOID) retval = allocate_value (ri->value_type); else if (ri->struct_return_p) { @@ -1025,7 +1025,7 @@ call_function_by_hand_dummy (struct value *function, /* FIXME drow/2002-05-31: Should just always mark methods as prototyped. Can we respect TYPE_VARARGS? Probably not. */ - if (TYPE_CODE (ftype) == TYPE_CODE_METHOD) + if (ftype->code () == TYPE_CODE_METHOD) prototyped = 1; if (TYPE_TARGET_TYPE (ftype) == NULL && TYPE_NFIELDS (ftype) == 0 && default_return_type != NULL) -- cgit v1.1