From 63da785d33275b8c9476a781a67829f91cc34fc6 Mon Sep 17 00:00:00 2001 From: Yunsup Lee Date: Sun, 18 Mar 2012 16:29:12 -0700 Subject: clean up vector exception instructions --- inst.v | 16 +++++++++------- opcodes | 17 ++++++++++------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/inst.v b/inst.v index dc88796..8745a53 100644 --- a/inst.v +++ b/inst.v @@ -103,14 +103,16 @@ `define MTPCR 32'b00000_?????_?????_0000000011_1111011 `define ERET 32'b00000_00000_00000_0000000100_1111011 `define CFLUSH 32'b00000_00000_00000_0000000101_1111011 -`define VENQCMD 32'b00000_?????_?????_1000000000_1111011 -`define VENQIMM1 32'b00000_?????_?????_1000000001_1111011 -`define VENQIMM2 32'b00000_?????_?????_1000000010_1111011 -`define VENQCNT 32'b00000_?????_?????_1000000011_1111011 +`define VXCPTSAVE 32'b00000_00000_00000_1000000000_1111011 +`define VXCPTRESTORE 32'b00000_00000_00000_1000000001_1111011 +`define VXCPTKILL 32'b00000_00000_00000_1000000010_1111011 `define VXCPTEVAC 32'b00000_?????_00000_1100000000_1111011 -`define VXCPTKILL 32'b00000_00000_00000_1100000001_1111011 -`define VXCPTWAIT 32'b00000_00000_00000_1100000010_1111011 -`define VXCPTHOLD 32'b00000_00000_00000_1100000011_1111011 +`define VXCPTWAIT 32'b00000_00000_00000_1100000001_1111011 +`define VXCPTHOLD 32'b00000_00000_00000_1100000010_1111011 +`define VENQCMD 32'b00000_?????_?????_1100000011_1111011 +`define VENQIMM1 32'b00000_?????_?????_1100000100_1111011 +`define VENQIMM2 32'b00000_?????_?????_1100000101_1111011 +`define VENQCNT 32'b00000_?????_?????_1100000110_1111011 `define FADD_S 32'b?????_?????_?????_00000_???_00_1010011 `define FSUB_S 32'b?????_?????_?????_00001_???_00_1010011 `define FMUL_S 32'b?????_?????_?????_00010_???_00_1010011 diff --git a/opcodes b/opcodes index 01ad683..f79cff8 100644 --- a/opcodes +++ b/opcodes @@ -134,14 +134,17 @@ mtpcr 31..27=0 rs1 rs2 16..7=3 6..2=0x1E 1..0=3 eret 31..27=0 26..22=0 21..17=0 16..7=4 6..2=0x1E 1..0=3 cflush 31..27=0 26..22=0 21..17=0 16..7=5 6..2=0x1E 1..0=3 -venqcmd 31..27=0 rs1 rs2 16..7=0x200 6..2=0x1E 1..0=3 -venqimm1 31..27=0 rs1 rs2 16..7=0x201 6..2=0x1E 1..0=3 -venqimm2 31..27=0 rs1 rs2 16..7=0x202 6..2=0x1E 1..0=3 -venqcnt 31..27=0 rs1 rs2 16..7=0x203 6..2=0x1E 1..0=3 +vxcptsave 31..27=0 26..22=0 21..17=0 16..7=0x200 6..2=0x1E 1..0=3 +vxcptrestore 31..27=0 26..22=0 21..17=0 16..7=0x201 6..2=0x1E 1..0=3 +vxcptkill 31..27=0 26..22=0 21..17=0 16..7=0x202 6..2=0x1E 1..0=3 + vxcptevac 31..27=0 rs1 21..17=0 16..7=0x300 6..2=0x1E 1..0=3 -vxcptkill 31..27=0 26..22=0 21..17=0 16..7=0x301 6..2=0x1E 1..0=3 -vxcptwait 31..27=0 26..22=0 21..17=0 16..7=0x302 6..2=0x1E 1..0=3 -vxcpthold 31..27=0 26..22=0 21..17=0 16..7=0x303 6..2=0x1E 1..0=3 +vxcptwait 31..27=0 26..22=0 21..17=0 16..7=0x301 6..2=0x1E 1..0=3 +vxcpthold 31..27=0 26..22=0 21..17=0 16..7=0x302 6..2=0x1E 1..0=3 +venqcmd 31..27=0 rs1 rs2 16..7=0x303 6..2=0x1E 1..0=3 +venqimm1 31..27=0 rs1 rs2 16..7=0x304 6..2=0x1E 1..0=3 +venqimm2 31..27=0 rs1 rs2 16..7=0x305 6..2=0x1E 1..0=3 +venqcnt 31..27=0 rs1 rs2 16..7=0x306 6..2=0x1E 1..0=3 # 0x7C-0x7F are reserved for >32b instructions -- cgit v1.2.3