elf_object.cc (10880:61a56f76222b) elf_object.cc (11320:42ecb523c64a)
1/*
2 * Copyright (c) 2011-2013 ARM Limited
3 * All rights reserved
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

--- 333 unchanged lines hidden (view full) ---

342 text.size = phdr.p_filesz;
343 text.fileImage = fileData + phdr.p_offset;
344 } else if (phdr.p_vaddr <= dataSecStart &&
345 phdr.p_vaddr + phdr.p_filesz > dataSecStart) {
346 data.baseAddr = phdr.p_paddr;
347 data.size = phdr.p_filesz;
348 data.fileImage = fileData + phdr.p_offset;
349 } else {
1/*
2 * Copyright (c) 2011-2013 ARM Limited
3 * All rights reserved
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

--- 333 unchanged lines hidden (view full) ---

342 text.size = phdr.p_filesz;
343 text.fileImage = fileData + phdr.p_offset;
344 } else if (phdr.p_vaddr <= dataSecStart &&
345 phdr.p_vaddr + phdr.p_filesz > dataSecStart) {
346 data.baseAddr = phdr.p_paddr;
347 data.size = phdr.p_filesz;
348 data.fileImage = fileData + phdr.p_offset;
349 } else {
350 // If it's none of the above but is loadable,
350 // If it's none of the above but is loadable,
351 // load the filesize worth of data
352 Segment extra;
353 extra.baseAddr = phdr.p_paddr;
354 extra.size = phdr.p_filesz;
355 extra.fileImage = fileData + phdr.p_offset;
356 extraSegments.push_back(extra);
357 }
358 }

--- 154 unchanged lines hidden --- 		351 // load the filesize worth of data
352 Segment extra;
353 extra.baseAddr = phdr.p_paddr;
354 extra.size = phdr.p_filesz;
355 extra.fileImage = fileData + phdr.p_offset;
356 extraSegments.push_back(extra);
357 }
358 }

--- 154 unchanged lines hidden ---