rename FPAddStage1Data to FPPostCalcData

diff --git a/src/ieee754/fcvt/downsize.py b/src/ieee754/fcvt/downsize.py
index 4a0dc822bc176a773c4cf475ee2148cb12fc8da3..1628c3f91d8b02ebc56ba6deb8c6ac250a6e641e 100644 (file)
--- a/src/ieee754/fcvt/downsize.py
+++ b/src/ieee754/fcvt/downsize.py
@@ -6,7 +6,7 @@ from nmigen.cli import main, verilog
 
 from nmutil.pipemodbase import PipeModBase
 from ieee754.fpcommon.getop import FPADDBaseData
-from ieee754.fpcommon.postcalc import FPAddStage1Data
+from ieee754.fpcommon.postcalc import FPPostCalcData
 from ieee754.fpcommon.msbhigh import FPMSBHigh
 from ieee754.fpcommon.exphigh import FPEXPHigh
 
@@ -25,7 +25,7 @@ class FPCVTDownConvertMod(PipeModBase):
         return FPADDBaseData(self.in_pspec)
 
     def ospec(self):
-        return FPAddStage1Data(self.out_pspec, e_extra=True)
+        return FPPostCalcData(self.out_pspec, e_extra=True)
 
     def elaborate(self, platform):
         m = Module()

diff --git a/src/ieee754/fcvt/float2int.py b/src/ieee754/fcvt/float2int.py
index 7ff94fc0cdaf8785e08d18b43da9066ce9fabc78..845a4e007b2d695ca4084a0c9a140fbd19baeb2a 100644 (file)
--- a/src/ieee754/fcvt/float2int.py
+++ b/src/ieee754/fcvt/float2int.py
@@ -6,7 +6,7 @@ from nmigen.cli import main, verilog
 
 from ieee754.fpcommon.fpbase import Overflow
 from ieee754.fpcommon.getop import FPADDBaseData
-from ieee754.fpcommon.postcalc import FPAddStage1Data
+from ieee754.fpcommon.postcalc import FPPostCalcData
 from ieee754.fpcommon.exphigh import FPEXPHigh
 
 from ieee754.fpcommon.fpbase import FPNumDecode, FPNumBaseRecord

diff --git a/src/ieee754/fcvt/int2float.py b/src/ieee754/fcvt/int2float.py
index 96c6309f57aa96fbe5d74406bc53d93dbf55ecc7..8c25cdb8699509584b2964d139e2980703827496 100644 (file)
--- a/src/ieee754/fcvt/int2float.py
+++ b/src/ieee754/fcvt/int2float.py
@@ -6,7 +6,7 @@ from nmigen.cli import main, verilog
 
 from nmutil.pipemodbase import PipeModBase
 from ieee754.fpcommon.getop import FPADDBaseData
-from ieee754.fpcommon.postcalc import FPAddStage1Data
+from ieee754.fpcommon.postcalc import FPPostCalcData
 from ieee754.fpcommon.msbhigh import FPMSBHigh
 
 from ieee754.fpcommon.fpbase import FPNumDecode, FPNumBaseRecord
@@ -27,7 +27,7 @@ class FPCVTIntToFloatMod(PipeModBase):
         return FPADDBaseData(self.in_pspec)
 
     def ospec(self):
-        return FPAddStage1Data(self.out_pspec, e_extra=True)
+        return FPPostCalcData(self.out_pspec, e_extra=True)
 
     def elaborate(self, platform):
         m = Module()

diff --git a/src/ieee754/fcvt/upsize.py b/src/ieee754/fcvt/upsize.py
index e225a2afb4b7b4642f40a6b56be6c4fba38acf0b..9aefa3286b1b7d488be69afa39d55a2d846d9ed4 100644 (file)
--- a/src/ieee754/fcvt/upsize.py
+++ b/src/ieee754/fcvt/upsize.py
@@ -10,7 +10,7 @@ from nmigen.cli import main, verilog
 
 from nmutil.pipemodbase import PipeModBase
 from ieee754.fpcommon.getop import FPADDBaseData
-from ieee754.fpcommon.postcalc import FPAddStage1Data
+from ieee754.fpcommon.postcalc import FPPostCalcData
 from ieee754.fpcommon.fpbase import FPNumDecode, FPNumBaseRecord
 
 
