9a02964a36
This reverts commit b66993bcfb.
Reason for revert: Broke v8 win32 https://ci.chromium.org/p/v8/builders/ci/V8%20Win32/29454?
Original change's description:
> [code] Separate instruction and metadata areas
>
> In this CL, Code object layout changes s.t. the instruction
> area is distinct / non-overlapping from the metadata area.
>
> On-heap Code objects now have a variable-size `body` area,
> containing distinct-but-adjacent `instruction` and `metadata`
> areas.
>
> Off-heap code (= embedded builtins) currently have the same,
> but in the future the metadata area will move elsewhere and
> no longer be adjacent to instructions.
>
> To implement this, the main changes are:
>
> - The Code object header now contains instruction and metadata
> sizes, and no longer contains the safepoint table offset
> (it's implicitly the first table of the metadata section).
> - The embedded metadata table contains information about both
> instruction and metadata areas.
>
> I've also added assertions in spots that currently rely on a
> contiguous body area.
>
> Bug: v8:11036
> Change-Id: I940f0c70c07ad511dafd2d2c3e337de8c92cd4b9
> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2491025
> Reviewed-by: Leszek Swirski <leszeks@chromium.org>
> Reviewed-by: Clemens Backes <clemensb@chromium.org>
> Reviewed-by: Dominik Inführ <dinfuehr@chromium.org>
> Commit-Queue: Jakob Gruber <jgruber@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#70743}
TBR=jgruber@chromium.org,leszeks@chromium.org,clemensb@chromium.org,dinfuehr@chromium.org
Change-Id: Ia52ac609a47b8a2038a2511f0af8526ebdfe4719
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: v8:11036
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2497381
Reviewed-by: Zhi An Ng <zhin@chromium.org>
Commit-Queue: Zhi An Ng <zhin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#70744}
107 lines
3.8 KiB
C++
107 lines
3.8 KiB
C++
// Copyright 2016 the V8 project authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "src/execution/isolate.h"
|
|
#include "src/heap/factory.h"
|
|
#include "src/objects/objects-inl.h"
|
|
#include "test/cctest/cctest.h"
|
|
|
|
namespace v8 {
|
|
namespace internal {
|
|
|
|
TEST(CodeLayoutWithoutUnwindingInfo) {
|
|
CcTest::InitializeVM();
|
|
HandleScope handle_scope(CcTest::i_isolate());
|
|
|
|
// "Hello, World!" in ASCII.
|
|
byte buffer_array[13] = {0x48, 0x65, 0x6C, 0x6C, 0x6F, 0x2C, 0x20,
|
|
0x57, 0x6F, 0x72, 0x6C, 0x64, 0x21};
|
|
|
|
byte* buffer = &buffer_array[0];
|
|
int buffer_size = sizeof(buffer_array);
|
|
|
|
CodeDesc code_desc;
|
|
code_desc.buffer = buffer;
|
|
code_desc.buffer_size = buffer_size;
|
|
code_desc.instr_size = buffer_size;
|
|
code_desc.safepoint_table_offset = buffer_size;
|
|
code_desc.safepoint_table_size = 0;
|
|
code_desc.handler_table_offset = buffer_size;
|
|
code_desc.handler_table_size = 0;
|
|
code_desc.constant_pool_offset = buffer_size;
|
|
code_desc.constant_pool_size = 0;
|
|
code_desc.code_comments_offset = buffer_size;
|
|
code_desc.code_comments_size = 0;
|
|
code_desc.reloc_offset = buffer_size;
|
|
code_desc.reloc_size = 0;
|
|
code_desc.unwinding_info = nullptr;
|
|
code_desc.unwinding_info_size = 0;
|
|
code_desc.origin = nullptr;
|
|
|
|
Handle<Code> code = Factory::CodeBuilder(CcTest::i_isolate(), code_desc,
|
|
CodeKind::FOR_TESTING)
|
|
.Build();
|
|
|
|
CHECK(!code->has_unwinding_info());
|
|
CHECK_EQ(code->raw_instruction_size(), buffer_size);
|
|
CHECK_EQ(0, memcmp(reinterpret_cast<void*>(code->raw_instruction_start()),
|
|
buffer, buffer_size));
|
|
CHECK_EQ(code->raw_instruction_end() - code->raw_instruction_start(),
|
|
buffer_size);
|
|
}
|
|
|
|
TEST(CodeLayoutWithUnwindingInfo) {
|
|
CcTest::InitializeVM();
|
|
HandleScope handle_scope(CcTest::i_isolate());
|
|
|
|
// "Hello, World!" in ASCII.
|
|
byte buffer_array[13] = {0x48, 0x65, 0x6C, 0x6C, 0x6F, 0x2C, 0x20,
|
|
0x57, 0x6F, 0x72, 0x6C, 0x64, 0x21};
|
|
|
|
// "JavaScript" in ASCII.
|
|
byte unwinding_info_array[10] = {0x4A, 0x61, 0x76, 0x61, 0x53,
|
|
0x63, 0x72, 0x69, 0x70, 0x74};
|
|
|
|
byte* buffer = &buffer_array[0];
|
|
int buffer_size = sizeof(buffer_array);
|
|
byte* unwinding_info = &unwinding_info_array[0];
|
|
int unwinding_info_size = sizeof(unwinding_info_array);
|
|
|
|
CodeDesc code_desc;
|
|
code_desc.buffer = buffer;
|
|
code_desc.buffer_size = buffer_size;
|
|
code_desc.instr_size = buffer_size;
|
|
code_desc.safepoint_table_offset = buffer_size;
|
|
code_desc.safepoint_table_size = 0;
|
|
code_desc.handler_table_offset = buffer_size;
|
|
code_desc.handler_table_size = 0;
|
|
code_desc.constant_pool_offset = buffer_size;
|
|
code_desc.constant_pool_size = 0;
|
|
code_desc.code_comments_offset = buffer_size;
|
|
code_desc.code_comments_size = 0;
|
|
code_desc.reloc_offset = buffer_size;
|
|
code_desc.reloc_size = 0;
|
|
code_desc.unwinding_info = unwinding_info;
|
|
code_desc.unwinding_info_size = unwinding_info_size;
|
|
code_desc.origin = nullptr;
|
|
|
|
Handle<Code> code = Factory::CodeBuilder(CcTest::i_isolate(), code_desc,
|
|
CodeKind::FOR_TESTING)
|
|
.Build();
|
|
|
|
CHECK(code->has_unwinding_info());
|
|
CHECK_EQ(code->raw_instruction_size(), buffer_size + unwinding_info_size);
|
|
CHECK_EQ(0, memcmp(reinterpret_cast<void*>(code->raw_instruction_start()),
|
|
buffer, buffer_size));
|
|
CHECK_EQ(code->unwinding_info_size(), unwinding_info_size);
|
|
CHECK_EQ(memcmp(reinterpret_cast<void*>(code->unwinding_info_start()),
|
|
unwinding_info, unwinding_info_size),
|
|
0);
|
|
CHECK_EQ(code->unwinding_info_end() - code->raw_instruction_start(),
|
|
buffer_size + unwinding_info_size);
|
|
}
|
|
|
|
} // namespace internal
|
|
} // namespace v8
|