Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

Use gdbpy_enter in gdbpy_before_prompt_hook

Browse Source 
Change gdbpy_before_prompt_hook to use gdbpy_enter and gdbpy_ref.
This also rearranges the function a tiny bit to make it more clear.

2017-01-10  Tom Tromey  <tom@tromey.com>

	* python/python.c (gdbpy_before_prompt_hook): Use gdbpy_enter,
	gdbpy_ref.
This commit is contained in:
Tom Tromey
2016-11-08 15:13:49 -07:00
parent e9f0c3639f
commit a88b13c7e3
2 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@@ -1,3 +1,8 @@
2017-01-10 Tom Tromey <tom@tromey.com>
* python/python.c (gdbpy_before_prompt_hook): Use gdbpy_enter,
gdbpy_ref.
2017-01-10 Tom Tromey <tom@tromey.com> 2017-01-10 Tom Tromey <tom@tromey.com>
* python/py-prettyprint.c (gdbpy_apply_val_pretty_printer): Use * python/py-prettyprint.c (gdbpy_apply_val_pretty_printer): Use

76
gdb/python/python.c
View File

@@ -1005,76 +1005,70 @@ static enum ext_lang_rc
gdbpy_before_prompt_hook (const struct extension_language_defn *extlang, gdbpy_before_prompt_hook (const struct extension_language_defn *extlang,
const char *current_gdb_prompt) const char *current_gdb_prompt)
{ {
struct cleanup *cleanup;
gdb::unique_xmalloc_ptr<char> prompt;
if (!gdb_python_initialized) if (!gdb_python_initialized)
return EXT_LANG_RC_NOP; return EXT_LANG_RC_NOP;
cleanup = ensure_python_env (get_current_arch (), current_language); gdbpy_enter enter_py (get_current_arch (), current_language);
if (gdb_python_module if (gdb_python_module
&& PyObject_HasAttrString (gdb_python_module, "prompt_hook")) && PyObject_HasAttrString (gdb_python_module, "prompt_hook"))
{ {
PyObject *hook; gdbpy_ref hook (PyObject_GetAttrString (gdb_python_module,
"prompt_hook"));
hook = PyObject_GetAttrString (gdb_python_module, "prompt_hook");
if (hook == NULL) if (hook == NULL)
goto fail;
make_cleanup_py_decref (hook);
if (PyCallable_Check (hook))
{ {
PyObject *result; gdbpy_print_stack ();
PyObject *current_prompt; return EXT_LANG_RC_ERROR;
}
current_prompt = PyString_FromString (current_gdb_prompt); if (PyCallable_Check (hook.get ()))
{
gdbpy_ref current_prompt (PyString_FromString (current_gdb_prompt));
if (current_prompt == NULL) if (current_prompt == NULL)
goto fail; {
gdbpy_print_stack ();
result = PyObject_CallFunctionObjArgs (hook, current_prompt, NULL); return EXT_LANG_RC_ERROR;
}
Py_DECREF (current_prompt);
gdbpy_ref result (PyObject_CallFunctionObjArgs (hook.get (),
current_prompt.get (),
NULL));
if (result == NULL) if (result == NULL)
goto fail; {
gdbpy_print_stack ();
make_cleanup_py_decref (result); return EXT_LANG_RC_ERROR;
}
/* Return type should be None, or a String. If it is None, /* Return type should be None, or a String. If it is None,
fall through, we will not set a prompt. If it is a fall through, we will not set a prompt. If it is a
string, set PROMPT. Anything else, set an exception. */ string, set PROMPT. Anything else, set an exception. */
if (result != Py_None && ! PyString_Check (result)) if (result != Py_None && ! PyString_Check (result.get ()))
{ {
PyErr_Format (PyExc_RuntimeError, PyErr_Format (PyExc_RuntimeError,
_("Return from prompt_hook must " \ _("Return from prompt_hook must " \
"be either a Python string, or None")); "be either a Python string, or None"));
goto fail; gdbpy_print_stack ();
return EXT_LANG_RC_ERROR;
} }
if (result != Py_None) if (result != Py_None)
{ {
prompt = python_string_to_host_string (result); gdb::unique_xmalloc_ptr<char>
prompt (python_string_to_host_string (result.get ()));
if (prompt == NULL) if (prompt == NULL)
goto fail; {
}
}
}
/* If a prompt has been set, PROMPT will not be NULL. If it is
NULL, do not set the prompt. */
if (prompt != NULL)
set_prompt (prompt.get ());
do_cleanups (cleanup);
return prompt != NULL ? EXT_LANG_RC_OK : EXT_LANG_RC_NOP;
fail:
gdbpy_print_stack (); gdbpy_print_stack ();
do_cleanups (cleanup);
return EXT_LANG_RC_ERROR; return EXT_LANG_RC_ERROR;
}
set_prompt (prompt.get ());
return EXT_LANG_RC_OK;
}
}
}
return EXT_LANG_RC_NOP;
} }