Author: emaste Date: Fri Jul 22 10:00:42 2016 New Revision: 276424 URL: http://llvm.org/viewvc/llvm-project?rev=276424&view=rev Log: Merge r276128: libunwind: limit stack usage in unwind cursor
Modified: libunwind/branches/release_39/ (props changed) libunwind/branches/release_39/include/__libunwind_config.h libunwind/branches/release_39/src/DwarfParser.hpp Propchange: libunwind/branches/release_39/ ------------------------------------------------------------------------------ svn:mergeinfo = /libunwind/trunk:276128 Modified: libunwind/branches/release_39/include/__libunwind_config.h URL: http://llvm.org/viewvc/llvm-project/libunwind/branches/release_39/include/__libunwind_config.h?rev=276424&r1=276423&r2=276424&view=diff ============================================================================== --- libunwind/branches/release_39/include/__libunwind_config.h (original) +++ libunwind/branches/release_39/include/__libunwind_config.h Fri Jul 22 10:00:42 2016 @@ -22,18 +22,22 @@ # define _LIBUNWIND_TARGET_I386 1 # define _LIBUNWIND_CONTEXT_SIZE 8 # define _LIBUNWIND_CURSOR_SIZE 19 +# define _LIBUNWIND_HIGHEST_DWARF_REGISTER 9 # elif defined(__x86_64__) # define _LIBUNWIND_TARGET_X86_64 1 # define _LIBUNWIND_CONTEXT_SIZE 21 # define _LIBUNWIND_CURSOR_SIZE 33 +# define _LIBUNWIND_HIGHEST_DWARF_REGISTER 17 # elif defined(__ppc__) # define _LIBUNWIND_TARGET_PPC 1 # define _LIBUNWIND_CONTEXT_SIZE 117 # define _LIBUNWIND_CURSOR_SIZE 128 +# define _LIBUNWIND_HIGHEST_DWARF_REGISTER 113 # elif defined(__aarch64__) # define _LIBUNWIND_TARGET_AARCH64 1 # define _LIBUNWIND_CONTEXT_SIZE 66 # define _LIBUNWIND_CURSOR_SIZE 78 +# define _LIBUNWIND_HIGHEST_DWARF_REGISTER 96 # elif defined(__arm__) # define _LIBUNWIND_TARGET_ARM 1 # if defined(__ARM_WMMX) @@ -43,10 +47,12 @@ # define _LIBUNWIND_CONTEXT_SIZE 42 # define _LIBUNWIND_CURSOR_SIZE 49 # endif +# define _LIBUNWIND_HIGHEST_DWARF_REGISTER 96 # elif defined(__or1k__) # define _LIBUNWIND_TARGET_OR1K 1 # define _LIBUNWIND_CONTEXT_SIZE 16 # define _LIBUNWIND_CURSOR_SIZE 28 +# define _LIBUNWIND_HIGHEST_DWARF_REGISTER 32 # else # error "Unsupported architecture." # endif @@ -59,6 +65,7 @@ # define _LIBUNWIND_TARGET_OR1K 1 # define _LIBUNWIND_CONTEXT_SIZE 128 # define _LIBUNWIND_CURSOR_SIZE 140 +# define _LIBUNWIND_HIGHEST_DWARF_REGISTER 120 #endif // _LIBUNWIND_IS_NATIVE_ONLY #endif // ____LIBUNWIND_CONFIG_H__ Modified: libunwind/branches/release_39/src/DwarfParser.hpp URL: http://llvm.org/viewvc/llvm-project/libunwind/branches/release_39/src/DwarfParser.hpp?rev=276424&r1=276423&r2=276424&view=diff ============================================================================== --- libunwind/branches/release_39/src/DwarfParser.hpp (original) +++ libunwind/branches/release_39/src/DwarfParser.hpp Fri Jul 22 10:00:42 2016 @@ -62,7 +62,7 @@ public: }; enum { - kMaxRegisterNumber = 120 + kMaxRegisterNumber = _LIBUNWIND_HIGHEST_DWARF_REGISTER }; enum RegisterSavedWhere { kRegisterUnused, _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits