From 8a4fa786dd262e0f93c6620f90c32ac1427b4b17 Mon Sep 17 00:00:00 2001
From: Peter Rugg <pdr32@cam.ac.uk>
Date: Tue, 21 Apr 2020 13:52:33 +0100
Subject: [PATCH] Add CToPtr special case

---
 src_Core/RISCY_OOO/procs/lib/Exec.bsv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src_Core/RISCY_OOO/procs/lib/Exec.bsv b/src_Core/RISCY_OOO/procs/lib/Exec.bsv
index 0b770b9..7681a34 100755
--- a/src_Core/RISCY_OOO/procs/lib/Exec.bsv
+++ b/src_Core/RISCY_OOO/procs/lib/Exec.bsv
@@ -206,7 +206,7 @@ function Data capInspect(CapPipe a, CapPipe b, CapInspectFunc func);
                tagged GetType                :
                    signExtend(getType(a));
                tagged ToPtr                  :
-                   (getAddr(a) - getBase(b));
+                   (isValidCap(a) ? (getAddr(a) - getBase(b)) : 0);
                default: ?;
         endcase);
     return res;