@@ -26,7 +26,7 @@ class FPCVTUpConvertMod(PipeModBase):
         return FPADDBaseData(self.in_pspec)
 
     def ospec(self):
-        return FPAddStage1Data(self.out_pspec, e_extra=False)
+        return FPPostCalcData(self.out_pspec, e_extra=False)
 
     def elaborate(self, platform):
         m = Module()

diff --git a/src/ieee754/fpadd/add1.py b/src/ieee754/fpadd/add1.py
index 4b92ad1ad28c769285e3c08ab972cd8f8679ef0b..e8fd5e9941b80c352af2229a2560b398e67f7000 100644 (file)
--- a/src/ieee754/fpadd/add1.py
+++ b/src/ieee754/fpadd/add1.py
@@ -9,7 +9,7 @@ from nmigen.cli import main, verilog
 from math import log
 
 from nmutil.pipemodbase import PipeModBase
-from ieee754.fpcommon.postcalc import FPAddStage1Data
+from ieee754.fpcommon.postcalc import FPPostCalcData
 from ieee754.fpadd.add0 import FPAddStage0Data
 
 
@@ -25,7 +25,7 @@ class FPAddStage1Mod(PipeModBase):
         return FPAddStage0Data(self.pspec)
 
     def ospec(self):
-        return FPAddStage1Data(self.pspec)
+        return FPPostCalcData(self.pspec)
 
     def elaborate(self, platform):
         m = Module()

diff --git a/src/ieee754/fpadd/pipeline.py b/src/ieee754/fpadd/pipeline.py
index 6792a20c9ee27b0e8fb0232ed620b9206fffb7ef..943533c66426c17d88e286ae8f4c1b1314028eeb 100644 (file)
--- a/src/ieee754/fpadd/pipeline.py
+++ b/src/ieee754/fpadd/pipeline.py
@@ -16,13 +16,13 @@ scnorm   - FPDIVSpecialCasesDeNorm ispec FPADDBaseData
                             FPAlignModSingle
 
 addalign  - FPAddAlignSingleAdd    ispec FPSCData
---------                           ospec FPAddStage1Data
+--------                           ospec FPPostCalcData
 
                 StageChain: FPAddAlignSingleMod
                             FPAddStage0Mod
                             FPAddStage1Mod
 
-normpack  - FPNormToPack           ispec FPAddStage1Data
+normpack  - FPNormToPack           ispec FPPostCalcData
 --------                           ospec FPPackData
 
                 StageChain: Norm1ModSingle,

diff --git a/src/ieee754/fpadd/statemachine.py b/src/ieee754/fpadd/statemachine.py
index aed69932ec657776f1662dfdc0918e660ba5c8e6..1f59cacb97568612777468f768096b97a080c27c 100644 (file)
--- a/src/ieee754/fpadd/statemachine.py
+++ b/src/ieee754/fpadd/statemachine.py
@@ -13,7 +13,7 @@ from nmutil.singlepipe import StageChain
 from ieee754.fpcommon.fpbase import FPState, FPID
 from ieee754.fpcommon.getop import (FPGetOp, FPADDBaseData, FPGet2Op)
 from ieee754.fpcommon.denorm import (FPSCData, FPAddDeNorm)
-from ieee754.fpcommon.postcalc import FPAddStage1Data
+from ieee754.fpcommon.postcalc import FPPostCalcData
 from ieee754.fpcommon.postnormalise import (FPNorm1Data,
                             FPNorm1Single, FPNorm1Multi)
 from ieee754.fpcommon.roundz import (FPRoundData, FPRound)

diff --git a/src/ieee754/fpcommon/postcalc.py b/src/ieee754/fpcommon/postcalc.py
index fc906a2d124de007428111243433a0ab4b6af042..c71bdf907b730c7026126e77babc3faccd3bf4d8 100644 (file)
--- a/src/ieee754/fpcommon/postcalc.py
+++ b/src/ieee754/fpcommon/postcalc.py
@@ -7,7 +7,7 @@ from ieee754.fpcommon.fpbase import Overflow, FPNumBaseRecord
 from ieee754.fpcommon.getop import FPPipeContext
 
 
