From 9e365350044a9c4e3c1e4249119eab6bdb604c7d Mon Sep 17 00:00:00 2001 From: mac Date: Sun, 23 Nov 2025 12:42:01 -0800 Subject: [PATCH 1/3] - Fix JAVA binding compilation: Apparently, the pointer there is a leftover from the previous implementation. Fails to build on OSX. --- bindings/java/unicorn_Unicorn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/java/unicorn_Unicorn.c b/bindings/java/unicorn_Unicorn.c index 739ca36c2c..913254efd7 100644 --- a/bindings/java/unicorn_Unicorn.c +++ b/bindings/java/unicorn_Unicorn.c @@ -760,7 +760,7 @@ JNIEXPORT void JNICALL Java_unicorn_Unicorn__1mem_1read(JNIEnv *env, { jlong size = (*env)->GetArrayLength(env, dest); jbyte *arr = (*env)->GetByteArrayElements(env, dest, NULL); - uc_err err = uc_mem_read((uc_engine *)uc, address, arr, *size); + uc_err err = uc_mem_read((uc_engine *)uc, address, arr, (uint64_t)size); (*env)->ReleaseByteArrayElements(env, dest, arr, 0); if (err != UC_ERR_OK) { throwUnicornException(env, err); From 6e323ec6eebe600a62eac90743c5e212da44df05 Mon Sep 17 00:00:00 2001 From: mac Date: Sun, 23 Nov 2025 13:14:53 -0800 Subject: [PATCH 2/3] - Fix m68k regression test, probably needs updating as a result of #2161. --- bindings/java/src/test/java/tests/TestSamples.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/java/src/test/java/tests/TestSamples.java b/bindings/java/src/test/java/tests/TestSamples.java index ea458cd8bd..f9191d15e1 100644 --- a/bindings/java/src/test/java/tests/TestSamples.java +++ b/bindings/java/src/test/java/tests/TestSamples.java @@ -236,7 +236,7 @@ public void testM68k() { ">>> A6 = 0x0 >>> D6 = 0x0\n" + ">>> A7 = 0x0 >>> D7 = 0x0\n" + ">>> PC = 0x10002\n" + - ">>> SR = 0x0\n", + ">>> SR = 0x8\n", outContent.toString()); } From b44ad7d7e2c872f7b1b7958db5fdd0e2348fe28b Mon Sep 17 00:00:00 2001 From: mac Date: Sun, 23 Nov 2025 13:26:58 -0800 Subject: [PATCH 3/3] - Fix the Java regression testing, probably as a result of fixing #2161. --- bindings/java/unicorn_Unicorn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/java/unicorn_Unicorn.c b/bindings/java/unicorn_Unicorn.c index 913254efd7..739ca36c2c 100644 --- a/bindings/java/unicorn_Unicorn.c +++ b/bindings/java/unicorn_Unicorn.c @@ -760,7 +760,7 @@ JNIEXPORT void JNICALL Java_unicorn_Unicorn__1mem_1read(JNIEnv *env, { jlong size = (*env)->GetArrayLength(env, dest); jbyte *arr = (*env)->GetByteArrayElements(env, dest, NULL); - uc_err err = uc_mem_read((uc_engine *)uc, address, arr, (uint64_t)size); + uc_err err = uc_mem_read((uc_engine *)uc, address, arr, *size); (*env)->ReleaseByteArrayElements(env, dest, arr, 0); if (err != UC_ERR_OK) { throwUnicornException(env, err);