Browse Source

dyncom: Rename armdefs.h to armstate.h

pull/15/merge
Lioncash 11 years ago
parent
commit
dfb424b6d1
  1. 1
      src/citra_qt/debugger/disassembler.cpp
  2. 2
      src/core/CMakeLists.txt
  3. 2
      src/core/arm/dyncom/arm_dyncom.cpp
  4. 2
      src/core/arm/dyncom/arm_dyncom.h
  5. 2
      src/core/arm/dyncom/arm_dyncom_interpreter.cpp
  6. 2
      src/core/arm/dyncom/arm_dyncom_interpreter.h
  7. 2
      src/core/arm/dyncom/arm_dyncom_run.cpp
  8. 2
      src/core/arm/dyncom/arm_dyncom_run.h
  9. 2
      src/core/arm/dyncom/arm_dyncom_thumb.h
  10. 2
      src/core/arm/skyeye_common/arminit.cpp
  11. 2
      src/core/arm/skyeye_common/armmmu.h
  12. 0
      src/core/arm/skyeye_common/armstate.h
  13. 2
      src/core/arm/skyeye_common/armsupp.cpp
  14. 2
      src/core/arm/skyeye_common/vfp/vfp.cpp
  15. 2
      src/core/arm/skyeye_common/vfp/vfp_helper.h
  16. 2
      src/core/hle/kernel/thread.cpp

1
src/citra_qt/debugger/disassembler.cpp

@ -15,7 +15,6 @@
#include "common/break_points.h" #include "common/break_points.h"
#include "common/symbols.h" #include "common/symbols.h"
#include "core/arm/arm_interface.h" #include "core/arm/arm_interface.h"
#include "core/arm/skyeye_common/armdefs.h"
#include "core/arm/disassembler/arm_disasm.h" #include "core/arm/disassembler/arm_disasm.h"

2
src/core/CMakeLists.txt

