Rename some hook related enums:

- UC_ERR_READ_INVALID -> UC_ERR_READ_UNMAPPED
 - UC_ERR_WRITE_INVALID -> UC_ERR_WRITE_UNMAPPED
 - UC_ERR_FETCH_INVALID -> UC_ERR_FETCH_UNMAPPED
 - UC_MEM_READ_INVALID -> UC_MEM_READ_UNMAPPED
 - UC_MEM_WRITE_INVALID -> UC_MEM_WRITE_UNMAPPED
 - UC_MEM_FETCH_INVALID -> UC_MEM_FETCH_UNMAPPED
 - UC_HOOK_MEM_READ_INVALID -> UC_HOOK_MEM_READ_UNMAPPED
 - UC_HOOK_MEM_WRITE_INVALID -> UC_HOOK_MEM_WRITE_UNMAPPED
 - UC_HOOK_MEM_FETCH_INVALID -> UC_HOOK_MEM_FETCH_UNMAPPED
 - UC_HOOK_MEM_INVALID -> UC_HOOK_MEM_UNMAPPED

This also renames some newly added macros to use _INVALID postfix:

 - UC_HOOK_MEM_READ_ERR -> UC_HOOK_MEM_READ_INVALID
 - UC_HOOK_MEM_WRITE_ERR -> UC_HOOK_MEM_WRITE_INVALID
 - UC_HOOK_MEM_FETCH_ERR -> UC_HOOK_MEM_FETCH_INVALID
 - UC_HOOK_MEM_ERR -> UC_HOOK_MEM_INVALID

Fixed all the bindings Java, Go & Python.

bindings/python/sample_x86.py

@@ -33,7 +33,7 @@ def hook_code(uc, address, size, user_data):
 
 # callback for tracing invalid memory access (READ or WRITE)
 def hook_mem_invalid(uc, access, address, size, value, user_data):
-    if access == UC_MEM_WRITE_INVALID:
+    if access == UC_MEM_WRITE_UNMAPPED:
         print(">>> Missing memory is being WRITE at 0x%x, data size = %u, data value = 0x%x" \
                 %(address, size, value))
         # map this memory in with 2MB in size
@@ -231,7 +231,7 @@ def test_i386_invalid_mem_write():
         #mu.hook_add(UC_HOOK_CODE, hook_code)
 
         # intercept invalid memory events
-        mu.hook_add(UC_HOOK_MEM_READ_INVALID | UC_HOOK_MEM_WRITE_INVALID, hook_mem_invalid)
+        mu.hook_add(UC_HOOK_MEM_READ_UNMAPPED | UC_HOOK_MEM_WRITE_UNMAPPED, hook_mem_invalid)
 
         try:
             # emulate machine code in infinite time

bindings/python/unicorn/unicorn.py

@@ -272,8 +272,8 @@ class Uc(object):
             cb = ctypes.cast(UC_HOOK_CODE_CB(self._hookcode_cb), UC_HOOK_CODE_CB)
             status = _uc.uc_hook_add(self._uch, ctypes.byref(_h2), htype, cb, \
                     ctypes.cast(self._callback_count, ctypes.c_void_p), begin, end)
-        elif htype & UC_HOOK_MEM_READ_INVALID or htype & UC_HOOK_MEM_WRITE_INVALID or \
-            htype & UC_HOOK_MEM_FETCH_INVALID or htype & UC_HOOK_MEM_READ_PROT or \
+        elif htype & UC_HOOK_MEM_READ_UNMAPPED or htype & UC_HOOK_MEM_WRITE_UNMAPPED or \
+            htype & UC_HOOK_MEM_FETCH_UNMAPPED or htype & UC_HOOK_MEM_READ_PROT or \
             htype & UC_HOOK_MEM_WRITE_PROT or htype & UC_HOOK_MEM_FETCH_PROT:
             cb = ctypes.cast(UC_HOOK_MEM_INVALID_CB(self._hook_mem_invalid_cb), UC_HOOK_MEM_INVALID_CB)
             status = _uc.uc_hook_add(self._uch, ctypes.byref(_h2), htype, \

bindings/python/unicorn/unicorn_const.py

@@ -37,26 +37,25 @@ UC_ERR_ARCH = 2
 UC_ERR_HANDLE = 3
 UC_ERR_MODE = 4
 UC_ERR_VERSION = 5
-UC_ERR_READ_INVALID = 6
-UC_ERR_WRITE_INVALID = 7
-UC_ERR_FETCH_INVALID = 8
-UC_ERR_CODE_INVALID = 9
-UC_ERR_HOOK = 10
-UC_ERR_INSN_INVALID = 11
-UC_ERR_MAP = 12
-UC_ERR_WRITE_PROT = 13
-UC_ERR_READ_PROT = 14
-UC_ERR_FETCH_PROT = 15
-UC_ERR_ARG = 16
-UC_ERR_READ_UNALIGNED = 17
-UC_ERR_WRITE_UNALIGNED = 18
-UC_ERR_FETCH_UNALIGNED = 19
+UC_ERR_READ_UNMAPPED = 6
+UC_ERR_WRITE_UNMAPPED = 7
+UC_ERR_FETCH_UNMAPPED = 8
+UC_ERR_HOOK = 9
+UC_ERR_INSN_INVALID = 10
+UC_ERR_MAP = 11
+UC_ERR_WRITE_PROT = 12
+UC_ERR_READ_PROT = 13
+UC_ERR_FETCH_PROT = 14
+UC_ERR_ARG = 15
+UC_ERR_READ_UNALIGNED = 16
+UC_ERR_WRITE_UNALIGNED = 17
+UC_ERR_FETCH_UNALIGNED = 18
 UC_MEM_READ = 16
 UC_MEM_WRITE = 17
 UC_MEM_FETCH = 18
-UC_MEM_READ_INVALID = 19
-UC_MEM_WRITE_INVALID = 20
-UC_MEM_FETCH_INVALID = 21
+UC_MEM_READ_UNMAPPED = 19
+UC_MEM_WRITE_UNMAPPED = 20
+UC_MEM_FETCH_UNMAPPED = 21
 UC_MEM_WRITE_PROT = 22
 UC_MEM_READ_PROT = 23
 UC_MEM_FETCH_PROT = 24
@@ -64,9 +63,9 @@ UC_HOOK_INTR = 1
 UC_HOOK_INSN = 2
 UC_HOOK_CODE = 4
 UC_HOOK_BLOCK = 8
-UC_HOOK_MEM_READ_INVALID = 16
-UC_HOOK_MEM_WRITE_INVALID = 32
-UC_HOOK_MEM_FETCH_INVALID = 64
+UC_HOOK_MEM_READ_UNMAPPED = 16
+UC_HOOK_MEM_WRITE_UNMAPPED = 32
+UC_HOOK_MEM_FETCH_UNMAPPED = 64
 UC_HOOK_MEM_READ_PROT = 128
 UC_HOOK_MEM_WRITE_PROT = 256
 UC_HOOK_MEM_FETCH_PROT = 512