Fix code errors & details

0rphee · Jul 16, 2024 · b810d2a · b810d2a
1 parent 00f3927
commit b810d2a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/app/Main.hs b/app/Main.hs
@@ -13,8 +13,8 @@ main = do
   (Options sourceCodePath) <- runCmdOptions
   putStrLn $ "FILEPATH: " <> sourceCodePath
   assemblyCode <- T.readFile sourceCodePath
-  T.putStrLn assemblyCode
-  T.putStrLn $ T.replicate 10 "-"
+  -- T.putStrLn assemblyCode
+  -- T.putStrLn $ T.replicate 10 "-"
   mayStatements <- Expr.mainLocal assemblyCode
   case mayStatements of
     Nothing -> T.putStrLn "No results to be written"

diff --git a/src/Bin.hs b/src/Bin.hs
@@ -49,9 +49,9 @@ getInstOffset = \case
 
 trans :: Map Label Location -> Location -> Instruction -> Put
 trans labelMap instrLoc = \case
-  MOV (RegOp AX) (ImmOp ew) -> putWord8 0xb8 >> treatAsW16 ew
-  MOV (RegOp BX) (ImmOp ew) -> putWord8 0xbb >> treatAsW16 ew
-  MOV (RegOp CX) (ImmOp ew) -> putWord8 0xb9 >> treatAsW16 ew
+  MOV (RegOp AX) (ImmOp ew) -> putWord8 0xb8 >> putAsW16 ew
+  MOV (RegOp BX) (ImmOp ew) -> putWord8 0xbb >> putAsW16 ew
+  MOV (RegOp CX) (ImmOp ew) -> putWord8 0xb9 >> putAsW16 ew
   -- MOV (RegOp DX) (ImmOp ew) -> putWord8 >> putEitherW ew
   MOV (RegOp AH) (ImmOp ew) -> putWord8 0xb4 >> putAsW8 ew
   MOV (RegOp AL) (ImmOp ew) -> putWord8 0xb0 >> putAsW8 ew
@@ -95,7 +95,7 @@ trans labelMap instrLoc = \case
 
     putAsW8 :: Either Word8 Word16 -> Put =
       putWord8 . either id fromIntegral
-    treatAsW16 :: Either Word8 Word16 -> Put =
+    putAsW16 :: Either Word8 Word16 -> Put =
       putWord16le . either fromIntegral id
 
 firstPass :: [Statement] -> ProgramInfo