From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27272 invoked by alias); 30 Dec 2010 20:40:06 -0000 Received: (qmail 27208 invoked by uid 22791); 30 Dec 2010 20:40:02 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL,BAYES_00,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from smtp.gentoo.org (HELO smtp.gentoo.org) (140.211.166.183) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 30 Dec 2010 20:39:54 +0000 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 5D2C11B41D5; Thu, 30 Dec 2010 20:39:52 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Cc: toolchain-devel@blackfin.uclinux.org Subject: [PATCH v2] sim: allow memory maps to default to mapped files Date: Thu, 30 Dec 2010 21:09:00 -0000 Message-Id: <1293741562-9225-1-git-send-email-vapier@gentoo.org> In-Reply-To: <1293426471-5571-1-git-send-email-vapier@gentoo.org> References: <1293426471-5571-1-git-send-email-vapier@gentoo.org> X-IsSubscribed: yes 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 X-SW-Source: 2010-12/txt/msg00560.txt.bz2 I find it annoying when using --memory-mapfile that I also need to look up and manually specify the file size to the following --memory-region option. So make a length of 0 in the following --memory-region trigger an auto-sizing of the map to the length of the file being mapped. Signed-off-by: Mike Frysinger 2010-12-27 Mike Frysinger * sim-memopt.c (do_memopt_add): Set nr_bytes to s.st_size before bytes has been calculated and when mmap_next_fd is valid and nr_bytes is 0. (memory_option_handler): Allow missing size when mmap_next_fd is valid. --- v2 - fix typo in nr_bytes==0 handling sim/common/sim-memopt.c | 40 ++++++++++++++++++++++++++++++---------- 1 files changed, 30 insertions(+), 10 deletions(-) diff --git a/sim/common/sim-memopt.c b/sim/common/sim-memopt.c index 99e6add..5ef48cb 100644 --- a/sim/common/sim-memopt.c +++ b/sim/common/sim-memopt.c @@ -154,7 +154,27 @@ do_memopt_add (SIM_DESC sd, /* Allocate new well-aligned buffer, just as sim_core_attach(). */ void *aligned_buffer; int padding = (addr % sizeof (unsigned64)); - unsigned long bytes = (modulo == 0 ? nr_bytes : modulo) + padding; + unsigned long bytes; + +#ifdef HAVE_MMAP + struct stat s; + + if (mmap_next_fd >= 0) + { + /* Check that given file is big enough. */ + int rc = fstat (mmap_next_fd, &s); + + if (rc < 0) + sim_io_error (sd, "Error, unable to stat file: %s\n", + strerror (errno)); + + /* Autosize the mapping to the file length. */ + if (nr_bytes == 0) + nr_bytes = s.st_size; + } +#endif + + bytes = (modulo == 0 ? nr_bytes : modulo) + padding; free_buffer = NULL; free_length = bytes; @@ -163,14 +183,9 @@ do_memopt_add (SIM_DESC sd, /* Memory map or malloc(). */ if (mmap_next_fd >= 0) { - /* Check that given file is big enough. */ - struct stat s; - int rc; - /* Some kernels will SIGBUS the application if mmap'd file is not large enough. */ - rc = fstat (mmap_next_fd, &s); - if (rc < 0 || s.st_size < bytes) + if (s.st_size < bytes) { sim_io_error (sd, "Error, cannot confirm that mmap file is large enough " @@ -383,10 +398,15 @@ memory_option_handler (SIM_DESC sd, sim_cpu *cpu, int opt, chp = parse_addr (chp, &level, &space, &addr); if (*chp != ',') { - sim_io_eprintf (sd, "Missing size for memory-region\n"); - return SIM_RC_FAIL; + /* let the file autosize */ + if (mmap_next_fd == -1) + { + sim_io_eprintf (sd, "Missing size for memory-region\n"); + return SIM_RC_FAIL; + } } - chp = parse_size (chp + 1, &nr_bytes, &modulo); + else + chp = parse_size (chp + 1, &nr_bytes, &modulo); /* old style */ if (*chp == ',') modulo = strtoul (chp + 1, &chp, 0); -- 1.7.3.1