-class FPAddStage1Data:
+class FPPostCalcData:
 
     def __init__(self, pspec, e_extra=False):
         width = pspec.width

diff --git a/src/ieee754/fpcommon/postnormalise.py b/src/ieee754/fpcommon/postnormalise.py
index d9e245b6aa3bc748520a1e6567a9d4847faf002e..5d0a6ac8f96583ac628a4b7d16063472dcbcc230 100644 (file)
--- a/src/ieee754/fpcommon/postnormalise.py
+++ b/src/ieee754/fpcommon/postnormalise.py
@@ -13,7 +13,7 @@ from ieee754.fpcommon.fpbase import FPState
 from ieee754.fpcommon.getop import FPPipeContext
 from ieee754.fpcommon.msbhigh import FPMSBHigh
 from ieee754.fpcommon.exphigh import FPEXPHigh
-from ieee754.fpcommon.postcalc import FPAddStage1Data
+from ieee754.fpcommon.postcalc import FPPostCalcData
 
 
 class FPNorm1Data:
@@ -40,7 +40,7 @@ class FPNorm1ModSingle(PipeModBase):
         super().__init__(pspec, "normalise_1")
 
     def ispec(self):
-        return FPAddStage1Data(self.pspec, e_extra=self.e_extra)
+        return FPPostCalcData(self.pspec, e_extra=self.e_extra)
 
     def ospec(self):
         return FPNorm1Data(self.pspec)

diff --git a/src/ieee754/fpdiv/div2.py b/src/ieee754/fpdiv/div2.py
index b62bec816e1a02f5ef96dd8e4703121aa2e78a0b..6cb1f5b3d5d4968164ac0d1facddb93b9d4a4ebf 100644 (file)
--- a/src/ieee754/fpdiv/div2.py
+++ b/src/ieee754/fpdiv/div2.py
@@ -13,7 +13,7 @@ from nmigen import Module, Signal, Cat
 from nmigen.cli import main, verilog
 
 from nmutil.pipemodbase import PipeModBase
-from ieee754.fpcommon.postcalc import FPAddStage1Data
+from ieee754.fpcommon.postcalc import FPPostCalcData
 from ieee754.div_rem_sqrt_rsqrt.div_pipe import DivPipeOutputData
 
 
@@ -33,7 +33,7 @@ class FPDivStage2Mod(PipeModBase):
     def ospec(self):
         # XXX REQUIRED.  MUST NOT BE CHANGED.  this is the format
         # required for ongoing processing (normalisation, correction etc.)
-        return FPAddStage1Data(self.pspec)  # out to post-process
+        return FPPostCalcData(self.pspec)  # out to post-process
 
     def elaborate(self, platform):
         m = Module()

diff --git a/src/ieee754/fpdiv/divstages.py b/src/ieee754/fpdiv/divstages.py
index e8829dcc3b1b29897db07cb8bfdf13ccc3dd560e..ebaaa2e9378da37c95b6bf0e7e3bfe2fa4205f9c 100644 (file)
--- a/src/ieee754/fpdiv/divstages.py
+++ b/src/ieee754/fpdiv/divstages.py
@@ -106,7 +106,7 @@ class FPDivStagesFinal(PipeModBaseChain):
         divstages.append(DivPipeFinalStage(self.pspec))
 
         # does conversion from DivPipeOutputData into
-        # FPAddStage1Data format (bad name, TODO, doesn't matter),
+        # FPPostCalcData format (bad name, TODO, doesn't matter),
         # so that post-normalisation and corrections can take over
         divstages.append(FPDivStage2Mod(self.pspec))
 

diff --git a/src/ieee754/fpdiv/pipeline.py b/src/ieee754/fpdiv/pipeline.py
index c73d38148eb62bbd04f62359607e6106dc270e0d..399867b46da192cfffd1ba98d3c868ba2e1b8a36 100644 (file)
--- a/src/ieee754/fpdiv/pipeline.py
+++ b/src/ieee754/fpdiv/pipeline.py
@@ -35,7 +35,7 @@ pipediv1 - FPDivStagesIntermediate ispec DivPipeInterstageData
 ...
 
 pipediv5 - FPDivStageFinal         ispec FPDivStage0Data
---------                           ospec FPAddStage1Data
+--------                           ospec FPPostCalcData
 
                 StageChain: DivPipeCalculateStage,
                             ...
