From 938261d46550d72719d5bd83ab3985ed6ddea604 Mon Sep 17 00:00:00 2001
From: Alexandre Joannou <aj443@cam.ac.uk>
Date: Tue, 8 Dec 2020 15:19:57 +0000
Subject: [PATCH] Reflect changes to CHERICap.bsv into CHERICapWrap.bsv
 forgotten in some past commit

---
 CHERICapWrap.bsv | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/CHERICapWrap.bsv b/CHERICapWrap.bsv
index dfb6aa8..af7073e 100644
--- a/CHERICapWrap.bsv
+++ b/CHERICapWrap.bsv
@@ -58,17 +58,9 @@ function Bit#(31) `W(getPerms) (`CAPTYPE cap) = getPerms(cap);
 (* noinline *)
 function `CAPTYPE `W(setPerms) (`CAPTYPE cap, Bit#(31) perms) = setPerms(cap, perms);
 (* noinline *)
-function Kind `W(getKind) (`CAPTYPE cap) = getKind(cap);
+function Kind#(OTypeW) `W(getKind) (`CAPTYPE cap) = getKind(cap);
 (* noinline *)
-function Bool `W(isSentry) (`CAPTYPE cap) = isSentry(cap);
-(* noinline *)
-function Bool `W(isSealedWithType) (`CAPTYPE cap) = isSealedWithType(cap);
-(* noinline *)
-function Bool `W(isSealed) (`CAPTYPE cap) = isSealed(cap);
-(* noinline *)
-function Bit#(OTypeW) `W(getType) (`CAPTYPE cap) = getType(cap);
-(* noinline *)
-function `CAPTYPE `W(setType) (`CAPTYPE cap, Bit#(OTypeW) otype) = setType(cap, otype);
+function `CAPTYPE `W(setKind) (`CAPTYPE cap, Kind#(OTypeW) kind) = setKind(cap, kind);
 (* noinline *)
 function Bit#(CapAddressW) `W(getAddr) (`CAPTYPE cap) = getAddr(cap);
 (* noinline *)