c765fdb902
defs.h includes utils.h, and utils.h includes exceptions.h. All GDB .c files include defs.h as their first line, so no file other than utils.h needs to include exceptions.h. This commit removes all such inclusions. gdb/ChangeLog: * ada-lang.c: Do not include exceptions.h. * ada-valprint.c: Likewise. * amd64-tdep.c: Likewise. * auto-load.c: Likewise. * block.c: Likewise. * break-catch-throw.c: Likewise. * breakpoint.c: Likewise. * btrace.c: Likewise. * c-lang.c: Likewise. * cli/cli-cmds.c: Likewise. * cli/cli-interp.c: Likewise. * cli/cli-script.c: Likewise. * completer.c: Likewise. * corefile.c: Likewise. * corelow.c: Likewise. * cp-abi.c: Likewise. * cp-support.c: Likewise. * cp-valprint.c: Likewise. * darwin-nat.c: Likewise. * dwarf2-frame-tailcall.c: Likewise. * dwarf2-frame.c: Likewise. * dwarf2loc.c: Likewise. * dwarf2read.c: Likewise. * eval.c: Likewise. * event-loop.c: Likewise. * event-top.c: Likewise. * f-valprint.c: Likewise. * frame-unwind.c: Likewise. * frame.c: Likewise. * gdbtypes.c: Likewise. * gnu-v2-abi.c: Likewise. * gnu-v3-abi.c: Likewise. * guile/scm-auto-load.c: Likewise. * guile/scm-breakpoint.c: Likewise. * guile/scm-cmd.c: Likewise. * guile/scm-frame.c: Likewise. * guile/scm-lazy-string.c: Likewise. * guile/scm-param.c: Likewise. * guile/scm-symbol.c: Likewise. * guile/scm-type.c: Likewise. * hppa-hpux-tdep.c: Likewise. * i386-tdep.c: Likewise. * inf-loop.c: Likewise. * infcall.c: Likewise. * infcmd.c: Likewise. * infrun.c: Likewise. * interps.c: Likewise. * interps.h: Likewise. * jit.c: Likewise. * linespec.c: Likewise. * linux-nat.c: Likewise. * linux-thread-db.c: Likewise. * m32r-rom.c: Likewise. * main.c: Likewise. * memory-map.c: Likewise. * mi/mi-cmd-break.c: Likewise. * mi/mi-cmd-stack.c: Likewise. * mi/mi-interp.c: Likewise. * mi/mi-main.c: Likewise. * monitor.c: Likewise. * nto-procfs.c: Likewise. * objc-lang.c: Likewise. * p-valprint.c: Likewise. * parse.c: Likewise. * ppc-linux-tdep.c: Likewise. * printcmd.c: Likewise. * probe.c: Likewise. * python/py-auto-load.c: Likewise. * python/py-breakpoint.c: Likewise. * python/py-cmd.c: Likewise. * python/py-finishbreakpoint.c: Likewise. * python/py-frame.c: Likewise. * python/py-framefilter.c: Likewise. * python/py-function.c: Likewise. * python/py-gdb-readline.c: Likewise. * python/py-inferior.c: Likewise. * python/py-infthread.c: Likewise. * python/py-lazy-string.c: Likewise. * python/py-linetable.c: Likewise. * python/py-param.c: Likewise. * python/py-prettyprint.c: Likewise. * python/py-symbol.c: Likewise. * python/py-type.c: Likewise. * python/py-value.c: Likewise. * python/python-internal.h: Likewise. * python/python.c: Likewise. * record-btrace.c: Likewise. * record-full.c: Likewise. * regcache.c: Likewise. * remote-fileio.c: Likewise. * remote-mips.c: Likewise. * remote.c: Likewise. * rs6000-aix-tdep.c: Likewise. * rs6000-nat.c: Likewise. * skip.c: Likewise. * solib-darwin.c: Likewise. * solib-dsbt.c: Likewise. * solib-frv.c: Likewise. * solib-ia64-hpux.c: Likewise. * solib-spu.c: Likewise. * solib-svr4.c: Likewise. * solib.c: Likewise. * spu-tdep.c: Likewise. * stack.c: Likewise. * stap-probe.c: Likewise. * symfile-mem.c: Likewise. * symmisc.c: Likewise. * target.c: Likewise. * thread.c: Likewise. * top.c: Likewise. * tracepoint.c: Likewise. * tui/tui-interp.c: Likewise. * typeprint.c: Likewise. * utils.c: Likewise. * valarith.c: Likewise. * valops.c: Likewise. * valprint.c: Likewise. * value.c: Likewise. * varobj.c: Likewise. * windows-nat.c: Likewise. * xml-support.c: Likewise.
107 lines
3.1 KiB
C
107 lines
3.1 KiB
C
/* Readline support for Python.
|
|
|
|
Copyright (C) 2012-2014 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 3 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, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include "python-internal.h"
|
|
#include "top.h"
|
|
#include "cli/cli-utils.h"
|
|
/* Readline function suitable for PyOS_ReadlineFunctionPointer, which
|
|
is used for Python's interactive parser and raw_input. In both
|
|
cases, sys_stdin and sys_stdout are always stdin and stdout
|
|
respectively, as far as I can tell; they are ignored and
|
|
command_line_input is used instead. */
|
|
|
|
static char *
|
|
gdbpy_readline_wrapper (FILE *sys_stdin, FILE *sys_stdout,
|
|
char *prompt)
|
|
{
|
|
int n;
|
|
char *p = NULL, *q;
|
|
volatile struct gdb_exception except;
|
|
|
|
TRY_CATCH (except, RETURN_MASK_ALL)
|
|
p = command_line_input (prompt, 0, "python");
|
|
|
|
/* Detect user interrupt (Ctrl-C). */
|
|
if (except.reason == RETURN_QUIT)
|
|
return NULL;
|
|
|
|
/* Handle errors by raising Python exceptions. */
|
|
if (except.reason < 0)
|
|
{
|
|
/* The thread state is nulled during gdbpy_readline_wrapper,
|
|
with the original value saved in the following undocumented
|
|
variable (see Python's Parser/myreadline.c and
|
|
Modules/readline.c). */
|
|
PyEval_RestoreThread (_PyOS_ReadlineTState);
|
|
gdbpy_convert_exception (except);
|
|
PyEval_SaveThread ();
|
|
return NULL;
|
|
}
|
|
|
|
/* Detect EOF (Ctrl-D). */
|
|
if (p == NULL)
|
|
{
|
|
q = PyMem_Malloc (1);
|
|
if (q != NULL)
|
|
q[0] = '\0';
|
|
return q;
|
|
}
|
|
|
|
n = strlen (p);
|
|
|
|
/* Copy the line to Python and return. */
|
|
q = PyMem_Malloc (n + 2);
|
|
if (q != NULL)
|
|
{
|
|
strncpy (q, p, n);
|
|
q[n] = '\n';
|
|
q[n + 1] = '\0';
|
|
}
|
|
return q;
|
|
}
|
|
|
|
/* Initialize Python readline support. */
|
|
|
|
void
|
|
gdbpy_initialize_gdb_readline (void)
|
|
{
|
|
/* Python's readline module conflicts with GDB's use of readline
|
|
since readline is not reentrant. Ideally, a reentrant wrapper to
|
|
GDB's readline should be implemented to replace Python's readline
|
|
and prevent conflicts. For now, this file implements a
|
|
sys.meta_path finder that simply fails to import the readline
|
|
module. */
|
|
if (PyRun_SimpleString ("\
|
|
import sys\n\
|
|
\n\
|
|
class GdbRemoveReadlineFinder:\n\
|
|
def find_module(self, fullname, path=None):\n\
|
|
if fullname == 'readline' and path is None:\n\
|
|
return self\n\
|
|
return None\n\
|
|
\n\
|
|
def load_module(self, fullname):\n\
|
|
raise ImportError('readline module disabled under GDB')\n\
|
|
\n\
|
|
sys.meta_path.append(GdbRemoveReadlineFinder())\n\
|
|
") == 0)
|
|
PyOS_ReadlineFunctionPointer = gdbpy_readline_wrapper;
|
|
}
|
|
|