diff options
author | Jeff Hao <jeffhao@google.com> | 2013-09-19 15:13:16 -0700 |
---|---|---|
committer | Jeff Hao <jeffhao@google.com> | 2013-09-19 15:37:02 -0700 |
commit | e47637cc7c96e654d2c340e6006c232c8078673b (patch) | |
tree | 4e49c4d7bccbb7903b6de186b8676a77d7c157bc /runtime/stack.h | |
parent | f466553d7f2f941765adaa657c340ff31b55d891 (diff) | |
download | art-e47637cc7c96e654d2c340e6006c232c8078673b.zip art-e47637cc7c96e654d2c340e6006c232c8078673b.tar.gz art-e47637cc7c96e654d2c340e6006c232c8078673b.tar.bz2 |
4-byte align 64-bit values in Get/Set Double/Long for GCC 4.8.
Bug: 10837416
Change-Id: Ibb562407d81c2085666ae8824e7570f22e56eaa7
Diffstat (limited to 'runtime/stack.h')
-rw-r--r-- | runtime/stack.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/runtime/stack.h b/runtime/stack.h index 8ecf8f0..7c87f45 100644 --- a/runtime/stack.h +++ b/runtime/stack.h @@ -138,13 +138,17 @@ class ShadowFrame { int64_t GetVRegLong(size_t i) const { DCHECK_LT(i, NumberOfVRegs()); const uint32_t* vreg = &vregs_[i]; - return *reinterpret_cast<const int64_t*>(vreg); + // Alignment attribute required for GCC 4.8 + typedef const int64_t unaligned_int64 __attribute__ ((aligned (4))); + return *reinterpret_cast<unaligned_int64*>(vreg); } double GetVRegDouble(size_t i) const { DCHECK_LT(i, NumberOfVRegs()); const uint32_t* vreg = &vregs_[i]; - return *reinterpret_cast<const double*>(vreg); + // Alignment attribute required for GCC 4.8 + typedef const double unaligned_double __attribute__ ((aligned (4))); + return *reinterpret_cast<unaligned_double*>(vreg); } mirror::Object* GetVRegReference(size_t i) const { @@ -177,13 +181,17 @@ class ShadowFrame { void SetVRegLong(size_t i, int64_t val) { DCHECK_LT(i, NumberOfVRegs()); uint32_t* vreg = &vregs_[i]; - *reinterpret_cast<int64_t*>(vreg) = val; + // Alignment attribute required for GCC 4.8 + typedef int64_t unaligned_int64 __attribute__ ((aligned (4))); + *reinterpret_cast<unaligned_int64*>(vreg) = val; } void SetVRegDouble(size_t i, double val) { DCHECK_LT(i, NumberOfVRegs()); uint32_t* vreg = &vregs_[i]; - *reinterpret_cast<double*>(vreg) = val; + // Alignment attribute required for GCC 4.8 + typedef double unaligned_double __attribute__ ((aligned (4))); + *reinterpret_cast<unaligned_double*>(vreg) = val; } void SetVRegReference(size_t i, mirror::Object* val) { |