From 5fa814486ad9b7e14f76f8c4cdc1f058bd0db706 Mon Sep 17 00:00:00 2001 From: Yunsup Lee Date: Sun, 15 May 2011 22:53:52 -0700 Subject: [opcodes,pk,sim,xcc] resolve a conflict --- pk/riscv-opc.h | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pk/riscv-opc.h b/pk/riscv-opc.h index 1d1ef04..276d3fb 100644 --- a/pk/riscv-opc.h +++ b/pk/riscv-opc.h @@ -1,5 +1,5 @@ /* Automatically generated by parse-opcodes */ -#define MATCH_MOVN 0x2f7 +#define MATCH_MOVN 0x6f7 #define MASK_MOVN 0x1ffff #define MATCH_VFSSTW 0x150f #define MASK_VFSSTW 0x1ffff @@ -15,7 +15,7 @@ #define MASK_BLTU 0x3ff #define MATCH_VLSEGSTWU 0xb0b #define MASK_VLSEGSTWU 0xfff -#define MATCH_MOVZ 0x277 +#define MATCH_MOVZ 0x2f7 #define MASK_MOVZ 0x1ffff #define MATCH_FCVT_LU_S 0x9053 #define MASK_FCVT_LU_S 0x3ff1ff @@ -69,8 +69,8 @@ #define MASK_DI 0x7ffffff #define MATCH_SLTIU 0x193 #define MASK_SLTIU 0x3ff -#define MATCH_C_ADD 0x1a -#define MASK_C_ADD 0x801f +#define MATCH_MTPCR 0x1fb +#define MASK_MTPCR 0xf801ffff #define MATCH_VLB 0xb #define MASK_VLB 0x3fffff #define MATCH_STOP 0x177 @@ -256,7 +256,7 @@ #define MATCH_FEQ_D 0x150d3 #define MASK_FEQ_D 0x1ffff #define MATCH_FCVT_D_WU 0xf0d3 -#define MASK_FCVT_D_WU 0x3fffff +#define MASK_FCVT_D_WU 0x3ff1ff #define MATCH_VMTS 0x1873 #define MASK_VMTS 0x1ffff #define MATCH_OR 0x333 @@ -297,6 +297,8 @@ #define MASK_VLSTD 0x1ffff #define MATCH_C_LD0 0x8012 #define MASK_C_LD0 0x801f +#define MATCH_RDTIME 0x677 +#define MASK_RDTIME 0x7ffffff #define MATCH_ANDI 0x393 #define MASK_ANDI 0x3ff #define MATCH_C_SRLI32 0xc19 @@ -331,7 +333,7 @@ #define MASK_AMOMAX_W 0x1ffff #define MATCH_C_MOVE 0x2 #define MASK_C_MOVE 0x801f -#define MATCH_FMOVN 0x3f7 +#define MATCH_FMOVN 0xef7 #define MASK_FMOVN 0x1ffff #define MATCH_C_FSW 0x16 #define MASK_C_FSW 0x1f @@ -349,7 +351,7 @@ #define MASK_AMOMAX_D 0x1ffff #define MATCH_FCVT_W_D 0xa0d3 #define MASK_FCVT_W_D 0x3ff1ff -#define MATCH_FMOVZ 0x377 +#define MATCH_FMOVZ 0xaf7 #define MASK_FMOVZ 0x1ffff #define MATCH_C_OR3 0x21c #define MASK_C_OR3 0x31f @@ -451,6 +453,8 @@ #define MASK_FCVT_S_L 0x3ff1ff #define MATCH_VFLSEGSTD 0xd8b #define MASK_VFLSEGSTD 0xfff +#define MATCH_C_ADD 0x1a +#define MASK_C_ADD 0x801f #define MATCH_FCVT_LU_D 0x90d3 #define MASK_FCVT_LU_D 0x3ff1ff #define MATCH_VFLD 0x58b -- cgit v1.1