From patchwork Tue Mar 11 03:38:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 29 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx20.g.dreamhost.com (caibbdcaaahc.dreamhost.com [208.113.200.72]) by wilcox.dreamhost.com (Postfix) with ESMTP id BAE7036008F for ; Mon, 10 Mar 2014 20:38:28 -0700 (PDT) Received: by homiemail-mx20.g.dreamhost.com (Postfix, from userid 14314964) id 441AB40668F80; Mon, 10 Mar 2014 20:38:28 -0700 (PDT) X-Original-To: gdb@patchwork.siddhesh.in Delivered-To: x14314964@homiemail-mx20.g.dreamhost.com Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by homiemail-mx20.g.dreamhost.com (Postfix) with ESMTPS id 1695C405E0E33 for ; Mon, 10 Mar 2014 20:38:28 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=IK02WeQmhXAlzPqlb+9fKMWWlsj2EoL V0+lC+UZb5QVJ1IfF71cvvNFBATtXwLdaPXZUvKxgI+WqLRdZ+FUSIMeI3efdi1S L6onYV2LbzFFh8UQj/Z2vEzTkTUbrOw4ifJL9idT6Lh1mao/cqhHwuYqyfNmKO24 Ah96sxEInaCo= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=gW8RVtBJlsN0gwj/uPmlpQNQR9Y=; b=XTwd9 DN6JCg9PokQWpUqJIGSRDUa739+rC6sh4nRbIKglRG77GFu4euuZATW2FDKo5iYw ANve9CYlkV3BBh6Zg+rtnthNbmv+m11Iy+tH/dX2FiXzWapPICY5COlIPJFNbZcU btRvmlowktrKcCca2mpUkT4qAF4CajMAKtmHHA= Received: (qmail 16910 invoked by alias); 11 Mar 2014 03:38:26 -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 16901 invoked by uid 89); 11 Mar 2014 03:38:25 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.1 required=5.0 tests=AWL, BAYES_00, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: smtp.gentoo.org Received: from smtp.gentoo.org (HELO smtp.gentoo.org) (140.211.166.183) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Tue, 11 Mar 2014 03:38:24 +0000 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 5A08C33EBB7 for ; Tue, 11 Mar 2014 03:38:22 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH v2] sim: msp430: set initial PC to ELF entry if available Date: Mon, 10 Mar 2014 23:38:26 -0400 Message-Id: <1394509106-27143-1-git-send-email-vapier@gentoo.org> In-Reply-To: <1394256493-15084-2-git-send-email-vapier@gentoo.org> References: <1394256493-15084-2-git-send-email-vapier@gentoo.org> X-IsSubscribed: yes X-DH-Original-To: gdb@patchwork.siddhesh.in If we want to run a simple ELF, it makes more sense to start at the ELF's entry point instead of requiring the magic reset vector always be set up. This matches better what other sims do. 2014-03-08 Mike Frysinger * msp430-sim.c (sim_create_inferior): Set new_pc to the result of bfd_get_start_address when abfd is not NULL and new_pc is zero. --- v2 - use the ELF entry only when the reset vector is not set up. sim/msp430/msp430-sim.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sim/msp430/msp430-sim.c b/sim/msp430/msp430-sim.c index c3fa4a9..2a648f5 100644 --- a/sim/msp430/msp430-sim.c +++ b/sim/msp430/msp430-sim.c @@ -249,9 +249,14 @@ sim_create_inferior (SIM_DESC sd, int c; int new_pc; + /* Set the PC to the default reset vector if available. */ c = sim_core_read_buffer (sd, MSP430_CPU (sd), read_map, resetv, 0xfffe, 2); - new_pc = resetv[0] + 256 * resetv[1]; + + /* If the reset vector isn't initialized, then use the ELF entry. */ + if (abfd != NULL && !new_pc) + new_pc = bfd_get_start_address (abfd); + sim_pc_set (MSP430_CPU (sd), new_pc); msp430_pc_store (MSP430_CPU (sd), new_pc);