From 3c65c44a1ae87607337a56ca45b6b305778d52ff Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Sat, 28 Sep 2019 19:26:02 -0700 Subject: base: Rename Section to Segment, and some of its members. ELF is, in my opinion, the most important object file format gem5 currently understands, and in ELF terminolgy the blob of data that needs to be loaded into memory to a particular location is called a segment. A section is a software level view of what's in a region of memory, and a single segment may contain multiple sections which happen to follow each other in memory. Change-Id: Ib810c5050723d5a96bd7550515b08ac695fb1b02 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/21462 Tested-by: kokoro Reviewed-by: Andreas Sandberg Maintainer: Gabe Black --- src/base/loader/dtb_object.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/base/loader/dtb_object.cc') diff --git a/src/base/loader/dtb_object.cc b/src/base/loader/dtb_object.cc index fab6a762d..92e305ffa 100644 --- a/src/base/loader/dtb_object.cc +++ b/src/base/loader/dtb_object.cc @@ -55,17 +55,17 @@ DtbObject::DtbObject(const std::string &_filename, size_t _len, uint8_t *_data, Arch _arch, OpSys _opSys) : ObjectFile(_filename, _len, _data, _arch, _opSys) { - text.baseAddr = 0; + text.base = 0; text.size = len; - text.fileImage = fileData; + text.data = fileData; - data.baseAddr = 0; + data.base = 0; data.size = 0; - data.fileImage = NULL; + data.data = nullptr; - bss.baseAddr = 0; + bss.base = 0; bss.size = 0; - bss.fileImage = NULL; + bss.data = nullptr; fileDataMmapped = true; } @@ -141,7 +141,7 @@ DtbObject::addBootCmdLine(const char* _args, size_t len) } text.size = newLen; - text.fileImage = fdt_buf_w_space; + text.data = fdt_buf_w_space; // clean up old buffer and set to new fdt blob munmap(fileData, this->len); -- cgit v1.2.3