X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=openpower%2Fisafunctions%2Ffpfromint.mdwn;h=67ae7583140d70c8a8d35df37dd95f012eac372d;hb=42cf839110d8a942238ebf0b3adaad50cd22bbf6;hp=df3ed6911697d947d44d1b6546e215d10831c084;hpb=8edd6456fcc352c377832876d564d2e37ad9c7e1;p=openpower-isa.git

diff --git a/openpower/isafunctions/fpfromint.mdwn b/openpower/isafunctions/fpfromint.mdwn
index df3ed691..67ae7583 100644
--- a/openpower/isafunctions/fpfromint.mdwn
+++ b/openpower/isafunctions/fpfromint.mdwn
@@ -6,77 +6,76 @@ Convert From Integer instructions.
 <!-- Power ISA Book I Version 3.0B Section A.3 page 782 -->
 
     def Round_Float( tgt_precision, sign, exp, frac, round_mode ):
-       inc <- 0
-       if tgt_precision = "single-precision" then
-           lsb <- frac[23]
-           gbit <- frac[24]
-           rbit <- frac[25]
-           xbit <- frac[26:63] > 0
-        else # tgt_precision = "double-precision"
-            lsb  <= frac[52]
-            gbit <= frac[53]
-            rbit <= frac[54]
-            xbit <= frac[55:63] > 0
+        inc <- 0
+        if tgt_precision = 'single-precision' then
+            lsb  <- frac[23]
+            gbit <- frac[24]
+            rbit <- frac[25]
+            xbit <- frac[26:63] > 0
+        else # tgt_precision = 'double-precision'
+            lsb  <- frac[52]
+            gbit <- frac[53]
+            rbit <- frac[54]
+            xbit <- frac[55:63] > 0
 
         if round_mode  = 0b00  then           # Round to Nearest
-            if lsb = 1 and gbit = 1              then inc <- 1
-            if lsb = 0 and gbit = 1 and rbit = 1 then inc <- 1
-            if lsb = 0 and gbit = 1 and xbit = 1 then inc <- 1
-        end
+            if (lsb = 1) & (gbit = 1)              then inc <- 1
+            if (lsb = 0) & (gbit = 1) & (rbit = 1) then inc <- 1
+            if (lsb = 0) & (gbit = 1) & (xbit = 1) then inc <- 1
         if round_mode  = 0b10  then           # Round toward + Infinity
-            if sign = 0 and gbit = 1 then inc <-1
-            if sign = 0 and rbit = 1 then inc <-1
-            if sign = 0 and xbit = 1 then inc <-1
-        end
+            if (sign = 0) & (gbit = 1) then inc <-1
+            if (sign = 0) & (rbit = 1) then inc <-1
+            if (sign = 0) & (xbit = 1) then inc <-1
         if round_mode  = 0b11  then           # Round toward - Infinity
-            if sign = 1 and gbit = 1 then inc <-1
-            if sign = 1 and rbit = 1 then inc <-1
-            if sign = 1 and xbit = 1 then inc <-1
-        end
-        # increase fraction, record the top bit as a "carry out"
-        if tgt_precision = "single-precision" then
-            tmp = [0]*25
-            tmp[1:24] = frac[0:23]
-            tmp[0:24] <- tmp[0:24] + inc
-            carry_out = tmp[24]
-            frac[0:23] = tmp[1:24]
-        else # tgt_precision = "double-precision"
-            tmp = [0]*54
-            tmp[1:53] = frac[0:52]
-            tmp[0:53] <- tmp[0:53] + inc
-            carry_out = tmp[53]
-            frac[0:52] = tmp[1:54]
+            if (sign = 1) & (gbit = 1) then inc <-1
+            if (sign = 1) & (rbit = 1) then inc <-1
+            if (sign = 1) & (xbit = 1) then inc <-1
+
+        # increase fraction, record the top bit as a 'carry out'
+        if tgt_precision = 'single-precision' then
+            tmp        <- [0]*25
+            tmp[1:24]  <- frac[0:23]
+            tmp[0:24]  <- tmp[0:24] + inc
+            carry_out  <- tmp[0]
+            frac[0:23] <- tmp[1:24]
+        else # tgt_precision = 'double-precision'
+            tmp        <- [0]*54
+            tmp[1:53]  <- frac[0:52]
+            tmp[0:53]  <- tmp[0:53] + inc
+            carry_out  <- tmp[0]
+            frac[0:52] <- tmp[1:53]
         if carry_out = 1 then exp <- exp + 1
         # TODO, later
         # FPSCR[FR] <- inc
         # FPSCR[FI] <- gbit | rbit | xbit
         # FPSCR[XX] <- FPSCR[XX] | FPSCR[FI]
 
-    def INT2FP(FR, cvt, RN):
-        if cvt = "sint2double" then
-            tgt_precision = "double-precision"
+    def INT2FP(FR, cvt):
+        if cvt = 'sint2double' then
+            tgt_precision = 'double-precision'
             sign       <- FR[0]
-        if cvt = "sint2single" then
-            tgt_precision <- "single-precision"
+        if cvt = 'sint2single' then
+            tgt_precision <- 'single-precision'
             sign       <- FR[0]
-        if cvt = "uint2double" then
-            tgt_precision <- "double-precision"
+        if cvt = 'uint2double' then
+            tgt_precision <- 'double-precision'
             sign       <- 0
-        if cvt = "uint2single" then
-            tgt_precision <- "single-precision"
+        if cvt = 'uint2single' then
+            tgt_precision <- 'single-precision'
             sign       <- 0
 
-        result = [0] * 64
-        exp        <- 63
-        frac[0:63] <- FR
+        frac   <- [0] * 64
+        result <- [0] * 64
+        exp    <- 63
+        frac   <- FR[0:63]
 
         if frac[0:63] = 0 then
             # Zero Operand
             # TODO, FPSCR
             #FPSCR[FR] <- 0b00
             #FPSCR[FI] <- 0b00
-            #FPSCR[FPRF] <- "+ zero"
-            result = [0] * 64
+            #FPSCR[FPRF] <- '+ zero'
+            result <- [0] * 64
         else
             if sign = 1 then frac[0:63] <- ¬frac[0:63] + 1
             # do the loop 0 times if FR = max negative 64-bit integer or
@@ -85,10 +84,11 @@ Convert From Integer instructions.
                 frac[0:63] <- frac[1:63] || 0b0
                 exp <- exp - 1
             # round to nearest
-            Round_Float( tgt_precision, sign, exp, frac, 0b00 )
+            RN <- 0b00 # TODO, FPSCR[RN]
+            Round_Float( tgt_precision, sign, exp, frac, RN )
             # TODO, FPSCR
-            #if sign = 0 then FPSCR[FPRF] <- "+normal number"
-            #if sign = 1 then FPSCR[FPRF] <- "-normal number"
+            #if sign = 0 then FPSCR[FPRF] <- '+normal number'
+            #if sign = 1 then FPSCR[FPRF] <- '-normal number'
             result[0]    <- sign
             result[1:11] <- exp + 1023     # exp + bias
             result[12:63] <- frac[1:52]