Commit c74af694 authored by Michael Starzinger's avatar Michael Starzinger Committed by Commit Bot

[assembler] Fix compilation for non-simulator builds.

R=mvstanton@chromium.org

No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: I6175fd4c4e2999667ba04c89df5cd3f2b380ae0a
Reviewed-on: https://chromium-review.googlesource.com/916263Reviewed-by: 's avatarMichael Stanton <mvstanton@chromium.org>
Commit-Queue: Michael Starzinger <mstarzinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#51271}
parent 5586ecfc
...@@ -166,7 +166,7 @@ MemCopyUint8Function CreateMemCopyUint8Function(Isolate* isolate, ...@@ -166,7 +166,7 @@ MemCopyUint8Function CreateMemCopyUint8Function(Isolate* isolate,
CodeDesc desc; CodeDesc desc;
masm.GetCode(isolate, &desc); masm.GetCode(isolate, &desc);
DCHECK(!RelocInfo::RequiresRelocation(isolate, desc)); DCHECK(!RelocInfo::RequiresRelocation(desc));
Assembler::FlushICache(buffer, allocated); Assembler::FlushICache(buffer, allocated);
CHECK(SetPermissions(buffer, allocated, PageAllocator::kReadExecute)); CHECK(SetPermissions(buffer, allocated, PageAllocator::kReadExecute));
...@@ -282,7 +282,7 @@ UnaryMathFunctionWithIsolate CreateSqrtFunction(Isolate* isolate) { ...@@ -282,7 +282,7 @@ UnaryMathFunctionWithIsolate CreateSqrtFunction(Isolate* isolate) {
CodeDesc desc; CodeDesc desc;
masm.GetCode(isolate, &desc); masm.GetCode(isolate, &desc);
DCHECK(!RelocInfo::RequiresRelocation(isolate, desc)); DCHECK(!RelocInfo::RequiresRelocation(desc));
Assembler::FlushICache(buffer, allocated); Assembler::FlushICache(buffer, allocated);
CHECK(SetPermissions(buffer, allocated, PageAllocator::kReadExecute)); CHECK(SetPermissions(buffer, allocated, PageAllocator::kReadExecute));
......
...@@ -541,7 +541,7 @@ MemCopyUint8Function CreateMemCopyUint8Function(Isolate* isolate, ...@@ -541,7 +541,7 @@ MemCopyUint8Function CreateMemCopyUint8Function(Isolate* isolate,
} }
CodeDesc desc; CodeDesc desc;
masm.GetCode(isolate, &desc); masm.GetCode(isolate, &desc);
DCHECK(!RelocInfo::RequiresRelocation(isolate, desc)); DCHECK(!RelocInfo::RequiresRelocation(desc));
Assembler::FlushICache(buffer, allocated); Assembler::FlushICache(buffer, allocated);
CHECK(SetPermissions(buffer, allocated, PageAllocator::kReadExecute)); CHECK(SetPermissions(buffer, allocated, PageAllocator::kReadExecute));
...@@ -568,7 +568,7 @@ UnaryMathFunctionWithIsolate CreateSqrtFunction(Isolate* isolate) { ...@@ -568,7 +568,7 @@ UnaryMathFunctionWithIsolate CreateSqrtFunction(Isolate* isolate) {
CodeDesc desc; CodeDesc desc;
masm.GetCode(isolate, &desc); masm.GetCode(isolate, &desc);
DCHECK(!RelocInfo::RequiresRelocation(isolate, desc)); DCHECK(!RelocInfo::RequiresRelocation(desc));
Assembler::FlushICache(buffer, allocated); Assembler::FlushICache(buffer, allocated);
CHECK(SetPermissions(buffer, allocated, PageAllocator::kReadExecute)); CHECK(SetPermissions(buffer, allocated, PageAllocator::kReadExecute));
......
...@@ -542,7 +542,7 @@ MemCopyUint8Function CreateMemCopyUint8Function(Isolate* isolate, ...@@ -542,7 +542,7 @@ MemCopyUint8Function CreateMemCopyUint8Function(Isolate* isolate,
} }
CodeDesc desc; CodeDesc desc;
masm.GetCode(isolte, &desc); masm.GetCode(isolte, &desc);
DCHECK(!RelocInfo::RequiresRelocation(isolate, desc)); DCHECK(!RelocInfo::RequiresRelocation(desc));
Assembler::FlushICache(buffer, allocated); Assembler::FlushICache(buffer, allocated);
CHECK(SetPermissions(buffer, allocated, PageAllocator::kReadExecute)); CHECK(SetPermissions(buffer, allocated, PageAllocator::kReadExecute));
...@@ -569,7 +569,7 @@ UnaryMathFunctionWithIsolate CreateSqrtFunction(Isolate* isolate) { ...@@ -569,7 +569,7 @@ UnaryMathFunctionWithIsolate CreateSqrtFunction(Isolate* isolate) {
CodeDesc desc; CodeDesc desc;
masm.GetCode(isolate, &desc); masm.GetCode(isolate, &desc);
DCHECK(!RelocInfo::RequiresRelocation(isolate, desc)); DCHECK(!RelocInfo::RequiresRelocation(desc));
Assembler::FlushICache(buffer, allocated); Assembler::FlushICache(buffer, allocated);
CHECK(SetPermissions(buffer, allocated, PageAllocator::kReadExecute)); CHECK(SetPermissions(buffer, allocated, PageAllocator::kReadExecute));
......
...@@ -36,8 +36,7 @@ UnaryMathFunctionWithIsolate CreateSqrtFunction(Isolate* isolate) { ...@@ -36,8 +36,7 @@ UnaryMathFunctionWithIsolate CreateSqrtFunction(Isolate* isolate) {
CodeDesc desc; CodeDesc desc;
masm.GetCode(isolate, &desc); masm.GetCode(isolate, &desc);
DCHECK(ABI_USES_FUNCTION_DESCRIPTORS || DCHECK(ABI_USES_FUNCTION_DESCRIPTORS || !RelocInfo::RequiresRelocation(desc));
!RelocInfo::RequiresRelocation(isolate, desc));
Assembler::FlushICache(buffer, allocated); Assembler::FlushICache(buffer, allocated);
CHECK(SetPermissions(buffer, allocated, PageAllocator::kReadExecute)); CHECK(SetPermissions(buffer, allocated, PageAllocator::kReadExecute));
......
...@@ -33,8 +33,7 @@ UnaryMathFunctionWithIsolate CreateSqrtFunction(Isolate* isolate) { ...@@ -33,8 +33,7 @@ UnaryMathFunctionWithIsolate CreateSqrtFunction(Isolate* isolate) {
CodeDesc desc; CodeDesc desc;
masm.GetCode(isolate, &desc); masm.GetCode(isolate, &desc);
DCHECK(ABI_USES_FUNCTION_DESCRIPTORS || DCHECK(ABI_USES_FUNCTION_DESCRIPTORS || !RelocInfo::RequiresRelocation(desc));
!RelocInfo::RequiresRelocation(isolate, desc));
Assembler::FlushICache(buffer, allocated); Assembler::FlushICache(buffer, allocated);
CHECK(SetPermissions(buffer, allocated, PageAllocator::kReadExecute)); CHECK(SetPermissions(buffer, allocated, PageAllocator::kReadExecute));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment