Merge branch 'master' into master

This commit is contained in:
Elad Ashkenazi 2023-07-24 08:41:20 +03:00 committed by GitHub
commit 45023d298b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 455 additions and 219 deletions

View file

@ -1637,7 +1637,7 @@ bool handle_access_violation(u32 addr, bool is_writing, ucontext_t* context) noe
if (!g_tls_access_violation_recovered)
{
vm_log.notice("\n%s", dump_useful_thread_info());
vm_log.error("Access violation %s location 0x%x (%s)", is_writing ? "writing" : "reading", addr, (is_writing && vm::check_addr(addr)) ? "read-only memory" : "unmapped memory");
vm_log.error("[%s] Access violation %s location 0x%x (%s)", is_writing ? "writing" : "reading", cpu->get_name(), addr, (is_writing && vm::check_addr(addr)) ? "read-only memory" : "unmapped memory");
}
// TODO: