From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8993 invoked by alias); 3 Sep 2013 14:17:46 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 8984 invoked by uid 89); 3 Sep 2013 14:17:46 -0000 Received: from ra.se.axis.com (HELO ra.se.axis.com) (195.60.68.13) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 03 Sep 2013 14:17:46 +0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.5 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: ra.se.axis.com Received: from localhost (localhost [127.0.0.1]) by ra.se.axis.com (Postfix) with ESMTP id EB0A234961C for ; Tue, 3 Sep 2013 16:17:42 +0200 (CEST) Received: from ra.se.axis.com ([127.0.0.1]) by localhost (ra.se.axis.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id I9lrvP-OpjIZ for ; Tue, 3 Sep 2013 16:17:41 +0200 (CEST) Received: from boulder.se.axis.com (boulder.se.axis.com [10.0.2.104]) by ra.se.axis.com (Postfix) with ESMTP id DF34B349615 for ; Tue, 3 Sep 2013 16:17:41 +0200 (CEST) Received: from boulder.se.axis.com (localhost [127.0.0.1]) by postfix.imss71 (Postfix) with ESMTP id C7BD7760 for ; Tue, 3 Sep 2013 16:17:41 +0200 (CEST) Received: from thoth.se.axis.com (thoth.se.axis.com [10.0.2.173]) by boulder.se.axis.com (Postfix) with ESMTP id BCEF746D for ; Tue, 3 Sep 2013 16:17:41 +0200 (CEST) Received: from xmail2.se.axis.com (xmail2.se.axis.com [10.0.5.74]) by thoth.se.axis.com (Postfix) with ESMTP id BB8B63404E for ; Tue, 3 Sep 2013 16:17:41 +0200 (CEST) Received: from lnxricardw.se.axis.com (10.88.7.1) by xmail2.se.axis.com (10.0.5.74) with Microsoft SMTP Server (TLS) id 8.2.255.0; Tue, 3 Sep 2013 16:17:41 +0200 Date: Tue, 03 Sep 2013 14:17:00 -0000 From: Ricard Wanderlof To: Subject: [PATCH 2/2][CRIS/CRISv32] Consistent names for cris/crisv32_elf_greg_t Message-ID: User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="_002_alpineDEB200130903155047010770lnxricardwseaxiscom_" Content-ID: X-SW-Source: 2013-09/txt/msg00073.txt.bz2 --_002_alpineDEB200130903155047010770lnxricardwseaxiscom_ Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 8BIT Content-ID: Content-length: 2605 This is just a cosmetic change to get consistent names for elf_greg_t/crisv32_elf_greg_t in cris-tdep.c . Compile-time tested, then tested the result by running the resulting gdb against gdbserver running on a target system. Patch included inline for review and as attachement for use. Signed-off-by: Ricard Wanderlof 2013-09-03 Ricard Wanderlof * cris-tdep.c (cris_elf_greg_t): Rename from elf_greg_t. diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c index 80ab1b8..1b0e3cd 100644 --- a/gdb/cris-tdep.c +++ b/gdb/cris-tdep.c @@ -3819,25 +3819,25 @@ cris_delayed_get_disassembler (bfd_vma addr, struct disassemble_info *info) return print_insn (addr, info); } -/* Copied from . */ -typedef unsigned char elf_greg_t[4]; +/* Originally from . */ +typedef unsigned char cris_elf_greg_t[4]; /* Same as user_regs_struct struct in . */ #define CRISV10_ELF_NGREG 35 -typedef elf_greg_t elf_gregset_t[CRISV10_ELF_NGREG]; +typedef cris_elf_greg_t cris_elf_gregset_t[CRISV10_ELF_NGREG]; #define CRISV32_ELF_NGREG 32 -typedef elf_greg_t crisv32_elf_gregset_t[CRISV32_ELF_NGREG]; +typedef cris_elf_greg_t crisv32_elf_gregset_t[CRISV32_ELF_NGREG]; -/* Unpack an elf_gregset_t into GDB's register cache. */ +/* Unpack a cris_elf_gregset_t into GDB's register cache. */ static void -cris_supply_gregset (struct regcache *regcache, elf_gregset_t *gregsetp) +cris_supply_gregset (struct regcache *regcache, cris_elf_gregset_t *gregsetp) { struct gdbarch *gdbarch = get_regcache_arch (regcache); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); int i; - elf_greg_t *regp = *gregsetp; + cris_elf_greg_t *regp = *gregsetp; static char zerobuf[4] = {0}; /* The kernel dumps all 32 registers as unsigned longs, but supply_register @@ -3868,12 +3868,12 @@ fetch_core_registers (struct regcache *regcache, char *core_reg_sect, unsigned core_reg_size, int which, CORE_ADDR reg_addr) { - elf_gregset_t gregset; + cris_elf_gregset_t gregset; switch (which) { case 0: - if (core_reg_size != sizeof (elf_gregset_t) + if (core_reg_size != sizeof (cris_elf_gregset_t) && core_reg_size != sizeof (crisv32_elf_gregset_t)) { warning (_("wrong size gregset struct in core file")); /Ricard -- Ricard Wolf Wanderlöf ricardw(at)axis.com Axis Communications AB, Lund, Sweden www.axis.com Phone +46 46 272 2016 Fax +46 46 13 61 30 --_002_alpineDEB200130903155047010770lnxricardwseaxiscom_ Content-Type: text/x-diff; name="cris-head-cleanup-elf_greg_t.patch" Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: patch file.patch Content-Disposition: attachment; filename="cris-head-cleanup-elf_greg_t.patch"; size=2023; creation-date="Tue, 03 Sep 2013 15:56:41 GMT"; modification-date="Tue, 03 Sep 2013 15:56:41 GMT" Content-length: 2656 ZGlmZiAtLWdpdCBhL2dkYi9jcmlzLXRkZXAuYyBiL2dkYi9jcmlzLXRkZXAu Yw0KaW5kZXggODBhYjFiOC4uMWIwZTNjZCAxMDA2NDQNCi0tLSBhL2dkYi9j cmlzLXRkZXAuYw0KKysrIGIvZ2RiL2NyaXMtdGRlcC5jDQpAQCAtMzgxOSwy NSArMzgxOSwyNSBAQCBjcmlzX2RlbGF5ZWRfZ2V0X2Rpc2Fzc2VtYmxlciAo YmZkX3ZtYSBhZGRyLCBzdHJ1Y3QgZGlzYXNzZW1ibGVfaW5mbyAqaW5mbykN CiAgIHJldHVybiBwcmludF9pbnNuIChhZGRyLCBpbmZvKTsNCiB9DQogDQot LyogQ29waWVkIGZyb20gPGFzbS9lbGYuaD4uICAqLw0KLXR5cGVkZWYgdW5z aWduZWQgY2hhciBlbGZfZ3JlZ190WzRdOw0KKy8qIE9yaWdpbmFsbHkgZnJv bSA8YXNtL2VsZi5oPi4gICovDQordHlwZWRlZiB1bnNpZ25lZCBjaGFyIGNy aXNfZWxmX2dyZWdfdFs0XTsNCiANCiAvKiBTYW1lIGFzIHVzZXJfcmVnc19z dHJ1Y3Qgc3RydWN0IGluIDxhc20vdXNlci5oPi4gICovDQogI2RlZmluZSBD UklTVjEwX0VMRl9OR1JFRyAzNQ0KLXR5cGVkZWYgZWxmX2dyZWdfdCBlbGZf Z3JlZ3NldF90W0NSSVNWMTBfRUxGX05HUkVHXTsNCit0eXBlZGVmIGNyaXNf ZWxmX2dyZWdfdCBjcmlzX2VsZl9ncmVnc2V0X3RbQ1JJU1YxMF9FTEZfTkdS RUddOw0KIA0KICNkZWZpbmUgQ1JJU1YzMl9FTEZfTkdSRUcgMzINCi10eXBl ZGVmIGVsZl9ncmVnX3QgY3Jpc3YzMl9lbGZfZ3JlZ3NldF90W0NSSVNWMzJf RUxGX05HUkVHXTsNCit0eXBlZGVmIGNyaXNfZWxmX2dyZWdfdCBjcmlzdjMy X2VsZl9ncmVnc2V0X3RbQ1JJU1YzMl9FTEZfTkdSRUddOw0KIA0KLS8qIFVu cGFjayBhbiBlbGZfZ3JlZ3NldF90IGludG8gR0RCJ3MgcmVnaXN0ZXIgY2Fj aGUuICAqLw0KKy8qIFVucGFjayBhIGNyaXNfZWxmX2dyZWdzZXRfdCBpbnRv IEdEQidzIHJlZ2lzdGVyIGNhY2hlLiAgKi8NCiANCiBzdGF0aWMgdm9pZCAN Ci1jcmlzX3N1cHBseV9ncmVnc2V0IChzdHJ1Y3QgcmVnY2FjaGUgKnJlZ2Nh Y2hlLCBlbGZfZ3JlZ3NldF90ICpncmVnc2V0cCkNCitjcmlzX3N1cHBseV9n cmVnc2V0IChzdHJ1Y3QgcmVnY2FjaGUgKnJlZ2NhY2hlLCBjcmlzX2VsZl9n cmVnc2V0X3QgKmdyZWdzZXRwKQ0KIHsNCiAgIHN0cnVjdCBnZGJhcmNoICpn ZGJhcmNoID0gZ2V0X3JlZ2NhY2hlX2FyY2ggKHJlZ2NhY2hlKTsNCiAgIHN0 cnVjdCBnZGJhcmNoX3RkZXAgKnRkZXAgPSBnZGJhcmNoX3RkZXAgKGdkYmFy Y2gpOw0KICAgaW50IGk7DQotICBlbGZfZ3JlZ190ICpyZWdwID0gKmdyZWdz ZXRwOw0KKyAgY3Jpc19lbGZfZ3JlZ190ICpyZWdwID0gKmdyZWdzZXRwOw0K ICAgc3RhdGljIGNoYXIgemVyb2J1Zls0XSA9IHswfTsNCiANCiAgIC8qIFRo ZSBrZXJuZWwgZHVtcHMgYWxsIDMyIHJlZ2lzdGVycyBhcyB1bnNpZ25lZCBs b25ncywgYnV0IHN1cHBseV9yZWdpc3Rlcg0KQEAgLTM4NjgsMTIgKzM4Njgs MTIgQEAgZmV0Y2hfY29yZV9yZWdpc3RlcnMgKHN0cnVjdCByZWdjYWNoZSAq cmVnY2FjaGUsDQogCQkgICAgICBjaGFyICpjb3JlX3JlZ19zZWN0LCB1bnNp Z25lZCBjb3JlX3JlZ19zaXplLA0KICAgICAgICAgICAgICAgICAgICAgICBp bnQgd2hpY2gsIENPUkVfQUREUiByZWdfYWRkcikNCiB7DQotICBlbGZfZ3Jl Z3NldF90IGdyZWdzZXQ7DQorICBjcmlzX2VsZl9ncmVnc2V0X3QgZ3JlZ3Nl dDsNCiANCiAgIHN3aXRjaCAod2hpY2gpDQogICAgIHsNCiAgICAgY2FzZSAw Og0KLSAgICAgIGlmIChjb3JlX3JlZ19zaXplICE9IHNpemVvZiAoZWxmX2dy ZWdzZXRfdCkgDQorICAgICAgaWYgKGNvcmVfcmVnX3NpemUgIT0gc2l6ZW9m IChjcmlzX2VsZl9ncmVnc2V0X3QpDQogCSAgJiYgY29yZV9yZWdfc2l6ZSAh PSBzaXplb2YgKGNyaXN2MzJfZWxmX2dyZWdzZXRfdCkpDQogICAgICAgICB7 DQogICAgICAgICAgIHdhcm5pbmcgKF8oIndyb25nIHNpemUgZ3JlZ3NldCBz dHJ1Y3QgaW4gY29yZSBmaWxlIikpOw0K --_002_alpineDEB200130903155047010770lnxricardwseaxiscom_--