mirror of
https://github.com/Mercury-Language/mercury.git
synced 2025-12-12 20:34:19 +00:00
2bef47ce85
Estimated hours taken: 20
Branches: main (for now, after more testing, on release branch too)
Extend the information we record about procedures when debugging is enabled
to include information about the tabling transformation, if the procedure
in question is tabled. This is useful to developers in debugging the tabling
mechanism, and can be useful to general users by helping them understand the
space (and hence time) costs of tabling.
Add a new mdb command "table" that uses this information to print
programmer-selected subsets of the tables of a tabled procedure.
compiler/hlds_pred.m:
Generalize the existing field in procedures that used to hold
information about I/O tabling to contain information about tabling
in general, including forms other than I/O tabling.
compiler/continuation_info.m:
compiler/code_gen.m:
compiler/stack_layout.m:
Conform to the changes in hlds_pred.m.
compiler/layout.m:
Provide Mercury parallels for the new data structures in
mercury_stack_layout.h.
compiler/layout_out.m:
Generate the new data structures in mercury_stack_layout.h.
compiler/table_gen.m:
Generate the new data structures in hlds_pred.m.
compiler/llds_common.m:
compiler/opt_debug.m:
Conform to the changes in layout.m
compiler/llds_out.m:
Abstract out existing code into a new procedure to make it available
to layout_out.m.
Make tabling pointer variables their natural type.
compiler/modules.m:
Fix an old bug: implicitly import table_builtin.m in .mm grades.
doc/mdb_categories:
doc/user_guide.texi:
Document the new mdb command "table".
runtime/mercury_types.h:
Move some type definitions here from mercury_tabling.h and
mercury_stack_layout.h. This was necessary to avoid problems with
circular #includes, in which a.h #includes b.h to get access to a
definition, but b.h #includes a.h, which is prevented by the macro
guarding against duplicate definition, which causes syntax errors
in the rest of b.h because the rest of b.h depends on typedefs in
a.h that occur in a.h *after* the #include of b.h.
runtime/mercury_label.h:
Adjust the list of #includes after the change to mercury_types.h.
runtime/mercury_stack_layout.h:
Extend the debugging data structures with constructs that describe
the call tables, answer tables and answer blocks of tabled procedures.
Delete typedefs that are now in mercury_types.h.
runtime/mercury_tabling.[ch]:
Add new functions to allow lookups without insertions in hash tables
containing ints, floats and strings.
Add new functions to return the entire contents of these hash tables.
Change to four-space indentation where this wasn't done previously.
runtime/mercury_grade.h:
Increment the binary compatbility version number, partially to
account for the change to mercury_stack_layout.h in this diff, but
mostly to account for all the other diffs to mercury_stack_layout.h
since the last released version.
trace/mercury_trace_tables.[ch]:
Rename MR_print_proc_id_for_debugger as MR_print_proc_id_and_nl,
since this better describes what the function does.
trace/mercury_trace_util.[ch]:
Add a new function MR_trace_is_integer that reads in signed integers.
Rename MR_trace_is_number as MR_trace_is_natural_number, since the
former would now be ambiguous.
Add a new function MR_trace_is_float that reads in floating point
values.
library/string.m:
Document that MR_trace_is_float uses the same logic as
MR_trace_is_float.
trace/mercury_trace_browse.c:
trace/mercury_trace_vars.c:
Update calls to MR_trace_is_number.
trace/mercury_trace_internal.c:
Implement the new mdb command "table".
Update calls to MR_trace_is_number and to
MR_print_proc_id_for_debugger.
tests/debugger/print_table.{m,inp,exp}:
New test case to test the new mdb command.
tests/debugger/Mmakefile:
Enable the new test case.
Disable the sensitive test cases in .mm grades.
tests/debugger/completion.exp:
Update the expected output to include the new mdb command.
tests/debugger/mdb_command_test.inp:
Update this automatically generated file to include the new mdb
command.
95 lines
3.1 KiB
C
95 lines
3.1 KiB
C
/*
|
|
** Copyright (C) 1998,2000-2002 The University of Melbourne.
|
|
** This file may only be copied under the terms of the GNU Library General
|
|
** Public License - see the file COPYING.LIB in the Mercury distribution.
|
|
*/
|
|
|
|
/*
|
|
** This module provides utility functions for the debugger.
|
|
**
|
|
** This header files defines macros for dealing with registers.
|
|
** These macros assume, and enforce, the conventions described
|
|
** in trace/README.
|
|
*/
|
|
|
|
#ifndef MERCURY_TRACE_UTIL_H
|
|
#define MERCURY_TRACE_UTIL_H
|
|
|
|
#include "mercury_std.h" /* for MR_bool */
|
|
#include "mercury_float.h" /* for MR_Float */
|
|
#include "mercury_types.h" /* for MR_Word etc */
|
|
#include "mercury_library_types.h" /* for MercuryFile */
|
|
#include <stdio.h> /* for FILE */
|
|
|
|
/*
|
|
** When using the heap pointer, we need to restore it, in case it is
|
|
** transient.
|
|
*/
|
|
#define MR_TRACE_USE_HP(STATEMENTS) do { \
|
|
MR_restore_transient_registers(); \
|
|
STATEMENTS; \
|
|
MR_save_transient_registers(); \
|
|
} while (0)
|
|
|
|
/*
|
|
** When calling Mercury code defined using `pragma export', we need
|
|
** to call save_registers() and restore_registers() around it.
|
|
** That in turn needs to be preceded/followed by
|
|
** restore/save_transient_registers() if it is in a C function.
|
|
*/
|
|
|
|
#define MR_TRACE_CALL_MERCURY(STATEMENTS) do { \
|
|
MR_bool saved_io_enabled; \
|
|
\
|
|
saved_io_enabled = MR_io_tabling_enabled; \
|
|
MR_io_tabling_enabled = MR_FALSE; \
|
|
MR_restore_transient_registers(); \
|
|
MR_save_registers(); \
|
|
STATEMENTS; \
|
|
MR_restore_registers(); \
|
|
MR_save_transient_registers(); \
|
|
MR_io_tabling_enabled = saved_io_enabled; \
|
|
} while (0)
|
|
|
|
/*
|
|
** MR_c_file_to_mercury_file is used to convert MR_mdb_in and MR_mdb_out
|
|
** into Mercury streams suitable for use by the browser.
|
|
*/
|
|
extern void MR_c_file_to_mercury_file(FILE *c_file,
|
|
MercuryFile *mercury_file);
|
|
|
|
/*
|
|
** MR_trace_is_natural_number checks whether the given word contains a natural
|
|
** number, i.e. a sequence of digits. If yes, it puts the value of the number
|
|
** in *value and returns MR_TRUE, otherwise it returns MR_FALSE.
|
|
**
|
|
** MR_trace_is_integer is similar, but it also allows an initial minus sign
|
|
** to denote a negative number.
|
|
**
|
|
** MR_trace_is_float is similar again, but it also allows an optional
|
|
** fractional part.
|
|
**
|
|
** XXX None of these functions are robust if given numbers too large for their
|
|
** type. MR_trace_is_integer doesn't even work for MININT.
|
|
*/
|
|
|
|
extern MR_bool MR_trace_is_natural_number(const char *word, int *value);
|
|
|
|
extern MR_bool MR_trace_is_integer(const char *word, MR_Integer *value);
|
|
|
|
extern MR_bool MR_trace_is_float(const char *word, MR_Float *value);
|
|
|
|
/*
|
|
** These functions print the values of sets of Mercury abstract machine
|
|
** registers. Their main use is low level debugging, including debugging
|
|
** the debugger itself.
|
|
*/
|
|
|
|
extern void MR_print_stack_regs(FILE *fp, MR_Word *saved_regs);
|
|
extern void MR_print_heap_regs(FILE *fp, MR_Word *saved_regs);
|
|
extern void MR_print_tabling_regs(FILE *fp, MR_Word *saved_regs);
|
|
extern void MR_print_succip_reg(FILE *fp, MR_Word *saved_regs);
|
|
extern void MR_print_r_regs(FILE *fp, MR_Word *saved_regs);
|
|
|
|
#endif /* MERCURY_TRACE_UTIL_H */
|