From bb4f4ece27fb4cc3942c00fb48c2386ca2330cee Mon Sep 17 00:00:00 2001
From: lizzie <lizzie@eden-emu.dev>
Date: Thu, 7 May 2026 19:29:37 +0000
Subject: [PATCH] manaleg fixes for dynarmic common context

---
 externals/ffmpeg/CMakeLists.txt            | 3 ++-
 src/dynarmic/src/dynarmic/common/context.h | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt
index 2d85876ad2..7c53af18c2 100644
--- a/externals/ffmpeg/CMakeLists.txt
+++ b/externals/ffmpeg/CMakeLists.txt
@@ -168,7 +168,8 @@ if (PLATFORM_PS4)
         --extra-libs="${FFmpeg_CROSS_COMPILE_LIBS}"
     )
 elseif (PLATFORM_MANAGARM)
-    # Required for proper stuff
+    # Required for proper stuff, otherwise truncf and cosf won't get detected
+    list(APPEND FFmpeg_CROSS_COMPILE_LIBS -lm)
     list(APPEND FFmpeg_CROSS_COMPILE_FLAGS 
         --disable-pthreads
         --extra-libs="${FFmpeg_CROSS_COMPILE_LIBS}"
diff --git a/src/dynarmic/src/dynarmic/common/context.h b/src/dynarmic/src/dynarmic/common/context.h
index e849c9861b..61e5379300 100644
--- a/src/dynarmic/src/dynarmic/common/context.h
+++ b/src/dynarmic/src/dynarmic/common/context.h
@@ -121,6 +121,9 @@
 #    elif defined(__DragonFly__)
 #        define CTX_RIP (mctx.mc_rip)
 #        define CTX_RSP (mctx.mc_rsp)
+#    elif defined(__managarm__)
+#        define CTX_RIP (mctx.__pollution(gregs)[REG_RIP])
+#        define CTX_RSP (mctx.__pollution(gregs)[REG_RSP])
 #    else
 #        error "unknown platform"
 #    endif