summaryrefslogtreecommitdiff
path: root/src/core/arm/disassembler
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/arm/disassembler')
-rw-r--r--src/core/arm/disassembler/arm_disasm.cpp4
-rw-r--r--src/core/arm/disassembler/arm_disasm.h1
-rw-r--r--src/core/arm/disassembler/load_symbol_map.cpp4
3 files changed, 2 insertions, 7 deletions
diff --git a/src/core/arm/disassembler/arm_disasm.cpp b/src/core/arm/disassembler/arm_disasm.cpp
index b3b9971e8..068f395ac 100644
--- a/src/core/arm/disassembler/arm_disasm.cpp
+++ b/src/core/arm/disassembler/arm_disasm.cpp
@@ -1,12 +1,10 @@
1// Copyright 2006 The Android Open Source Project 1// Copyright 2006 The Android Open Source Project
2 2
3#include "core/arm/disassembler/arm_disasm.h"
3#include <string> 4#include <string>
4#include <unordered_set> 5#include <unordered_set>
5
6#include "common/common_types.h" 6#include "common/common_types.h"
7#include "common/string_util.h" 7#include "common/string_util.h"
8
9#include "core/arm/disassembler/arm_disasm.h"
10#include "core/arm/skyeye_common/armsupp.h" 8#include "core/arm/skyeye_common/armsupp.h"
11 9
12static const char* cond_names[] = {"eq", "ne", "cs", "cc", "mi", "pl", "vs", "vc", 10static const char* cond_names[] = {"eq", "ne", "cs", "cc", "mi", "pl", "vs", "vc",
diff --git a/src/core/arm/disassembler/arm_disasm.h b/src/core/arm/disassembler/arm_disasm.h
index 031f973d6..300e228ed 100644
--- a/src/core/arm/disassembler/arm_disasm.h
+++ b/src/core/arm/disassembler/arm_disasm.h
@@ -3,7 +3,6 @@
3#pragma once 3#pragma once
4 4
5#include <string> 5#include <string>
6
7#include "common/common_types.h" 6#include "common/common_types.h"
8 7
9// Note: this list of opcodes must match the list used to initialize 8// Note: this list of opcodes must match the list used to initialize
diff --git a/src/core/arm/disassembler/load_symbol_map.cpp b/src/core/arm/disassembler/load_symbol_map.cpp
index 58e8e6fa1..e602d4511 100644
--- a/src/core/arm/disassembler/load_symbol_map.cpp
+++ b/src/core/arm/disassembler/load_symbol_map.cpp
@@ -2,15 +2,13 @@
2// Licensed under GPLv2 or any later version 2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "core/arm/disassembler/load_symbol_map.h"
5#include <sstream> 6#include <sstream>
6#include <string> 7#include <string>
7#include <vector> 8#include <vector>
8
9#include "common/file_util.h" 9#include "common/file_util.h"
10#include "common/symbols.h" 10#include "common/symbols.h"
11 11
12#include "core/arm/disassembler/load_symbol_map.h"
13
14/* 12/*
15 * Loads a symbol map file for use with the disassembler 13 * Loads a symbol map file for use with the disassembler
16 * @param filename String filename path of symbol map file 14 * @param filename String filename path of symbol map file