Reorganise src/frontend: Add subdirectories disassembler and translate

This commit is contained in:
MerryMage 2016-07-14 14:39:43 +01:00
parent 9b2aff166a
commit 07eaf100ba
15 changed files with 19 additions and 35 deletions

View file

@ -11,11 +11,11 @@ set(SRCS
common/x64/abi.cpp common/x64/abi.cpp
common/x64/cpu_detect.cpp common/x64/cpu_detect.cpp
common/x64/emitter.cpp common/x64/emitter.cpp
frontend/disassembler_arm.cpp frontend/disassembler/disassembler_arm.cpp
frontend/disassembler_thumb.cpp frontend/disassembler/disassembler_thumb.cpp
frontend/ir/ir.cpp frontend/ir/ir.cpp
frontend/ir_emitter.cpp frontend/ir/ir_emitter.cpp
frontend/translate.cpp frontend/translate/translate.cpp
) )
set(HEADERS set(HEADERS
@ -40,14 +40,13 @@ set(HEADERS
frontend/decoder/arm.h frontend/decoder/arm.h
frontend/decoder/decoder_detail.h frontend/decoder/decoder_detail.h
frontend/decoder/thumb16.h frontend/decoder/thumb16.h
frontend/disassembler.h frontend/disassembler/disassembler.h
frontend/frontend_arm.h
frontend/ir/ir.h frontend/ir/ir.h
frontend/ir/ir_emitter.h
frontend/ir/opcodes.h frontend/ir/opcodes.h
frontend/ir_emitter.h frontend/translate/translate.h
frontend/translate.h frontend/translate/translate_arm.cpp
frontend/translate_arm.cpp frontend/translate/translate_thumb.cpp
frontend/translate_thumb.cpp
interface/interface.h interface/interface.h
) )

View file

@ -14,7 +14,7 @@
#include "common/common_types.h" #include "common/common_types.h"
#include "common/scope_exit.h" #include "common/scope_exit.h"
#include "frontend/arm_types.h" #include "frontend/arm_types.h"
#include "frontend/translate.h" #include "frontend/translate/translate.h"
#include "interface/interface.h" #include "interface/interface.h"
namespace Dynarmic { namespace Dynarmic {

View file

@ -1,15 +0,0 @@
/* This file is part of the dynarmic project.
* Copyright (c) 2016 MerryMage
* This software may be used and distributed according to the terms of the GNU
* General Public License version 2 or any later version.
*/
#pragma once
namespace Dynarmic {
namespace Arm {
} // namespace Arm
} // namespace Dynarmic

View file

@ -5,7 +5,7 @@
*/ */
#include "common/assert.h" #include "common/assert.h"
#include "frontend/ir_emitter.h" #include "ir_emitter.h"
namespace Dynarmic { namespace Dynarmic {
namespace Arm { namespace Arm {

View file

@ -6,7 +6,7 @@
#include "frontend/arm_types.h" #include "frontend/arm_types.h"
#include "frontend/ir/ir.h" #include "frontend/ir/ir.h"
#include "frontend/translate.h" #include "translate.h"
namespace Dynarmic { namespace Dynarmic {
namespace Arm { namespace Arm {

View file

@ -8,8 +8,8 @@
#include "frontend/arm_types.h" #include "frontend/arm_types.h"
#include "frontend/decoder/arm.h" #include "frontend/decoder/arm.h"
#include "frontend/ir/ir.h" #include "frontend/ir/ir.h"
#include "frontend/ir_emitter.h" #include "frontend/ir/ir_emitter.h"
#include "frontend/translate.h" #include "translate.h"
namespace Dynarmic { namespace Dynarmic {
namespace Arm { namespace Arm {

View file

@ -9,8 +9,8 @@
#include "common/assert.h" #include "common/assert.h"
#include "frontend/arm_types.h" #include "frontend/arm_types.h"
#include "frontend/decoder/thumb16.h" #include "frontend/decoder/thumb16.h"
#include "frontend/ir_emitter.h" #include "frontend/ir/ir_emitter.h"
#include "frontend/translate.h" #include "translate.h"
namespace Dynarmic { namespace Dynarmic {
namespace Arm { namespace Arm {

View file

@ -12,7 +12,7 @@
#include "common/bit_util.h" #include "common/bit_util.h"
#include "common/common_types.h" #include "common/common_types.h"
#include "frontend/disassembler.h" #include "frontend/disassembler/disassembler.h"
#include "interface/interface.h" #include "interface/interface.h"
#include "rand_int.h" #include "rand_int.h"
#include "skyeye_interpreter/dyncom/arm_dyncom_interpreter.h" #include "skyeye_interpreter/dyncom/arm_dyncom_interpreter.h"

View file

@ -12,7 +12,7 @@
#include "common/bit_util.h" #include "common/bit_util.h"
#include "common/common_types.h" #include "common/common_types.h"
#include "frontend/disassembler.h" #include "frontend/disassembler/disassembler.h"
#include "interface/interface.h" #include "interface/interface.h"
#include "rand_int.h" #include "rand_int.h"
#include "skyeye_interpreter/dyncom/arm_dyncom_interpreter.h" #include "skyeye_interpreter/dyncom/arm_dyncom_interpreter.h"

View file

@ -6,7 +6,7 @@
#include <catch.hpp> #include <catch.hpp>
#include "frontend/disassembler.h" #include "frontend/disassembler/disassembler.h"
TEST_CASE( "Disassemble branch instructions", "[arm][disassembler][!hide]" ) { TEST_CASE( "Disassemble branch instructions", "[arm][disassembler][!hide]" ) {
REQUIRE(Dynarmic::Arm::DisassembleArm(0xEAFFFFFE) == "b +#0"); REQUIRE(Dynarmic::Arm::DisassembleArm(0xEAFFFFFE) == "b +#0");