From dff73c1d184792adb317bd68bd381cd666c6f9d9 Mon Sep 17 00:00:00 2001
From: Andrew Waterman <waterman@s141.Millennium.Berkeley.EDU>
Date: Mon, 17 Jan 2011 01:13:50 -0800
Subject: [opcodes, pk, sim, xcc] removed nor, normalized macros to addi

---
 pk/entry.S     | 2 +-
 pk/riscv-opc.h | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/pk/entry.S b/pk/entry.S
index 15cb871..d2fb72c 100644
--- a/pk/entry.S
+++ b/pk/entry.S
@@ -123,7 +123,7 @@ pop_tf:	# write the trap frame onto the stack
 trap_entry:
 	mtpcr	$ra,ASM_CR(PCR_K0)
 	mtpcr	$x2,ASM_CR(PCR_K1)
-	law		$x2,stack_top-320
+	la		$x2,stack_top-320
 	jal		save_tf
 	move	$sp,$x2
 	move	$a0,$x2
diff --git a/pk/riscv-opc.h b/pk/riscv-opc.h
index 35e5aeb..164a6d5 100644
--- a/pk/riscv-opc.h
+++ b/pk/riscv-opc.h
@@ -71,8 +71,6 @@
 #define  MASK_MUL 0x1ffff
 #define MATCH_AMOW_MIN 0x117a
 #define  MASK_AMOW_MIN 0x1ffff
-#define MATCH_NOR 0x1c75
-#define  MASK_NOR 0x1ffff
 #define MATCH_NMSUB_D 0x1ee
 #define  MASK_NMSUB_D 0x1ff
 #define MATCH_AMO_SWAP 0x5fa
-- 
cgit v1.1