From 44cd79e4b194f2aa8d7ba0718ea0e3361706e9cc Mon Sep 17 00:00:00 2001 From: David Edelsohn Date: Thu, 17 Apr 1997 09:23:28 +0000 Subject: [PATCH] * remote-sim.c (gdbsim_load): Update call to sim_load. (gdbsim_create_inferior): No longer pass start_address to sim_create_inferior. (gdbsim_open): Pass endian indicator as arg. --- gdb/ChangeLog | 6 ++++++ gdb/remote-sim.c | 23 +++++++++++------------ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4091b58..87f6030 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +Thu Apr 17 02:20:23 1997 Doug Evans + + * remote-sim.c (gdbsim_load): Update call to sim_load. + (gdbsim_create_inferior): No longer pass start_address to + sim_create_inferior. + Tue Apr 15 15:31:09 1997 Stan Shebs * remote.c (get_offsets): Don't use scanf for interpreting diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c index 4655658..51cc66a 100644 --- a/gdb/remote-sim.c +++ b/gdb/remote-sim.c @@ -405,11 +405,13 @@ gdbsim_load (prog, fromtty) inferior_pid = 0; - /* This must be done before calling gr_load_image. */ - program_loaded = 1; + /* FIXME: We will print two messages on error. + Need error to either not print anything if passed NULL or need + another routine that doesn't take any arguments. */ + if (sim_load (gdbsim_desc, prog, NULL, fromtty) == SIM_RC_FAIL) + error ("unable to load program"); - if (sim_load (gdbsim_desc, prog, fromtty) != 0) - generic_load (prog, fromtty); + program_loaded = 1; } @@ -455,7 +457,7 @@ gdbsim_create_inferior (exec_file, args, env) strcat (arg_buf, args); argv = buildargv (arg_buf); make_cleanup (freeargv, (char *) argv); - sim_create_inferior (gdbsim_desc, entry_pt, argv, env); + sim_create_inferior (gdbsim_desc, argv, env); inferior_pid = 42; insert_breakpoints (); /* Needed to get correct instruction in cache */ @@ -490,14 +492,11 @@ gdbsim_open (args, from_tty) init_callbacks (); - len = 7 + 1 + (args ? strlen (args) : 0) + 1 + /*slop*/ 10; + len = 7 + 1 + (args ? strlen (args) : 0) + 50; arg_buf = (char *) alloca (len); - strcpy (arg_buf, "gdbsim"); - if (args) - { - strcat (arg_buf, " "); - strcat (arg_buf, args); - } + sprintf (arg_buf, "gdbsim%s%s -E %s", + args ? " " : "", args ? args : "", + TARGET_BYTE_ORDER == BIG_ENDIAN ? "big" : "little"); argv = buildargv (arg_buf); if (argv == NULL) error ("Insufficient memory available to allocate simulator arg list."); -- 2.7.4