minor fixes in pseudocode, CONST_UI->CONST_SH in minor_22.csv

diff --git a/openpower/isa/butterfly.mdwn b/openpower/isa/butterfly.mdwn
index 43ae0b62dd3e05dacc243afa2f13cbbd399e8532..821df73844fc2fe2bc4652431869c4e3df30d07c 100644 (file)
--- a/openpower/isa/butterfly.mdwn
+++ b/openpower/isa/butterfly.mdwn
@@ -10,12 +10,13 @@ DCTI-Form
 
 Pseudo-code:
 
+    n <- XLEN-SH
     sum <- (RT) + (RA)
     diff <- (RT) - (RA)
     prod1 <- MUL(RB, sum)
     prod2 <- MUL(RB, diff)
-    res1 <- ROTL64(prod1, XLEN-SH)
-    res2 <- ROTL64(prod2, XLEN-SH)
+    res1 <- ROTL64(prod1, n)
+    res2 <- ROTL64(prod2, n)
     RT <- (RT) + res1
     RS <- (RS) + res2
 

diff --git a/openpower/isatables/minor_22.csv b/openpower/isatables/minor_22.csv
index 8195796e11ff0761b3c8c02018ac435b2e147c43..5ac2e76f40deefabc6ab5db1585bb1d2434730c6 100644 (file)
--- a/openpower/isatables/minor_22.csv
+++ b/openpower/isatables/minor_22.csv
@@ -40,4 +40,4 @@ opcode,unit,internal op,in1,in2,in3,out,CR in,CR out,inv A,inv out,cry in,cry ou
 ------10001,ALU,OP_BMASK,RA,RB,NONE,RT,NONE,NONE,0,0,ZERO,0,NONE,0,0,0,0,0,0,NONE,0,0,bmask,BM2,,1,unofficial until submitted and approved/renumbered by the opf isa wg
 -----00011-,ALU,OP_FMVIS,NONE,CONST_UI,NONE,FRS,NONE,NONE,0,0,ZERO,0,NONE,0,0,0,0,0,0,NONE,0,0,fmvis,DX,,1,unofficial until submitted and approved/renumbered by the opf isa wg
 -----01011-,ALU,OP_FISHMV,FRS,CONST_UI,NONE,FRS,NONE,NONE,0,0,ZERO,0,NONE,0,0,0,0,0,0,NONE,0,0,fishmv,DX,,1,unofficial until submitted and approved/renumbered by the opf isa wg
-------01000,ALU,OP_MADDSUBRS,RT,CONST_UI,RB,RT,NONE,CR0,0,0,ZERO,0,NONE,0,0,0,0,1,0,RC_ONLY,0,0,maddsubrs,DCTI,,1,unofficial until submitted and approved/renumbered by the opf isa wg
+------01000,ALU,OP_MADDSUBRS,RT,CONST_SH,RB,RT,NONE,CR0,0,0,ZERO,0,NONE,0,0,0,0,1,0,RC_ONLY,0,0,maddsubrs,DCTI,,1,unofficial until submitted and approved/renumbered by the opf isa wg