diff --git a/README.md b/README.md index 7139d63bb..8a6331880 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,6 @@ Simple tests under src/test directory - [mman-win32](https://github.com/mcgarrah/mman-win32) ### One-time Donation -We accept donations via the following ways: +We accept donations via WeChatPay: -![WeChat Pay](assets/wx.jpg) +![WeChat Pay](assets/wx.png) diff --git a/assets/wx.jpg b/assets/wx.jpg deleted file mode 100644 index 3540d728e..000000000 Binary files a/assets/wx.jpg and /dev/null differ diff --git a/assets/wx.png b/assets/wx.png new file mode 100644 index 000000000..d37ab6b82 Binary files /dev/null and b/assets/wx.png differ diff --git a/backend/dynarmic/pom.xml b/backend/dynarmic/pom.xml index 7d6614ee1..1f6b6c713 100644 --- a/backend/dynarmic/pom.xml +++ b/backend/dynarmic/pom.xml @@ -5,18 +5,18 @@ com.github.zhkl0228 unidbg-parent - 0.9.4 + 0.9.5-SNAPSHOT ../../pom.xml 4.0.0 unidbg-dynarmic - 0.9.4 + 0.9.5-SNAPSHOT com.github.zhkl0228 unidbg-api - 0.9.4 + 0.9.5-SNAPSHOT diff --git a/backend/hypervisor/pom.xml b/backend/hypervisor/pom.xml index dc2a6312c..d13f05a71 100644 --- a/backend/hypervisor/pom.xml +++ b/backend/hypervisor/pom.xml @@ -5,18 +5,18 @@ com.github.zhkl0228 unidbg-parent - 0.9.4 + 0.9.5-SNAPSHOT ../../pom.xml 4.0.0 unidbg-hypervisor - 0.9.4 + 0.9.5-SNAPSHOT com.github.zhkl0228 unidbg-api - 0.9.4 + 0.9.5-SNAPSHOT diff --git a/backend/kvm/pom.xml b/backend/kvm/pom.xml index bc563e5d8..7b4d7f6be 100644 --- a/backend/kvm/pom.xml +++ b/backend/kvm/pom.xml @@ -5,18 +5,18 @@ com.github.zhkl0228 unidbg-parent - 0.9.4 + 0.9.5-SNAPSHOT ../../pom.xml 4.0.0 unidbg-kvm - 0.9.4 + 0.9.5-SNAPSHOT com.github.zhkl0228 unidbg-api - 0.9.4 + 0.9.5-SNAPSHOT diff --git a/pom.xml b/pom.xml index f7fecf225..6b756c3e1 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.github.zhkl0228 unidbg-parent pom - 0.9.4 + 0.9.5-SNAPSHOT unidbg-api unidbg-android diff --git a/unidbg-android/pom.xml b/unidbg-android/pom.xml index 3d07f9b24..5440f2db6 100644 --- a/unidbg-android/pom.xml +++ b/unidbg-android/pom.xml @@ -5,34 +5,34 @@ com.github.zhkl0228 unidbg-parent - 0.9.4 + 0.9.5-SNAPSHOT 4.0.0 unidbg-android - 0.9.4 + 0.9.5-SNAPSHOT com.github.zhkl0228 unidbg-api - 0.9.4 + 0.9.5-SNAPSHOT com.github.zhkl0228 unidbg-dynarmic - 0.9.4 + 0.9.5-SNAPSHOT test com.github.zhkl0228 unidbg-hypervisor - 0.9.4 + 0.9.5-SNAPSHOT test com.github.zhkl0228 unidbg-kvm - 0.9.4 + 0.9.5-SNAPSHOT test diff --git a/unidbg-android/src/main/java/com/github/unidbg/linux/android/dvm/DalvikVM.java b/unidbg-android/src/main/java/com/github/unidbg/linux/android/dvm/DalvikVM.java index c85754600..02904ab6a 100644 --- a/unidbg-android/src/main/java/com/github/unidbg/linux/android/dvm/DalvikVM.java +++ b/unidbg-android/src/main/java/com/github/unidbg/linux/android/dvm/DalvikVM.java @@ -109,14 +109,13 @@ public long handle(Emulator emulator) { Pointer _GetSuperclass = svcMemory.registerSvc(new ArmSvc() { @Override public long handle(Emulator emulator) { - Arm32RegisterContext context = emulator.getContext(); + RegisterContext context = emulator.getContext(); UnidbgPointer clazz = context.getPointerArg(1); DvmClass dvmClass = classMap.get(clazz.toIntPeer()); if (verbose) { - System.out.printf("JNIEnv->GetSuperClass(%s) was called from %s%n", dvmClass, - UnidbgPointer.register(emulator, ArmConst.UC_ARM_REG_LR)); + System.out.printf("JNIEnv->GetSuperClass(%s) was called from %s%n", dvmClass, context.getLRPointer()); } - if(dvmClass.getClassName().equals("java/lang/Object")){ + if (dvmClass.getClassName().equals("java/lang/Object")) { log.debug("JNIEnv->GetSuperClass was called, class = " + dvmClass.getClassName() + " According to Java Native Interface Specification, " + "If clazz specifies the class Object, returns NULL."); throw new BackendException(); diff --git a/unidbg-android/src/main/java/com/github/unidbg/linux/file/Stdout.java b/unidbg-android/src/main/java/com/github/unidbg/linux/file/Stdout.java index 7a7b2f3e2..2455d00af 100644 --- a/unidbg-android/src/main/java/com/github/unidbg/linux/file/Stdout.java +++ b/unidbg-android/src/main/java/com/github/unidbg/linux/file/Stdout.java @@ -51,8 +51,10 @@ public int write(byte[] data) { if (debugStream != null) { debugStream.write(data); } - out.write(data); - out.flush(); + if (log.isWarnEnabled()) { + out.write(data); + out.flush(); + } if (callback != null) { callback.notifyOut(data, err); } diff --git a/unidbg-android/src/test/java/com/github/unidbg/android/AndroidTest.java b/unidbg-android/src/test/java/com/github/unidbg/android/AndroidTest.java index 6c7f5e680..67a3fa371 100644 --- a/unidbg-android/src/test/java/com/github/unidbg/android/AndroidTest.java +++ b/unidbg-android/src/test/java/com/github/unidbg/android/AndroidTest.java @@ -16,11 +16,14 @@ import com.github.unidbg.linux.android.dvm.DvmClass; import com.github.unidbg.linux.android.dvm.VM; import com.github.unidbg.linux.android.dvm.VarArg; +import com.github.unidbg.linux.file.Stdout; import com.github.unidbg.linux.struct.Dirent; import com.github.unidbg.memory.Memory; import com.github.unidbg.memory.SvcMemory; import com.github.unidbg.unix.UnixSyscallHandler; import com.sun.jna.Pointer; +import org.apache.log4j.Level; +import org.apache.log4j.Logger; import java.io.File; import java.io.IOException; @@ -103,7 +106,7 @@ private void test() { 0x789a, 0.12345D, true, 0x123, 0.456f, 0.789123D, (byte) 0x7f, 0x89abcdefL, 0.123f); -// Logger.getLogger("com.github.unidbg.linux.ARM32SyscallHandler").setLevel(Level.DEBUG); + Logger.getLogger(Stdout.class).setLevel(Level.ERROR); System.err.println("exit code: " + module.callEntry(emulator) + ", backend=" + emulator.getBackend()); } diff --git a/unidbg-api/pom.xml b/unidbg-api/pom.xml index 0bc255dfa..b0ce4cbe5 100644 --- a/unidbg-api/pom.xml +++ b/unidbg-api/pom.xml @@ -5,12 +5,12 @@ com.github.zhkl0228 unidbg-parent - 0.9.4 + 0.9.5-SNAPSHOT 4.0.0 unidbg-api - 0.9.4 + 0.9.5-SNAPSHOT com.github.zhkl0228 diff --git a/unidbg-ios/pom.xml b/unidbg-ios/pom.xml index e5d239702..cb273f1ef 100644 --- a/unidbg-ios/pom.xml +++ b/unidbg-ios/pom.xml @@ -5,34 +5,34 @@ com.github.zhkl0228 unidbg-parent - 0.9.4 + 0.9.5-SNAPSHOT 4.0.0 unidbg-ios - 0.9.4 + 0.9.5-SNAPSHOT com.github.zhkl0228 unidbg-api - 0.9.4 + 0.9.5-SNAPSHOT com.github.zhkl0228 unidbg-dynarmic - 0.9.4 + 0.9.5-SNAPSHOT test com.github.zhkl0228 unidbg-hypervisor - 0.9.4 + 0.9.5-SNAPSHOT test com.github.zhkl0228 unidbg-kvm - 0.9.4 + 0.9.5-SNAPSHOT test diff --git a/unidbg-ios/src/main/java/com/github/unidbg/ios/file/Stdout.java b/unidbg-ios/src/main/java/com/github/unidbg/ios/file/Stdout.java index 4d4edb2c8..6c9163762 100644 --- a/unidbg-ios/src/main/java/com/github/unidbg/ios/file/Stdout.java +++ b/unidbg-ios/src/main/java/com/github/unidbg/ios/file/Stdout.java @@ -51,8 +51,10 @@ public int write(byte[] data) { if (debugStream != null) { debugStream.write(data); } - out.write(data); - out.flush(); + if (log.isWarnEnabled()) { + out.write(data); + out.flush(); + } if (callback != null) { callback.notifyOut(data, err); }