From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Thu, 5 Mar 2020 18:41:46 +0000 (+0000)
Subject: add v3.0 DX form, correction on mfocrf
X-Git-Tag: convert-csv-opcode-to-binary~3195
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=72c9c712c2c4aa982c26369d023bcfe955d57bea;p=libreriscv.git

add v3.0 DX form, correction on mfocrf
---

diff --git a/openpower/isatables/fields.txt b/openpower/isatables/fields.txt
index ae2e59cac..12242dfd7 100644
--- a/openpower/isatables/fields.txt
+++ b/openpower/isatables/fields.txt
@@ -244,6 +244,10 @@
    | OPCD |  FRT |  /// | R | FRB   |RMC|   XO |Rc |
    | OPCD |  FRTp|  /// | R | FRBp  |RMC|   XO |Rc |
 
+# V3.0B 1.6.6 DX-FORM
+   |0    |6   |11   |16   |26   |31
+   |   PO|  RT|   d1|   d0|   XO|d2
+
 # 1.6.28 Instruction Fields
 
     A (6)
diff --git a/openpower/isatables/minor_31.csv b/openpower/isatables/minor_31.csv
index 962a12d1d..cd7171dff 100644
--- a/openpower/isatables/minor_31.csv
+++ b/openpower/isatables/minor_31.csv
@@ -104,7 +104,7 @@ opcode,unit,internal op,in1,in2,in3,out,CR in,CR out,inv A,inv out,cry in,cry ou
 0b0000010111,LDST,OP_LOAD,RA_OR_ZERO,RB,NONE,RT,0,0,0,0,ZERO,0,is4B,0,0,0,0,0,0,NONE,0,1,lwzx,X
 0b1000000000,,,,,,,,,,,,,,,,,,,,,,,mcrxr,X
 0b1001000000,,,,,,,,,,,,,,,,,,,,,,,mcrxrx,X
-0b0000010011,ALU,OP_MFCR,NONE,NONE,NONE,RT,1,0,0,0,ZERO,0,NONE,0,0,0,0,0,0,NONE,0,0,mfcr/mfocrf,XFB
+0b0000010011,ALU,OP_MFCR,NONE,NONE,NONE,RT,1,0,0,0,ZERO,0,NONE,0,0,0,0,0,0,NONE,0,0,mfcr/mfocrf,XFX
 0b0101010011,ALU,OP_MFSPR,SPR,NONE,NONE,RT,0,0,0,0,ZERO,0,NONE,0,0,0,0,0,0,NONE,0,0,mfspr,XFX
 0b0100001001,ALU,OP_MOD,RA,RB,NONE,RT,0,0,0,0,ZERO,0,NONE,0,0,0,0,0,0,NONE,0,0,modud,X
 0b0100001011,ALU,OP_MOD,RA,RB,NONE,RT,0,0,0,0,ZERO,0,NONE,0,0,0,0,1,0,NONE,0,0,moduw,X