From 74f3916a537b4fbb237a0d5fb9d23a58b7bf8591 Mon Sep 17 00:00:00 2001
From: Adrian Herrera <adrian.herrera02@gmail.com>
Date: Mon, 6 Jun 2016 23:26:36 +1000
Subject: [PATCH] Minor updates
Removed unused utility functions and renamed variables
---
bindings/haskell/samples/Sample.hs | 8 ++++----
bindings/haskell/src/Keystone/Internal/Util.hs | 6 ------
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/bindings/haskell/samples/Sample.hs b/bindings/haskell/samples/Sample.hs
index 21960eb..a37a775 100644
--- a/bindings/haskell/samples/Sample.hs
+++ b/bindings/haskell/samples/Sample.hs
@@ -15,12 +15,12 @@ testKs :: Architecture
-> String
-> Maybe OptionValue
-> IO ()
-testKs arch mode assembly syntax = do
+testKs arch mode assembly maybeSyntax = do
result <- runAssembler $ do
ks <- open arch mode
- case syntax of
- Just syn -> option ks OptSyntax syn
- Nothing -> return ()
+ case maybeSyntax of
+ Just syntax -> option ks OptSyntax syntax
+ Nothing -> return ()
(encode, count) <- assemble ks assembly Nothing
return (encode, count)
case result of
diff --git a/bindings/haskell/src/Keystone/Internal/Util.hs b/bindings/haskell/src/Keystone/Internal/Util.hs
index e7ee1cc..c23fa38 100644
--- a/bindings/haskell/src/Keystone/Internal/Util.hs
+++ b/bindings/haskell/src/Keystone/Internal/Util.hs
@@ -7,18 +7,12 @@ License : GPL-2
module Keystone.Internal.Util where
import Data.Bits
-import Foreign
-- | Combine a list of Enums by performing a bitwise-OR.
combineEnums :: (Enum a, Num b, Bits b) => [a] -> b
combineEnums =
foldr ((.|.) <$> enumToNum) 0
--- | Cast a pointer and then peek inside it.
-castPtrAndPeek :: Storable a => Ptr b -> IO a
-castPtrAndPeek =
- peek . castPtr
-
-- | Convert an 'Eum' to a 'Num'.
enumToNum :: (Enum a, Num b) => a -> b
enumToNum =
--
GitLab