Skip to content

Make rela.dyn, rela.plt and functionentries optional #631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
katrinafyi merged 3 commits into from
Jun 11, 2026
Merged

Make rela.dyn, rela.plt and functionentries optional #631

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47bcc60
optional-plt
Jun 11, 2026
9230a4d
automated scalafmt
github-actions[bot] Jun 11, 2026
58e09d9
rearrange for-yield to avoid intermediate local vals
katrinafyi Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 16 additions & 22 deletions src/main/scala/gtirb/GTIRBReadELF.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import util.Logger

import java.io.ByteArrayInputStream
import scala.util.DynamicVariable
import scala.util.chaining.scalaUtilChainingOps

/**
* Responsible for interpreting the GTIRB's symbol information
Expand Down Expand Up @@ -149,16 +148,11 @@ class GTIRBReadELF(protected val gtirb: GTIRBResolver) {
* Returns relocations as a tuple of relocation offsets and external functions.
*/
def getRelocations(): (Map[BigInt, BigInt], Set[ExternalFunction]) = {
def getSectionBytes(sectionName: String): List[Elf64Rela] = {
if (gtirb.sectionsByName.contains(sectionName)) {
gtirb.sectionsByName(sectionName).byteIntervals.head.contents.pipe(parseRelaTab)
} else {
List()
}
}
def getSectionBytes(sectionName: String) =
gtirb.sectionsByName.get(sectionName).map(_.byteIntervals.head.contents)

val relaDyns = getSectionBytes(".rela.dyn")
val relaPlts = getSectionBytes(".rela.plt")
val relaDyns = getSectionBytes(".rela.dyn").toList.flatMap(parseRelaTab)
val relaPlts = getSectionBytes(".rela.plt").toList.flatMap(parseRelaTab)

val relas = (relaDyns ++ relaPlts)
.groupBy(x => parseAarch64RelaType(x.r_type))
Expand Down Expand Up @@ -194,18 +188,18 @@ class GTIRBReadELF(protected val gtirb: GTIRBResolver) {
}.toSet

def getFunctionEntries(): Set[FuncEntry] =
gtirb.symbolEntriesByUuid.view.collect {
case (symid, (size, "FUNC", "GLOBAL", "DEFAULT", idx)) if idx != 0 =>

val nameSymbol = symid.get
val funcUuid = symid.getFunction.get
val entries = funcUuid.getEntries

assert(entries.size == 1, "function with non-singular entry")
val entry = entries.head
val addr = entry.get.address

FuncEntry(nameSymbol.name, (size * 8).toInt, addr)
gtirb.symbolEntriesByUuid.view.flatMap {
case (symid, (size, "FUNC", "GLOBAL", "DEFAULT", idx)) if idx != 0 => {
for {
funcUuid <- symid.getFunction
entry <- funcUuid.getEntries.head.getOption
} yield {
val nameSymbol = symid.get
val addr = entry.address
FuncEntry(nameSymbol.name, (size * 8).toInt, addr)
}
}
case _ => None
}.toSet

def getMainAddress(mainProcedureName: String): BigInt =
Expand Down
Loading