Fixed recompiler's file naming convention to match citra file naming convention.

Fixed unnecessary double public block.

src/binary_translation/ARM_funcs.cpp

@@ -1,5 +1,5 @@
-#include "ARMFuncs.h"
+#include "ARM_funcs.h"
-#include "InstructionBlock.h"
+#include "instruction_block.h"
 #include <functional>
 
 ARMFuncs::ShiftTN ARMFuncs::DecodeImmShift(InstructionBlock* instruction, u32 type, u32 imm5)

src/binary_translation/CMakeLists.txt

@@ -1,40 +1,39 @@
 set(SRCS
             main.cpp
-            CodeGen.cpp
+            code_gen.cpp
-            ModuleGen.cpp
+            module_gen.cpp
-            Disassembler.cpp
+            disassembler.cpp
-            InstructionBlock.cpp
+            instruction_block.cpp
-            MachineState.cpp
+            machine_state.cpp
-            TBAA.cpp
+            tbaa.cpp
-            ARMFuncs.cpp
+            ARM_funcs.cpp
-            BlockColors.cpp
+            block_colors.cpp
 
-            Instructions/Instruction.cpp
+            instructions/instruction.cpp
-            Instructions/MovShift.cpp
+            instructions/mov_shift.cpp
-            Instructions/Branch.cpp
+            instructions/branch.cpp
-            Instructions/Arithmetic.cpp
+            instructions/arithmetic.cpp
-            Instructions/Ldr.cpp
+            instructions/ldr.cpp
-            Instructions/Str.cpp
+            instructions/str.cpp
             )
 set(HEADERS
-            CodeGen.h
+            code_gen.h
-            ModuleGen.h
+            module_gen.h
-            Disassembler.h
+            disassembler.h
-            InstructionBlock.h
+            instruction_block.h
-            MachineState.h
+            machine_state.h
-            TBAA.h
+            tbaa.h
-            BinarySearch.h
+            binary_search.h
-            ARMFuncs.h
+            ARM_funcs.h
-            BlockColors.h
+            block_colors.h
 
-            Instructions/Types.h
+            instructions/types.h
-            Instructions/Types.h
+            instructions/instruction.h
-            Instructions/Instruction.h
+            instructions/mov_shift.h
-            Instructions/MovShift.h
+            instructions/branch.h
-            Instructions/Branch.h
+            instructions/arithmetic.h
-            Instructions/Arithmetic.h
+            instructions/ldr.h
-            Instructions/Ldr.h
+            instructions/str.h
-            Instructions/Str.h
             )
 create_directory_groups(${SRCS} ${HEADERS})
 

src/binary_translation/Instructions/Branch.cpp

@@ -1,7 +1,7 @@
-#include "Branch.h"
+#include "branch.h"
-#include "Disassembler.h"
+#include "disassembler.h"
-#include "InstructionBlock.h"
+#include "instruction_block.h"
-#include "ModuleGen.h"
+#include "module_gen.h"
 
 static RegisterInstruction<Branch> register_instruction;
 

src/binary_translation/Instructions/Branch.h

