diff options
32 files changed, 56 insertions, 66 deletions
diff --git a/libunwindstack/ArmExidx.cpp b/libunwindstack/ArmExidx.cpp index 65638ae..6e397e3 100644 --- a/libunwindstack/ArmExidx.cpp +++ b/libunwindstack/ArmExidx.cpp @@ -22,12 +22,12 @@ #include <android-base/stringprintf.h> #include <unwindstack/Log.h> +#include <unwindstack/MachineArm.h> #include <unwindstack/Memory.h> #include <unwindstack/RegsArm.h> #include "ArmExidx.h" #include "Check.h" -#include "MachineArm.h" namespace unwindstack { diff --git a/libunwindstack/DwarfEhFrame.h b/libunwindstack/DwarfEhFrame.h index 2589c89..7a41e45 100644 --- a/libunwindstack/DwarfEhFrame.h +++ b/libunwindstack/DwarfEhFrame.h @@ -46,4 +46,4 @@ class DwarfEhFrame : public DwarfSectionImpl<AddressType> { } // namespace unwindstack -#endif // _LIBUNWINDSTACK_DWARF_EH_FRAME_WITH_HDR_H +#endif // _LIBUNWINDSTACK_DWARF_EH_FRAME_H diff --git a/libunwindstack/ElfInterfaceArm.cpp b/libunwindstack/ElfInterfaceArm.cpp index 616d1b1..dfb8e8f 100644 --- a/libunwindstack/ElfInterfaceArm.cpp +++ b/libunwindstack/ElfInterfaceArm.cpp @@ -17,12 +17,12 @@ #include <elf.h> #include <stdint.h> +#include <unwindstack/MachineArm.h> #include <unwindstack/Memory.h> #include <unwindstack/RegsArm.h> #include "ArmExidx.h" #include "ElfInterfaceArm.h" -#include "MachineArm.h" namespace unwindstack { diff --git a/libunwindstack/Regs.cpp b/libunwindstack/Regs.cpp index 7feafad..c7dec52 100644 --- a/libunwindstack/Regs.cpp +++ b/libunwindstack/Regs.cpp @@ -25,17 +25,16 @@ #include <unwindstack/Regs.h> #include <unwindstack/RegsArm.h> #include <unwindstack/RegsArm64.h> -#include <unwindstack/RegsX86.h> -#include <unwindstack/RegsX86_64.h> #include <unwindstack/RegsMips.h> #include <unwindstack/RegsMips64.h> - -#include "UserArm.h" -#include "UserArm64.h" -#include "UserX86.h" -#include "UserX86_64.h" -#include "UserMips.h" -#include "UserMips64.h" +#include <unwindstack/RegsX86.h> +#include <unwindstack/RegsX86_64.h> +#include <unwindstack/UserArm.h> +#include <unwindstack/UserArm64.h> +#include <unwindstack/UserMips.h> +#include <unwindstack/UserMips64.h> +#include <unwindstack/UserX86.h> +#include <unwindstack/UserX86_64.h> namespace unwindstack { diff --git a/libunwindstack/RegsArm.cpp b/libunwindstack/RegsArm.cpp index d05c3e2..7f16146 100644 --- a/libunwindstack/RegsArm.cpp +++ b/libunwindstack/RegsArm.cpp @@ -19,13 +19,12 @@ #include <functional> #include <unwindstack/Elf.h> +#include <unwindstack/MachineArm.h> #include <unwindstack/MapInfo.h> #include <unwindstack/Memory.h> #include <unwindstack/RegsArm.h> - -#include "MachineArm.h" -#include "UcontextArm.h" -#include "UserArm.h" +#include <unwindstack/UcontextArm.h> +#include <unwindstack/UserArm.h> namespace unwindstack { diff --git a/libunwindstack/RegsArm64.cpp b/libunwindstack/RegsArm64.cpp index 2077bc5..d6b467a 100644 --- a/libunwindstack/RegsArm64.cpp +++ b/libunwindstack/RegsArm64.cpp @@ -19,13 +19,12 @@ #include <functional> #include <unwindstack/Elf.h> +#include <unwindstack/MachineArm64.h> #include <unwindstack/MapInfo.h> #include <unwindstack/Memory.h> #include <unwindstack/RegsArm64.h> - -#include "MachineArm64.h" -#include "UcontextArm64.h" -#include "UserArm64.h" +#include <unwindstack/UcontextArm64.h> +#include <unwindstack/UserArm64.h> namespace unwindstack { diff --git a/libunwindstack/RegsMips.cpp b/libunwindstack/RegsMips.cpp index 44cde05..6751f52 100644 --- a/libunwindstack/RegsMips.cpp +++ b/libunwindstack/RegsMips.cpp @@ -19,13 +19,12 @@ #include <functional> #include <unwindstack/Elf.h> +#include <unwindstack/MachineMips.h> #include <unwindstack/MapInfo.h> #include <unwindstack/Memory.h> #include <unwindstack/RegsMips.h> - -#include "MachineMips.h" -#include "UcontextMips.h" -#include "UserMips.h" +#include <unwindstack/UcontextMips.h> +#include <unwindstack/UserMips.h> namespace unwindstack { diff --git a/libunwindstack/RegsMips64.cpp b/libunwindstack/RegsMips64.cpp index b4e5246..97082bd 100644 --- a/libunwindstack/RegsMips64.cpp +++ b/libunwindstack/RegsMips64.cpp @@ -19,13 +19,12 @@ #include <functional> #include <unwindstack/Elf.h> +#include <unwindstack/MachineMips64.h> #include <unwindstack/MapInfo.h> #include <unwindstack/Memory.h> #include <unwindstack/RegsMips64.h> - -#include "MachineMips64.h" -#include "UcontextMips64.h" -#include "UserMips64.h" +#include <unwindstack/UcontextMips64.h> +#include <unwindstack/UserMips64.h> namespace unwindstack { diff --git a/libunwindstack/RegsX86.cpp b/libunwindstack/RegsX86.cpp index ef2f3de..27476b7 100644 --- a/libunwindstack/RegsX86.cpp +++ b/libunwindstack/RegsX86.cpp @@ -19,13 +19,12 @@ #include <functional> #include <unwindstack/Elf.h> +#include <unwindstack/MachineX86.h> #include <unwindstack/MapInfo.h> #include <unwindstack/Memory.h> #include <unwindstack/RegsX86.h> - -#include "MachineX86.h" -#include "UcontextX86.h" -#include "UserX86.h" +#include <unwindstack/UcontextX86.h> +#include <unwindstack/UserX86.h> namespace unwindstack { diff --git a/libunwindstack/RegsX86_64.cpp b/libunwindstack/RegsX86_64.cpp index 70921f8..0f66943 100644 --- a/libunwindstack/RegsX86_64.cpp +++ b/libunwindstack/RegsX86_64.cpp @@ -19,13 +19,12 @@ #include <functional> #include <unwindstack/Elf.h> +#include <unwindstack/MachineX86_64.h> #include <unwindstack/MapInfo.h> #include <unwindstack/Memory.h> #include <unwindstack/RegsX86_64.h> - -#include "MachineX86_64.h" -#include "UcontextX86_64.h" -#include "UserX86_64.h" +#include <unwindstack/UcontextX86_64.h> +#include <unwindstack/UserX86_64.h> namespace unwindstack { diff --git a/libunwindstack/MachineArm.h b/libunwindstack/include/unwindstack/MachineArm.h index 3f902b1..3f902b1 100644 --- a/libunwindstack/MachineArm.h +++ b/libunwindstack/include/unwindstack/MachineArm.h diff --git a/libunwindstack/MachineArm64.h b/libunwindstack/include/unwindstack/MachineArm64.h index e8b778b..e8b778b 100644 --- a/libunwindstack/MachineArm64.h +++ b/libunwindstack/include/unwindstack/MachineArm64.h diff --git a/libunwindstack/MachineMips.h b/libunwindstack/include/unwindstack/MachineMips.h index 2dfb1e9..2dfb1e9 100644 --- a/libunwindstack/MachineMips.h +++ b/libunwindstack/include/unwindstack/MachineMips.h diff --git a/libunwindstack/MachineMips64.h b/libunwindstack/include/unwindstack/MachineMips64.h index 34addf2..34addf2 100644 --- a/libunwindstack/MachineMips64.h +++ b/libunwindstack/include/unwindstack/MachineMips64.h diff --git a/libunwindstack/MachineX86.h b/libunwindstack/include/unwindstack/MachineX86.h index 02adb98..02adb98 100644 --- a/libunwindstack/MachineX86.h +++ b/libunwindstack/include/unwindstack/MachineX86.h diff --git a/libunwindstack/MachineX86_64.h b/libunwindstack/include/unwindstack/MachineX86_64.h index af33fea..af33fea 100644 --- a/libunwindstack/MachineX86_64.h +++ b/libunwindstack/include/unwindstack/MachineX86_64.h diff --git a/libunwindstack/UcontextArm.h b/libunwindstack/include/unwindstack/UcontextArm.h index 8c94166..7d1ec3b 100644 --- a/libunwindstack/UcontextArm.h +++ b/libunwindstack/include/unwindstack/UcontextArm.h @@ -31,7 +31,7 @@ #include <stdint.h> -#include "MachineArm.h" +#include <unwindstack/MachineArm.h> namespace unwindstack { diff --git a/libunwindstack/UcontextArm64.h b/libunwindstack/include/unwindstack/UcontextArm64.h index 655719f..a68be3b 100644 --- a/libunwindstack/UcontextArm64.h +++ b/libunwindstack/include/unwindstack/UcontextArm64.h @@ -31,7 +31,7 @@ #include <stdint.h> -#include "MachineArm64.h" +#include <unwindstack/MachineArm64.h> namespace unwindstack { diff --git a/libunwindstack/UcontextMips.h b/libunwindstack/include/unwindstack/UcontextMips.h index 27185e7..02e33b6 100644 --- a/libunwindstack/UcontextMips.h +++ b/libunwindstack/include/unwindstack/UcontextMips.h @@ -31,7 +31,7 @@ #include <stdint.h> -#include "MachineMips.h" +#include <unwindstack/MachineMips.h> namespace unwindstack { diff --git a/libunwindstack/UcontextMips64.h b/libunwindstack/include/unwindstack/UcontextMips64.h index 623bf3a..5b92a55 100644 --- a/libunwindstack/UcontextMips64.h +++ b/libunwindstack/include/unwindstack/UcontextMips64.h @@ -31,7 +31,7 @@ #include <stdint.h> -#include "MachineMips64.h" +#include <unwindstack/MachineMips64.h> namespace unwindstack { @@ -66,4 +66,4 @@ struct mips64_ucontext_t { } // namespace unwindstack -#endif // _LIBUNWINDSTACK_UCONTEXT_MIPS6464_H +#endif // _LIBUNWINDSTACK_UCONTEXT_MIPS64_H diff --git a/libunwindstack/UcontextX86.h b/libunwindstack/include/unwindstack/UcontextX86.h index f79d92b..c96ebb7 100644 --- a/libunwindstack/UcontextX86.h +++ b/libunwindstack/include/unwindstack/UcontextX86.h @@ -31,7 +31,7 @@ #include <stdint.h> -#include "MachineX86.h" +#include <unwindstack/MachineX86.h> namespace unwindstack { diff --git a/libunwindstack/UcontextX86_64.h b/libunwindstack/include/unwindstack/UcontextX86_64.h index 2b8bdc4..4e163e5 100644 --- a/libunwindstack/UcontextX86_64.h +++ b/libunwindstack/include/unwindstack/UcontextX86_64.h @@ -31,7 +31,7 @@ #include <stdint.h> -#include "MachineX86_64.h" +#include <unwindstack/MachineX86_64.h> namespace unwindstack { diff --git a/libunwindstack/UserArm.h b/libunwindstack/include/unwindstack/UserArm.h index 7388c03..7388c03 100644 --- a/libunwindstack/UserArm.h +++ b/libunwindstack/include/unwindstack/UserArm.h diff --git a/libunwindstack/UserArm64.h b/libunwindstack/include/unwindstack/UserArm64.h index d74983f..d74983f 100644 --- a/libunwindstack/UserArm64.h +++ b/libunwindstack/include/unwindstack/UserArm64.h diff --git a/libunwindstack/UserMips.h b/libunwindstack/include/unwindstack/UserMips.h index 184be4f..184be4f 100644 --- a/libunwindstack/UserMips.h +++ b/libunwindstack/include/unwindstack/UserMips.h diff --git a/libunwindstack/UserMips64.h b/libunwindstack/include/unwindstack/UserMips64.h index c46befd..c46befd 100644 --- a/libunwindstack/UserMips64.h +++ b/libunwindstack/include/unwindstack/UserMips64.h diff --git a/libunwindstack/UserX86.h b/libunwindstack/include/unwindstack/UserX86.h index a040560..a040560 100644 --- a/libunwindstack/UserX86.h +++ b/libunwindstack/include/unwindstack/UserX86.h diff --git a/libunwindstack/UserX86_64.h b/libunwindstack/include/unwindstack/UserX86_64.h index b80d201..b80d201 100644 --- a/libunwindstack/UserX86_64.h +++ b/libunwindstack/include/unwindstack/UserX86_64.h diff --git a/libunwindstack/tests/ElfInterfaceArmTest.cpp b/libunwindstack/tests/ElfInterfaceArmTest.cpp index 31d6a63..70a52ad 100644 --- a/libunwindstack/tests/ElfInterfaceArmTest.cpp +++ b/libunwindstack/tests/ElfInterfaceArmTest.cpp @@ -20,10 +20,10 @@ #include <vector> +#include <unwindstack/MachineArm.h> #include <unwindstack/RegsArm.h> #include "ElfInterfaceArm.h" -#include "MachineArm.h" #include "ElfFake.h" #include "MemoryFake.h" diff --git a/libunwindstack/tests/RegsIterateTest.cpp b/libunwindstack/tests/RegsIterateTest.cpp index 8b5b31f..9a27dbd 100644 --- a/libunwindstack/tests/RegsIterateTest.cpp +++ b/libunwindstack/tests/RegsIterateTest.cpp @@ -24,20 +24,19 @@ #include <unwindstack/Elf.h> #include <unwindstack/ElfInterface.h> +#include <unwindstack/MachineArm.h> +#include <unwindstack/MachineArm64.h> +#include <unwindstack/MachineMips.h> +#include <unwindstack/MachineMips64.h> +#include <unwindstack/MachineX86.h> +#include <unwindstack/MachineX86_64.h> #include <unwindstack/MapInfo.h> #include <unwindstack/RegsArm.h> #include <unwindstack/RegsArm64.h> -#include <unwindstack/RegsX86.h> -#include <unwindstack/RegsX86_64.h> #include <unwindstack/RegsMips.h> #include <unwindstack/RegsMips64.h> - -#include "MachineArm.h" -#include "MachineArm64.h" -#include "MachineX86.h" -#include "MachineX86_64.h" -#include "MachineMips.h" -#include "MachineMips64.h" +#include <unwindstack/RegsX86.h> +#include <unwindstack/RegsX86_64.h> namespace unwindstack { diff --git a/libunwindstack/tests/RegsStepIfSignalHandlerTest.cpp b/libunwindstack/tests/RegsStepIfSignalHandlerTest.cpp index ef9e61c..ecd4051 100644 --- a/libunwindstack/tests/RegsStepIfSignalHandlerTest.cpp +++ b/libunwindstack/tests/RegsStepIfSignalHandlerTest.cpp @@ -19,19 +19,18 @@ #include <gtest/gtest.h> #include <unwindstack/Elf.h> +#include <unwindstack/MachineArm.h> +#include <unwindstack/MachineArm64.h> +#include <unwindstack/MachineMips.h> +#include <unwindstack/MachineMips64.h> +#include <unwindstack/MachineX86.h> +#include <unwindstack/MachineX86_64.h> #include <unwindstack/RegsArm.h> #include <unwindstack/RegsArm64.h> -#include <unwindstack/RegsX86.h> -#include <unwindstack/RegsX86_64.h> #include <unwindstack/RegsMips.h> #include <unwindstack/RegsMips64.h> - -#include "MachineArm.h" -#include "MachineArm64.h" -#include "MachineX86.h" -#include "MachineX86_64.h" -#include "MachineMips.h" -#include "MachineMips64.h" +#include <unwindstack/RegsX86.h> +#include <unwindstack/RegsX86_64.h> #include "MemoryFake.h" diff --git a/libunwindstack/tests/UnwindOfflineTest.cpp b/libunwindstack/tests/UnwindOfflineTest.cpp index e93d826..e499593 100644 --- a/libunwindstack/tests/UnwindOfflineTest.cpp +++ b/libunwindstack/tests/UnwindOfflineTest.cpp @@ -26,6 +26,9 @@ #include <vector> #include <unwindstack/JitDebug.h> +#include <unwindstack/MachineArm.h> +#include <unwindstack/MachineArm64.h> +#include <unwindstack/MachineX86.h> #include <unwindstack/Maps.h> #include <unwindstack/Memory.h> #include <unwindstack/RegsArm.h> @@ -33,10 +36,6 @@ #include <unwindstack/RegsX86.h> #include <unwindstack/Unwinder.h> -#include "MachineArm.h" -#include "MachineArm64.h" -#include "MachineX86.h" - #include "ElfTestUtils.h" namespace unwindstack { |