16726dd15b
and stack pointer during stepping, to speed things up. A. Changes to not select a frame until we need a selected frame: * blockframe.c (flush_cached_frames): Call select_frame (NULL, -1). * infrun.c (wait_for_inferior): Move call to select_frame back to normal_stop. This reverts a change of 13 Apr 94 (it says Jeff Law, but the change was my idea); the only reason for that change was so we could save and restore the selected frame in wait_for_inferior, and now that flush_cached frames clears the selected frame, that should work OK now. B. Changes to not create a current_frame until we need one: * blockframe.c (get_current_frame): If current_frame is NULL, try to create an innermost frame. * sparc-tdep.c (sparc_pop_frame), infcmd.c (run-stack_dummy), infrun.c (wait_for_inferior), thread.c (thread_switch), convex-tdep.c (set_thread_command), a29k-tdep.c (pop_frame), alpha-tdep.c (alpha_pop_frame), convex-xdep.c (core_file_command), h8300-tdep.c (h8300_pop_frame), h8500-tdep.c (h8300_pop_frame), hppa-tdep.c (hppa_pop_frame), i386-tdep.c (i386_pop_frame), i960-tdep.c (pop_frame), m68k-tdep.c (m68k_pop_frame), mips-tdep.c (mips_pop_frame), rs6000-tdep.c (push_dummy_frame, pop_dummy_frame, pop_frame), sh-tdep.c (pop_frame), config/arm/tm-arm.h (POP_FRAME), config/convex/tm-convex.h (POP_FRAME), config/gould/tm-pn.h (POP_FRAME), config/ns32k/tm-merlin.h (POP_FRAME), config/ns32k/tm-umax.h (POP_FRAME), config/tahoe/tm-tahoe.h (POP_FRAME), config/vax/tm-vax.h (POP_FRAME): Don't call create_new_frame. * corelow.c (core_open), altos-xdep.c (core_file_command), arm-xdep.c (core_file_command), gould-xdep.c (core_file_command), m3-nat.c (select_thread), sun386-nat.c (core_file_command), umax-xdep.c (core_file_command): Don't call create_new_frame; do call flush_cached_frames. * blockframe.c (reinit_frame_cache): Don't call create_new_frame or select_frame. C. Changes to get rid of stop_frame_address and instead only fetch the frame pointer when we need it. * breakpoint.c (bpstat_stop_status): Remove argument frame_address; use FRAME_FP (get_current_frame ()). * infrun.c (wait_for_inferior): Don't pass frame pointer to bpstat_stop_status. * infrun.c (wait_for_inferior): Use FRAME_FP (get_current_frame ()) instead of stop_frame_address. * infrun.c (save_inferior_status, restore_inferior_status), inferior.h (struct inferior_status): Don't save and restore stop_frame_address. * inferior.h, infcmd.c, thread.c (thread_switch), m3-nat.c (select_thread): Remove stop_frame_address and uses thereof. D. Same thing for the stack pointer. * infrun.c (wait_for_inferior): Remove stop_sp and replace uses thereof with read_sp (). E. Change to eliminate one nasty little spot where we were wanting to know the frame pointer from before the current step (idea from GDB 3.5, which saved my ass, because my other ideas of how to fix it were very baroque). * infrun.c: Remove prev_frame_address. * infrun.c (wait_for_inferior, step_over_function): Use step_frame_address instead of prev_frame_address. F. Same basic idea for the stack pointer. * inferior.h, infcmd.c: New variable step_sp. * infcmd.c (step_1, until_next_command): Set it. * infrun.c: Remove prev_sp and replace uses by step_sp. * infrun.c (wait_for_inferior): If we get out of the step range, then set step_sp to the current stack pointer before we start going again.
133 lines
3.5 KiB
C
133 lines
3.5 KiB
C
/* umax host stuff.
|
|
Copyright (C) 1986, 1987, 1989, 1991 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
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
|
|
(at your option) any later version.
|
|
|
|
This program 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., 675 Mass Ave, Cambridge, MA 02139, USA. */
|
|
|
|
#include "defs.h"
|
|
#include "frame.h"
|
|
#include "inferior.h"
|
|
|
|
#include <sys/param.h>
|
|
#include <sys/dir.h>
|
|
#include <signal.h>
|
|
#include <sys/ioctl.h>
|
|
#include <fcntl.h>
|
|
|
|
#include "gdbcore.h"
|
|
#include <sys/ptrace.h>
|
|
#define PTRACE_ATTACH PT_ATTACH
|
|
#define PTRACE_DETACH PT_FREEPROC
|
|
|
|
#include <sys/file.h>
|
|
#include <sys/stat.h>
|
|
|
|
/* Work with core dump and executable files, for GDB.
|
|
This code would be in core.c if it weren't machine-dependent. */
|
|
|
|
void
|
|
core_file_command (filename, from_tty)
|
|
char *filename;
|
|
int from_tty;
|
|
{
|
|
int val;
|
|
extern char registers[];
|
|
|
|
/* Discard all vestiges of any previous core file
|
|
and mark data and stack spaces as empty. */
|
|
|
|
if (corefile)
|
|
free (corefile);
|
|
corefile = 0;
|
|
|
|
if (corechan >= 0)
|
|
close (corechan);
|
|
corechan = -1;
|
|
|
|
data_start = 0;
|
|
data_end = 0;
|
|
stack_start = STACK_END_ADDR;
|
|
stack_end = STACK_END_ADDR;
|
|
|
|
/* Now, if a new core file was specified, open it and digest it. */
|
|
|
|
if (filename)
|
|
{
|
|
filename = tilde_expand (filename);
|
|
make_cleanup (free, filename);
|
|
|
|
if (have_inferior_p ())
|
|
error ("To look at a core file, you must kill the program with \"kill\".");
|
|
corechan = open (filename, O_RDONLY, 0);
|
|
if (corechan < 0)
|
|
perror_with_name (filename);
|
|
/* 4.2-style (and perhaps also sysV-style) core dump file. */
|
|
{
|
|
struct ptrace_user u;
|
|
int reg_offset;
|
|
|
|
val = myread (corechan, &u, sizeof u);
|
|
if (val < 0)
|
|
perror_with_name (filename);
|
|
data_start = exec_data_start;
|
|
|
|
data_end = data_start + u.pt_dsize;
|
|
stack_start = stack_end - u.pt_ssize;
|
|
data_offset = sizeof u;
|
|
stack_offset = data_offset + u.pt_dsize;
|
|
reg_offset = 0;
|
|
|
|
memcpy (&core_aouthdr, &u.pt_aouthdr, sizeof (AOUTHDR));
|
|
printf_unfiltered ("Core file is from \"%s\".\n", u.pt_comm);
|
|
if (u.pt_signal > 0)
|
|
printf_unfiltered ("Program terminated with signal %d, %s.\n",
|
|
u.pt_signal, safe_strsignal (u.pt_signal));
|
|
|
|
/* Read the register values out of the core file and store
|
|
them where `read_register' will find them. */
|
|
|
|
{
|
|
register int regno;
|
|
|
|
for (regno = 0; regno < NUM_REGS; regno++)
|
|
{
|
|
char buf[MAX_REGISTER_RAW_SIZE];
|
|
|
|
val = lseek (corechan, register_addr (regno, reg_offset), 0);
|
|
if (val < 0)
|
|
perror_with_name (filename);
|
|
|
|
val = myread (corechan, buf, sizeof buf);
|
|
if (val < 0)
|
|
perror_with_name (filename);
|
|
supply_register (regno, buf);
|
|
}
|
|
}
|
|
}
|
|
if (filename[0] == '/')
|
|
corefile = savestring (filename, strlen (filename));
|
|
else
|
|
{
|
|
corefile = concat (current_directory, "/", filename, NULL);
|
|
}
|
|
|
|
flush_cached_frames ();
|
|
select_frame (get_current_frame (), 0);
|
|
validate_files ();
|
|
}
|
|
else if (from_tty)
|
|
printf_unfiltered ("No core file now.\n");
|
|
}
|