Merge branch 'master' of github.com:justinian/jsix

scripts/build_symbol_table.py

@@ -19,16 +19,19 @@ def parse_syms(infile):
     representing the symbols in the text segment of the binary. Returns
     a list of (address, symbol_name)."""
 
-    from cxxfilt import demangle
+    from cxxfilt import demangle, InvalidName
 
     syms = []
     for line in sys.stdin:
         addr, t, mangled = line.split()
         if t not in "tTvVwW": continue
 
-        addr = int(addr, base=16)
-        name = demangle(mangled)
-        syms.append((addr, name))
+        try:
+            addr = int(addr, base=16)
+            name = demangle(mangled)
+            syms.append((addr, name))
+        except InvalidName:
+            pass
 
     return sorted(syms)
 

src/boot/fs.cpp

@@ -77,7 +77,7 @@ file::load(uefi::memory_type mem_type)
 		m_file->read(&size, data),
 		L"Could not read from file");
 
-	return { .data = data, .size = size };
+	return { .size = size,  .data = data };
 }
 
 file