From f62e692e72d1626977be0e92f766bdeed305d903 Mon Sep 17 00:00:00 2001
From: Andrew Waterman <waterman@eecs.berkeley.edu>
Date: Mon, 25 Nov 2013 02:02:42 -0800
Subject: Update to new privileged ISA

---
 pk/handlers.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'pk/handlers.c')

diff --git a/pk/handlers.c b/pk/handlers.c
index 8d71e4f..972a5dc 100644
--- a/pk/handlers.c
+++ b/pk/handlers.c
@@ -1,6 +1,5 @@
 // See LICENSE for license details.
 
-#include "pcr.h"
 #include "pk.h"
 #include "config.h"
 #include "syscall.h"
@@ -55,7 +54,7 @@ static void handle_illegal_instruction(trapframe_t* tf)
 
 static void handle_fp_disabled(trapframe_t* tf)
 {
-  if(have_fp && !(mfpcr(PCR_SR) & SR_EF))
+  if (have_fp && !(read_csr(status) & SR_EF))
     init_fp(tf);
   else
     handle_illegal_instruction(tf);
@@ -124,7 +123,7 @@ static void handle_syscall(trapframe_t* tf)
 
 void handle_trap(trapframe_t* tf)
 {
-  setpcr(PCR_SR, SR_EI);
+  set_csr(status, SR_EI);
 
   typedef void (*trap_handler)(trapframe_t*);
 
-- 
cgit v1.1