Skip to content

[s390x] add in-process crash reporter for s390x #131796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkotas merged 2 commits into from
Aug 5, 2026
Merged

[s390x] add in-process crash reporter for s390x #131796

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e72b7de
Fixes #131535 for linux-s390x, #131604 introduced a crash
saitama951 Aug 4, 2026
1287fda
Apply suggestions from code review
saitama951 Aug 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/coreclr/debug/crashreport/inproccrashreporter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ static const char CRASHREPORT_ARCHITECTURE_NAME[] =
"riscv64";
#elif defined(TARGET_LOONGARCH64)
"loongarch64";
#elif defined(TARGET_S390X)
"s390x";
#elif defined(TARGET_POWERPC64)
"ppc64le";
#else
Comment thread
saitama951 marked this conversation as resolved.
#error "Unsupported arch"
#endif
Expand Down Expand Up @@ -1241,6 +1245,15 @@ CrashReportHelpers::WriteRegistersToJson(
#define CRASH_MCREG_SP(uc) (static_cast<uint64_t>((uc)->uc_mcontext.__gregs[2]))
#define CRASH_MCREG_FP(uc) (static_cast<uint64_t>((uc)->uc_mcontext.__gregs[8]))

#elif defined(TARGET_S390X)
#define CRASH_MCREG_PC(uc) (static_cast<uint64_t>((uc)->uc_mcontext.psw.addr))
#define CRASH_MCREG_SP(uc) (static_cast<uint64_t>((uc)->uc_mcontext.gregs[15]))
#define CRASH_MCREG_FP(uc) (static_cast<uint64_t>((uc)->uc_mcontext.gregs[11]))

#elif defined(TARGET_POWERPC64)
#define CRASH_MCREG_PC(uc) (static_cast<uint64_t>((uc)->uc_mcontext.gp_regs[32]))
#define CRASH_MCREG_SP(uc) (static_cast<uint64_t>((uc)->uc_mcontext.gp_regs[1]))
#define CRASH_MCREG_FP(uc) (static_cast<uint64_t>((uc)->uc_mcontext.gp_regs[31]))
#else
Comment thread
saitama951 marked this conversation as resolved.
#error "Unsupported arch"
#endif
Expand Down
Loading