From 0962c4822b99bfa6215a3381ef68f4943ca71663 Mon Sep 17 00:00:00 2001
From: Nguyen Anh Quynh <aquynh@gmail.com>
Date: Fri, 4 Sep 2015 09:43:31 +0800
Subject: [PATCH] cleanup & update bindings' constants

---
 bindings/go/unicorn/unicorn_const.go     | 16 ++++++++++------
 bindings/python/unicorn/unicorn_const.py | 16 ++++++++++------
 include/unicorn/unicorn.h                |  5 ++---
 samples/sample_sparc.c                   |  2 +-
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/bindings/go/unicorn/unicorn_const.go b/bindings/go/unicorn/unicorn_const.go
index 427b34cd..e5ab6863 100644
--- a/bindings/go/unicorn/unicorn_const.go
+++ b/bindings/go/unicorn/unicorn_const.go
@@ -34,7 +34,7 @@ const (
 	UC_MODE_MIPS64 = 8
 
 	UC_ERR_OK = 0
-	UC_ERR_OOM = 1
+	UC_ERR_NOMEM = 1
 	UC_ERR_ARCH = 2
 	UC_ERR_HANDLE = 3
 	UC_ERR_UCH = 4
@@ -46,13 +46,16 @@ const (
 	UC_ERR_HOOK = 10
 	UC_ERR_INSN_INVALID = 11
 	UC_ERR_MAP = 12
-	UC_ERR_MEM_WRITE_NW = 13
-	UC_ERR_MEM_READ_NR = 14
+	UC_ERR_WRITE_PROT = 13
+	UC_ERR_READ_PROT = 14
+	UC_ERR_EXEC_PROT = 15
+	UC_ERR_INVAL = 16
 	UC_MEM_READ = 16
 	UC_MEM_WRITE = 17
 	UC_MEM_READ_WRITE = 18
-	UC_MEM_WRITE_NW = 19
-	UC_MEM_READ_NR = 20
+	UC_MEM_WRITE_PROT = 19
+	UC_MEM_READ_PROT = 20
+	UC_MEM_EXEC_PROT = 21
 	UC_HOOK_INTR = 32
 	UC_HOOK_INSN = 33
 	UC_HOOK_CODE = 34
@@ -65,5 +68,6 @@ const (
 	UC_PROT_NONE = 0
 	UC_PROT_READ = 1
 	UC_PROT_WRITE = 2
-	UC_PROT_ALL = 3
+	UC_PROT_EXEC = 4
+	UC_PROT_ALL = 7
 )
\ No newline at end of file
diff --git a/bindings/python/unicorn/unicorn_const.py b/bindings/python/unicorn/unicorn_const.py
index f2c8f0db..0f2bf718 100644
--- a/bindings/python/unicorn/unicorn_const.py
+++ b/bindings/python/unicorn/unicorn_const.py
@@ -32,7 +32,7 @@ UC_MODE_MIPS32 = 4
 UC_MODE_MIPS64 = 8
 
 UC_ERR_OK = 0
-UC_ERR_OOM = 1
+UC_ERR_NOMEM = 1
 UC_ERR_ARCH = 2
 UC_ERR_HANDLE = 3
 UC_ERR_UCH = 4
@@ -44,13 +44,16 @@ UC_ERR_CODE_INVALID = 9
 UC_ERR_HOOK = 10
 UC_ERR_INSN_INVALID = 11
 UC_ERR_MAP = 12
-UC_ERR_MEM_WRITE_NW = 13
-UC_ERR_MEM_READ_NR = 14
+UC_ERR_WRITE_PROT = 13
+UC_ERR_READ_PROT = 14
+UC_ERR_EXEC_PROT = 15
+UC_ERR_INVAL = 16
 UC_MEM_READ = 16
 UC_MEM_WRITE = 17
 UC_MEM_READ_WRITE = 18
-UC_MEM_WRITE_NW = 19
-UC_MEM_READ_NR = 20
+UC_MEM_WRITE_PROT = 19
+UC_MEM_READ_PROT = 20
+UC_MEM_EXEC_PROT = 21
 UC_HOOK_INTR = 32
 UC_HOOK_INSN = 33
 UC_HOOK_CODE = 34
@@ -63,4 +66,5 @@ UC_HOOK_MEM_READ_WRITE = 39
 UC_PROT_NONE = 0
 UC_PROT_READ = 1
 UC_PROT_WRITE = 2
-UC_PROT_ALL = 3
+UC_PROT_EXEC = 4
+UC_PROT_ALL = 7
diff --git a/include/unicorn/unicorn.h b/include/unicorn/unicorn.h
index e9136f14..c6e5015c 100644
--- a/include/unicorn/unicorn.h
+++ b/include/unicorn/unicorn.h
@@ -447,9 +447,8 @@ uc_err uc_mem_unmap(uch handle, uint64_t address, size_t size);
     This must be some combination of UC_PROT_READ | UC_PROT_WRITE | UC_PROT_EXEC,
     or this will return with UC_ERR_INVAL error.
 
- @return UC_ERR_OK on success, UC_ERR_HANDLE for an invalid handle, UC_ERR_INVAL
-    for invalid perms or unaligned address or size, UC_ERR_NOMEM if entire region
-    is not mapped.
+ @return UC_ERR_OK on success, or other value on failure (refer to uc_err enum
+ for detailed error).
 */
 UNICORN_EXPORT
 uc_err uc_mem_protect(uch handle, uint64_t address, size_t size, uint32_t perms);
diff --git a/samples/sample_sparc.c b/samples/sample_sparc.c
index c7f2971a..ee81aad9 100644
--- a/samples/sample_sparc.c
+++ b/samples/sample_sparc.c
@@ -64,7 +64,7 @@ static void test_sparc(void)
 
     // emulate machine code in infinite time (last param = 0), or when
     // finishing all the code.
-    err = uc_emu_start(handle, ADDRESS, ADDRESS + sizeof(SPARC_CODE) -1, 0, 0);
+    err = uc_emu_start(handle, ADDRESS, ADDRESS + sizeof(SPARC_CODE) - 1, 0, 0);
     if (err) {
         printf("Failed on uc_emu_start() with error returned: %u (%s)\n",
                 err, uc_strerror(err));