From bc569f5a5450dd0d76048e329443d25688ed3975 Mon Sep 17 00:00:00 2001 From: Nguyen Anh Quynh Date: Tue, 10 Jan 2017 20:59:14 +0800 Subject: [PATCH] rename API uc_mem_free() to uc_free(). see #662 --- bindings/go/unicorn/context.go | 2 +- bindings/haskell/src/Unicorn/Internal/Unicorn.chs | 4 ++-- bindings/haskell/src/cbits/unicorn_wrapper.c | 4 ++-- bindings/haskell/src/include/unicorn_wrapper.h | 4 ++-- bindings/java/unicorn_Unicorn.c | 2 +- bindings/python/unicorn/unicorn.py | 4 ++-- include/unicorn/unicorn.h | 6 +++--- samples/sample_x86.c | 4 ++-- tests/regress/mem_64_c.c | 2 +- tests/unit/test_x86.c | 2 +- uc.c | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/bindings/go/unicorn/context.go b/bindings/go/unicorn/context.go index ed5bc636..be9fceb9 100644 --- a/bindings/go/unicorn/context.go +++ b/bindings/go/unicorn/context.go @@ -17,7 +17,7 @@ func (u *uc) ContextSave(reuse Context) (Context, error) { if err := errReturn(C.uc_context_alloc(u.handle, ctx)); err != nil { return nil, err } - runtime.SetFinalizer(ctx, func(p Context) { C.uc_mem_free(*p) }) + runtime.SetFinalizer(ctx, func(p Context) { C.uc_free(*p) }) if err := errReturn(C.uc_context_save(u.handle, *ctx)); err != nil { } return ctx, nil diff --git a/bindings/haskell/src/Unicorn/Internal/Unicorn.chs b/bindings/haskell/src/Unicorn/Internal/Unicorn.chs index fc2111c4..bfe8bd37 100644 --- a/bindings/haskell/src/Unicorn/Internal/Unicorn.chs +++ b/bindings/haskell/src/Unicorn/Internal/Unicorn.chs @@ -117,7 +117,7 @@ instance Storable MemoryRegion where -- | Opaque storage for CPU context, used with the context functions. {# pointer *uc_context as Context - foreign finalizer uc_mem_free_wrapper as memFree + foreign finalizer uc_free_wrapper as memFree newtype #} @@ -125,7 +125,7 @@ instance Storable MemoryRegion where {# pointer *uc_context as ContextPtr -> Context #} -- | Make a CPU context out of a context pointer. The returned CPU context will --- automatically call 'uc_mem_free' when it goes out of scope. +-- automatically call 'uc_free' when it goes out of scope. mkContext :: ContextPtr -> IO Context mkContext ptr = diff --git a/bindings/haskell/src/cbits/unicorn_wrapper.c b/bindings/haskell/src/cbits/unicorn_wrapper.c index f92675c6..92251a7c 100644 --- a/bindings/haskell/src/cbits/unicorn_wrapper.c +++ b/bindings/haskell/src/cbits/unicorn_wrapper.c @@ -7,6 +7,6 @@ void uc_close_wrapper(uc_engine *uc) { void uc_close_dummy(uc_engine *uc) { } -void uc_mem_free_wrapper(void *mem) { - uc_mem_free(mem); +void uc_free_wrapper(void *mem) { + uc_free(mem); } diff --git a/bindings/haskell/src/include/unicorn_wrapper.h b/bindings/haskell/src/include/unicorn_wrapper.h index 0fb17583..77174750 100644 --- a/bindings/haskell/src/include/unicorn_wrapper.h +++ b/bindings/haskell/src/include/unicorn_wrapper.h @@ -14,8 +14,8 @@ void uc_close_wrapper(uc_engine *uc); void uc_close_dummy(uc_engine *uc); /* - * Wrap Unicorn's uc_mem_free function and ignore the returned error code. + * Wrap Unicorn's uc_free function and ignore the returned error code. */ -void uc_mem_free_wrapper(void *context); +void uc_free_wrapper(void *context); #endif diff --git a/bindings/java/unicorn_Unicorn.c b/bindings/java/unicorn_Unicorn.c index 40461cc7..6a5b62ee 100644 --- a/bindings/java/unicorn_Unicorn.c +++ b/bindings/java/unicorn_Unicorn.c @@ -746,7 +746,7 @@ JNIEXPORT jlong JNICALL Java_unicorn_Unicorn_context_1alloc */ JNIEXPORT void JNICALL Java_unicorn_Unicorn_context_1free (JNIEnv *env, jobject self, jlong ctx) { - uc_err err = uc_mem_free((void *)ctx); + uc_err err = uc_free((void *)ctx); if (err != UC_ERR_OK) { throwException(env, err); } diff --git a/bindings/python/unicorn/unicorn.py b/bindings/python/unicorn/unicorn.py index 2c286720..93d67c0f 100644 --- a/bindings/python/unicorn/unicorn.py +++ b/bindings/python/unicorn/unicorn.py @@ -126,7 +126,7 @@ _setup_prototype(_uc, "uc_mem_unmap", ucerr, uc_engine, ctypes.c_uint64, ctypes. _setup_prototype(_uc, "uc_mem_protect", ucerr, uc_engine, ctypes.c_uint64, ctypes.c_size_t, ctypes.c_uint32) _setup_prototype(_uc, "uc_query", ucerr, uc_engine, ctypes.c_uint32, ctypes.POINTER(ctypes.c_size_t)) _setup_prototype(_uc, "uc_context_alloc", ucerr, uc_engine, ctypes.POINTER(uc_context)) -_setup_prototype(_uc, "uc_mem_free", ucerr, ctypes.c_void_p) +_setup_prototype(_uc, "uc_free", ucerr, ctypes.c_void_p) _setup_prototype(_uc, "uc_context_save", ucerr, uc_engine, uc_context) _setup_prototype(_uc, "uc_context_restore", ucerr, uc_engine, uc_context) @@ -496,7 +496,7 @@ class SavedContext(object): self.pointer = pointer def __del__(self): - status = _uc.uc_mem_free(self.pointer) + status = _uc.uc_free(self.pointer) if status != uc.UC_ERR_OK: raise UcError(status) diff --git a/include/unicorn/unicorn.h b/include/unicorn/unicorn.h index c34978b0..61d16568 100644 --- a/include/unicorn/unicorn.h +++ b/include/unicorn/unicorn.h @@ -642,7 +642,7 @@ uc_err uc_mem_protect(uc_engine *uc, uint64_t address, size_t size, uint32_t per @uc: handle returned by uc_open() @regions: pointer to an array of uc_mem_region struct. This is allocated by - Unicorn, and must be freed by user later with uc_mem_free() + Unicorn, and must be freed by user later with uc_free() @count: pointer to number of struct uc_mem_region contained in @regions @return UC_ERR_OK on success, or other value on failure (refer to uc_err enum @@ -660,7 +660,7 @@ uc_err uc_mem_regions(uc_engine *uc, uc_mem_region **regions, uint32_t *count); @uc: handle returned by uc_open() @context: pointer to a uc_engine*. This will be updated with the pointer to the new context on successful return of this function. - Later, this allocated memory must be freed with uc_mem_free(). + Later, this allocated memory must be freed with uc_free(). @return UC_ERR_OK on success, or other value on failure (refer to uc_err enum for detailed error). @@ -678,7 +678,7 @@ uc_err uc_context_alloc(uc_engine *uc, uc_context **context); for detailed error). */ UNICORN_EXPORT -uc_err uc_mem_free(void *mem); +uc_err uc_free(void *mem); /* Save a copy of the internal CPU context. diff --git a/samples/sample_x86.c b/samples/sample_x86.c index 46b8bfa2..079ca7d6 100644 --- a/samples/sample_x86.c +++ b/samples/sample_x86.c @@ -759,9 +759,9 @@ static void test_i386_context_save(void) printf(">>> EAX = 0x%x\n", r_eax); // free the CPU context - err = uc_mem_free(context); + err = uc_free(context); if (err) { - printf("Failed on uc_mem_free() with error returned: %u\n", err); + printf("Failed on uc_free() with error returned: %u\n", err); return; } diff --git a/tests/regress/mem_64_c.c b/tests/regress/mem_64_c.c index d20a3fda..137e6561 100644 --- a/tests/regress/mem_64_c.c +++ b/tests/regress/mem_64_c.c @@ -32,7 +32,7 @@ int main(int argc, char **argv, char **envp) { starts[i], regions[i].begin); } } - uc_mem_free(regions); + uc_free(regions); } uc_close(uc); diff --git a/tests/unit/test_x86.c b/tests/unit/test_x86.c index 6ffd7d24..1c451fcf 100644 --- a/tests/unit/test_x86.c +++ b/tests/unit/test_x86.c @@ -800,7 +800,7 @@ static void test_i386_reg_save(void **state) assert_int_equal(eax, 2); // clean up; - uc_mem_free(saved_context); + uc_free(saved_context); uc_assert_success(uc_close(uc)); } /******************************************************************************/ diff --git a/uc.c b/uc.c index c162c3fc..46b019cc 100644 --- a/uc.c +++ b/uc.c @@ -1193,7 +1193,7 @@ uc_err uc_context_alloc(uc_engine *uc, uc_context **context) } UNICORN_EXPORT -uc_err uc_mem_free(void *mem) +uc_err uc_free(void *mem) { g_free(mem); return UC_ERR_OK;