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

Unified Diff: runtime/vm/assembler_arm64.cc

Issue 1314883002: VM: Use constant pool also for leaf runtime calls on x64, arm, arm64 and mips. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: fixed non-simulated arm/mips build Created 5 years, 4 months 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 side-by-side diff with in-line comments
Download patch
Index: runtime/vm/assembler_arm64.cc
diff --git a/runtime/vm/assembler_arm64.cc b/runtime/vm/assembler_arm64.cc
index 72d90f221aeec291afe226b66b19b639ca5e6d5e..345b18d61fc13bdc204083927e6f69c0db10a415 100644
--- a/runtime/vm/assembler_arm64.cc
+++ b/runtime/vm/assembler_arm64.cc
@@ -584,24 +584,48 @@ void Assembler::LoadDImmediate(VRegister vd, double immd) {
}
+void Assembler::Branch(const ExternalLabel* label) {
+ LoadExternalLabel(TMP, label);
+ br(TMP);
+}
+
+
void Assembler::Branch(const StubEntry& stub_entry) {
const ExternalLabel label(stub_entry.EntryPoint());
Branch(&label);
}
+void Assembler::BranchPatchable(const ExternalLabel* label) {
+ // TODO(zra): Use LoadExternalLabelFixed if possible.
+ LoadImmediateFixed(TMP, label->address());
+ br(TMP);
+}
+
void Assembler::BranchPatchable(const StubEntry& stub_entry) {
const ExternalLabel label(stub_entry.EntryPoint());
BranchPatchable(&label);
}
+void Assembler::BranchLink(const ExternalLabel* label) {
+ LoadExternalLabel(TMP, label);
+ blr(TMP);
+}
+
+
void Assembler::BranchLink(const StubEntry& stub_entry) {
const ExternalLabel label(stub_entry.EntryPoint());
BranchLink(&label);
}
+void Assembler::BranchLinkPatchable(const ExternalLabel* label) {
+ LoadExternalLabelFixed(TMP, label, kPatchable);
+ blr(TMP);
+}
+
+
void Assembler::BranchLinkPatchable(const StubEntry& stub_entry) {
const ExternalLabel label(stub_entry.EntryPoint());
BranchLinkPatchable(&label);
@@ -1144,7 +1168,7 @@ void Assembler::LeaveDartFrame() {
void Assembler::EnterCallRuntimeFrame(intptr_t frame_size) {
- EnterFrame(0);
+ EnterStubFrame();
// Store fpu registers with the lowest register number at the lowest
// address.
@@ -1174,7 +1198,8 @@ void Assembler::LeaveCallRuntimeFrame() {
// We need to restore it before restoring registers.
const intptr_t kPushedRegistersSize =
kDartVolatileCpuRegCount * kWordSize +
- kDartVolatileFpuRegCount * kWordSize;
+ kDartVolatileFpuRegCount * kWordSize +
+ 2 * kWordSize; // PP and pc marker from EnterStubFrame.
AddImmediate(SP, FP, -kPushedRegistersSize);
for (int i = kDartLastVolatileCpuReg; i >= kDartFirstVolatileCpuReg; i--) {
const Register reg = static_cast<Register>(i);
@@ -1192,7 +1217,7 @@ void Assembler::LeaveCallRuntimeFrame() {
PopDouble(reg);
}
- PopPair(LR, FP);
+ LeaveStubFrame();
}

Powered by Google App Engine
This is Rietveld 408576698