From 1413f8f39d5f83c0b18a257d987a3e4973d045d7 Mon Sep 17 00:00:00 2001 From: Andrew Waterman Date: Tue, 6 Aug 2013 16:56:44 -0700 Subject: Rename MTFSR/MFFSR to FSSR/FRSR --- inst.v | 4 ++-- instr-table.tex | 4 ++-- opcodes | 4 ++-- parse-opcodes | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/inst.v b/inst.v index 681e39b..d409a29 100644 --- a/inst.v +++ b/inst.v @@ -142,10 +142,10 @@ `define FMAX_D 32'b???????????????11001000011010011 `define FMV_X_S 32'b??????????0000011100000001010011 `define FMV_X_D 32'b??????????0000011100000011010011 -`define MFFSR 32'b?????000000000011101000001010011 +`define FRSR 32'b?????000000000011101000001010011 `define FMV_S_X 32'b??????????0000011110000001010011 `define FMV_D_X 32'b??????????0000011110000011010011 -`define MTFSR 32'b??????????0000011111000001010011 +`define FSSR 32'b??????????0000011111000001010011 `define FLW 32'b??????????????????????0100000111 `define FLD 32'b??????????????????????0110000111 `define FSW 32'b??????????????????????0100100111 diff --git a/instr-table.tex b/instr-table.tex index 754816b..22e28d5 100644 --- a/instr-table.tex +++ b/instr-table.tex @@ -1394,7 +1394,7 @@ \multicolumn{3}{c|}{11111} & \multicolumn{2}{c|}{000} & \multicolumn{1}{c|}{00} & -\multicolumn{1}{c|}{1010011} & MTFSR rd,rs1 \\ +\multicolumn{1}{c|}{1010011} & FSSR rd,rs1 \\ \cline{2-11} @@ -1405,7 +1405,7 @@ \multicolumn{3}{c|}{11101} & \multicolumn{2}{c|}{000} & \multicolumn{1}{c|}{00} & -\multicolumn{1}{c|}{1010011} & MFFSR rd \\ +\multicolumn{1}{c|}{1010011} & FRSR rd \\ \cline{2-11} diff --git a/opcodes b/opcodes index 24c3f0a..d1291f1 100644 --- a/opcodes +++ b/opcodes @@ -185,10 +185,10 @@ fmax.d rd rs1 rs2 16..12=0x19 11..9=0 8..7=1 6..2=0x14 1..0=3 fmv.x.s rd rs1 21..17=0 16..12=0x1C 11..9=0 8..7=0 6..2=0x14 1..0=3 fmv.x.d rd rs1 21..17=0 16..12=0x1C 11..9=0 8..7=1 6..2=0x14 1..0=3 -mffsr rd 26..22=0 21..17=0 16..12=0x1D 11..9=0 8..7=0 6..2=0x14 1..0=3 +frsr rd 26..22=0 21..17=0 16..12=0x1D 11..9=0 8..7=0 6..2=0x14 1..0=3 fmv.s.x rd rs1 21..17=0 16..12=0x1E 11..9=0 8..7=0 6..2=0x14 1..0=3 fmv.d.x rd rs1 21..17=0 16..12=0x1E 11..9=0 8..7=1 6..2=0x14 1..0=3 -mtfsr rd rs1 21..17=0 16..12=0x1F 11..9=0 8..7=0 6..2=0x14 1..0=3 +fssr rd rs1 21..17=0 16..12=0x1F 11..9=0 8..7=0 6..2=0x14 1..0=3 flw rd rs1 imm12 9..7=2 6..2=0x01 1..0=3 fld rd rs1 imm12 9..7=3 6..2=0x01 1..0=3 diff --git a/parse-opcodes b/parse-opcodes index fceefdb..95785af 100755 --- a/parse-opcodes +++ b/parse-opcodes @@ -423,7 +423,7 @@ def print_inst(n): elif 'rs3' in arguments[n]: print_r4_type(n, match[n], arguments[n]) elif 'rm' in arguments[n] or \ - filter(lambda x: x in n, ['fmin','fmax','fsgnj','fmv','feq','flt','fle','mtfsr','mffsr']): + filter(lambda x: x in n, ['fmin','fmax','fsgnj','fmv','feq','flt','fle','fssr','frsr']): print_r_rm_type(n, match[n], arguments[n]) else: print_r_type(n, match[n], arguments[n]) @@ -473,7 +473,7 @@ def make_latex_table(): print_insts('fcvt.s.w', 'fcvt.s.wu', 'fmv.s.x') print_insts('fcvt.w.s', 'fcvt.wu.s', 'fmv.x.s') print_insts('feq.s', 'flt.s', 'fle.s') - print_insts('mtfsr', 'mffsr') + print_insts('fssr', 'frsr') print_footer(0) print_header() -- cgit v1.2.3