diff options
| author | Andreas Gampe <agampe@google.com> | 2014-04-03 13:31:32 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-04-03 13:31:32 -0700 |
| commit | 242947dbcdc4038ddd8ac522bb480f82e7d92ffa (patch) | |
| tree | a84dc663494a1dbadd0f209788ae071742381309 /runtime/runtime.cc | |
| parent | 0537c5ea92a4fb60a04024cc2b7247f08a3d9096 (diff) | |
| download | art-242947dbcdc4038ddd8ac522bb480f82e7d92ffa.zip art-242947dbcdc4038ddd8ac522bb480f82e7d92ffa.tar.gz art-242947dbcdc4038ddd8ac522bb480f82e7d92ffa.tar.bz2 | |
Make frame size dependent on arch-specific constants.
Necessary for proper cross-compiling.
Change-Id: I852901ee6ca5121e480b83a8e318bdc9c7d615e8
Diffstat (limited to 'runtime/runtime.cc')
| -rw-r--r-- | runtime/runtime.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/runtime/runtime.cc b/runtime/runtime.cc index f8634ce..edc3b33 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -999,7 +999,7 @@ mirror::ArtMethod* Runtime::CreateCalleeSaveMethod(InstructionSet instruction_se uint32_t fp_spills = type == kSaveAll ? fp_all_spills : 0; size_t frame_size = RoundUp((__builtin_popcount(core_spills) /* gprs */ + __builtin_popcount(fp_spills) /* fprs */ + - 1 /* Method* */) * kPointerSize, kStackAlignment); + 1 /* Method* */) * kArmPointerSize, kStackAlignment); method->SetFrameSizeInBytes(frame_size); method->SetCoreSpillMask(core_spills); method->SetFpSpillMask(fp_spills); @@ -1013,7 +1013,7 @@ mirror::ArtMethod* Runtime::CreateCalleeSaveMethod(InstructionSet instruction_se (type == kSaveAll ? all_spills : 0) | (1 << art::mips::RA); size_t frame_size = RoundUp((__builtin_popcount(core_spills) /* gprs */ + (type == kRefsAndArgs ? 0 : 3) + 1 /* Method* */) * - kPointerSize, kStackAlignment); + kMipsPointerSize, kStackAlignment); method->SetFrameSizeInBytes(frame_size); method->SetCoreSpillMask(core_spills); method->SetFpSpillMask(0); @@ -1023,7 +1023,7 @@ mirror::ArtMethod* Runtime::CreateCalleeSaveMethod(InstructionSet instruction_se uint32_t core_spills = ref_spills | (type == kRefsAndArgs ? arg_spills : 0) | (1 << art::x86::kNumberOfCpuRegisters); // fake return address callee save size_t frame_size = RoundUp((__builtin_popcount(core_spills) /* gprs */ + - 1 /* Method* */) * kPointerSize, kStackAlignment); + 1 /* Method* */) * kX86PointerSize, kStackAlignment); method->SetFrameSizeInBytes(frame_size); method->SetCoreSpillMask(core_spills); method->SetFpSpillMask(0); @@ -1043,7 +1043,7 @@ mirror::ArtMethod* Runtime::CreateCalleeSaveMethod(InstructionSet instruction_se uint32_t fp_spills = (type == kRefsAndArgs ? fp_arg_spills : 0); size_t frame_size = RoundUp((__builtin_popcount(core_spills) /* gprs */ + __builtin_popcount(fp_spills) /* fprs */ + - 1 /* Method* */) * kPointerSize, kStackAlignment); + 1 /* Method* */) * kX86_64PointerSize, kStackAlignment); method->SetFrameSizeInBytes(frame_size); method->SetCoreSpillMask(core_spills); method->SetFpSpillMask(fp_spills); @@ -1083,7 +1083,7 @@ mirror::ArtMethod* Runtime::CreateCalleeSaveMethod(InstructionSet instruction_se | (type == kSaveAll ? fp_all_spills : 0); size_t frame_size = RoundUp((__builtin_popcount(core_spills) /* gprs */ + __builtin_popcount(fp_spills) /* fprs */ + - 1 /* Method* */) * kPointerSize, kStackAlignment); + 1 /* Method* */) * kArm64PointerSize, kStackAlignment); method->SetFrameSizeInBytes(frame_size); method->SetCoreSpillMask(core_spills); method->SetFpSpillMask(fp_spills); |