Merge pull request #169 from sifive/pick-first-unnamed-reg

Get first unnamed reg from a memory node
sifive · Oct 23, 2019 · 5bb9f91 · 5bb9f91
2 parents eba4dcd + 8497af1
commit 5bb9f91
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/linker_script/freedom-ldscript-generator.c++ b/linker_script/freedom-ldscript-generator.c++
@@ -5,6 +5,7 @@
 #include <iostream>
 #include <list>
 #include <regex>
+#include <tuple>
 
 #include <fdt.h++>
 
@@ -123,11 +124,12 @@ int main(int argc, char *argv[]) {
         m.size = ranges.front().size;
       }
     } else {
-      n.maybe_tuple("reg", tuple_t<target_addr, target_size>(), [&]() {},
-                    [&](target_addr b, target_size s) {
-                      m.base = b;
-                      m.size = s;
-                    });
+      auto regs = n.get_fields<std::tuple<target_addr, target_size>>("reg");
+
+      if (!regs.empty()) {
+        m.base = std::get<0>(regs.front());
+        m.size = std::get<1>(regs.front());
+      }
     }
   };