From patchwork Fri Dec 11 19:11:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 9987 Received: (qmail 106144 invoked by alias); 11 Dec 2015 19:11:39 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 105520 invoked by uid 89); 11 Dec 2015 19:11:39 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 X-HELO: mail-wm0-f41.google.com Received: from mail-wm0-f41.google.com (HELO mail-wm0-f41.google.com) (74.125.82.41) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Fri, 11 Dec 2015 19:11:37 +0000 Received: by wmec201 with SMTP id c201so83393857wme.1 for ; Fri, 11 Dec 2015 11:11:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=9cI/dlSuyvG/POlIklCw6A1eIjMfVvq9JqKH4tinwTo=; b=b93rT6lW9v55r92Gn/W1Pi9ep93XNq02XZwg2RhUWY/sWLImyAlt3PnKVFjE4tmyt1 /Mg3k+tUMxItnmIuxt2sxal4YuJpYYKLB1a4U/QaRfABuMqWEmboWjyuZuOK3do0azeI a7WZzMYJs0cDKo1RDfVAqRFu7wdfPgZN2WXvgfMiTGcOAQXSMoVm5cxRKn4dg4MQcz2e J9OtcoIgDMN0IihL7SdwAPQ4qiZlyJNZvAcRYyEkjtTBJ1ec9PLQoAiNhtgzPM4PARFx kkj3U833v4s3vm//8Y2OF7E8EDoYR6AaVoJ2GpI5Ygv/JMFX9sL7DVh37Am23sOOSyeb zYsw== X-Gm-Message-State: ALoCoQnxLzIRwa35igYXd4w7i9aACzAOZMEdQKLfw0jKUVyLkQNWMcdrHHMcatfDDByRpvQpsYl4S2zdMbbrf2in0udlhY5QFA== X-Received: by 10.28.186.138 with SMTP id k132mr8306392wmf.75.1449861094575; Fri, 11 Dec 2015 11:11:34 -0800 (PST) Received: from localhost (host86-138-95-213.range86-138.btcentralplus.com. [86.138.95.213]) by smtp.gmail.com with ESMTPSA id l128sm4591256wmf.10.2015.12.11.11.11.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Dec 2015 11:11:33 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCH] gdb: Use TYPE_LENGTH macro Date: Fri, 11 Dec 2015 19:11:28 +0000 Message-Id: <35fffac2800e23cf5347c960104f8afa9c6f135d.1449861062.git.andrew.burgess@embecosm.com> X-IsSubscribed: yes Fixes a couple of places where we access the length field of the type structure directly, rather than using the TYPE_LENGTH macro. gdb/ChangeLog: * i386-tdep.c (i386_mpx_info_bounds): Use TYPE_LENGTH. (i386_mpx_set_bounds): Likewise. * solib-darwin.c (darwin_load_image_infos): Likewise. (darwin_solib_read_all_image_info_addr): Likewise. --- gdb/ChangeLog | 7 +++++++ gdb/i386-tdep.c | 8 ++++---- gdb/solib-darwin.c | 8 ++++---- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 03ae010..31e3028 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2015-12-11 Andrew Burgess + + * i386-tdep.c (i386_mpx_info_bounds): Use TYPE_LENGTH. + (i386_mpx_set_bounds): Likewise. + * solib-darwin.c (darwin_load_image_infos): Likewise. + (darwin_solib_read_all_image_info_addr): Likewise. + 2015-12-10 Antoine Tremblay * linux-thread-db.c (find_new_threads_callback): Use record_thread. diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c index ebb21fc..58f0a84 100644 --- a/gdb/i386-tdep.c +++ b/gdb/i386-tdep.c @@ -8807,7 +8807,7 @@ i386_mpx_info_bounds (char *args, int from_tty) for (i = 0; i < 4; i++) bt_entry[i] = read_memory_typed_address (bt_entry_addr - + i * data_ptr_type->length, + + i * TYPE_LENGTH (data_ptr_type), data_ptr_type); i386_mpx_print_bounds (bt_entry); @@ -8853,14 +8853,14 @@ i386_mpx_set_bounds (char *args, int from_tty) bt_entry_addr = i386_mpx_get_bt_entry (addr, bd_base); for (i = 0; i < 2; i++) bt_entry[i] = read_memory_typed_address (bt_entry_addr - + i * data_ptr_type->length, + + i * TYPE_LENGTH (data_ptr_type), data_ptr_type); bt_entry[0] = (uint64_t) lower; bt_entry[1] = ~(uint64_t) upper; for (i = 0; i < 2; i++) - write_memory_unsigned_integer (bt_entry_addr + i * data_ptr_type->length, - data_ptr_type->length, byte_order, + write_memory_unsigned_integer (bt_entry_addr + i * TYPE_LENGTH (data_ptr_type), + TYPE_LENGTH (data_ptr_type), byte_order, bt_entry[i]); } diff --git a/gdb/solib-darwin.c b/gdb/solib-darwin.c index 88a4d73..6829bc5 100644 --- a/gdb/solib-darwin.c +++ b/gdb/solib-darwin.c @@ -132,7 +132,7 @@ darwin_load_image_infos (struct darwin_info *info) /* The structure has 4 fields: version (4 bytes), count (4 bytes), info (pointer) and notifier (pointer). */ - len = 4 + 4 + 2 * ptr_type->length; + len = 4 + 4 + 2 * TYPE_LENGTH (ptr_type); gdb_assert (len <= sizeof (buf)); memset (&info->all_image, 0, sizeof (info->all_image)); @@ -148,7 +148,7 @@ darwin_load_image_infos (struct darwin_info *info) info->all_image.count = extract_unsigned_integer (buf + 4, 4, byte_order); info->all_image.info = extract_typed_address (buf + 8, ptr_type); info->all_image.notifier = extract_typed_address - (buf + 8 + ptr_type->length, ptr_type); + (buf + 8 + TYPE_LENGTH (ptr_type), ptr_type); } /* Link map info to include in an allocated so_list entry. */ @@ -528,11 +528,11 @@ darwin_solib_read_all_image_info_addr (struct darwin_info *info) struct type *ptr_type = builtin_type (target_gdbarch ())->builtin_data_ptr; /* Sanity check. */ - if (ptr_type->length > sizeof (buf)) + if (TYPE_LENGTH (ptr_type) > sizeof (buf)) return; len = target_read (¤t_target, TARGET_OBJECT_DARWIN_DYLD_INFO, NULL, - buf, 0, ptr_type->length); + buf, 0, TYPE_LENGTH (ptr_type)); if (len <= 0) return;