@@ -43,7 +43,7 @@ pipediv5 - FPDivStageFinal         ispec FPDivStage0Data
                             DivPipeFinalStage,
                             FPDivStage2Mod
 
-normpack - FPNormToPack            ispec FPAddStage1Data
+normpack - FPNormToPack            ispec FPPostCalcData
 --------                           ospec FPPackData
 
                 StageChain: Norm1ModSingle,

diff --git a/src/ieee754/fpmul/align.py b/src/ieee754/fpmul/align.py
index b105f8ef9cfd6468f60927114e8e973140b7e330..f2559c2b2787a4e25470516dd6df71fb8fd4c004 100644 (file)
--- a/src/ieee754/fpmul/align.py
+++ b/src/ieee754/fpmul/align.py
@@ -9,7 +9,7 @@ from ieee754.fpcommon.fpbase import FPNumBase
 from ieee754.fpcommon.getop import FPPipeContext
 from ieee754.fpcommon.msbhigh import FPMSBHigh
 from ieee754.fpcommon.denorm import FPSCData
-from ieee754.fpcommon.postcalc import FPAddStage1Data
+from ieee754.fpcommon.postcalc import FPPostCalcData
 
 
 class FPAlignModSingle(PipeModBase):

diff --git a/src/ieee754/fpmul/mul1.py b/src/ieee754/fpmul/mul1.py
index b83432ff3d771da2274a87b6e4f5f803737c7916..ce73ab2911af7d2165e6f3319920800255f789b1 100644 (file)
--- a/src/ieee754/fpmul/mul1.py
+++ b/src/ieee754/fpmul/mul1.py
@@ -8,7 +8,7 @@ from nmigen import Module, Signal
 from nmigen.cli import main, verilog
 
 from nmutil.pipemodbase import PipeModBase
-from ieee754.fpcommon.postcalc import FPAddStage1Data
+from ieee754.fpcommon.postcalc import FPPostCalcData
 from ieee754.fpmul.mul0 import FPMulStage0Data
 
 
@@ -23,7 +23,7 @@ class FPMulStage1Mod(PipeModBase):
         return FPMulStage0Data(self.pspec)
 
     def ospec(self):
-        return FPAddStage1Data(self.pspec)
+        return FPPostCalcData(self.pspec)
 
     def elaborate(self, platform):
         m = Module()

diff --git a/src/ieee754/fpmul/mulstages.py b/src/ieee754/fpmul/mulstages.py
index 95fc5be30930f98d570fbb1969d1204e3b24384d..09e79eb7b2db33ef00eb67bc6dbafc240b461084 100644 (file)
--- a/src/ieee754/fpmul/mulstages.py
+++ b/src/ieee754/fpmul/mulstages.py
@@ -7,7 +7,7 @@ from nmutil.singlepipe import StageChain
 
 from nmutil.pipemodbase import PipeModBaseChain
 from ieee754.fpcommon.denorm import FPSCData
-from ieee754.fpcommon.postcalc import FPAddStage1Data
+from ieee754.fpcommon.postcalc import FPPostCalcData
 from ieee754.fpmul.mul0 import FPMulStage0Mod
 from ieee754.fpmul.mul1 import FPMulStage1Mod
 

diff --git a/src/ieee754/fpmul/pipeline.py b/src/ieee754/fpmul/pipeline.py
index adb66a373805456cae458410f87cc57493ecf587..c20fa6253d3ff1ecb7e3f39319853a1d8a5fc575 100644 (file)
--- a/src/ieee754/fpmul/pipeline.py
+++ b/src/ieee754/fpmul/pipeline.py
@@ -16,12 +16,12 @@ scnorm   - FPDIVSpecialCasesDeNorm ispec FPADDBaseData
                             FPAlignModSingle
 
 mulstages - FPMulStages            ispec FPSCData
----------                          ospec FPAddStage1Data
+---------                          ospec FPPostCalcData
 
                 StageChain: FPMulStage0Mod
                             FPMulStage1Mod
 
-normpack  - FPNormToPack           ispec FPAddStage1Data
+normpack  - FPNormToPack           ispec FPPostCalcData
 --------                           ospec FPPackData
 
                 StageChain: Norm1ModSingle,