diff options
| author | Vladimir Marko <vmarko@google.com> | 2018-06-22 02:16:08 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-06-22 02:16:08 -0700 |
| commit | 5f7748b6ec5b51afe8314f2c169f99a1f93a2053 (patch) | |
| tree | 25879b7002fd0601f9ed0ac9b6ef0b7d84134f55 /compiler/optimizing/code_generator_x86_64.h | |
| parent | 0ad09c4b396d37f57eecca8b1f841fb99a1a0baf (diff) | |
| parent | 077cc1c59c32f08c752c603bf991160c22eae9bb (diff) | |
Merge "Implement Integer.valueOf() intrinsic for PIC." am: ccfc88af4a am: 8e73527acf
am: 077cc1c59c
Change-Id: If3a8ed8679e4fa8ef851b0c92e303473ef74a910
Diffstat (limited to 'compiler/optimizing/code_generator_x86_64.h')
| -rw-r--r-- | compiler/optimizing/code_generator_x86_64.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/optimizing/code_generator_x86_64.h b/compiler/optimizing/code_generator_x86_64.h index 9a4c53b5240..cf862d3f341 100644 --- a/compiler/optimizing/code_generator_x86_64.h +++ b/compiler/optimizing/code_generator_x86_64.h @@ -429,7 +429,7 @@ class CodeGeneratorX86_64 : public CodeGenerator { dex::TypeIndex type_index, Handle<mirror::Class> handle); - void MoveFromReturnRegister(Location trg, DataType::Type type) OVERRIDE; + void LoadBootImageAddress(CpuRegister reg, uint32_t boot_image_offset); void EmitLinkerPatches(ArenaVector<linker::LinkerPatch>* linker_patches) OVERRIDE; @@ -566,6 +566,8 @@ class CodeGeneratorX86_64 : public CodeGenerator { // Store a 64 bit value into a DoubleStackSlot in the most efficient manner. void Store64BitValueToStack(Location dest, int64_t value); + void MoveFromReturnRegister(Location trg, DataType::Type type) OVERRIDE; + // Assign a 64 bit constant to an address. void MoveInt64ToAddress(const Address& addr_low, const Address& addr_high, |