@@ -1,5 +1,5 @@
-#include "Instruction.h"
+#include "instruction.h"
-#include "Types.h"
+#include "types.h"
 
 class Branch : public Instruction
 {

src/binary_translation/Instructions/Instruction.cpp

@@ -1,10 +1,10 @@
-#include "Instruction.h"
+#include "instruction.h"
 #include "common/logging/log.h"
 #include <cassert>
-#include "InstructionBlock.h"
+#include "instruction_block.h"
-#include "ModuleGen.h"
+#include "module_gen.h"
-#include "MachineState.h"
+#include "machine_state.h"
-#include "BinarySearch.h"
+#include "binary_search.h"
 
 Instruction::Instruction()
 {

src/binary_translation/Instructions/Instruction.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "common/common_types.h"
 #include <initializer_list>
-#include "Types.h"
+#include "types.h"
 
 class InstructionBlock;
 
@@ -77,7 +77,6 @@ class Instruction::FieldDefObject
 {
 public:
     typedef void(*WriteFunctionType)(u32 value, void *field_address);
-public:
     // Constant
     FieldDefObject(u32 bit_count, u32 const_value);
     // Field

src/binary_translation/Instructions/Ldr.cpp

@@ -1,10 +1,10 @@
-#include "Ldr.h"
+#include "ldr.h"
-#include "Disassembler.h"
+#include "disassembler.h"
-#include "InstructionBlock.h"
+#include "instruction_block.h"
 #include <llvm/IR/Value.h>
 #include <core/loader/loader.h>
 #include <core/mem_map.h>
-#include "MachineState.h"
+#include "machine_state.h"
 
 static RegisterInstruction<Ldr> register_instruction;
 

src/binary_translation/Instructions/Ldr.h

@@ -1,5 +1,5 @@
-#include "Instruction.h"
+#include "instruction.h"
-#include "Types.h"
+#include "types.h"
 #include <bitset>
 
 class Ldr : public Instruction

src/binary_translation/Instructions/Str.cpp

@@ -1,10 +1,10 @@
-#include "Str.h"
+#include "str.h"
-#include "Disassembler.h"
+#include "disassembler.h"
-#include "InstructionBlock.h"
+#include "instruction_block.h"
 #include <llvm/IR/Value.h>
 #include <core/loader/loader.h>
 #include <core/mem_map.h>
-#include "MachineState.h"
+#include "machine_state.h"
 
 static RegisterInstruction<Str> register_instruction;
 

src/binary_translation/Instructions/Str.h

@@ -1,5 +1,5 @@
-#include "Instruction.h"
+#include "instruction.h"
-#include "Types.h"
+#include "types.h"
 #include <bitset>
 
 class Str : public Instruction

src/binary_translation/Instructions/arithmetic.cpp

@@ -1,7 +1,7 @@
-#include "Arithmetic.h"
+#include "arithmetic.h"
-#include "Disassembler.h"
+#include "disassembler.h"
-#include <binary_translation/ARMFuncs.h>
+#include <binary_translation/ARM_funcs.h>
-#include <binary_translation/InstructionBlock.h>
+#include <binary_translation/instruction_block.h>
 
 static RegisterInstruction<Arithmetic> register_instruction;
 

src/binary_translation/Instructions/arithmetic.h

@@ -1,5 +1,5 @@
-#include "Instruction.h"
+#include "instruction.h"
-#include "Types.h"
+#include "types.h"
 
 /*
 * Data processing instructions

src/binary_translation/Instructions/mov_shift.cpp

@@ -1,9 +1,9 @@
-#include "MovShift.h"
+#include "mov_shift.h"
-#include "Disassembler.h"
+#include "disassembler.h"
-#include "InstructionBlock.h"
+#include "instruction_block.h"
-#include "ModuleGen.h"
+#include "module_gen.h"
-#include "ARMFuncs.h"
+#include "ARM_funcs.h"
-#include <binary_translation/BinarySearch.h>
+#include <binary_translation/binary_search.h>
 
 static RegisterInstruction<MovShift> register_instruction;
 

src/binary_translation/Instructions/mov_shift.h

@@ -1,5 +1,5 @@
-#include "Instruction.h"
+#include "instruction.h"
-#include "Types.h"
+#include "types.h"
 
 /*
  * Data processing instructions

src/binary_translation/block_colors.cpp

@@ -1,6 +1,6 @@
-#include "BlockColors.h"
+#include "block_colors.h"
 #include <stack>
-#include "InstructionBlock.h"
+#include "instruction_block.h"
 #include <llvm/IR/Function.h>
 #include "common/logging/log.h"
 

src/binary_translation/code_gen.cpp

@@ -1,5 +1,5 @@
-#include "CodeGen.h"
+#include "code_gen.h"
-#include "ModuleGen.h"
+#include "module_gen.h"
 
 #include "core/loader/loader.h"
 #include "common/logging/log.h"

src/binary_translation/disassembler.cpp

@@ -1,5 +1,5 @@
-#include "Disassembler.h"
+#include "disassembler.h"
-#include "Instructions/Instruction.h"
+#include "instructions/instruction.h"
 #include <vector>
 
 std::vector<RegisterInstructionBase::CreateFunctionType> g_read_functions;

src/binary_translation/instruction_block.cpp

@@ -1,9 +1,9 @@
-#include "InstructionBlock.h"
+#include "instruction_block.h"
-#include "ModuleGen.h"
+#include "module_gen.h"
-#include "Instructions/Instruction.h"
+#include "instructions/instruction.h"
 #include <sstream>
 #include <iomanip>
-#include "MachineState.h"
+#include "machine_state.h"
 
 InstructionBlock::InstructionBlock(ModuleGen* module, Instruction* instruction)
     : module(module),

src/binary_translation/instruction_block.h

@@ -2,7 +2,7 @@
 #include <string>
 #include <common/common_types.h>
 #include <llvm/IR/IRBuilder.h>
-#include "ModuleGen.h"
+#include "module_gen.h"
 
 namespace llvm
 {

src/binary_translation/machine_state.cpp

@@ -1,11 +1,11 @@
-#include "MachineState.h"
+#include "machine_state.h"
-#include "ModuleGen.h"
+#include "module_gen.h"
-#include "Instructions/Types.h"
+#include "instructions/types.h"
 #include <llvm/IR/GlobalValue.h>
 #include <llvm/IR/Constants.h>
 #include <llvm/IR/LLVMContext.h>
 #include <llvm/IR/GlobalVariable.h>
-#include "TBAA.h"
+#include "tbaa.h"
 
 using namespace llvm;
 

src/binary_translation/main.cpp

@@ -5,7 +5,7 @@
 #include "core/mem_map.h"
 #include "core/hle/kernel/memory.h"
 #include "core/loader/loader.h"
-#include "codegen.h"
+#include "code_gen.h"
 #include <llvm/Support/CommandLine.h>
 
 namespace cl = llvm::cl;

src/binary_translation/module_gen.cpp

@@ -1,18 +1,18 @@
-#include "ModuleGen.h"
+#include "module_gen.h"
-#include "Disassembler.h"
+#include "disassembler.h"
 #include "core/loader/loader.h"
 #include "core/mem_map.h"
-#include "Instructions/Instruction.h"
+#include "instructions/instruction.h"
-#include "Instructions/Types.h"
+#include "instructions/types.h"
-#include "InstructionBlock.h"
+#include "instruction_block.h"
 #include "common/logging/log.h"
 #include <llvm/IR/Function.h>
 #include <llvm/IR/GlobalVariable.h>
 #include <llvm/ADT/STLExtras.h>
 #include <stack>
-#include "MachineState.h"
+#include "machine_state.h"
-#include "TBAA.h"
+#include "tbaa.h"
-#include "BlockColors.h"
+#include "block_colors.h"
 
 using namespace llvm;
 

src/binary_translation/tbaa.cpp

@@ -1,4 +1,4 @@
-#include "TBAA.h"
+#include "tbaa.h"
 #include <llvm/IR/MDBuilder.h>
 #include <llvm/IR/LLVMContext.h>
 #include <llvm/IR/Metadata.h>

src/binary_translation/tbaa.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "Instructions/Types.h"
+#include "instructions/types.h"
 #include <llvm/IR/Instructions.h>
 
 namespace llvm

src/core/CMakeLists.txt

@@ -256,12 +256,12 @@ set(HEADERS
 if(ENABLE_BINARY_TRANSLATION)
     set(SRCS
                 ${SRCS}
-                binary_translation/BinaryTranslationLoader.cpp
+                binary_translation/binary_translation_loader.cpp
                 )
     set(HEADERS
                 ${HEADERS}
                 mem_map.h
-                binary_translation/BinaryTranslationLoader.h
+                binary_translation/binary_translation_loader.h
                 )
 endif()
 create_directory_groups(${SRCS} ${HEADERS})

src/core/arm/dyncom/arm_dyncom_interpreter.cpp

@@ -24,7 +24,7 @@
 #include "core/arm/skyeye_common/vfp/vfp.h"
 
 #if ENABLE_BINARY_TRANSLATION
-#include "core/binary_translation/BinaryTranslationLoader.h"
+#include "core/binary_translation/binary_translation_loader.h"
 #endif
 
 #include "core/gdbstub/gdbstub.h"

src/core/binary_translation/binary_translation_loader.cpp

@@ -1,4 +1,4 @@
-#include "BinaryTranslationLoader.h"
+#include "binary_translation_loader.h"
 #include "core/arm/skyeye_common/armstate.h"
 #include "core/arm/skyeye_common/arm_regformat.h"
 #include "common/logging/log.h"

src/core/loader/loader.cpp

@@ -16,7 +16,7 @@
 #include "core/loader/elf.h"
 #include "core/loader/ncch.h"
 #if ENABLE_BINARY_TRANSLATION
-#include "core/binary_translation/BinaryTranslationLoader.h"
+#include "core/binary_translation/binary_translation_loader.h"
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////