Renamed x86- and ARM-specific source files (for improved readability).

Updated include paths and CMake config appropriately

Change-Id: Ida5045cde0458b3031e64b73853fe5f58ef5a9d6

src/core/sal/CMakeLists.txt

@@ -64,20 +64,20 @@ elseif(BUILD_T32)
 	if(BUILD_ARM)
 		set(SRCS ${SRCS}
 			t32/T32ArmCPU.cc
-      arm/ArmMemoryInstruction.cc
-      arm/arm_disassembler.cc
+			arm/ArmMemoryInstruction.cc
+			arm/ArmDisassembler.cc
 		)
 	endif(BUILD_ARM)
 endif(BUILD_BOCHS)
 
 if(BUILD_X86)
 	set(SRCS ${SRCS}
-		x86/Architecture.cc
+		x86/X86Architecture.cc
 	)
   set(ARCH_TOOL_PREFIX "" CACHE PATH "Setup prefix for binutils, e.g., arm-none-eabi- or tricore-, ..")
 elseif(BUILD_ARM)
 	set(SRCS ${SRCS}
-		arm/Architecture.cc
+		arm/ArmArchitecture.cc
 	)
   set(ARCH_TOOL_PREFIX "arm-none-eabi-" CACHE PATH "Setup prefix for binutils, e.g., arm-none-eabi- or tricore-, ..")
 endif(BUILD_X86)

src/core/sal/arm/ArmArchitecture.cc

@@ -1,4 +1,4 @@
-#include "Architecture.hpp"
+#include "ArmArchitecture.hpp"
 #include "../Register.hpp"
 #include <sstream>
 

src/core/sal/arm/ArmDisassembler.cc

@@ -25,7 +25,7 @@
 //#endif
 
 //#include "target.h"
-#include "arm_disassembler.hpp"
+#include "ArmDisassembler.hpp"
 #include "util/Logger.hpp"
 #include "sal/SALInst.hpp"
 #include "sal/Memory.hpp"

src/core/sal/arm/ArmMemoryInstruction.hpp

@@ -4,7 +4,7 @@
 #include "../MemoryInstruction.hpp"
 #include "util/Disassembler.hpp"
 #include "util/ElfReader.hpp"
-#include "arm_disassembler.hpp"
+#include "ArmDisassembler.hpp"
 
 namespace fail {
 

src/core/sal/bochs/BochsCPU.hpp

@@ -1,8 +1,8 @@
 #ifndef __BOCHS_CPU_HPP__
   #define __BOCHS_CPU_HPP__
 
-#include "../x86/Architecture.hpp"
-#include "../x86/CPUState.hpp"
+#include "../x86/X86Architecture.hpp"
+#include "../x86/X86CPUState.hpp"
 
 #include "bochs.h"
 #include "cpu/cpu.h"

src/core/sal/gem5/Gem5ArmCPU.hpp

@@ -1,8 +1,8 @@
 #ifndef __GEM5_ARM_CPU_HPP__
   #define __GEM5_ARM_CPU_HPP__
 
-#include "../arm/Architecture.hpp"
-#include "../arm/CPUState.hpp"
+#include "../arm/ArmArchitecture.hpp"
+#include "../arm/ArmCPUState.hpp"
 
 #include "sim/system.hh"
 

src/core/sal/t32/T32ArmCPU.hpp

@@ -1,8 +1,8 @@
 #ifndef __T32_ARM_CPU_HPP__
   #define __T32_ARM_CPU_HPP__
 
-#include "../arm/Architecture.hpp"
-#include "../arm/CPUState.hpp"
+#include "../arm/ArmArchitecture.hpp"
+#include "../arm/ArmCPUState.hpp"
 #include <t32.h>
 
 namespace fail {

src/core/sal/x86/X86Architecture.cc

@@ -1,4 +1,4 @@
-#include "Architecture.hpp"
+#include "X86Architecture.hpp"
 #include "../Register.hpp"
 #include <sstream>
 

src/experiments/nanojpeg/campaign.hpp

@@ -8,7 +8,7 @@
 #include "cpn/Campaign.hpp"
 #include "comm/ExperimentData.hpp"
 #include "util/Logger.hpp"
-#include "sal/x86/Architecture.hpp"
+#include "sal/x86/X86Architecture.hpp"
 #include "nanojpeg.pb.h"
 
 class NanoJPEGExperimentData : public fail::ExperimentData {

src/experiments/nanojpeg/udis86_helper.hpp

@@ -7,7 +7,7 @@
 #include <utility>
 #include <map>
 
-#include "sal/x86/Architecture.hpp"
+#include "sal/x86/X86Architecture.hpp"
 
 class Udis86Helper {
 public: