add missing forms

diff --git a/openpower/isa/fixedarith.mdwn b/openpower/isa/fixedarith.mdwn
index fc33debab0c600621da55949b9a13a933178f1fc..fb17b836c61b64fbaae1f370f747c602ae8da787 100644 (file)
--- a/openpower/isa/fixedarith.mdwn
+++ b/openpower/isa/fixedarith.mdwn
@@ -1,5 +1,7 @@
 # Add Immediate
 
+D-Form
+
 * addi RT,RA,SI
 
     if RA = 0 then RT <- EXTS(SI)
@@ -7,6 +9,8 @@
 
 # Add Immediate Shifted
 
+D-Form
+
 * addis RT,RA,SI
 
     if RA = 0 then RT <- EXTS(SI || 160)
@@ -14,6 +18,8 @@
 
 # Add PC Immediate Shifted
 
+DX-Form
+
 * addpcis RT,D
 
     D <- d0||d1||d2
@@ -22,6 +28,8 @@
 
 # Add
 
+XO-Form
+
 * add RT,RA,RB (OE=0 Rc=0)
 * add.  RT,RA,RB (OE=0 Rc=1)
 * addo RT,RA,RB (OE=1 Rc=0)
@@ -31,6 +39,7 @@
 
 # Subtract From
 
+XO-Form
 
 * subf RT,RA,RB (OE=0 Rc=0)
 * subf.  RT,RA,RB (OE=0 Rc=1)
@@ -41,24 +50,32 @@
 
 # Add Immediate Carrying
 
+D-Form
+
 * addic RT,RA,SI
 
     RT <- (RA) + EXTS(SI)
 
 # Add Immediate Carrying and Record
 
+D-Form
+
 * addic. RT,RA,SI
 
     RT <- (RA) + EXTS(SI)
 
 # Subtract From Immediate Carrying
 
+D-Form
+
 * subfic RT,RA,SI
 
     RT <- ¬(RA) + EXTS(SI) + 1
 
 # Add Carrying
 
+XO-Form
+
 * addc RT,RA,RB (OE=0 Rc=0)
 * addc.  RT,RA,RB (OE=0 Rc=1)
 * addco RT,RA,RB (OE=1 Rc=0)
@@ -68,6 +85,8 @@
 
 # Subtract From Carrying
 
+XO-Form
+
 * subfc RT,RA,RB (OE=0 Rc=0)
 * subfc.  RT,RA,RB (OE=0 Rc=1)
 * subfco RT,RA,RB (OE=1 Rc=0)
@@ -77,6 +96,8 @@
 
 # Add Extended
 
+XO-Form
+
 * adde RT,RA,RB (OE=0 Rc=0)
 * adde.  RT,RA,RB (OE=0 Rc=1)
 * addeo RT,RA,RB (OE=1 Rc=0)
@@ -86,6 +107,8 @@
 
 # Subtract From Extended
 
+XO-Form
+
 * subfe RT,RA,RB (OE=0 Rc=0)
 * subfe.  RT,RA,RB (OE=0 Rc=1)
 * subfeo RT,RA,RB (OE=1 Rc=0)
@@ -93,9 +116,9 @@
 
     RT <- ¬(RA) + (RB) + CA
 
-#Add to Minus One Extended
+# Add to Minus One Extended
 
-# Subtract From Minus One Extended
+XO-Form
 
 * addme RT,RA (OE=0 Rc=0)
 * addme.  RT,RA (OE=0 Rc=1)
@@ -104,6 +127,10 @@
 
     RT <- (RA) + CA - 1
 
+# Subtract From Minus One Extended
+
+XO-Form
+
 * subfme RT,RA (OE=0 Rc=0)
 * subfme.  RT,RA (OE=0 Rc=1)
 * subfmeo RT,RA (OE=1 Rc=0)
@@ -113,11 +140,15 @@
 
 # Add Extended using alternate carry bit
 
+Z23-Form
+
 * addex RT,RA,RB,CY
 
     if CY=0 then RT <- (RA) + (RB) + OV
 
-# Subtract From Zero Extended   XO-form
+# Subtract From Zero Extended
+
+XO-form
 
 * subfze RT,RA (OE=0 Rc=0)
 * subfze.  RT,RA (OE=0 Rc=1)
@@ -128,6 +159,8 @@
 
 # Add to Zero Extended
 
+XO-form
+
 * addze RT,RA (OE=0 Rc=0)
 * addze.  RT,RA (OE=0 Rc=1)
 * addzeo RT,RA (OE=1 Rc=0)
@@ -137,6 +170,8 @@
 
 # Negate
 
+XO-form
+
 * neg RT,RA (OE=0 Rc=0)
 * neg.  RT,RA (OE=0 Rc=1)
 * nego RT,RA (OE=1 Rc=0)
@@ -146,6 +181,8 @@ RT <- ¬(RA) + 1
 
 # Multiply Low Immediate
 
+D-form
+
 * mulli RT,RA,SI
 
     prod[0:127] <- (RA) * EXTS(SI)
@@ -153,6 +190,8 @@ RT <- ¬(RA) + 1
 
 # Multiply High Word
 
+XO-form
+
 * mulhw RT,RA,RB (Rc=0)
 * mulhw.  RT,RA,RB (Rc=1)
 
@@ -162,6 +201,8 @@ RT <- ¬(RA) + 1
 
 # Multiply Low Word
 
+XO-form
+
 * mullw RT,RA,RB (OE=0 Rc=0)
 * mullw.  RT,RA,RB (OE=0 Rc=1)
 * mullwo RT,RA,RB (OE=1 Rc=0)
@@ -171,6 +212,8 @@ RT <- ¬(RA) + 1
 
 # Multiply High Word Unsigned
 
+XO-form
+
 * mulhwu RT,RA,RB (Rc=0)
 * mulhwu.  RT,RA,RB (Rc=1)
 
@@ -180,6 +223,8 @@ RT <- ¬(RA) + 1
 
 # Divide Word
 
+XO-form
+
 * divw RT,RA,RB (OE=0 Rc=0)
 * divw.  RT,RA,RB (OE=0 Rc=1)
 * divwo RT,RA,RB (OE=1 Rc=0)
@@ -192,6 +237,7 @@ RT <- ¬(RA) + 1
 
 # Divide Word Unsigned
 
+XO-form
 
 * divwu RT,RA,RB (OE=0 Rc=0)
 * divwu.  RT,RA,RB (OE=0 Rc=1)
@@ -205,6 +251,8 @@ RT <- ¬(RA) + 1
 
 # Divide Word Extended
 
+XO-form
+
 * divwe RT,RA,RB (OE=0 Rc=0)
 * divwe.  RT,RA,RB (OE=0 Rc=1)
 * divweo RT,RA,RB (OE=1 Rc=0)
@@ -217,6 +265,8 @@ RT <- ¬(RA) + 1
 
 # Divide Word Extended Unsigned
 
+XO-form
+
 * divweu RT,RA,RB (OE=0 Rc=0)
 * divweu.  RT,RA,RB (OE=0 Rc=1)
 * divweuo RT,RA,RB (OE=1 Rc=0)
@@ -229,6 +279,8 @@ RT <- ¬(RA) + 1
 
 # Modulo Signed Word X-form
 
+X-form
+
 * modsw RT,RA,RB
 
     dividend[0:31] <- (RA)[32:63]
@@ -238,6 +290,8 @@ RT <- ¬(RA) + 1
 
 # Modulo Unsigned Word X-form
 
+X-form
+
 * moduw RT,RA,RB
 
     dividend[0:31] <- (RA) [32:63]
@@ -248,12 +302,16 @@ RT <- ¬(RA) + 1
 
 # Deliver A Random Number
 
+X-form
+
 * darn RT,L
 
     RT <- random(L)
 
 # Multiply Low Doubleword
 
+XO-form
+
 * mulld RT,RA,RB (OE=0 Rc=0)
 * mulld.  RT,RA,RB (OE=0 Rc=1)
 * mulldo RT,RA,RB (OE=1 Rc=0)
@@ -264,6 +322,8 @@ RT <- ¬(RA) + 1
 
 # Multiply High Doubleword
 
+XO-form
+
 * mulhd RT,RA,RB (Rc=0)
 * mulhd.  RT,RA,RB (Rc=1)
 
@@ -272,6 +332,8 @@ RT <- ¬(RA) + 1
 
 # Multiply High Doubleword Unsigned
 
+XO-form
+
 * mulhdu RT,RA,RB (Rc=0)
 * mulhdu.  RT,RA,RB (Rc=1)
 
@@ -280,6 +342,8 @@ RT <- ¬(RA) + 1
 
 # Multiply-Add High Doubleword VA-form
 
+VA-form
+
 * maddhd RT,RA.RB,RC
 
     prod[0:127] <- (RA) * (RB)
@@ -288,6 +352,8 @@ RT <- ¬(RA) + 1
 
 # Multiply-Add High Doubleword Unsigned
 
+VA-form
+
 * maddhdu RT,RA.RB,RC
 
     prod[0:127] <- (RA) * (RB)
@@ -296,6 +362,8 @@ RT <- ¬(RA) + 1
 
 # Multiply-Add Low Doubleword
 
+VA-form
+
 * maddld RT,RA.RB,RC
 
 
@@ -305,6 +373,8 @@ RT <- ¬(RA) + 1
 
 # Divide Doubleword
 
+XO-form
+
 * divd RT,RA,RB (OE=0 Rc=0)
 * divd.  RT,RA,RB (OE=0 Rc=1)
 * divdo RT,RA,RB (OE=1 Rc=0)
@@ -316,6 +386,8 @@ RT <- ¬(RA) + 1
 
 # Divide Doubleword Unsigned
 
+XO-form
+
 * divdu RT,RA,RB (OE=0 Rc=0)
 * divdu.  RT,RA,RB (OE=0 Rc=1)
 * divduo RT,RA,RB (OE=1 Rc=0)
@@ -327,6 +399,8 @@ RT <- ¬(RA) + 1
 
 # Divide Doubleword Extended
 
+XO-form
+
 * divde RT,RA,RB (OE=0 Rc=0)
 * divde.  RT,RA,RB (OE=0 Rc=1)
 * divdeo RT,RA,RB (OE=1 Rc=0)
@@ -338,6 +412,8 @@ RT <- ¬(RA) + 1
 
 # Divide Doubleword Extended Unsigned
 
+XO-form
+
 * divdeu RT,RA,RB (OE=0 Rc=0)
 * divdeu.  RT,RA,RB (OE=0 Rc=1)
 * divdeuo RT,RA,RB (OE=1 Rc=0)
@@ -347,7 +423,9 @@ RT <- ¬(RA) + 1
     divisor[0:63] <- (RB)
     RT <- dividend / divisor
 
-# Modulo Signed Doubleword X-form
+# Modulo Signed Doubleword
+
+X-form
 
 * modsd RT,RA,RB
 
@@ -355,7 +433,9 @@ RT <- ¬(RA) + 1
     divisor  <- (RB)
     RT       <- dividend % divisor
 
-# Modulo Unsigned Doubleword X-form
+# Modulo Unsigned Doubleword
+
+X-form
 
 * modud RT,RA,RB