Remove duplicated code: ExtendReg

grin-compiler · Nov 15, 2018 · a376387 · a376387
1 parent fc6c7dc
commit a376387
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 14 deletions.
diff --git a/grin/src/AbstractInterpretation/IR.hs b/grin/src/AbstractInterpretation/IR.hs
@@ -48,11 +48,7 @@ data Instruction
     , dstSelector   :: Selector -- ^ the seleced tag must exist
     , dstReg        :: Reg
     }
-  | ExtendReg -- ^ extends the destination register with the source register
-    { srcReg :: Reg
-    , dstReg :: Reg
-    }
-  | Move
+  | Move -- ^ extends the destination register with the source register
     { srcReg        :: Reg
     , dstReg        :: Reg
     }

diff --git a/grin/src/AbstractInterpretation/PrettyIR.hs b/grin/src/AbstractInterpretation/PrettyIR.hs
@@ -116,7 +116,6 @@ prettyInstruction mirm = \case
     Store   {..} -> keyword "store" <+> ppR srcReg <+> arr <+> pretty address
     Update  {..} -> keyword "update" <+> ppR srcReg <+> arr <+> ppR addressReg
     Set     {..} -> keyword "set" <+> prettyConstant mirm constant <+> arr <+> ppR dstReg
-    ExtendReg {..} -> keyword "extend-reg" <+> ppR srcReg <+> ppR dstReg
   where
     ppR = prettyReg mirm
     ppS = prettySelector mirm

diff --git a/grin/src/AbstractInterpretation/Reduce.hs b/grin/src/AbstractInterpretation/Reduce.hs
@@ -125,10 +125,6 @@ evalInstruction = \case
     let NodeItem tag itemIndex = dstSelector
     register.ix (regIndex dstReg).nodeSet.nodeTagMap.at tag.non mempty.ix itemIndex %= (mappend value)
 
-  ExtendReg {..} -> do
-    value <- use $ register.ix (regIndex srcReg)
-    register . ix (regIndex dstReg) %= mappend value
-
   Move {..} -> do
     value <- use $ register.ix (regIndex srcReg)
     register.ix (regIndex dstReg) %= (mappend value)

diff --git a/grin/src/AbstractInterpretation/Sharing.hs b/grin/src/AbstractInterpretation/Sharing.hs
@@ -64,12 +64,12 @@ sharingCodeGen s e = do
     nonLinearVarReg <- getReg name
     nonLinearVarLocReg <- newReg
     emit $ IR.Project Locations nonLinearVarReg nonLinearVarLocReg
-    emit $ IR.ExtendReg nonLinearVarLocReg s
+    emit $ IR.Move nonLinearVarLocReg s
 
   pointsToLocReg <- newReg
   pointsToNodeReg <- newReg
   emit $ IR.Fetch s pointsToNodeReg
   emit $ IR.Project IR.NodeLocations pointsToNodeReg pointsToLocReg
-  emit $ IR.ExtendReg pointsToLocReg s
+  emit $ IR.Move pointsToLocReg s
   where
     nonLinearVars = calcNonLinearNonUpdateLocVariables e
diff --git a/playground/hpt/hpt.cpp b/playground/hpt/hpt.cpp
@@ -77,8 +77,6 @@ inline void union_value(value_t& src, value_t& dst) {
 }
 
 // data-flow instruction execution
-
-// NOTE: Move == ExtendReg
 void cmd_move(reg_t src, reg_t dst) {
   union_value(_register[src], _register[dst]);
 }