From 3cd37d0aeb6d57d89bed1df8b185fb17f5cc7d48 Mon Sep 17 00:00:00 2001 From: Adrian Prantl Date: Fri, 28 Oct 2016 22:57:02 +0000 Subject: Refactor DW_LNE_* into Dwarf.def llvm-svn: 285475 --- llvm/include/llvm/Support/Dwarf.def | 29 ++++++++++++++++++++--------- llvm/include/llvm/Support/Dwarf.h | 8 +++----- 2 files changed, 23 insertions(+), 14 deletions(-) (limited to 'llvm/include') diff --git a/llvm/include/llvm/Support/Dwarf.def b/llvm/include/llvm/Support/Dwarf.def index 1fd0fa8bb70..841fc7d4ae2 100644 --- a/llvm/include/llvm/Support/Dwarf.def +++ b/llvm/include/llvm/Support/Dwarf.def @@ -12,13 +12,14 @@ //===----------------------------------------------------------------------===// // TODO: Add other DW-based macros. -#if !( \ - defined HANDLE_DW_TAG || defined HANDLE_DW_AT || defined HANDLE_DW_FORM || \ - defined HANDLE_DW_OP || defined HANDLE_DW_LANG || defined HANDLE_DW_ATE || \ - defined HANDLE_DW_VIRTUALITY || defined HANDLE_DW_DEFAULTED || \ - defined HANDLE_DW_CC || defined HANDLE_DW_LNS || defined HANDLE_DW_LNCT || \ - defined HANDLE_DW_MACRO || defined HANDLE_DW_RLE || \ - defined HANDLE_DW_CFA || defined HANDLE_DW_APPLE_PROPERTY) +#if !(defined HANDLE_DW_TAG || defined HANDLE_DW_AT || \ + defined HANDLE_DW_FORM || defined HANDLE_DW_OP || \ + defined HANDLE_DW_LANG || defined HANDLE_DW_ATE || \ + defined HANDLE_DW_VIRTUALITY || defined HANDLE_DW_DEFAULTED || \ + defined HANDLE_DW_CC || defined HANDLE_DW_LNS || \ + defined HANDLE_DW_LNE || defined HANDLE_DW_LNCT || \ + defined HANDLE_DW_MACRO || defined HANDLE_DW_RLE || \ + defined HANDLE_DW_CFA || defined HANDLE_DW_APPLE_PROPERTY) #error "Missing macro definition of HANDLE_DW*" #endif @@ -62,6 +63,10 @@ #define HANDLE_DW_LNS(ID, NAME) #endif +#ifndef HANDLE_DW_LNE +#define HANDLE_DW_LNE(ID, NAME) +#endif + #ifndef HANDLE_DW_LNCT #define HANDLE_DW_LNCT(ID, NAME) #endif @@ -687,7 +692,13 @@ HANDLE_DW_CC(0xb5, BORLAND_thiscall) HANDLE_DW_CC(0xb6, BORLAND_fastcall) HANDLE_DW_CC(0xc0, LLVM_vectorcall) -/// Line Number Standard Opcode Encodings. +// Line Number Extended Opcode Encodings +HANDLE_DW_LNE(0x01, end_sequence) +HANDLE_DW_LNE(0x02, set_address) +HANDLE_DW_LNE(0x03, define_file) +HANDLE_DW_LNE(0x04, set_discriminator) + +// Line Number Standard Opcode Encodings. HANDLE_DW_LNS(0x00, extended_op) HANDLE_DW_LNS(0x01, copy) HANDLE_DW_LNS(0x02, advance_pc) @@ -702,7 +713,6 @@ HANDLE_DW_LNS(0x0a, set_prologue_end) HANDLE_DW_LNS(0x0b, set_epilogue_begin) HANDLE_DW_LNS(0x0c, set_isa) - // DWARF v5 Line number header entry format. HANDLE_DW_LNCT(0x01, path) HANDLE_DW_LNCT(0x02, directory_index) @@ -793,6 +803,7 @@ HANDLE_DW_APPLE_PROPERTY(0x4000, class) #undef HANDLE_DW_DEFAULTED #undef HANDLE_DW_CC #undef HANDLE_DW_LNS +#undef HANDLE_DW_LNE #undef HANDLE_DW_LNCT #undef HANDLE_DW_MACRO #undef HANDLE_DW_RLE diff --git a/llvm/include/llvm/Support/Dwarf.h b/llvm/include/llvm/Support/Dwarf.h index b1b1639037c..7d0fe7ef4b8 100644 --- a/llvm/include/llvm/Support/Dwarf.h +++ b/llvm/include/llvm/Support/Dwarf.h @@ -211,12 +211,10 @@ enum LineNumberOps { #include "llvm/Support/Dwarf.def" }; +/// Line Number Extended Opcode Encodings. enum LineNumberExtendedOps { - // Line Number Extended Opcode Encodings - DW_LNE_end_sequence = 0x01, - DW_LNE_set_address = 0x02, - DW_LNE_define_file = 0x03, - DW_LNE_set_discriminator = 0x04, +#define HANDLE_DW_LNE(ID, NAME) DW_LNE_##NAME = ID, +#include "llvm/Support/Dwarf.def" DW_LNE_lo_user = 0x80, DW_LNE_hi_user = 0xff }; -- cgit v1.2.3