mirror of
https://github.com/Mercury-Language/mercury.git
synced 2026-04-15 01:13:30 +00:00
05ef8e01fb
Rename mmc and mgnuc options that set this grade component to --c-debug-grade.
Let the options named --c-debug of both mmc and mgnuc enable C level debugging
of only the module being compiled.
runtime/mercury_grade.h:
Rename the .ll_debug grade component to .c_debug. Also rename the C macro
that controls the presence or absence of this grade component
from MR_LL_DEBUG to MR_C_DEBUG_GRADE.
runtime/mercury_conf_param.h:
runtime/mercury_debug.c:
runtime/mercury_debug.h:
runtime/mercury_engine.c:
runtime/mercury_label.c:
runtime/mercury_memory_zones.c:
runtime/mercury_memory_zones.h:
runtime/mercury_overflow.c:
runtime/mercury_std.h:
runtime/mercury_wrapper.c:
Rename the MR_LOWLEVEL_DEBUG macro to MR_DEBUG_THE_RUNTIME.
Previously, the name of this macro wrongly implied that it had
something to do with the old .ll_debug grade component, even though
- the MR_LOWLEVEL_DEBUG macro was designed to debug LLDS grades,
since only these existed when it was created, while
- the .ll_debug grade component (now .c_debug) is useful only for
MLDS grades targeting C.
compiler/options.m:
Rename the old confusingly named low_level_debug option to c_debug_grade.
Move it to the list of grade options, and fix its documentation, which
was completely wrong:
- code in compile_target_code.m treated it as being a synonym of
the .ll_debug (now .c_debug) grade component, while
- its (commented out) documentation here in options.m said it called for
the enabling of what is now MR_DEBUG_THE_RUNTIME.
compiler/compile_target_code.m:
Conform to the rename just above.
Define MR_C_DEBUG_GRADE instead of MR_LL_DEBUG if c_debug_grade is enabled.
Pass -g to the C compiler if either c_debug_grade or target_debug
is enabled.
Add an XXX about a missing safety check for an obsolete experimental
feature.
compiler/compute_grade.m:
When given a grade with a .c_debug grade component, set only the
c_debug_grade option; don't set the target_debug option, which is NOT
a grade option. The change to compile_target_code.m above handles the
only situation in which this implication was formerly required.
scripts/canonical_grade.sh-subr:
scripts/init_grade_options.sh-subr:
scripts/parse_grade_options.sh-subr:
Look for and process the .c_debug grade component instead of .ll_debug.
Use a sh variable named c_debug_grade to record its absence/presence.
Look for and process the --c-debug-grade grade-component option,
setting the same sh variable, c_debug_grade. (All grade components
can be set piecemeal using sh options to the scripts using these
subroutines.) This replaces the old, confusingly named option
--low-level-debug.
scripts/mgnuc.in:
scripts/mgnuc_file_opts.sh-subr:
Consistently use the sh variable c_debug to record the presence of
the (non-grade) --c-debug option to mgnuc, and the sh variable
c_debug_grade to record the presence of the .c_debug grade component.
Stop looking for and handling the --low-level-debug option, which
mgnuc used to document, even though this duplicated the same documentation
in init_grade_options.sh-subr, which mgnuc includes. The difference was
that init_grade_options.sh-subr meant it to represent the old .ll_debug
MLDS grade component, while mgnuc treated it as specifying what is now
MR_DEBUG_THE_RUNTIME for LLDS grades. It didn't help that two sh variables
with quite different semantics had names that differed only in an
underscore: LLDEBUG_OPTS vs LL_DEBUG_OPTS.
scripts/Mmakefile:
Add a missing dependency to force the rebuild of mgnuc after each update
of its sh subroutine mgnuc_file_ops.sh-subr.
doc/user_guide.texi:
Document the --c-debug-grade option of mmc. This option was not publicly
documented under its original misleading name (--low-level-debug), but
its documentation is now possible without contorted dancing around the
name.
Clarify the documentation of mgnuc's --c-debug option.
README.sanitizers:
configure.ac:
Conform to the rename of the grade component.
grade_lib/grade_spec.m:
grade_lib/grade_string.m:
grade_lib/grade_structure.m:
grade_lib/try_all_grade_structs.m:
Conform to the rename of the grade component .ll_debug to .c_debug.
Don't allow the .c_debug grade component in LLDS grades.
In grade_string.m, add some obvious implications of some grade components.
grade_lib/choose_grade.m:
grade_lib/grade_lib.m:
grade_lib/test_grades.m:
grade_lib/var_value_names.m:
Fix white space.
scripts/ml.in:
tools/lmc.in:
tools/test_mercury:
Conform to the change in compile_target_code.m to the naming of
Boehm gc library variants.
85 lines
2.3 KiB
C
85 lines
2.3 KiB
C
// vim: ts=4 sw=4 expandtab ft=c
|
|
|
|
// Copyright (C) 2014, 2016, 2018 The Mercury team
|
|
// This file is distributed under the terms specified in COPYING.LIB.
|
|
|
|
#include "mercury_imp.h"
|
|
#include "mercury_overflow.h"
|
|
#include "mercury_memory_zones.h" // for MR_MemoryZone
|
|
#include "mercury_debug.h" // for MR_print_zone() etc
|
|
#include "mercury_misc.h" // for MR_fatal_error()
|
|
|
|
#if !defined(MR_HIGHLEVEL_CODE)
|
|
void
|
|
MR_nondetstack_inclusion_check(MR_Word *maxfr,
|
|
const char *error, const char *where)
|
|
{
|
|
MR_MemoryZone *cur_zone;
|
|
MR_MemoryZones *prev_zones;
|
|
|
|
cur_zone = MR_CONTEXT(MR_ctxt_nondetstack_zone);
|
|
prev_zones = MR_CONTEXT(MR_ctxt_prev_nondetstack_zones);
|
|
while (MR_TRUE) {
|
|
if (MR_in_zone(maxfr, cur_zone)) {
|
|
if (maxfr > cur_zone->MR_zone_max) {
|
|
cur_zone->MR_zone_max = maxfr;
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
if (prev_zones == NULL) {
|
|
MR_fatal_zone_error(MR_OVERFLOW_ZONE_NONDETSTACK,
|
|
"MR_maxfr", maxfr, "nondetstack_zone",
|
|
MR_CONTEXT(MR_ctxt_nondetstack_zone),
|
|
MR_CONTEXT(MR_ctxt_prev_nondetstack_zones),
|
|
error, where);
|
|
}
|
|
|
|
cur_zone = prev_zones->MR_zones_head;
|
|
prev_zones = prev_zones->MR_zones_tail;
|
|
}
|
|
}
|
|
#endif // !MR_HIGHLEVEL_CODE
|
|
|
|
void
|
|
MR_fatal_zone_error(MR_OverflowZone ptr_kind,
|
|
const char *ptr_name, const void *ptr,
|
|
const char *zone_name,
|
|
const MR_MemoryZone *zone, const MR_MemoryZones *zones,
|
|
const char *error, const char *where)
|
|
{
|
|
#ifdef MR_DEBUG_THE_RUNTIME
|
|
fprintf(stderr, "fatal zone error\n%s: ", ptr_name);
|
|
switch (ptr_kind) {
|
|
|
|
case MR_OVERFLOW_ZONE_DETSTACK:
|
|
MR_print_detstackptr(stderr, ptr);
|
|
break;
|
|
|
|
case MR_OVERFLOW_ZONE_NONDETSTACK:
|
|
MR_print_nondetstackptr(stderr, ptr);
|
|
break;
|
|
|
|
case MR_OVERFLOW_ZONE_HEAP:
|
|
MR_print_heapptr(stderr, ptr);
|
|
break;
|
|
|
|
case MR_OVERFLOW_ZONE_OTHER:
|
|
default:
|
|
fprintf(stderr, "%p", ptr);
|
|
break;
|
|
}
|
|
|
|
fprintf(stderr, "\n%s: ", zone_name);
|
|
MR_print_zone(stderr, zone);
|
|
MR_print_zones(stderr, zones);
|
|
|
|
if (where != NULL) {
|
|
fprintf(stderr, "error occurred in %s\n", where);
|
|
}
|
|
#endif
|
|
|
|
MR_fatal_error("%s", error);
|
|
}
|