diff options
Diffstat (limited to 'src/tools/env.c')
| -rw-r--r-- | src/tools/env.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/tools/env.c b/src/tools/env.c index 2a8c40a7..9d84fd5c 100644 --- a/src/tools/env.c +++ b/src/tools/env.c @@ -698,8 +698,16 @@ void RecordEnvMappings(uintptr_t addr, size_t length, int fd) mapping = kh_value(mapping_entries, k); if(mapping && mapping->start>addr) { - dynarec_log(LOG_INFO, "Mapping %s (%s) adjusted start: %p from %p\n", fullname, lowercase_filename, (void*)addr, (void*)(mapping->start)); - mapping->start = addr; + dynarec_log(LOG_INFO, "Ignoring Mapping %s (%s) adjusted start: %p from %p\n", fullname, lowercase_filename, (void*)addr, (void*)(mapping->start)); + box_free(lowercase_filename); + return; + } + if(BOX64ENV(dynarec_log)) { + uintptr_t end; uintptr_t val; + if(rb_get_end_64(envmap, addr, &val, &end)) + if(end<addr+length) { + dynarec_log(LOG_INFO, "Enlarging Mapping %s (%s) %p-%p from %p\n", fullname, lowercase_filename, (void*)(mapping->start), (void*)(addr+length), (void*)end); + } } rb_set_64(envmap, addr, addr + length, (uint64_t)mapping); if(mapping->env) { |