fix compilation

anoma · Oct 14, 2022 · cfb6f42 · cfb6f42
1 parent 1aeba80
commit cfb6f42
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/Juvix/Compiler/Reg/Language/Base.hs b/src/Juvix/Compiler/Reg/Language/Base.hs
@@ -5,4 +5,4 @@ module Juvix.Compiler.Reg.Language.Base
 where
 
 import Juvix.Compiler.Asm.Language.Rep
-import Juvix.Compiler.Core.Language.Base hiding (Index, BuiltinOp(..))
+import Juvix.Compiler.Core.Language.Base hiding (BuiltinOp (..), Index)
diff --git a/src/Juvix/Compiler/Reg/Translation/FromAsm.hs b/src/Juvix/Compiler/Reg/Translation/FromAsm.hs
@@ -75,14 +75,7 @@ fromAsmInstr ::
   Sem r Instruction
 fromAsmInstr tab mem Asm.CmdInstr {..} =
   case _cmdInstrInstruction of
-    Asm.IntAdd -> return $ mkBinop OpIntAdd
-    Asm.IntSub -> return $ mkBinop OpIntSub
-    Asm.IntMul -> return $ mkBinop OpIntMul
-    Asm.IntDiv -> return $ mkBinop OpIntDiv
-    Asm.IntMod -> return $ mkBinop OpIntMod
-    Asm.IntLt -> return $ mkBinop OpIntLt
-    Asm.IntLe -> return $ mkBinop OpIntLe
-    Asm.ValEq -> return $ mkBinop OpEq
+    Asm.Binop op -> return $ mkBinop (mkOpcode op)
     Asm.Push val -> return $ mkAssign (VarRef VarGroupStack (n + 1)) (mkValue val)
     Asm.Pop -> return Nop
     Asm.PushTemp ->
@@ -130,6 +123,17 @@ fromAsmInstr tab mem Asm.CmdInstr {..} =
             }
         )
 
+    mkOpcode :: Asm.Opcode -> Opcode
+    mkOpcode = \case
+      Asm.IntAdd -> OpIntAdd
+      Asm.IntSub -> OpIntSub
+      Asm.IntMul -> OpIntMul
+      Asm.IntDiv -> OpIntDiv
+      Asm.IntMod -> OpIntMod
+      Asm.IntLt -> OpIntLt
+      Asm.IntLe -> OpIntLe
+      Asm.ValEq -> OpEq
+
     mkAssign :: VarRef -> Value -> Instruction
     mkAssign tgt src = Assign (InstrAssign tgt src)