From 1cf477d43a2b1f470d1b73b5ef5cc116108c9fe3 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Fri, 6 Sep 2019 09:42:23 -0400
Subject: [PATCH] Stack cont
---
common/src/GHC/Debug/Decode/Convert.hs | 2 +-
common/src/GHC/Debug/Types/Ptr.hs | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/common/src/GHC/Debug/Decode/Convert.hs b/common/src/GHC/Debug/Decode/Convert.hs
index eab16123..36af0701 100644
--- a/common/src/GHC/Debug/Decode/Convert.hs
+++ b/common/src/GHC/Debug/Decode/Convert.hs
@@ -32,7 +32,7 @@ convertClosure g =
GHC.MutVarClosure a1 a2 -> MutVarClosure a1 a2
GHC.BlockingQueueClosure a1 a2 a3 a4 a5 -> BlockingQueueClosure a1 a2 a3 a4 a5
GHC.TSOClosure a1 a2 -> TSOClosure a1 a2
- GHC.StackClosure a1 a2 a3 a4 a5 -> StackClosure a1 a2 a3 a4 a5
+ GHC.StackClosure a1 a2 a3 a4 a5 -> StackClosure a1 a2 a3 (StackCont a5 a4)
GHC.IntClosure a1 a2 -> IntClosure a1 a2
GHC.WordClosure a1 a2 -> WordClosure a1 a2
GHC.Int64Closure a1 a2 -> Int64Closure a1 a2
diff --git a/common/src/GHC/Debug/Types/Ptr.hs b/common/src/GHC/Debug/Types/Ptr.hs
index 6843339e..e66a05c5 100644
--- a/common/src/GHC/Debug/Types/Ptr.hs
+++ b/common/src/GHC/Debug/Types/Ptr.hs
@@ -58,7 +58,9 @@ newtype ClosurePtr = ClosurePtr Word64
instance Show ClosurePtr where
show (ClosurePtr p) = "0x" ++ showHex (fromBE64 p) ""
-data StackCont = StackCont RawStack deriving Show
+data StackCont = StackCont { stackContStack :: !RawStack
+ , stackContSp :: !Word64
+ } deriving Show
newtype StackPtr = StackPtr Word64
--
GitLab