@ -132,7 +132,7 @@ set(HEADERS
arm/dyncom/arm_dyncom_run.h arm/dyncom/arm_dyncom_run.h
arm/dyncom/arm_dyncom_thumb.h arm/dyncom/arm_dyncom_thumb.h
arm/skyeye_common/arm_regformat.h arm/skyeye_common/arm_regformat.h
arm/skyeye_common/armdefs.h
arm/skyeye_common/armstate.h
arm/skyeye_common/armmmu.h arm/skyeye_common/armmmu.h
arm/skyeye_common/armsupp.h arm/skyeye_common/armsupp.h
arm/skyeye_common/vfp/asm_vfp.h arm/skyeye_common/vfp/asm_vfp.h

2
src/core/arm/dyncom/arm_dyncom.cpp

@ -6,7 +6,7 @@
#include "common/make_unique.h" #include "common/make_unique.h"
#include "core/arm/skyeye_common/armdefs.h"
#include "core/arm/skyeye_common/armstate.h"
#include "core/arm/skyeye_common/armsupp.h" #include "core/arm/skyeye_common/armsupp.h"
#include "core/arm/skyeye_common/vfp/vfp.h" #include "core/arm/skyeye_common/vfp/vfp.h"

2
src/core/arm/dyncom/arm_dyncom.h

@ -9,8 +9,8 @@
#include "common/common_types.h" #include "common/common_types.h"
#include "core/arm/arm_interface.h" #include "core/arm/arm_interface.h"
#include "core/arm/skyeye_common/armdefs.h"
#include "core/arm/skyeye_common/arm_regformat.h" #include "core/arm/skyeye_common/arm_regformat.h"
#include "core/arm/skyeye_common/armstate.h"
namespace Core { namespace Core {
struct ThreadContext; struct ThreadContext;

2
src/core/arm/dyncom/arm_dyncom_interpreter.cpp

@ -17,8 +17,8 @@
#include "core/arm/dyncom/arm_dyncom_interpreter.h" #include "core/arm/dyncom/arm_dyncom_interpreter.h"
#include "core/arm/dyncom/arm_dyncom_thumb.h" #include "core/arm/dyncom/arm_dyncom_thumb.h"
#include "core/arm/dyncom/arm_dyncom_run.h" #include "core/arm/dyncom/arm_dyncom_run.h"
#include "core/arm/skyeye_common/armdefs.h"
#include "core/arm/skyeye_common/armmmu.h" #include "core/arm/skyeye_common/armmmu.h"
#include "core/arm/skyeye_common/armstate.h"
#include "core/arm/skyeye_common/armsupp.h" #include "core/arm/skyeye_common/armsupp.h"
#include "core/arm/skyeye_common/vfp/vfp.h" #include "core/arm/skyeye_common/vfp/vfp.h"

2
src/core/arm/dyncom/arm_dyncom_interpreter.h

@ -4,6 +4,6 @@
#pragma once #pragma once
#include "core/arm/skyeye_common/armdefs.h"
struct ARMul_State;
unsigned InterpreterMainLoop(ARMul_State* state); unsigned InterpreterMainLoop(ARMul_State* state);

2
src/core/arm/dyncom/arm_dyncom_run.cpp

@ -3,7 +3,7 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "core/arm/dyncom/arm_dyncom_run.h" #include "core/arm/dyncom/arm_dyncom_run.h"
#include "core/arm/skyeye_common/armdefs.h"
#include "core/arm/skyeye_common/armstate.h"
void switch_mode(ARMul_State* core, uint32_t mode) { void switch_mode(ARMul_State* core, uint32_t mode) {
if (core->Mode == mode) if (core->Mode == mode)

2
src/core/arm/dyncom/arm_dyncom_run.h

@ -18,7 +18,7 @@
#pragma once #pragma once
#include "core/arm/skyeye_common/armdefs.h"
#include "core/arm/skyeye_common/armstate.h"
void switch_mode(ARMul_State* core, uint32_t mode); void switch_mode(ARMul_State* core, uint32_t mode);

2
src/core/arm/dyncom/arm_dyncom_thumb.h

@ -26,7 +26,7 @@
#pragma once #pragma once
#include "core/arm/skyeye_common/armdefs.h"
#include "common/common_types.h"
enum tdstate { enum tdstate {
t_undefined, // Undefined Thumb instruction t_undefined, // Undefined Thumb instruction

2
src/core/arm/skyeye_common/arminit.cpp

@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include <cstring> #include <cstring>
#include "core/arm/skyeye_common/armdefs.h"
#include "core/arm/skyeye_common/armstate.h"
#include "core/arm/skyeye_common/vfp/vfp.h" #include "core/arm/skyeye_common/vfp/vfp.h"
/***************************************************************************\ /***************************************************************************\

2
src/core/arm/skyeye_common/armmmu.h

@ -23,7 +23,7 @@
#include "common/swap.h" #include "common/swap.h"
#include "core/memory.h" #include "core/memory.h"
#include "core/arm/skyeye_common/armdefs.h"
#include "core/arm/skyeye_common/armstate.h"
#include "core/arm/skyeye_common/armsupp.h" #include "core/arm/skyeye_common/armsupp.h"
// Register numbers in the MMU // Register numbers in the MMU

0
src/core/arm/skyeye_common/armdefs.h → src/core/arm/skyeye_common/armstate.h

2
src/core/arm/skyeye_common/armsupp.cpp

@ -19,7 +19,7 @@
#include "core/mem_map.h" #include "core/mem_map.h"
#include "core/arm/skyeye_common/arm_regformat.h" #include "core/arm/skyeye_common/arm_regformat.h"
#include "core/arm/skyeye_common/armdefs.h"
#include "core/arm/skyeye_common/armstate.h"
#include "core/arm/skyeye_common/armsupp.h" #include "core/arm/skyeye_common/armsupp.h"
// Unsigned sum of absolute difference // Unsigned sum of absolute difference

2
src/core/arm/skyeye_common/vfp/vfp.cpp

@ -23,7 +23,7 @@
#include "common/common_funcs.h" #include "common/common_funcs.h"
#include "common/logging/log.h" #include "common/logging/log.h"
#include "core/arm/skyeye_common/armdefs.h"
#include "core/arm/skyeye_common/armstate.h"
#include "core/arm/skyeye_common/vfp/asm_vfp.h" #include "core/arm/skyeye_common/vfp/asm_vfp.h"
#include "core/arm/skyeye_common/vfp/vfp.h" #include "core/arm/skyeye_common/vfp/vfp.h"

2
src/core/arm/skyeye_common/vfp/vfp_helper.h

@ -34,7 +34,7 @@
#include <cstdio> #include <cstdio>
#include "common/common_types.h" #include "common/common_types.h"
#include "core/arm/skyeye_common/armdefs.h"
#include "core/arm/skyeye_common/armstate.h"
#include "core/arm/skyeye_common/vfp/asm_vfp.h" #include "core/arm/skyeye_common/vfp/asm_vfp.h"
#define do_div(n, base) {n/=base;} #define do_div(n, base) {n/=base;}

2
src/core/hle/kernel/thread.cpp

@ -13,7 +13,7 @@
#include "common/thread_queue_list.h" #include "common/thread_queue_list.h"
#include "core/arm/arm_interface.h" #include "core/arm/arm_interface.h"
#include "core/arm/skyeye_common/armdefs.h"
#include "core/arm/skyeye_common/armstate.h"
#include "core/core.h" #include "core/core.h"
#include "core/core_timing.h" #include "core/core_timing.h"
#include "core/hle/hle.h" #include "core/hle/hle.h"

Loading…
Cancel
Save