merge fix

README.md

@@ -2,7 +2,7 @@
 
 [![MIT](https://img.shields.io/packagist/l/doctrine/orm.svg?maxAge=2592000?style=plastic)](https://github.com/hugsy/cemu/blob/master/LICENSE) [![IRC](https://img.shields.io/badge/freenode-%23%23cemu-yellowgreen.svg)](https://webchat.freenode.net/?channels=##cemu) [![Python-Version](https://img.shields.io/pypi/pyversions/cemu.svg)](https://pypi.python.org/pypi/cemu) [![PyPi-Version](https://img.shields.io/pypi/v/cemu.svg)](https://pypi.python.org/pypi/cemu)
 
-![cemu-linux](https://i.imgur.com/Imuxb1q.png)
+![cemu-linux](https://i.imgur.com/7DI6BxR.png)
 
 ## Description ##
 
@@ -81,7 +81,7 @@ $ sudo ln -sf /path/to/libkeystone.so/found/above /usr/local/lib/libkeystone.so
 If you are using OSX, I would highly recommand installing Capstone engine directly using `brew.sh` command instead of `pip`, as its version seems more up-to-date than the one on PyPI. Doing so, the installation should work out of the box:
 
 ```bash
-$ brew install capstone 
+$ brew install capstone
 $ pip3 install -U cemu
 ```
 
@@ -93,7 +93,7 @@ The fastest way for Windows is to install the packaged binaries for:
     - Including the [Microsoft VC++ runtime library](https://www.microsoft.com/en-gb/download/details.aspx?id=40784)
   - Capstone (http://www.capstone-engine.org/download/)
   - Unicorn (http://www.unicorn-engine.org/download/)
-  
+
 
 Then spawn `cmd.exe` and install the missing Python packages using `pip`:
 

README.rst

@@ -3,7 +3,8 @@ CEMU
 
 |MIT| |IRC| |Python-Version| |PyPi-Version|
 
-.. figure:: https://i.imgur.com/Imuxb1q.png
+
+.. figure:: https://i.imgur.com/7DI6BxR.png
    :alt: cemu-linux
 
    cemu-linux
@@ -97,7 +98,7 @@ installation should work out of the box:
 
 .. code:: bash
 
-    $ brew install capstone 
+    $ brew install capstone
     $ pip3 install -U cemu
 
 Windows

cemu/__init__.py

@@ -1,8 +0,0 @@
-PROGNAME = 'cemu'
-AUTHOR = 'hugsy'
-EMAIL = '[email protected]'
-VERSION = '0.2.2'
-URL = 'https://github.com/{}/{}'.format(AUTHOR, PROGNAME)
-ISSUES = 'https://github.com/{}/{}/issues'.format(AUTHOR, PROGNAME)
-RELEASE_LINK = '{}/archive/{}.tar.gz'.format(URL, VERSION)
-LICENSE = 'MIT'

cemu/__main__.py

@@ -9,7 +9,7 @@ def check_dependencies():
         try:
             __import__(d)
         except ImportError:
-            print("[-] Missing required dependency '%s'" % d)
+            print("[-] Missing required dependency '{}'".format(d))
             sys.exit(1)
     return
 

cemu/arch/__init__.py

@@ -64,8 +64,9 @@ def syscalls(self):
         if self.__syscalls:
             return self.__syscalls
 
-        path = os.path.dirname(os.path.realpath(__file__)) + "/../syscalls"
-        fpath = "{}/{}.csv".format(path, self.syscall_filename)
+        cemu_directory = os.path.dirname(os.path.realpath(__file__))
+        path = os.sep.join([cemu_directory, os.sep, "..", os.sep, "syscalls"])
+        fpath = "{}{}{}.csv".format(path, os.sep, self.syscall_filename)
         syscalls = {}
 
         with open(fpath, 'r') as fd:
@@ -80,7 +81,6 @@ def syscalls(self):
     def __eq__(self, x):
         if not isinstance(x, Architecture):
             return False
-
         return self.name == x.name and self.endianness== x.endianness and self.syntax == x.syntax
 
 

cemu/const.py

@@ -0,0 +1,22 @@
+import os
+
+
+PROGNAME            = 'cemu'
+AUTHOR              = 'hugsy'
+EMAIL               = '[email protected]'
+VERSION             = '0.3'
+URL                 = 'https://github.com/{}/{}'.format(AUTHOR, PROGNAME)
+ISSUES              = 'https://github.com/{}/{}/issues'.format(AUTHOR, PROGNAME)
+RELEASE_LINK        = '{}/archive/{}.tar.gz'.format(URL, VERSION)
+LICENSE             = 'MIT'
+
+
+WINDOW_SIZE        = (1600, 800)
+PKG_PATH           = os.path.dirname(os.path.realpath(__file__))
+ICON_PATH          = "{}/img/icon.png".format(PKG_PATH)
+EXAMPLE_PATH       = "{}/examples".format(PKG_PATH)
+TEMPLATE_PATH      = "{}/templates".format(PKG_PATH)
+TITLE              = "CEmu - Cheap Emulator v.{}".format(VERSION)
+HOME               = os.getenv("HOME")
+COMMENT_MARKER     = ";;;"
+PROPERTY_MARKER    = "@@@"