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>
+
* tconfig.h (SIM_HAVE_SIMCACHE): Delete.
2015-11-21 Mike Frysinger <vapier@gentoo.org>
unsigned int 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 */
#define STATE_CORE(sd) (&(sd)->base.core)
sim_core core;
OPTION_VERBOSE,
OPTION_ENDIAN,
OPTION_DEBUG,
-#ifdef SIM_HAVE_FLATMEM
- OPTION_MEM_SIZE,
-#endif
OPTION_HELP,
OPTION_VERSION,
#ifdef SIM_H8300 /* FIXME: Should be movable to h8300 dir. */
standard_option_handler },
#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},
'\0', "COMMAND", ""/*undocumented*/,
standard_option_handler },
break;
#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:
sim_do_command (sd, arg);
break;
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>
+
* tconfig.h (SIM_HAVE_SIMCACHE): Delete.
2015-12-15 Dominik Vogt <vogt@linux.vnet.ibm.com>