X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Fppc%2Fsim_calls.c;h=4e61335c2d4e5b7b48cb1381a58cded60d4e4491;hb=00923338dec84505addaf9cdeca2e9c844757824;hp=4d73291c05dbd34292956d3620bf5ff0f432cd7e;hpb=fa803dc60f0bf01297674c41d001798e18ade4dc;p=deliverable%2Fbinutils-gdb.git diff --git a/sim/ppc/sim_calls.c b/sim/ppc/sim_calls.c index 4d73291c05..4e61335c2d 100644 --- a/sim/ppc/sim_calls.c +++ b/sim/ppc/sim_calls.c @@ -1,10 +1,10 @@ /* This file is part of the program psim. - Copyright (C) 1994-1996, Andrew Cagney + Copyright 1994, 1995, 1996, 1998, 2003 Andrew Cagney This program 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 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -13,8 +13,7 @@ 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. + along with this program; if not, see . */ @@ -40,23 +39,30 @@ #endif #endif -#include "defs.h" +#include "libiberty.h" #include "bfd.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" +#include "gdb/signals.h" + +/* Define the rate at which the simulator should poll the host + for a quit. */ +#ifndef POLL_QUIT_INTERVAL +#define POLL_QUIT_INTERVAL 0x20 +#endif +static int poll_quit_count = POLL_QUIT_INTERVAL; /* Structures used by the simulator, for gdb just have static structures */ -static psim *simulator; +psim *simulator; static device *root_device; -static const char *register_names[] = REGISTER_NAMES; static host_callback *callbacks; SIM_DESC sim_open (SIM_OPEN_KIND kind, host_callback *callback, - struct _bfd *abfd, + struct bfd *abfd, char **argv) { callbacks = callback; @@ -91,20 +97,15 @@ sim_close (SIM_DESC sd, int quitting) SIM_RC -sim_load (SIM_DESC sd, char *prog, bfd *abfd, int from_tty) +sim_load (SIM_DESC sd, const char *prog, bfd *abfd, int from_tty) { - char **argv; TRACE(trace_gdb, ("sim_load(prog=%s, from_tty=%d) called\n", prog, from_tty)); ASSERT(prog != NULL); - /* parse the arguments, assume that the file is argument 0 */ - argv = buildargv(prog); - ASSERT(argv != NULL && argv[0] != NULL); - /* create the simulator */ TRACE(trace_gdb, ("sim_load() - first time, create the simulator\n")); - simulator = psim_create(argv[0], root_device); + simulator = psim_create(prog, root_device); /* bring in all the data section */ psim_init(simulator); @@ -112,23 +113,20 @@ sim_load (SIM_DESC sd, char *prog, bfd *abfd, int from_tty) /* get the start address */ if (abfd == NULL) { - abfd = bfd_openr (argv[0], 0); + abfd = bfd_openr (prog, 0); if (abfd == NULL) error ("psim: can't open \"%s\": %s\n", - argv[0], bfd_errmsg (bfd_get_error ())); + prog, bfd_errmsg (bfd_get_error ())); if (!bfd_check_format (abfd, bfd_object)) { const char *errmsg = bfd_errmsg (bfd_get_error ()); bfd_close (abfd); error ("psim: \"%s\" is not an object file: %s\n", - argv[0], errmsg); + prog, errmsg); } bfd_close (abfd); } - /* release the arguments */ - freeargv(argv); - return SIM_RC_OK; } @@ -145,7 +143,7 @@ sim_read (SIM_DESC sd, SIM_ADDR mem, unsigned char *buf, int length) int -sim_write (SIM_DESC sd, SIM_ADDR mem, unsigned char *buf, int length) +sim_write (SIM_DESC sd, SIM_ADDR mem, const unsigned char *buf, int length) { int result = psim_write_memory(simulator, MAX_NR_PROCESSORS, buf, mem, length, @@ -155,34 +153,6 @@ sim_write (SIM_DESC sd, SIM_ADDR mem, unsigned char *buf, int length) return result; } - -void -sim_fetch_register (SIM_DESC sd, int regno, unsigned char *buf) -{ - if (simulator == NULL) { - return; - } - TRACE(trace_gdb, ("sim_fetch_register(regno=%d(%s), buf=0x%lx)\n", - regno, register_names[regno], (long)buf)); - psim_read_register(simulator, MAX_NR_PROCESSORS, - buf, register_names[regno], - raw_transfer); -} - - -void -sim_store_register (SIM_DESC sd, int regno, unsigned char *buf) -{ - if (simulator == NULL) - return; - TRACE(trace_gdb, ("sim_store_register(regno=%d(%s), buf=0x%lx)\n", - regno, register_names[regno], (long)buf)); - psim_write_register(simulator, MAX_NR_PROCESSORS, - buf, register_names[regno], - raw_transfer); -} - - void sim_info (SIM_DESC sd, int verbose) { @@ -193,7 +163,7 @@ sim_info (SIM_DESC sd, int verbose) SIM_RC sim_create_inferior (SIM_DESC sd, - struct _bfd *abfd, + struct bfd *abfd, char **argv, char **envp) { @@ -212,8 +182,8 @@ sim_create_inferior (SIM_DESC sd, psim_init(simulator); psim_stack(simulator, argv, envp); - psim_write_register(simulator, -1 /* all start at same PC */, - &entry_point, "pc", cooked_transfer); + ASSERT (psim_write_register(simulator, -1 /* all start at same PC */, + &entry_point, "pc", cooked_transfer) > 0); return SIM_RC_OK; } @@ -227,13 +197,13 @@ sim_stop_reason (SIM_DESC sd, enum sim_stop *reason, int *sigrc) case was_continuing: *reason = sim_stopped; if (status.signal == 0) - *sigrc = SIGTRAP; + *sigrc = GDB_SIGNAL_TRAP; else *sigrc = status.signal; break; case was_trap: *reason = sim_stopped; - *sigrc = SIGTRAP; + *sigrc = GDB_SIGNAL_TRAP; break; case was_exited: *reason = sim_exited; @@ -277,7 +247,7 @@ sim_resume (SIM_DESC sd, int step, int siggnal) } void -sim_do_command (SIM_DESC sd, char *cmd) +sim_do_command (SIM_DESC sd, const char *cmd) { TRACE(trace_gdb, ("sim_do_commands(cmd=%s) called\n", cmd ? cmd : "(null)")); @@ -288,6 +258,26 @@ sim_do_command (SIM_DESC sd, char *cmd) } } +char ** +sim_complete_command (SIM_DESC sd, const char *text, const char *word) +{ + return NULL; +} + +/* Polling, if required */ + +void +sim_io_poll_quit (void) +{ + if (callbacks->poll_quit != NULL && poll_quit_count-- < 0) + { + poll_quit_count = POLL_QUIT_INTERVAL; + if (callbacks->poll_quit (callbacks)) + psim_stop (simulator); + } +} + + /* Map simulator IO operations onto the corresponding GDB I/O functions. @@ -383,6 +373,16 @@ sim_io_flush_stdoutput(void) } } +void +sim_io_error (SIM_DESC sd, const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + callbacks->evprintf_filtered (callbacks, fmt, ap); + va_end(ap); + callbacks->error (callbacks, ""); +} + /****/ void * @@ -394,8 +394,3 @@ zalloc(long size) memset(memory, 0, size); return memory; } - -void zfree(void *data) -{ - free(NULL, data); -}