languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-11-02 08:44:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

[pkg/dart2native] Create PE images with sizes that are section aligned.

Browse source 
Bug: https://github.com/dart-lang/sdk/issues/39106
Change-Id: If1c88b4969fa44ffc6d764d3d1e34732acdf4d64
Cq-Include-Trybots: luci.dart.try:pkg-win-release-try
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/238541
Reviewed-by: Aske Simon Christensen <askesc@google.com>
Commit-Queue: Tess Strickland <sstrickl@google.com>
This commit is contained in:
Tess Strickland 2022-03-24 12:36:12 +00:00 committed by Commit Bot
parent 1a3ae1e44b
commit da691ea9c1
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkg/dart2native/lib/dart2native_pe.dart
View file

@ -209,7 +209,7 @@ class CoffHeaders {
int get size => optionalHeader.headersSize;
void addSnapshotSectionHeader(int length) {
final oldSize = size;
final oldHeadersSize = optionalHeader.headersSize;
final address =
align(sectionTable.addressEnd, optionalHeader.sectionAlignment);
final offset = align(sectionTable.offsetEnd, optionalHeader.fileAlignment);
@ -227,30 +227,35 @@ class CoffHeaders {
// Increment the number of sections in the file header.
fileHeader.sectionCount += 1;
// Adjust the sizes stored in the optional header.
// Adjust the header size stored in the optional header, which must be
// a multiple of fileAlignment.
optionalHeader.headersSize = align(
_coffOffset + fileHeader.size + optionalHeader.size + sectionTable.size,
optionalHeader.fileAlignment);
optionalHeader.imageSize += align(length, optionalHeader.fileAlignment);
// If the size of the headers changed, we'll need to adjust the section
// offsets and image size accordingly.
final headersSizeDiff = size - oldSize;
// offsets.
final headersSizeDiff = optionalHeader.headersSize - oldHeadersSize;
if (headersSizeDiff > 0) {
// Safety check that section virtual addresses need not be adjusted, as
// that requires rewriting much more of the fields and section contents.
// (Generally, the size of the headers is much smaller than the section
// alignment and so this is not expected to happen.)
if (size ~/ optionalHeader.sectionAlignment !=
oldSize ~/ optionalHeader.sectionAlignment) {
oldHeadersSize ~/ optionalHeader.sectionAlignment) {
throw 'Adding the snapshot would require adjusting virtual addresses';
}
assert(headersSizeDiff % optionalHeader.fileAlignment == 0);
for (final entry in sectionTable.entries) {
entry.fileOffset += headersSizeDiff;
}
optionalHeader.imageSize += headersSizeDiff;
}
// Adjust the image size stored in the optional header, which must be a
// multiple of section alignment (as it is the size in memory, not on disk).
optionalHeader.imageSize = align(
newHeader.virtualAddress + newHeader.virtualSize,
optionalHeader.sectionAlignment);
}
Future<void> write(RandomAccessFile output) async {