MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sim: delete SIM_HAVE_FLATMEM support

Browse Source 
No target has used this, and it's a cheap hack in place in using the
common memory module.  We want everyone using that though, so drop
support for flatmem entirely.
This commit is contained in:
Mike Frysinger 2015-12-24 16:41:55 -05:00
parent b1af947345
commit 3cabaf66d6
6 changed files with 13 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sim/common/ChangeLog
View File

@ -1,3 +1,12 @@
2015-12-24 Mike Frysinger <vapier@gentoo.org>
* sim-base.h [SIM_HAVE_FLATMEM] (sim_state_base): Delete flatmem code.
* sim-module.c [SIM_HAVE_FLATMEM] (modules): Always call
sim_memopt_install.
* sim-options.c (OPTION_MEM_SIZE): Delete.
[SIM_HAVE_FLATMEM] (standard_options): Delete flatmem code.
(standard_option_handler): Likewise.
2015-12-24 Mike Frysinger <vapier@gentoo.org> 2015-12-24 Mike Frysinger <vapier@gentoo.org>
* tconfig.h (SIM_HAVE_SIMCACHE): Delete. * tconfig.h (SIM_HAVE_SIMCACHE): Delete.

10
sim/common/sim-base.h
View File

@ -202,16 +202,6 @@ typedef struct {
unsigned int scache_size; unsigned int scache_size;
#define STATE_SCACHE_SIZE(sd) ((sd)->base.scache_size) #define STATE_SCACHE_SIZE(sd) ((sd)->base.scache_size)
/* FIXME: Move to top level sim_state struct (as some struct)? */
#ifdef SIM_HAVE_FLATMEM
unsigned int mem_size;
#define STATE_MEM_SIZE(sd) ((sd)->base.mem_size)
unsigned int mem_base;
#define STATE_MEM_BASE(sd) ((sd)->base.mem_base)
unsigned char *memory;
#define STATE_MEMORY(sd) ((sd)->base.memory)
#endif
/* core memory bus */ /* core memory bus */
#define STATE_CORE(sd) (&(sd)->base.core) #define STATE_CORE(sd) (&(sd)->base.core)
sim_core core; sim_core core;

3
sim/common/sim-module.c
View File

@ -53,10 +53,7 @@ static MODULE_INSTALL_FN * const modules[] = {
profile_install, profile_install,
#endif #endif
sim_core_install, sim_core_install,
#ifndef SIM_HAVE_FLATMEM
/* FIXME: should handle flatmem as well FLATMEM */
sim_memopt_install, sim_memopt_install,
#endif
#if WITH_WATCHPOINTS #if WITH_WATCHPOINTS
sim_watchpoint_install, sim_watchpoint_install,
#endif #endif

38
sim/common/sim-options.c
View File

@ -102,9 +102,6 @@ typedef enum {
OPTION_VERBOSE, OPTION_VERBOSE,
OPTION_ENDIAN, OPTION_ENDIAN,
OPTION_DEBUG, OPTION_DEBUG,
#ifdef SIM_HAVE_FLATMEM
OPTION_MEM_SIZE,
#endif
OPTION_HELP, OPTION_HELP,
OPTION_VERSION, OPTION_VERSION,
#ifdef SIM_H8300 /* FIXME: Should be movable to h8300 dir. */ #ifdef SIM_H8300 /* FIXME: Should be movable to h8300 dir. */
@ -162,12 +159,6 @@ static const OPTION standard_options[] =
standard_option_handler }, standard_option_handler },
#endif #endif
#ifdef SIM_HAVE_FLATMEM
{ {"mem-size", required_argument, NULL, OPTION_MEM_SIZE},
'm', "<size>[in bytes, Kb (k suffix), Mb (m suffix) or Gb (g suffix)]",
"Specify memory size", standard_option_handler },
#endif
{ {"do-command", required_argument, NULL, OPTION_DO_COMMAND}, { {"do-command", required_argument, NULL, OPTION_DO_COMMAND},
'\0', "COMMAND", ""/*undocumented*/, '\0', "COMMAND", ""/*undocumented*/,
standard_option_handler }, standard_option_handler },
@ -376,35 +367,6 @@ standard_option_handler (SIM_DESC sd, sim_cpu *cpu, int opt,
break; break;
#endif #endif
#ifdef SIM_HAVE_FLATMEM
case OPTION_MEM_SIZE:
{
char * endp;
unsigned long ul = strtol (arg, &endp, 0);
switch (* endp)
{
case 'k': case 'K': size <<= 10; break;
case 'm': case 'M': size <<= 20; break;
case 'g': case 'G': size <<= 30; break;
case ' ': case '\0': case '\t': break;
default:
if (ul > 0)
sim_io_eprintf (sd, "Ignoring strange character at end of memory size: %c\n", * endp);
break;
}
/* 16384: some minimal amount */
if (! isdigit (arg[0]) || ul < 16384)
{
sim_io_eprintf (sd, "Invalid memory size `%s'", arg);
return SIM_RC_FAIL;
}
STATE_MEM_SIZE (sd) = ul;
}
break;
#endif
case OPTION_DO_COMMAND: case OPTION_DO_COMMAND:
sim_do_command (sd, arg); sim_do_command (sd, arg);
break; break;

4
sim/mips/ChangeLog
View File

@ -1,3 +1,7 @@
2015-12-24 Mike Frysinger <vapier@gentoo.org>
* interp.c [SIM_HAVE_FLATMEM] (sim_open): Delete flatmem code.
2015-12-24 Mike Frysinger <vapier@gentoo.org> 2015-12-24 Mike Frysinger <vapier@gentoo.org>
* tconfig.h (SIM_HAVE_SIMCACHE): Delete. * tconfig.h (SIM_HAVE_SIMCACHE): Delete.

3
sim/mips/interp.c
View File

@ -399,9 +399,6 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb, struct bfd *abfd, char **argv)
/* Look for largest memory region defined on command-line at /* Look for largest memory region defined on command-line at
phys address 0. */ phys address 0. */
#ifdef SIM_HAVE_FLATMEM
mem_size = STATE_MEM_SIZE (sd);
#endif
for (entry = STATE_MEMOPT (sd); entry != NULL; entry = entry->next) for (entry = STATE_MEMOPT (sd); entry != NULL; entry = entry->next)
{ {
/* If we find an entry at address 0, then we will end up /* If we find an entry at address 0, then we will end up