summaryrefslogtreecommitdiff
path: root/src/base/SConscript
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2019-10-03 23:42:18 -0700
committerGabe Black <gabeblack@google.com>2019-10-15 22:03:31 +0000
commitd856e5ce7154202f050dafdb7a638e1146081507 (patch)
treee05654b1fe087c3f0c9e57bc5489626b98a01f73 /src/base/SConscript
parent73d60558e13ab94f59d3865c5c07ddd7cda032b7 (diff)
downloadgem5-d856e5ce7154202f050dafdb7a638e1146081507.tar.xz
arch,base: Restructure the object file loaders.
This change creates a distinction between object files which hold executable code, and flat files which don't. The first type of files have entry points, symbols, etc., while the others are just blobs which can be shoved into memory. Rather than have those aspects but stub them out, this change creates a new base class which simply doesn't have them. This change also restructures the ELF loader since it's main function was quite long and doing multiple jobs. It stops passing the architecture and operating system to the ObjectFile constructor, since those might not be known at the very top of the constructor. Instead, those default to Uknown*, and then are filled in in the constructor body if appropriate. This removes a lot of plumbing that was hard to actually use in practice. It also introduces a mechanism to collect generic object file formats so that they can be tried one by one by the general createObjectFile function, rather than listing them all there one by one. It's unlikely that new types of object files will need to be added in a modular way without being able to modify the core loader code, but it's cleaner to have that abstraction and modularization like is already there for process loaders. Finally, to make it possible to share the code which handles zipped files for both true object files and also files which will be loaded into memory but are just blobs, that mechanism is pulled out into a new class called ImageFileData. It holds a collection of segments which are set up by the object file and may refer to regions of the original file, buffers maintained elsewhere, or even nothing to support bss-es. shared_ptr is used to make it easier to keep track of that information without having to do so explicitly or worry about deleting a buffer before everyone was done using it. Change-Id: I92890266f2ba0a703803cccad675a3ab41f2c4af Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/21467 Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Brandon Potter <Brandon.Potter@amd.com> Maintainer: Gabe Black <gabeblack@google.com>
Diffstat (limited to 'src/base/SConscript')
-rw-r--r--src/base/SConscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/base/SConscript b/src/base/SConscript
index 8d170793b..b4b381bf1 100644
--- a/src/base/SConscript
+++ b/src/base/SConscript
@@ -74,12 +74,12 @@ GTest('trie.test', 'trie.test.cc')
Source('types.cc')
Source('loader/aout_object.cc')
-Source('loader/dtb_object.cc')
+Source('loader/dtb_file.cc')
Source('loader/ecoff_object.cc')
Source('loader/elf_object.cc')
+Source('loader/image_file_data.cc')
Source('loader/memory_image.cc')
Source('loader/object_file.cc')
-Source('loader/raw_object.cc')
Source('loader/symtab.cc')
Source('stats/group.cc')