sal/cppunittester/cppunittester.cxx | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit 93f9a747e0603ff3c38f44c43153f88e89d178c8
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Thu Apr 6 13:44:25 2023 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Tue Apr 11 12:06:42 2023 +0200
fix dbgutil build on win/aarch64 (print stack from cppunittester)
Change-Id: I632607599060e625bda3dabee627ae1ddd6bd709
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150102
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/sal/cppunittester/cppunittester.cxx
b/sal/cppunittester/cppunittester.cxx
index 8a9e184c431d..c859ee5e102f 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -503,6 +503,10 @@ static void printStack( PCONTEXT ctx )
stack.AddrPC.Offset = ctx->Rip;
stack.AddrStack.Offset = ctx->Rsp;
stack.AddrFrame.Offset = ctx->Rsp;
+#elif defined _M_ARM64
+ stack.AddrPC.Offset = ctx->Pc;
+ stack.AddrStack.Offset = ctx->Sp;
+ stack.AddrFrame.Offset = ctx->Fp;
#else
stack.AddrPC.Offset = ctx->Eip;
stack.AddrStack.Offset = ctx->Esp;
@@ -529,6 +533,8 @@ static void printStack( PCONTEXT ctx )
(
#ifdef _M_AMD64
IMAGE_FILE_MACHINE_AMD64,
+#elif defined _M_ARM64
+ IMAGE_FILE_MACHINE_ARM64,
#else
IMAGE_FILE_MACHINE_I386,
#endif
