diff options
| author | David Srbecky <dsrbecky@google.com> | 2015-06-20 05:46:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-20 05:46:48 +0000 |
| commit | 7060f2812b6eca80968a7480698fe943c276e90c (patch) | |
| tree | 12d71f5bef10c02a71f31675ece257c528673f72 | |
| parent | 73ad9401d93bdbfe51b00e51361e4ecd2047aac5 (diff) | |
| parent | 7257ece418469b284ae3cf1d9ba6617a62bdfc4f (diff) | |
| download | art-7060f2812b6eca80968a7480698fe943c276e90c.tar.gz art-7060f2812b6eca80968a7480698fe943c276e90c.tar.bz2 art-7060f2812b6eca80968a7480698fe943c276e90c.zip | |
am 7257ece4: Use signed encoding when using relative CFI addresses.
* commit '7257ece418469b284ae3cf1d9ba6617a62bdfc4f':
Use signed encoding when using relative CFI addresses.
| -rw-r--r-- | compiler/dwarf/headers.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/compiler/dwarf/headers.h b/compiler/dwarf/headers.h index ad315ee351..ae57755f43 100644 --- a/compiler/dwarf/headers.h +++ b/compiler/dwarf/headers.h @@ -54,9 +54,19 @@ void WriteDebugFrameCIE(bool is64bit, writer.PushUleb128(return_address_register.num()); // ubyte in DWARF2. writer.PushUleb128(1); // z: Augmentation data size. if (is64bit) { - writer.PushUint8(address_type | DW_EH_PE_udata8); // R: Pointer encoding. + if (address_type == DW_EH_PE_pcrel) { + writer.PushUint8(DW_EH_PE_pcrel | DW_EH_PE_sdata8); // R: Pointer encoding. + } else { + DCHECK(address_type == DW_EH_PE_absptr); + writer.PushUint8(DW_EH_PE_absptr | DW_EH_PE_udata8); // R: Pointer encoding. + } } else { - writer.PushUint8(address_type | DW_EH_PE_udata4); // R: Pointer encoding. + if (address_type == DW_EH_PE_pcrel) { + writer.PushUint8(DW_EH_PE_pcrel | DW_EH_PE_sdata4); // R: Pointer encoding. + } else { + DCHECK(address_type == DW_EH_PE_absptr); + writer.PushUint8(DW_EH_PE_absptr | DW_EH_PE_udata4); // R: Pointer encoding. + } } writer.PushData(opcodes.data()); writer.Pad(is64bit ? 8 : 4); |