Simplify vMkRWire1, rename to __mkRWireSubmodule, expand the comment

This module only exists so that AAddSchedAssumps can create an AVInst
for mkRWire of size 1.  We could consider eliminating it by having BSC
construct the AVInst in a better way.  Until then, the interface is at
least unneeded, so remove it -- eliminating the need for RWireN.

Also remove vMkUnsafeRWire1, which is unneeded and should not have
been created (when adding unsafe versions of the real modules).

Author: quark17

src/Libraries/Base1/Prelude.bs

@@ -259,7 +259,6 @@ package Prelude(
         NumConArg(..), StarConArg(..), OtherConArg(..),
         MetaConsNamed(..), MetaConsAnon(..), MetaField(..),
 
-        primMethod, -- TODO: Needed only in PreludeBSV for vMkRWire1, should be removed.
         WrapField(..), WrapMethod(..), WrapPorts(..),
         Port(..), unPort, SplitPorts(..)
         ) where

src/Libraries/Base1/PreludeBSV.bsv

@@ -82,25 +82,16 @@ interface VRWire#(type a) ;
    method Bool whas() ;
 endinterface: VRWire
 
-interface VRWireN#(numeric type n);
-  method PrimAction wset(Bit#(n) datain);
-  method Bit#(n) wget();
-  method Bit#(1) whas();
-endinterface
-
-// for addCFWire desugaring
-// This uses prim types like something coming from genwrap.
-module vMkRWire1(VRWireN#(1));
-
+// __mkRWireSubmodule only exists so that BSC can get a handle on the
+// 'AVInst' for the submodule instantiation of 'vMkRWire', by applying
+// a few compiler stages to the definition.  This occurs in
+// 'AAddSchedAssumps' where BSC implements the checking of
+// 'conflict_free' attributes by adding RWire writes to those rules,
+// and for that it needs to instantiate new RWire modules.
+//
+module __mkRWireSubmodule();
    (* hide *)
    VRWire#(Bit#(1)) _rw <- vMkRWire;
-   function rw_wset(v);
-      return toPrimAction(_rw.wset(v));
-   endfunction
-   method wset = primMethod(Cons("v", Nil), rw_wset);
-   method wget = primMethod(Nil, _rw.wget);
-   method whas = primMethod(Nil, pack(_rw.whas));
-
 endmodule
 
 interface VRWire0;
@@ -416,19 +407,6 @@ endmodule
 
 // =======
 
-// for addCFWire desugaring
-module vMkUnsafeRWire1(VRWireN#(1));
-
-   (* hide *)
-   VRWire#(Bit#(1)) _rw <- vMkUnsafeRWire;
-   method wset(v);
-      return(toPrimAction(_rw.wset(v)));
-   endmethod
-   method wget = _rw.wget;
-   method whas = pack(_rw.whas);
-
-endmodule
-
 import "BVI" RWire =
    module vMkUnsafeRWire (VRWire#(a))
       provisos (Bits#(a,sa));

src/comp/AAddSchedAssumps.hs

@@ -3,7 +3,6 @@ module AAddSchedAssumps(aAddSchedAssumps, aAddCFConditionWires) where
 import CSyntax
 import SymTab
 import TypeCheck(topExpr)
-import CType
 import Type
 import qualified TIMonad as TIM(runTI)
 import Flags(Flags, showElabProgress)
@@ -29,7 +28,6 @@ import PPrint
 import Pragma(ASchedulePragma)
 import Error(internalError, ErrMsg(..), showErrorList, ErrorHandle)
 import Id
-import Position(noPosition)
 import Util(unzipWith, ordPairBy)
 import Util(mapSnd)
 
@@ -223,8 +221,8 @@ buildMethCondList uses = M.toList (M.fromListWith aOr uses')
 getRWireInstFn :: ErrorHandle -> Flags -> SymTab ->
                   M.Map AId HExpr -> IO (Id -> AVInst)
 getRWireInstFn errh flags r alldefs = do
-  let blobT = TAp tModule (TAp tVRWireN (cTNum 1 noPosition))
-  case fst $ (TIM.runTI flags False r (topExpr blobT (CVar idVmkRWire1))) of
+  let blobT = TAp tModule tEmpty
+  case fst $ (TIM.runTI flags False r (topExpr blobT (CVar id__mkRWireSubmodule))) of
     Left errs -> internalError (ppReadable errs)
     Right (_,e') -> do
       let iexpr = iConvExpr errh flags r alldefs e'

src/comp/PreIds.hs

@@ -510,9 +510,8 @@ idPrimAdd = prelude_id_no fsPrimAdd
 idPrimSub = prelude_id_no fsPrimSub
 
 -- | Used by AddCFWire
-idVRWireN, idVmkRWire1, idWGet, idWSet, idWHas :: Id
-idVRWireN   = prelude_bsv_id_no fsVRWireN
-idVmkRWire1 = prelude_bsv_id_no fsVmkRWire1
+id__mkRWireSubmodule, idWGet, idWSet, idWHas :: Id
+id__mkRWireSubmodule = prelude_bsv_id_no fs__mkRWireSubmodule
 idWGet = prelude_bsv_id_no fsWGet
 idWSet = prelude_bsv_id_no fsWSet
 idWHas = prelude_bsv_id_no fsWHas

src/comp/PreStrings.hs

@@ -319,8 +319,7 @@ fsExposeCurrentReset = mkFString "exposeCurrentReset"
 fsNoClock          = mkFString "noClock"
 fsNoReset          = mkFString "noReset"
 fsPrimReplaceClockGate = mkFString "primReplaceClockGate"
-fsVRWireN          = mkFString "VRWireN"
-fsVmkRWire1        = mkFString "vMkRWire1"
+fs__mkRWireSubmodule = mkFString "__mkRWireSubmodule"
 fsWGet             = mkFString "wget"
 fsWSet             = mkFString "wset"
 fsWHas             = mkFString "whas"

src/comp/Type.hs

@@ -76,10 +76,10 @@ tRules = TCon (TyCon idRules (Just KStar) TIabstract)
 tRulesAt :: Position -> Type
 tRulesAt pos = TCon (TyCon (idRulesAt pos) (Just KStar) TIabstract)
 
-tSchedPragma, tModule, tVRWireN, tId, t32 :: Type
+tSchedPragma, tModule, tEmpty, tId, t32 :: Type
 tSchedPragma = TCon (TyCon idSchedPragma (Just KStar) TIabstract)
 tModule = TCon (TyCon idModule (Just (Kfun KStar KStar)) TIabstract)
-tVRWireN = TCon (TyCon idVRWireN (Just (Kfun KNum KStar)) (TIstruct SStruct [idWSet, idWGet, idWHas]))
+tEmpty = TCon (TyCon idEmpty (Just KStar) (TIstruct (SInterface []) []))
 tId = TCon (TyCon idId (Just (Kfun KStar KStar)) TIabstract)
 t32 = tOfSize 32 noPosition