Refactor

main.go

@@ -708,7 +708,7 @@ func main() {
  resolveShNames(s_shstrtab.contents, sectionHeaders[1:])
 
  s_rela_text.contents = buildRelaTextBody(symbolIndex)
- s_rela_data.contents = buildRelaDataBody(symbolIndex, relaDataUsers)
+ s_rela_data.contents = buildRelaDataBody(symbolIndex)
 
  sectionInBodyOrder := sortSectionsForBody(hasRelaText, hasRelaData, hasSymbols)
  assert(len(sectionInBodyOrder) == len(sectionHeaders)-1, "sections len unmatch")
@@ -764,10 +764,10 @@ func buildRelaTextBody(symbolIndex map[string]int) []byte {
  return contents
 }
 
-func buildRelaDataBody(symbolIndex map[string]int, relaDataUsers []*relaDataUser) []byte {
+func buildRelaDataBody(symbolIndex map[string]int) []byte {
  var contents []byte
  for _, ru := range relaDataUsers {
- debugf("checking relaDataUsers %s\n", ru.uses)
+ //debugf("checking relaDataUsers %s\n", ru.uses)
  sym, defined := definedSymbols[ru.uses]
  if !defined {
  panic("label not found")
@@ -780,20 +780,18 @@ func buildRelaDataBody(symbolIndex map[string]int, relaDataUsers []*relaDataUser
  addend = sym.address
  }
  var symIdx int = 1
- if defined {
- if globalSymbols[sym.name] {
- symIdx = symbolIndex[ru.uses]
- addend = 0
- }
+ if defined && globalSymbols[sym.name] {
+ symIdx = symbolIndex[ru.uses]
+ addend = 0
  }
  var typ uint64 = 1
  rela := &Elf64_Rela{
  r_offset: ru.addr,
  r_info: uint64(symIdx)<<32 + typ,
  r_addend: int64(addend),
  }
- debugf("RelaData info:%08x, addend:%08x [%s] \n",
- rela.r_info, addend, ru.uses)
+ //debugf("RelaData info:%08x, addend:%08x [%s] \n",
+ // rela.r_info, addend, ru.uses)
  p := (*[unsafe.Sizeof(Elf64_Rela{})]byte)(unsafe.Pointer(rela))[:]
  contents = append(contents, p...)
  }