* run.c: Deleted, use one in ../common now.
* Makefile.in: Delete everything that's been moved to ../common/Make-common.in. (SIM_OBJS): Define. * configure.in: Simplify using macros in ../common/aclocal.m4. * configure: Regenerated. * config.in: New file. * armos.c: #include config.h. * wrapper.c (mem_size): Value is in bytes now. (sim_callback): New global. (arm_sim_set_profile{,_size}): Delete. (arm_sim_set_mem_size): Rename to sim_size. (sim_do_command): Call printf_filtered via callback. (sim_set_callbacks): Record callback.
This commit is contained in:
parent
126d9d0a71
commit
e01714ccda
|
@ -47,6 +47,7 @@ bag.c
|
||||||
bag.h
|
bag.h
|
||||||
communicate.c
|
communicate.c
|
||||||
communicate.h
|
communicate.h
|
||||||
|
config.in
|
||||||
configure
|
configure
|
||||||
configure.in
|
configure.in
|
||||||
dbg_conf.h
|
dbg_conf.h
|
||||||
|
@ -58,7 +59,6 @@ gdbhost.h
|
||||||
kid.c
|
kid.c
|
||||||
main.c
|
main.c
|
||||||
parent.c
|
parent.c
|
||||||
run.c
|
|
||||||
wrapper.c
|
wrapper.c
|
||||||
|
|
||||||
Things-to-lose:
|
Things-to-lose:
|
||||||
|
|
|
@ -2,18 +2,8 @@ dnl Process this file with autoconf to produce a configure script.
|
||||||
AC_PREREQ(2.5)dnl
|
AC_PREREQ(2.5)dnl
|
||||||
AC_INIT(Makefile.in)
|
AC_INIT(Makefile.in)
|
||||||
|
|
||||||
AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
|
SIM_AC_COMMON
|
||||||
AC_CANONICAL_SYSTEM
|
|
||||||
AC_ARG_PROGRAM
|
|
||||||
|
|
||||||
. ${srcdir}/../../bfd/configure.host
|
AC_CHECK_HEADERS(unistd.h)
|
||||||
|
|
||||||
AC_PROG_CC
|
SIM_AC_OUTPUT
|
||||||
AC_PROG_INSTALL
|
|
||||||
AC_SUBST(CFLAGS)
|
|
||||||
AC_SUBST(HDEFINES)
|
|
||||||
AR=${AR-ar}
|
|
||||||
AC_SUBST(AR)
|
|
||||||
AC_PROG_RANLIB
|
|
||||||
|
|
||||||
AC_OUTPUT(Makefile)
|
|
||||||
|
|
157
sim/arm/run.c
157
sim/arm/run.c
|
@ -1,157 +0,0 @@
|
||||||
/* run front end support for ARM
|
|
||||||
Copyright (C) 1996 Free Software Foundation, Inc.
|
|
||||||
|
|
||||||
This file is part of ARM SIM
|
|
||||||
|
|
||||||
GNU CC is free software; you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation; either version 2, or (at your option)
|
|
||||||
any later version.
|
|
||||||
|
|
||||||
GNU CC is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program; if not, write to the Free Software
|
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
|
||||||
|
|
||||||
/* Steve Chamberlain
|
|
||||||
sac@cygnus.com */
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <varargs.h>
|
|
||||||
#include "bfd.h"
|
|
||||||
#include "getopt.h"
|
|
||||||
#include "remote-sim.h"
|
|
||||||
|
|
||||||
static void usage();
|
|
||||||
|
|
||||||
int target_byte_order;
|
|
||||||
|
|
||||||
int
|
|
||||||
main (ac, av)
|
|
||||||
int ac;
|
|
||||||
char **av;
|
|
||||||
{
|
|
||||||
bfd *abfd;
|
|
||||||
bfd_vma start_address;
|
|
||||||
asection *s;
|
|
||||||
int i;
|
|
||||||
int trace = 0;
|
|
||||||
int verbose = 0;
|
|
||||||
char *name;
|
|
||||||
|
|
||||||
while ((i = getopt (ac, av, "m:p:s:tv")) != EOF)
|
|
||||||
switch (i)
|
|
||||||
{
|
|
||||||
case 'm':
|
|
||||||
arm_sim_set_mem_size (atoi (optarg));
|
|
||||||
break;
|
|
||||||
case 'p': /* FIXME: unused */
|
|
||||||
arm_sim_set_profile (atoi (optarg));
|
|
||||||
break;
|
|
||||||
case 's': /* FIXME: unused */
|
|
||||||
arm_sim_set_profile_size (atoi (optarg));
|
|
||||||
break;
|
|
||||||
case 't':
|
|
||||||
trace = 1;
|
|
||||||
break;
|
|
||||||
case 'v':
|
|
||||||
verbose = 1;
|
|
||||||
arm_sim_set_verbosity (1);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
usage();
|
|
||||||
}
|
|
||||||
ac -= optind;
|
|
||||||
av += optind;
|
|
||||||
|
|
||||||
if (ac != 1)
|
|
||||||
usage();
|
|
||||||
|
|
||||||
name = *av;
|
|
||||||
|
|
||||||
if (verbose)
|
|
||||||
{
|
|
||||||
printf ("run %s\n", name);
|
|
||||||
}
|
|
||||||
|
|
||||||
abfd = bfd_openr (name, 0);
|
|
||||||
if (abfd)
|
|
||||||
{
|
|
||||||
if (bfd_check_format (abfd, bfd_object))
|
|
||||||
{
|
|
||||||
for (s = abfd->sections; s; s = s->next)
|
|
||||||
{
|
|
||||||
if (s->flags & SEC_LOAD)
|
|
||||||
{
|
|
||||||
unsigned char *buffer = malloc (bfd_section_size (abfd, s));
|
|
||||||
bfd_get_section_contents (abfd,
|
|
||||||
s,
|
|
||||||
buffer,
|
|
||||||
0,
|
|
||||||
bfd_section_size (abfd, s));
|
|
||||||
sim_write (s->vma, buffer, bfd_section_size (abfd, s));
|
|
||||||
free (buffer);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
start_address = bfd_get_start_address (abfd);
|
|
||||||
sim_create_inferior (start_address, NULL, NULL);
|
|
||||||
|
|
||||||
target_byte_order = bfd_big_endian (abfd) ? 4321 : 1234;
|
|
||||||
|
|
||||||
if (trace)
|
|
||||||
{
|
|
||||||
int done = 0;
|
|
||||||
while (!done)
|
|
||||||
{
|
|
||||||
done = sim_trace ();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
sim_resume (0, 0);
|
|
||||||
}
|
|
||||||
if (verbose)
|
|
||||||
sim_info (0);
|
|
||||||
|
|
||||||
/* Assume we left through the exit system call,
|
|
||||||
in which case r0 has the exit code */
|
|
||||||
/* FIXME: byte order dependent? */
|
|
||||||
{
|
|
||||||
unsigned char b[4];
|
|
||||||
sim_fetch_register (0, b);
|
|
||||||
return b[0];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
usage()
|
|
||||||
{
|
|
||||||
fprintf (stderr, "usage: run [-tv] program\n");
|
|
||||||
exit (1);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* Callbacks used by the simulator proper. */
|
|
||||||
|
|
||||||
void
|
|
||||||
printf_filtered (va_alist)
|
|
||||||
va_dcl
|
|
||||||
{
|
|
||||||
va_list args;
|
|
||||||
char *format;
|
|
||||||
|
|
||||||
va_start (args);
|
|
||||||
format = va_arg (args, char *);
|
|
||||||
|
|
||||||
vfprintf (stdout, format, args);
|
|
||||||
va_end (args);
|
|
||||||
}
|
|
Loading…
Reference in New Issue