From 80b00e616e5f0c386486d1c0f902a5bb9d21c285 Mon Sep 17 00:00:00 2001
From: Yunsup Lee <yunsup@cs.berkeley.edu>
Date: Sun, 15 May 2011 22:53:52 -0700
Subject: [PATCH] [opcodes,pk,sim,xcc] resolve a conflict

---
 riscv/execute.h | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/riscv/execute.h b/riscv/execute.h
index 6ea79c8..d2dfdad 100644
--- a/riscv/execute.h
+++ b/riscv/execute.h
@@ -1898,16 +1898,21 @@ switch((insn.bits >> 0x0) & 0x7f)
   }
   case 0x77:
   {
-        if((insn.bits & 0x1ffff) == 0x2f7)
+        if((insn.bits & 0x1ffff) == 0x6f7)
         {
           #include "insns/movn.h"
           break;
         }
-        if((insn.bits & 0x1ffff) == 0x277)
+        if((insn.bits & 0x1ffff) == 0x2f7)
         {
           #include "insns/movz.h"
           break;
         }
+        if((insn.bits & 0x7ffffff) == 0x277)
+        {
+          #include "insns/rdcycle.h"
+          break;
+        }
         if((insn.bits & 0xffffffff) == 0x177)
         {
           #include "insns/stop.h"
@@ -1923,12 +1928,22 @@ switch((insn.bits >> 0x0) & 0x7f)
           #include "insns/utidx.h"
           break;
         }
-        if((insn.bits & 0x1ffff) == 0x3f7)
+        if((insn.bits & 0x7ffffff) == 0xa77)
+        {
+          #include "insns/rdinstret.h"
+          break;
+        }
+        if((insn.bits & 0x7ffffff) == 0x677)
+        {
+          #include "insns/rdtime.h"
+          break;
+        }
+        if((insn.bits & 0x1ffff) == 0xef7)
         {
           #include "insns/fmovn.h"
           break;
         }
-        if((insn.bits & 0x1ffff) == 0x377)
+        if((insn.bits & 0x1ffff) == 0xaf7)
         {
           #include "insns/fmovz.h"
           break;
-- 
2.30.2