From 621c83642d17cf523c20f55f2ed945a7ec95ea6a Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 12 Nov 2010 20:49:43 +0000 Subject: gdb * varobj.c (value_get_print_value): Rearrange. Pass stream to apply_varobj_pretty_printer. * c-lang.c: Include exceptions.h. (c_get_string): Throw MEMORY_ERROR when appropriate. * python/py-prettyprint.c (enum string_repr_result): New. (print_stack_unless_memory_error): New function. (print_string_repr): Change return type. Use print_stack_unless_memory_error. (print_children): Use print_stack_unless_memory_error. (apply_val_pretty_printer): Update. Don't print children if string representation threw an exception. (apply_varobj_pretty_printer): Add 'stream' argument. Use print_stack_unless_memory_error. * python/python.c (gdbpy_gdb_error, gdbpy_gdb_memory_error): New globals. (_initialize_python): Initialize them. * python/python-internal.h (GDB_PY_HANDLE_EXCEPTION): Use gdbpy_convert_exception. (GDB_PY_SET_HANDLE_EXCEPTION): Likewise. (gdbpy_gdb_error, gdbpy_gdb_memory_error): Declare. (gdbpy_convert_exception): Declare. (apply_varobj_pretty_printer): Update. * python/py-utils.c (gdbpy_convert_exception): New function. gdb/doc * gdb.texinfo (Basic Python): Update. Add xref. (Exception Handling): Document new exception classes. (Types In Python): Update. (Frames In Python): Update. gdb/testsuite * gdb.python/py-prettyprint.c (main): Add new 'ns2' local. * gdb.python/py-prettyprint.exp (run_lang_tests): Add test for MemoryError. * gdb.python/python.exp (gdb_py_test_multiple): Update exception type. * gdb.python/py-value.exp (test_value_in_inferior): Add test for MemoryError. (test_subscript_regression): Update exception type. --- gdb/python/py-utils.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gdb/python/py-utils.c') diff --git a/gdb/python/py-utils.c b/gdb/python/py-utils.c index 90609fa..2f0aac4 100644 --- a/gdb/python/py-utils.c +++ b/gdb/python/py-utils.c @@ -274,6 +274,25 @@ gdbpy_exception_to_string (PyObject *ptype, PyObject *pvalue) return str; } +/* Convert a GDB exception to the appropriate Python exception. + + This sets the Python error indicator, and returns NULL. */ + +PyObject * +gdbpy_convert_exception (struct gdb_exception exception) +{ + PyObject *exc_class; + + if (exception.reason == RETURN_QUIT) + exc_class = PyExc_KeyboardInterrupt; + else if (exception.error == MEMORY_ERROR) + exc_class = gdbpy_gdb_memory_error; + else + exc_class = gdbpy_gdb_error; + + return PyErr_Format (exc_class, "%s", exception.message); +} + /* Converts OBJ to a CORE_ADDR value. Returns 1 on success or 0 on failure, with a Python exception set. This -- cgit v1.1