From patchwork Mon Dec 7 10:18:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Clifton X-Patchwork-Id: 9911 Received: (qmail 129411 invoked by alias); 7 Dec 2015 10:18:27 -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 129373 invoked by uid 89); 7 Dec 2015 10:18:26 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.3 required=5.0 tests=AWL, BAYES_00, SPF_HELO_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Mon, 07 Dec 2015 10:18:24 +0000 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id D1C2A8F268 for ; Mon, 7 Dec 2015 10:18:23 +0000 (UTC) Received: from littlehelper.redhat.com (vpn1-5-253.ams2.redhat.com [10.36.5.253]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tB7AIMAW017969 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Mon, 7 Dec 2015 05:18:23 -0500 From: Nick Clifton To: gdb-patches@sourceware.org Subject: Commit: MSP430 sim: Add support for simulating F5 hardware multiplies Date: Mon, 07 Dec 2015 10:18:21 +0000 Message-ID: <87r3iy1s0i.fsf@redhat.com> MIME-Version: 1.0 Hi Guys, I am applying the patch below to the MSP430 simulator. It adds support for the hardware multiply operations supported by the F5 series of MCUs. Cheers Nick sim/msp430/ChangeLog 2015-12-07 Nick Clifton * msp430-sim.c (sim_open): Check for needed memory at address 0x500 not 0x200. (get_op): Add support for F5 hardware multiply addresses. (put_op): Likewise. diff --git a/sim/msp430/msp430-sim.c b/sim/msp430/msp430-sim.c index 7f329c4..3a20f6c 100644 --- a/sim/msp430/msp430-sim.c +++ b/sim/msp430/msp430-sim.c @@ -181,8 +181,8 @@ sim_open (SIM_OPEN_KIND kind, Note - these values match the memory regions in the libgloss/msp430/msp430[xl]-sim.ld scripts. */ if (sim_core_read_buffer (sd, MSP430_CPU (sd), read_map, &c, 0x2, 1) == 0) sim_do_commandf (sd, "memory-region 0,0x20"); /* Needed by the GDB testsuite. */ - if (sim_core_read_buffer (sd, MSP430_CPU (sd), read_map, &c, 0x200, 1) == 0) - sim_do_commandf (sd, "memory-region 0x200,0xfd00"); /* RAM and/or ROM */ + if (sim_core_read_buffer (sd, MSP430_CPU (sd), read_map, &c, 0x500, 1) == 0) + sim_do_commandf (sd, "memory-region 0x500,0xfa00"); /* RAM and/or ROM */ if (sim_core_read_buffer (sd, MSP430_CPU (sd), read_map, &c, 0xfffe, 1) == 0) sim_do_commandf (sd, "memory-region 0xffc0,0x40"); /* VECTORS. */ if (sim_core_read_buffer (sd, MSP430_CPU (sd), read_map, &c, 0x10000, 1) == 0) @@ -404,10 +404,12 @@ get_op (SIM_DESC sd, MSP430_Opcode_Decoded *opc, int n) if (addr == 0x5dd) rv = 2; #endif - if (addr >= 0x130 && addr <= 0x15B) + if ((addr >= 0x130 && addr <= 0x15B) + || (addr >= 0x4C0 && addr <= 0x4EB)) { switch (addr) { + case 0x4CA: case 0x13A: switch (HWMULT (sd, hwmult_type)) { @@ -422,6 +424,7 @@ get_op (SIM_DESC sd, MSP430_Opcode_Decoded *opc, int n) } break; + case 0x4CC: case 0x13C: switch (HWMULT (sd, hwmult_type)) { @@ -437,6 +440,7 @@ get_op (SIM_DESC sd, MSP430_Opcode_Decoded *opc, int n) } break; + case 0x4CE: case 0x13E: switch (HWMULT (sd, hwmult_type)) { @@ -455,18 +459,22 @@ get_op (SIM_DESC sd, MSP430_Opcode_Decoded *opc, int n) } break; + case 0x4E4: case 0x154: rv = zero_ext (HWMULT (sd, hw32mult_result), 16); break; + case 0x4E6: case 0x156: rv = zero_ext (HWMULT (sd, hw32mult_result) >> 16, 16); break; + case 0x4E8: case 0x158: rv = zero_ext (HWMULT (sd, hw32mult_result) >> 32, 16); break; + case 0x4EA: case 0x15A: switch (HWMULT (sd, hw32mult_type)) { @@ -581,7 +589,8 @@ put_op (SIM_DESC sd, MSP430_Opcode_Decoded *opc, int n, int val) if (addr == 0x5ce) putchar (val); #endif - if (addr >= 0x130 && addr <= 0x15B) + if ((addr >= 0x130 && addr <= 0x15B) + || (addr >= 0x4C0 && addr <= 0x4EB)) { signed int a,b; @@ -590,12 +599,33 @@ put_op (SIM_DESC sd, MSP430_Opcode_Decoded *opc, int n, int val) switch (addr) { - case 0x130: HWMULT (sd, hwmult_op1) = val; HWMULT (sd, hwmult_type) = UNSIGN_32; break; - case 0x132: HWMULT (sd, hwmult_op1) = val; HWMULT (sd, hwmult_type) = SIGN_32; break; - case 0x134: HWMULT (sd, hwmult_op1) = val; HWMULT (sd, hwmult_type) = UNSIGN_MAC_32; break; - case 0x136: HWMULT (sd, hwmult_op1) = val; HWMULT (sd, hwmult_type) = SIGN_MAC_32; break; + case 0x4C0: + case 0x130: + HWMULT (sd, hwmult_op1) = val; + HWMULT (sd, hwmult_type) = UNSIGN_32; + break; + + case 0x4C2: + case 0x132: + HWMULT (sd, hwmult_op1) = val; + HWMULT (sd, hwmult_type) = SIGN_32; + break; + + case 0x4C4: + case 0x134: + HWMULT (sd, hwmult_op1) = val; + HWMULT (sd, hwmult_type) = UNSIGN_MAC_32; + break; + + case 0x4C6: + case 0x136: + HWMULT (sd, hwmult_op1) = val; + HWMULT (sd, hwmult_type) = SIGN_MAC_32; + break; - case 0x138: HWMULT (sd, hwmult_op2) = val; + case 0x4C8: + case 0x138: + HWMULT (sd, hwmult_op2) = val; switch (HWMULT (sd, hwmult_type)) { case UNSIGN_32: @@ -630,7 +660,8 @@ put_op (SIM_DESC sd, MSP430_Opcode_Decoded *opc, int n, int val) } break; - case 0x13a: + case 0x4CA: + case 0x13A: /* Copy into LOW result... */ switch (HWMULT (sd, hwmult_type)) { @@ -647,24 +678,34 @@ put_op (SIM_DESC sd, MSP430_Opcode_Decoded *opc, int n, int val) } break; + case 0x4D0: case 0x140: HWMULT (sd, hw32mult_op1) = val; HWMULT (sd, hw32mult_type) = UNSIGN_64; break; + + case 0x4D2: case 0x142: HWMULT (sd, hw32mult_op1) = (HWMULT (sd, hw32mult_op1) & 0xFFFF) | (val << 16); break; + + case 0x4D4: case 0x144: HWMULT (sd, hw32mult_op1) = val; HWMULT (sd, hw32mult_type) = SIGN_64; break; + + case 0x4D6: case 0x146: HWMULT (sd, hw32mult_op1) = (HWMULT (sd, hw32mult_op1) & 0xFFFF) | (val << 16); break; + + case 0x4E0: case 0x150: HWMULT (sd, hw32mult_op2) = val; break; + case 0x4E2: case 0x152: HWMULT (sd, hw32mult_op2) = (HWMULT (sd, hw32mult_op2) & 0xFFFF) | (val << 16); switch (HWMULT (sd, hw32mult_type))