Skip to content

Commit

Permalink
Release 0.9.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@zhkl0228
zhkl0228 committed Jul 29, 2021
1 parent 5fc6af7 commit 8046fda
Show file tree
Hide file tree
Showing 10 changed files with 37 additions and 29 deletions.
6 changes: 3 additions & 3 deletions backend/dynarmic/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
<parent>
<groupId>com.github.zhkl0228</groupId>
<artifactId>unidbg-parent</artifactId>
<version>0.9.4-SNAPSHOT</version>
<version>0.9.4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>unidbg-dynarmic</artifactId>
<version>0.9.4-SNAPSHOT</version>
<version>0.9.4</version>
<dependencies>
<dependency>
<groupId>com.github.zhkl0228</groupId>
<artifactId>unidbg-api</artifactId>
<version>0.9.4-SNAPSHOT</version>
<version>0.9.4</version>
</dependency>
</dependencies>
</project>
6 changes: 3 additions & 3 deletions backend/hypervisor/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
<parent>
<groupId>com.github.zhkl0228</groupId>
<artifactId>unidbg-parent</artifactId>
<version>0.9.4-SNAPSHOT</version>
<version>0.9.4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>unidbg-hypervisor</artifactId>
<version>0.9.4-SNAPSHOT</version>
<version>0.9.4</version>
<dependencies>
<dependency>
<groupId>com.github.zhkl0228</groupId>
<artifactId>unidbg-api</artifactId>
<version>0.9.4-SNAPSHOT</version>
<version>0.9.4</version>
</dependency>
</dependencies>
</project>
6 changes: 3 additions & 3 deletions backend/kvm/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
<parent>
<groupId>com.github.zhkl0228</groupId>
<artifactId>unidbg-parent</artifactId>
<version>0.9.4-SNAPSHOT</version>
<version>0.9.4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>unidbg-kvm</artifactId>
<version>0.9.4-SNAPSHOT</version>
<version>0.9.4</version>
<dependencies>
<dependency>
<groupId>com.github.zhkl0228</groupId>
<artifactId>unidbg-api</artifactId>
<version>0.9.4-SNAPSHOT</version>
<version>0.9.4</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>com.github.zhkl0228</groupId>
<artifactId>unidbg-parent</artifactId>
<packaging>pom</packaging>
<version>0.9.4-SNAPSHOT</version>
<version>0.9.4</version>
<modules>
<module>unidbg-api</module>
<module>unidbg-android</module>
Expand Down
12 changes: 6 additions & 6 deletions unidbg-android/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,34 @@
<parent>
<groupId>com.github.zhkl0228</groupId>
<artifactId>unidbg-parent</artifactId>
<version>0.9.4-SNAPSHOT</version>
<version>0.9.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>unidbg-android</artifactId>
<version>0.9.4-SNAPSHOT</version>
<version>0.9.4</version>
<dependencies>
<dependency>
<groupId>com.github.zhkl0228</groupId>
<artifactId>unidbg-api</artifactId>
<version>0.9.4-SNAPSHOT</version>
<version>0.9.4</version>
</dependency>
<dependency>
<groupId>com.github.zhkl0228</groupId>
<artifactId>unidbg-dynarmic</artifactId>
<version>0.9.4-SNAPSHOT</version>
<version>0.9.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.zhkl0228</groupId>
<artifactId>unidbg-hypervisor</artifactId>
<version>0.9.4-SNAPSHOT</version>
<version>0.9.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.zhkl0228</groupId>
<artifactId>unidbg-kvm</artifactId>
<version>0.9.4-SNAPSHOT</version>
<version>0.9.4</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
3 changes: 3 additions & 0 deletions unidbg-android/src/main/java/com/github/unidbg/linux/android/dvm/BaseVM.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,9 @@ public LibraryFile findLibrary(String soName) {
public final DalvikModule loadLibrary(String libname, boolean forceCallInit) {
String soName = "lib" + libname + ".so";
LibraryFile libraryFile = findLibrary(soName);
if (libraryFile == null) {
throw new IllegalStateException("load library failed: " + libname);
}
Module module = emulator.getMemory().load(libraryFile, forceCallInit);
return new DalvikModule(this, module);
}
Expand Down
4 changes: 2 additions & 2 deletions unidbg-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<groupId>com.github.zhkl0228</groupId>
<artifactId>unidbg-parent</artifactId>
<version>0.9.4-SNAPSHOT</version>
<version>0.9.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>unidbg-api</artifactId>
<version>0.9.4-SNAPSHOT</version>
<version>0.9.4</version>
<dependencies>
<dependency>
<groupId>com.github.zhkl0228</groupId>
Expand Down
12 changes: 6 additions & 6 deletions unidbg-ios/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,34 @@
<parent>
<groupId>com.github.zhkl0228</groupId>
<artifactId>unidbg-parent</artifactId>
<version>0.9.4-SNAPSHOT</version>
<version>0.9.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>unidbg-ios</artifactId>
<version>0.9.4-SNAPSHOT</version>
<version>0.9.4</version>
<dependencies>
<dependency>
<groupId>com.github.zhkl0228</groupId>
<artifactId>unidbg-api</artifactId>
<version>0.9.4-SNAPSHOT</version>
<version>0.9.4</version>
</dependency>
<dependency>
<groupId>com.github.zhkl0228</groupId>
<artifactId>unidbg-dynarmic</artifactId>
<version>0.9.4-SNAPSHOT</version>
<version>0.9.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.zhkl0228</groupId>
<artifactId>unidbg-hypervisor</artifactId>
<version>0.9.4-SNAPSHOT</version>
<version>0.9.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.zhkl0228</groupId>
<artifactId>unidbg-kvm</artifactId>
<version>0.9.4-SNAPSHOT</version>
<version>0.9.4</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
13 changes: 9 additions & 4 deletions unidbg-ios/src/main/java/com/github/unidbg/ios/Dyld64.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -438,17 +438,22 @@ public long handle(Emulator<?> emulator) {
@Override
public long handle(Emulator<?> emulator) {
RegisterContext context = emulator.getContext();
System.out.println("dispatch_after block=" + context.getPointerArg(2));
return context.getLongArg(0);
long when = context.getLongArg(0);
Pointer queue = context.getPointerArg(1);
Pointer block = context.getPointerArg(2);
System.out.println("dispatch_after when=" + when + ", queue=" + queue + ", block=" + block);
return 0;
}
}).peer;

_dispatch_async = svcMemory.registerSvc(new Arm64Svc() {
@Override
public long handle(Emulator<?> emulator) {
RegisterContext context = emulator.getContext();
System.out.println("dispatch_async block=" + context.getPointerArg(1));
return context.getLongArg(0);
Pointer queue = context.getPointerArg(0);
Pointer block = context.getPointerArg(1);
System.out.println("dispatch_async queue=" + queue + ", block=" + block);
return 0;
}
}).peer;

Expand Down
2 changes: 1 addition & 1 deletion unidbg-ios/src/main/java/com/github/unidbg/ios/MachOLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1585,7 +1585,7 @@ public Symbol dlsym(long handle, String symbolName) {
}
}
}
log.warn("dlsym failed: handle=" + handle + ", symbolName=" + symbolName);
log.info("dlsym failed: handle=" + handle + ", symbolName=" + symbolName);
return null;
}

Expand Down

0 comments on commit 8046fda

Please sign in to comment.