From patchwork Sat Dec 27 23:38:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Green X-Patchwork-Id: 4445 Received: (qmail 28868 invoked by alias); 27 Dec 2014 23:38:29 -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 28858 invoked by uid 89); 27 Dec 2014 23:38:28 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 X-HELO: mail-ie0-f173.google.com Received: from mail-ie0-f173.google.com (HELO mail-ie0-f173.google.com) (209.85.223.173) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Sat, 27 Dec 2014 23:38:27 +0000 Received: by mail-ie0-f173.google.com with SMTP id y20so10829704ier.32 for ; Sat, 27 Dec 2014 15:38:25 -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:subject:date:message-id:user-agent :mime-version:content-type; bh=l4uYS19wJ/LEohNNDMQYZCQA0UW0f5nrywF3csNUzIU=; b=EvnsnjJurNJYw+S5iyx0VZahJdCgYMMHxUhgTYqTTVhuEoLHX/7C+Q8XaPTHjHanKR KRdG83amHWYhfS9yyp0K++uBNOnaB3L/vbMsj3nPKrgOn+3NXYC61rIlcvbcPcb/SMSt VGZSOJQX0aCOt0oJsfX7KUMg3aaaV5lgKJkiIVkkYSrI/wWy0NFIFbDo4u5JYh0ItsY3 KpO8NdQVpZteBNAReFq9HrYXIN6Lae0DCXhlSAF5BwFvneCEScoHYVoYQ/FXhWJKHx70 /azwwerGvje7CZrLmv10q2j4uMjZWtJwI3wf+eq0JUfUBXb30/wku0vWJeyHnMVUj1pT 0r6A== X-Gm-Message-State: ALoCoQkdUKRNJiAUaEm5D//0BkLxLLdWVXNqoZCLvwiLM+a6M5zLyjvfjhlReEj5XE53VDbPae9E X-Received: by 10.42.207.129 with SMTP id fy1mr7111660icb.17.1419723505142; Sat, 27 Dec 2014 15:38:25 -0800 (PST) Received: from localhost (CPE687f74122463-CM84948c2e0610.cpe.net.cable.rogers.com. [99.226.94.59]) by mx.google.com with ESMTPSA id qj6sm12387904igc.1.2014.12.27.15.38.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 27 Dec 2014 15:38:24 -0800 (PST) From: Anthony Green To: gdb-patches@sourceware.org Subject: [PATCH, moxie] Update single step and process record for moxie ISA updates Date: Sat, 27 Dec 2014 18:38:23 -0500 Message-ID: <87h9wgbr4g.fsf@moxielogic.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 X-IsSubscribed: yes I'm committing this change, which corresponds to recent changes in GCC, binutils and the GDB simulator for updates to the moxie ISA. 2014-12-27 Anthony Green * moxie-tdep.c (moxie_software_single_step): ldo/sto instructions are 32 bits, not 48. Update comments for various instructions. (moxie_process_record): Update for new shorter ldo/sto instructions. Add support for sex, zex, umul.x and mul.x instructions. Update comments for various instructions. diff --git a/gdb/moxie-tdep.c b/gdb/moxie-tdep.c index 7926927..88db4a2 100644 --- a/gdb/moxie-tdep.c +++ b/gdb/moxie-tdep.c @@ -370,7 +370,7 @@ moxie_software_single_step (struct frame_info *frame) switch (opcode) { /* 16-bit instructions. */ - case 0x00: /* nop */ + case 0x00: /* bad */ case 0x02: /* mov (register-to-register) */ case 0x05: /* add.l */ case 0x06: /* push */ @@ -378,13 +378,13 @@ moxie_software_single_step (struct frame_info *frame) case 0x0a: /* ld.l (register indirect) */ case 0x0b: /* st.l */ case 0x0e: /* cmp */ - case 0x0f: - case 0x10: - case 0x11: - case 0x12: - case 0x13: - case 0x14: - case 0x15: + case 0x0f: /* nop */ + case 0x10: /* sex.b */ + case 0x11: /* sex.s */ + case 0x12: /* zex.b */ + case 0x13: /* zex.s */ + case 0x14: /* umul.x */ + case 0x15: /* mul.x */ case 0x16: case 0x17: case 0x18: @@ -409,22 +409,26 @@ moxie_software_single_step (struct frame_info *frame) insert_single_step_breakpoint (gdbarch, aspace, addr + 2); break; + /* 32-bit instructions. */ + case 0x0c: /* ldo.l */ + case 0x0d: /* sto.l */ + case 0x36: /* ldo.b */ + case 0x37: /* sto.b */ + case 0x38: /* ldo.s */ + case 0x39: /* sto.s */ + insert_single_step_breakpoint (gdbarch, aspace, addr + 4); + break; + /* 48-bit instructions. */ case 0x01: /* ldi.l (immediate) */ case 0x08: /* lda.l */ case 0x09: /* sta.l */ - case 0x0c: /* ldo.l */ - case 0x0d: /* sto.l */ case 0x1b: /* ldi.b (immediate) */ case 0x1d: /* lda.b */ case 0x1f: /* sta.b */ case 0x20: /* ldi.s (immediate) */ case 0x22: /* lda.s */ case 0x24: /* sta.s */ - case 0x36: /* ldo.b */ - case 0x37: /* sto.b */ - case 0x38: /* ldo.s */ - case 0x39: /* sto.s */ insert_single_step_breakpoint (gdbarch, aspace, addr + 6); break; @@ -857,8 +861,8 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache, case 0x0d: /* sto.l */ { int reg = (inst >> 4) & 0xf; - uint32_t offset = (uint32_t) moxie_process_readu (addr+2, buf, 4, - byte_order); + uint32_t offset = (((int16_t) moxie_process_readu (addr+2, buf, 2, + byte_order)) << 16 ) >> 16; regcache_raw_read (regcache, reg, (gdb_byte *) & tmpu32); tmpu32 = extract_unsigned_integer ((gdb_byte *) & tmpu32, 4, byte_order); @@ -873,13 +877,23 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache, return -1; } break; - case 0x0f: - case 0x10: - case 0x11: - case 0x12: - case 0x13: - case 0x14: - case 0x15: + case 0x0f: /* nop */ + { + /* Do nothing. */ + break; + } + case 0x10: /* sex.b */ + case 0x11: /* sex.s */ + case 0x12: /* zex.b */ + case 0x13: /* zex.s */ + case 0x14: /* umul.x */ + case 0x15: /* mul.x */ + { + int reg = (inst >> 4) & 0xf; + if (record_full_arch_list_add_reg (regcache, reg)) + return -1; + } + break; case 0x16: case 0x17: case 0x18: @@ -965,13 +979,13 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache, case 0x26: /* and */ case 0x27: /* lshr */ case 0x28: /* ashl */ - case 0x29: /* sub.l */ + case 0x29: /* sub */ case 0x2a: /* neg */ case 0x2b: /* or */ case 0x2c: /* not */ case 0x2d: /* ashr */ case 0x2e: /* xor */ - case 0x2f: /* mul.l */ + case 0x2f: /* mul */ { int reg = (inst >> 4) & 0xf; if (record_full_arch_list_add_reg (regcache, reg)) @@ -1052,8 +1066,8 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache, case 0x37: /* sto.b */ { int reg = (inst >> 4) & 0xf; - uint32_t offset = (uint32_t) moxie_process_readu (addr+2, buf, 4, - byte_order); + uint32_t offset = (((int16_t) moxie_process_readu (addr+2, buf, 2, + byte_order)) << 16 ) >> 16; regcache_raw_read (regcache, reg, (gdb_byte *) & tmpu32); tmpu32 = extract_unsigned_integer ((gdb_byte *) & tmpu32, 4, byte_order); @@ -1072,8 +1086,8 @@ moxie_process_record (struct gdbarch *gdbarch, struct regcache *regcache, case 0x39: /* sto.s */ { int reg = (inst >> 4) & 0xf; - uint32_t offset = (uint32_t) moxie_process_readu (addr+2, buf, 4, - byte_order); + uint32_t offset = (((int16_t) moxie_process_readu (addr+2, buf, 2, + byte_order)) << 16 ) >> 16; regcache_raw_read (regcache, reg, (gdb_byte *) & tmpu32); tmpu32 = extract_unsigned_integer ((gdb_byte *) & tmpu32, 4, byte_order);