Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 9da11d2

Browse filesBrowse files
Milad FaCommit Bot
Milad Fa
authored and
Commit Bot
committed
PPC/s390: [cleanup] Various misc. cleanups
Port dcf467a Original Commit Message: - Use kNoBuiltinId instead of literal -1. - Remove support for non-embedded builtins. - Update Code object layout comment. R=jgruber@chromium.org, joransiu@ca.ibm.com, junyan@redhat.com, midawson@redhat.com BUG= LOG=N Change-Id: Ie0101d883c8116a6076a7b9ef8b82dbcd1960dbf Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2483628 Reviewed-by: Junliang Yan <junyan@redhat.com> Reviewed-by: Jakob Gruber <jgruber@chromium.org> Commit-Queue: Milad Fa <mfarazma@redhat.com> Cr-Commit-Position: refs/heads/master@{#70614}
1 parent 6b04515 commit 9da11d2
Copy full SHA for 9da11d2

3 files changed

+12-21Lines changed: 12 additions & 21 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎src/codegen/ppc/macro-assembler-ppc.cc‎

Copy file name to clipboardExpand all lines: src/codegen/ppc/macro-assembler-ppc.cc
+6-10Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,8 @@ void TurboAssembler::Jump(Handle<Code> code, RelocInfo::Mode rmode,
173173
Builtins::IsIsolateIndependentBuiltin(*code));
174174

175175
int builtin_index = Builtins::kNoBuiltinId;
176-
bool target_is_isolate_independent_builtin =
177-
isolate()->builtins()->IsBuiltinHandle(code, &builtin_index) &&
178-
Builtins::IsIsolateIndependent(builtin_index);
176+
bool target_is_builtin =
177+
isolate()->builtins()->IsBuiltinHandle(code, &builtin_index);
179178

180179
if (root_array_available_ && options().isolate_independent_code) {
181180
Label skip;
@@ -187,8 +186,7 @@ void TurboAssembler::Jump(Handle<Code> code, RelocInfo::Mode rmode,
187186
Jump(scratch);
188187
bind(&skip);
189188
return;
190-
} else if (options().inline_offheap_trampolines &&
191-
target_is_isolate_independent_builtin) {
189+
} else if (options().inline_offheap_trampolines && target_is_builtin) {
192190
// Inline the trampoline.
193191
Label skip;
194192
RecordCommentForOffHeapTrampoline(builtin_index);
@@ -264,9 +262,8 @@ void TurboAssembler::Call(Handle<Code> code, RelocInfo::Mode rmode,
264262
Builtins::IsIsolateIndependentBuiltin(*code));
265263

266264
int builtin_index = Builtins::kNoBuiltinId;
267-
bool target_is_isolate_independent_builtin =
268-
isolate()->builtins()->IsBuiltinHandle(code, &builtin_index) &&
269-
Builtins::IsIsolateIndependent(builtin_index);
265+
bool target_is_builtin =
266+
isolate()->builtins()->IsBuiltinHandle(code, &builtin_index);
270267

271268
if (root_array_available_ && options().isolate_independent_code) {
272269
Label skip;
@@ -277,8 +274,7 @@ void TurboAssembler::Call(Handle<Code> code, RelocInfo::Mode rmode,
277274
Call(ip);
278275
bind(&skip);
279276
return;
280-
} else if (options().inline_offheap_trampolines &&
281-
target_is_isolate_independent_builtin) {
277+
} else if (options().inline_offheap_trampolines && target_is_builtin) {
282278
// Inline the trampoline.
283279
RecordCommentForOffHeapTrampoline(builtin_index);
284280
EmbeddedData d = EmbeddedData::FromBlob();
Collapse file

‎src/codegen/s390/macro-assembler-s390.cc‎

Copy file name to clipboardExpand all lines: src/codegen/s390/macro-assembler-s390.cc
+6-10Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,10 @@ void TurboAssembler::Jump(Handle<Code> code, RelocInfo::Mode rmode,
174174
Builtins::IsIsolateIndependentBuiltin(*code));
175175

176176
int builtin_index = Builtins::kNoBuiltinId;
177-
bool target_is_isolate_independent_builtin =
178-
isolate()->builtins()->IsBuiltinHandle(code, &builtin_index) &&
179-
Builtins::IsIsolateIndependent(builtin_index);
177+
bool target_is_builtin =
178+
isolate()->builtins()->IsBuiltinHandle(code, &builtin_index);
180179

181-
if (options().inline_offheap_trampolines &&
182-
target_is_isolate_independent_builtin) {
180+
if (options().inline_offheap_trampolines && target_is_builtin) {
183181
Label skip;
184182
if (cond != al) {
185183
b(NegateCondition(cond), &skip, Label::kNear);
@@ -242,12 +240,10 @@ void TurboAssembler::Call(Handle<Code> code, RelocInfo::Mode rmode,
242240
DCHECK_IMPLIES(options().isolate_independent_code,
243241
Builtins::IsIsolateIndependentBuiltin(*code));
244242
int builtin_index = Builtins::kNoBuiltinId;
245-
bool target_is_isolate_independent_builtin =
246-
isolate()->builtins()->IsBuiltinHandle(code, &builtin_index) &&
247-
Builtins::IsIsolateIndependent(builtin_index);
243+
bool target_is_builtin =
244+
isolate()->builtins()->IsBuiltinHandle(code, &builtin_index);
248245

249-
if (options().inline_offheap_trampolines &&
250-
target_is_isolate_independent_builtin) {
246+
if (options().inline_offheap_trampolines && target_is_builtin) {
251247
// Inline the trampoline.
252248
RecordCommentForOffHeapTrampoline(builtin_index);
253249
CHECK_NE(builtin_index, Builtins::kNoBuiltinId);
Collapse file

‎src/regexp/ppc/regexp-macro-assembler-ppc.cc‎

Copy file name to clipboardExpand all lines: src/regexp/ppc/regexp-macro-assembler-ppc.cc
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1152,7 +1152,6 @@ void RegExpMacroAssemblerPPC::CallCheckStackGuardState(Register scratch) {
11521152
__ mov(ip, Operand(stack_guard_check));
11531153

11541154
EmbeddedData d = EmbeddedData::FromBlob();
1155-
CHECK(Builtins::IsIsolateIndependent(Builtins::kDirectCEntry));
11561155
Address entry = d.InstructionStartOfBuiltin(Builtins::kDirectCEntry);
11571156
__ mov(r0, Operand(entry, RelocInfo::OFF_HEAP_TARGET));
11581157
__ Call(r0);

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.