diff options
| author | Elliott Hughes <enh@google.com> | 2012-05-03 21:50:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-03 21:50:07 -0700 |
| commit | ad4681b5d7f46bf8d672ddcd102b6e123bae37cd (patch) | |
| tree | f3b165b638bf47799ed1083f144e876d17d6dbe9 /vm/mterp | |
| parent | 0b88861edfe5c0d57e0bb4a1cccb04f1916b5e9f (diff) | |
| parent | 20aeca6e2b18c07d3840f4b09f09186511148d8c (diff) | |
| download | android_dalvik-ad4681b5d7f46bf8d672ddcd102b6e123bae37cd.tar.gz android_dalvik-ad4681b5d7f46bf8d672ddcd102b6e123bae37cd.tar.bz2 android_dalvik-ad4681b5d7f46bf8d672ddcd102b6e123bae37cd.zip | |
am 20aeca6e: Merge "Pad the 8 and 16 bit Jvalue members"
* commit '20aeca6e2b18c07d3840f4b09f09186511148d8c':
Pad the 8 and 16 bit Jvalue members
Diffstat (limited to 'vm/mterp')
| -rw-r--r-- | vm/mterp/common/asm-constants.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vm/mterp/common/asm-constants.h b/vm/mterp/common/asm-constants.h index 6158f3152..3c3038365 100644 --- a/vm/mterp/common/asm-constants.h +++ b/vm/mterp/common/asm-constants.h @@ -152,7 +152,11 @@ MTERP_OFFSET(offThread_method, Thread, interpSave.method, 8) MTERP_OFFSET(offThread_methodClassDex, Thread, interpSave.methodClassDex, 12) /* make sure all JValue union members are stored at the same offset */ MTERP_OFFSET(offThread_retval, Thread, interpSave.retval, 16) +#ifdef HAVE_BIG_ENDIAN +MTERP_OFFSET(offThread_retval_z, Thread, interpSave.retval.z, 19) +#else MTERP_OFFSET(offThread_retval_z, Thread, interpSave.retval.z, 16) +#endif MTERP_OFFSET(offThread_retval_i, Thread, interpSave.retval.i, 16) MTERP_OFFSET(offThread_retval_j, Thread, interpSave.retval.j, 16) MTERP_OFFSET(offThread_retval_l, Thread, interpSave.retval.l, 16) |