Skip to content
Snippets Groups Projects
Commit af701914 authored by Basile Desloges's avatar Basile Desloges
Browse files

[eacsl:runtime] Use address conversion specifier for the messages when validating the shadow layout

parent 82788932
No related branches found
No related tags found
No related merge requests found
...@@ -202,14 +202,14 @@ void validate_shadow_layout() { ...@@ -202,14 +202,14 @@ void validate_shadow_layout() {
uintptr_t *src = segments[i]; uintptr_t *src = segments[i];
const char *src_name = segment_names[i]; const char *src_name = segment_names[i];
DVASSERT(src[0] < src[1], DVASSERT(src[0] < src[1],
"Segment %s start is greater than segment end %lu < %lu\n", "Segment %s start is greater than segment end %a < %a\n",
src_name, src[0], src[1]); src_name, src[0], src[1]);
for (j = 0; j < num_segments; j++) { for (j = 0; j < num_segments; j++) {
if (i != j) { if (i != j) {
uintptr_t *dest = segments[j]; uintptr_t *dest = segments[j];
const char *dest_name = segment_names[j]; const char *dest_name = segment_names[j];
DVASSERT(src[1] < dest[0] || src[0] > dest[1], DVASSERT(src[1] < dest[0] || src[0] > dest[1],
"Segment %s [%lu, %lu] overlaps with segment %s [%lu, %lu]", "Segment %s [%a, %a] overlaps with segment %s [%a, %a]",
src_name, src[0], src[1], dest_name, dest[0], dest[1]); src_name, src[0], src[1], dest_name, dest[0], dest[1]);
} }
} }
...@@ -1043,7 +1043,7 @@ void print_shadows(uintptr_t addr, size_t size) { ...@@ -1043,7 +1043,7 @@ void print_shadows(uintptr_t addr, size_t size) {
} }
void print_memory_segment(struct memory_segment *p, char *lab, int off) { void print_memory_segment(struct memory_segment *p, char *lab, int off) {
DLOG(" %s: %lu MB [%lu, %lu]", lab, MB_SZ(p->size), p->start, p->end); DLOG(" %s: %lu MB [%a, %a]", lab, MB_SZ(p->size), p->start, p->end);
if (off) if (off)
DLOG("{ Offset: %ld }", p->shadow_offset); DLOG("{ Offset: %ld }", p->shadow_offset);
DLOG("\n"); DLOG("\n");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment