mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-09-06 21:29:07 +01:00
dyncom: Rename armdefs.h to armstate.h
This commit is contained in:
parent
4bb1a5ca47
commit
dfb424b6d1
16 changed files with 32 additions and 33 deletions
|
@ -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"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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"
|
||||||
|
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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"
|
||||||
|
|
||||||
|
|
|
@ -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);
|
||||||
|
|
|
@ -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)
|
||||||
|
|
|
@ -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);
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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"
|
||||||
|
|
||||||
/***************************************************************************\
|
/***************************************************************************\
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -253,27 +253,27 @@ enum ConditionCode {
|
||||||
|
|
||||||
// Flags for use with the APSR.
|
// Flags for use with the APSR.
|
||||||
enum : u32 {
|
enum : u32 {
|
||||||
NBIT = (1U << 31U),
|
NBIT = (1U << 31U),
|
||||||
ZBIT = (1 << 30),
|
ZBIT = (1 << 30),
|
||||||
CBIT = (1 << 29),
|
CBIT = (1 << 29),
|
||||||
VBIT = (1 << 28),
|
VBIT = (1 << 28),
|
||||||
QBIT = (1 << 27),
|
QBIT = (1 << 27),
|
||||||
JBIT = (1 << 24),
|
JBIT = (1 << 24),
|
||||||
EBIT = (1 << 9),
|
EBIT = (1 << 9),
|
||||||
ABIT = (1 << 8),
|
ABIT = (1 << 8),
|
||||||
IBIT = (1 << 7),
|
IBIT = (1 << 7),
|
||||||
FBIT = (1 << 6),
|
FBIT = (1 << 6),
|
||||||
TBIT = (1 << 5),
|
TBIT = (1 << 5),
|
||||||
|
|
||||||
// Masks for groups of bits in the APSR.
|
// Masks for groups of bits in the APSR.
|
||||||
MODEBITS = 0x1F,
|
MODEBITS = 0x1F,
|
||||||
INTBITS = 0x1C0,
|
INTBITS = 0x1C0,
|
||||||
};
|
};
|
||||||
|
|
||||||
// Values for Emulate.
|
// Values for Emulate.
|
||||||
enum {
|
enum {
|
||||||
STOP = 0, // Stop
|
STOP = 0, // Stop
|
||||||
CHANGEMODE = 1, // Change mode
|
CHANGEMODE = 1, // Change mode
|
||||||
ONCE = 2, // Execute just one iteration
|
ONCE = 2, // Execute just one iteration
|
||||||
RUN = 3 // Continuous execution
|
RUN = 3 // Continuous execution
|
||||||
};
|
};
|
|
@ -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
|
||||||
|
|
|
@ -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"
|
||||||
|
|
||||||
|
|
|
@ -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;}
|
||||||
|
|
|
@ -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…
Reference in a new issue