From a40e905aecd38b33573958d9c0685b81c678726d Mon Sep 17 00:00:00 2001
From: Michael Munday <munday@ca.ibm.com>
Date: Mon, 16 Jan 2017 16:28:21 -0500
Subject: [PATCH] Implement return hooks.

---
 src/vm_s390x.dasc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/vm_s390x.dasc b/src/vm_s390x.dasc
index e43e7745..6b86c032 100644
--- a/src/vm_s390x.dasc
+++ b/src/vm_s390x.dasc
@@ -2040,8 +2040,10 @@ static void build_subroutines(BuildCtx *ctx)
   |  stg r0, 0
   |
   |->vm_rethook:			// Dispatch target for return hooks.
-  |  stg r0, 0
-  |  stg r0, 0
+  |  llgc RD, (DISPATCH_GL(hookmask))(DISPATCH)
+  |  tmll RD, HOOK_ACTIVE
+  |  jne >5
+  |  j >1
   |
   |->vm_inshook:			// Dispatch target for instr/line hooks.
   |  llgc RD, (DISPATCH_GL(hookmask))(DISPATCH)