From 220475ed8b0c1ef7b4eabf64bcc723e14fd78209 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Fri, 9 Oct 2015 14:14:43 -0700 Subject: make is_scalar_type non-static and use it in ada-lang.c Just a small cleanup, to avoid code duplication... gdb/ChangeLog: * gdbtypes.h (is_scalar_type): Add extern declaration. * gdbtypes.c (is_scalar_type): Make non-static. * ada-lang.c (ada_value_primitive_packed_val): Use is_scalar_type to compute IS_SCALAR instead of doing it ourselves. --- gdb/ada-lang.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'gdb/ada-lang.c') diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 2b2c47c..d9bbed9 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -2519,7 +2519,7 @@ ada_value_primitive_packed_val (struct value *obj, const gdb_byte *valaddr, gdb_byte *src; /* First byte containing data to unpack */ int src_len = (bit_size + bit_offset + HOST_CHAR_BIT - 1) / 8; gdb_byte *unpacked; - int is_scalar; + const int is_scalar = is_scalar_type (type); const int is_big_endian = gdbarch_bits_big_endian (get_type_arch (type)); gdb_byte *staging = NULL; int staging_len = 0; @@ -2527,18 +2527,6 @@ ada_value_primitive_packed_val (struct value *obj, const gdb_byte *valaddr, type = ada_check_typedef (type); - switch (TYPE_CODE (type)) - { - case TYPE_CODE_ARRAY: - case TYPE_CODE_UNION: - case TYPE_CODE_STRUCT: - is_scalar = 0; - break; - default: - is_scalar = 1; - break; - } - if (obj == NULL) src = (gdb_byte *) valaddr + offset; else -- cgit v1.1