azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[test][dwarfdump] add method to lookup by symbol name

Browse Source
This commit is contained in:
Vasily Levchenko
2020-07-29 17:03:48 +02:00
parent 930ad51fae
commit 374a759f0c
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/tests/debugger/src/test/kotlin/org/jetbrains/kotlin/native/test/debugger/Driver.kt
+2 -1
View File
@@ -54,7 +54,8 @@ class ToolDriver(
} }
fun runDwarfDump(program: Path, vararg args:String = emptyArray(), processor:List<DwarfTag>.()->Unit) { fun runDwarfDump(program: Path, vararg args:String = emptyArray(), processor:List<DwarfTag>.()->Unit) {
val out = subprocess(DistProperties.dwarfDump, "${program}.dSYM/Contents/Resources/DWARF/${program.fileName}", *args).takeIf { it.process.exitValue() == 0 }?.stdout ?: error("${program}.dSYM/Contents/Resources/DWARF/${program.fileName}") val dwarfProcess = subprocess(DistProperties.dwarfDump, *args, "${program}.dSYM/Contents/Resources/DWARF/${program.fileName}")
val out = dwarfProcess.takeIf { it.process.exitValue() == 0 }?.stdout ?: error(dwarfProcess.stderr)
DwarfUtilParser().parse(StringReader(out)).tags.toList().processor() DwarfUtilParser().parse(StringReader(out)).tags.toList().processor()
} }
} }
backend.native/tests/debugger/src/test/kotlin/org/jetbrains/kotlin/native/test/debugger/DwarfDumpParser.kt
+1 -1
View File
@@ -314,7 +314,7 @@ class DwarfUtilParser() {
var currentAttribute: DwarfAttribute.Attribute? = null var currentAttribute: DwarfAttribute.Attribute? = null
val currentAttributePayload = StringBuilder() val currentAttributePayload = StringBuilder()
companion object { companion object {
val tagRegexp = Regex("^(0x[0-9a-f]{8}):\\ {3}(.*)$") val tagRegexp = Regex("^(0x[0-9a-f]{8}):\\ +([^\\ .]*)$")
val attributeRegexp = Regex("^\\s+(DW_AT_[a-zA-Z0-9_]*)\\s+\\((.*)\\)$") val attributeRegexp = Regex("^\\s+(DW_AT_[a-zA-Z0-9_]*)\\s+\\((.*)\\)$")
} }
backend.native/tests/debugger/src/test/kotlin/org/jetbrains/kotlin/native/test/debugger/Matchers.kt
+1
View File
@@ -130,6 +130,7 @@ class ToolDriverHelper(private val driver: ToolDriver, private val root:Path) {
private fun Path.compile(output: Path, vararg flags:String) = output.also{ driver.compile(this, it, *flags) } private fun Path.compile(output: Path, vararg flags:String) = output.also{ driver.compile(this, it, *flags) }
fun Path.dwarfDumpLookup(address: Long, parser:List<DwarfTag>.() -> Unit) = driver.runDwarfDump(this, "-lookup", address.toString(), processor = parser) fun Path.dwarfDumpLookup(address: Long, parser:List<DwarfTag>.() -> Unit) = driver.runDwarfDump(this, "-lookup", address.toString(), processor = parser)
fun Path.dwarfDumpLookup(name: String, parser:List<DwarfTag>.() -> Unit) = driver.runDwarfDump(this, "-find", name, processor = parser)
private fun String.feedOutput(output: String) = root.resolve(output).also { private fun String.feedOutput(output: String) = root.resolve(output).also {