Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(52)

Side by Side Diff: src/DartARM32/assembler_arm.cc

Issue 1511653002: Fix problems with sandboxing and the ARM integrated assembler. (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master
Patch Set: Fix nit. Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/DartARM32/assembler_arm.h ('k') | src/IceAssembler.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 // 4 //
5 // This is forked from Dart revision df52deea9f25690eb8b66c5995da92b70f7ac1fe 5 // This is forked from Dart revision df52deea9f25690eb8b66c5995da92b70f7ac1fe
6 // Please update the (git) revision if we merge changes from Dart. 6 // Please update the (git) revision if we merge changes from Dart.
7 // https://code.google.com/p/dart/wiki/GettingTheSource 7 // https://code.google.com/p/dart/wiki/GettingTheSource
8 8
9 #include "vm/globals.h" // NOLINT 9 #include "vm/globals.h" // NOLINT
10 #if defined(TARGET_ARCH_ARM) 10 #if defined(TARGET_ARCH_ARM)
(...skipping 582 matching lines...) Expand 10 before | Expand all | Expand 10 after
593 } 593 }
594 594
595 595
596 void Assembler::clrex() { 596 void Assembler::clrex() {
597 ASSERT(TargetCPUFeatures::arm_version() != ARMv5TE); 597 ASSERT(TargetCPUFeatures::arm_version() != ARMv5TE);
598 int32_t encoding = (kSpecialCondition << kConditionShift) | 598 int32_t encoding = (kSpecialCondition << kConditionShift) |
599 B26 | B24 | B22 | B21 | B20 | (0xff << 12) | B4 | 0xf; 599 B26 | B24 | B22 | B21 | B20 | (0xff << 12) | B4 | 0xf;
600 Emit(encoding); 600 Emit(encoding);
601 } 601 }
602 602
603 603 #if 0
604 // Moved to ARM32::AssemblerARM32::nop().
604 void Assembler::nop(Condition cond) { 605 void Assembler::nop(Condition cond) {
605 ASSERT(cond != kNoCondition); 606 ASSERT(cond != kNoCondition);
606 int32_t encoding = (static_cast<int32_t>(cond) << kConditionShift) | 607 int32_t encoding = (static_cast<int32_t>(cond) << kConditionShift) |
607 B25 | B24 | B21 | (0xf << 12); 608 B25 | B24 | B21 | (0xf << 12);
608 Emit(encoding); 609 Emit(encoding);
609 } 610 }
611 #endif
610 612
611 613
612 void Assembler::vmovsr(SRegister sn, Register rt, Condition cond) { 614 void Assembler::vmovsr(SRegister sn, Register rt, Condition cond) {
613 ASSERT(TargetCPUFeatures::vfp_supported()); 615 ASSERT(TargetCPUFeatures::vfp_supported());
614 ASSERT(sn != kNoSRegister); 616 ASSERT(sn != kNoSRegister);
615 ASSERT(rt != kNoRegister); 617 ASSERT(rt != kNoRegister);
616 ASSERT(rt != SP); 618 ASSERT(rt != SP);
617 ASSERT(rt != PC); 619 ASSERT(rt != PC);
618 ASSERT(cond != kNoCondition); 620 ASSERT(cond != kNoCondition);
619 int32_t encoding = (static_cast<int32_t>(cond) << kConditionShift) | 621 int32_t encoding = (static_cast<int32_t>(cond) << kConditionShift) |
(...skipping 3065 matching lines...) Expand 10 before | Expand all | Expand 10 after
3685 3687
3686 3688
3687 const char* Assembler::FpuRegisterName(FpuRegister reg) { 3689 const char* Assembler::FpuRegisterName(FpuRegister reg) {
3688 ASSERT((0 <= reg) && (reg < kNumberOfFpuRegisters)); 3690 ASSERT((0 <= reg) && (reg < kNumberOfFpuRegisters));
3689 return fpu_reg_names[reg]; 3691 return fpu_reg_names[reg];
3690 } 3692 }
3691 3693
3692 } // namespace dart 3694 } // namespace dart
3693 3695
3694 #endif // defined TARGET_ARCH_ARM 3696 #endif // defined TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « src/DartARM32/assembler_arm.h ('k') | src/IceAssembler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698