Fix function calls resolution

romainguy · Jun 12, 2024 · ea62348 · ea62348
1 parent 2ec3a87
commit ea62348
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -73,7 +73,7 @@ compose.desktop {
 
             targetFormats(TargetFormat.Dmg)
 
-            packageVersion = "1.4.2"
+            packageVersion = "1.4.3"
             packageName = "Kotlin Explorer"
             description = "Kotlin Explorer"
             vendor = "Romain Guy"

diff --git a/src/jvmMain/kotlin/dev/romainguy/kotlin/explorer/oat/OatDumpParser.kt b/src/jvmMain/kotlin/dev/romainguy/kotlin/explorer/oat/OatDumpParser.kt
@@ -28,7 +28,7 @@ private val MethodRegex = Regex("^\\s+\\d+:\\s+(?<method>.+)\\s+\\(dex_method_id
 private val CodeRegex = Regex("^\\s+0x(?<address>$HexDigit+):\\s+$HexDigit+\\s+(?<code>.+)")
 
 private val DexCodeRegex = Regex("^\\s+0x(?<address>$HexDigit+):\\s+($HexDigit+\\s+)+\\|\\s+(?<code>.+)")
-private val DexMethodInvokeRegex = Regex("^invoke-[^}]+},\\s+[a-zA-Z]+\\s+(?<name>.+)\\s+//.+")
+private val DexMethodInvokeRegex = Regex("^invoke-[^}]+},\\s+\\S+\\s+(?<name>.+)\\s+//.+")
 
 private val Arm64JumpRegex = Regex(".+ #[+-]0x$HexDigit+ \\(addr 0x(?<address>$HexDigit+)\\)\$")
 private val X86JumpRegex = Regex(".+ [+-]\\d+ \\(0x(?<address>$HexDigit{8})\\)\$")