diff options
author | Lioncash <mathew1800@gmail.com> | 2015-07-26 02:52:10 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2015-07-26 02:52:10 +0200 |
commit | 4bb1a5ca47c4135e867cd611c0e097f570bc721d (patch) | |
tree | 7928d289f223941e64bb2a0e918401611a3998a5 /src/core/arm/dyncom/arm_dyncom_interpreter.cpp | |
parent | dyncom: Move helper functions to their own header (diff) | |
download | yuzu-4bb1a5ca47c4135e867cd611c0e097f570bc721d.tar yuzu-4bb1a5ca47c4135e867cd611c0e097f570bc721d.tar.gz yuzu-4bb1a5ca47c4135e867cd611c0e097f570bc721d.tar.bz2 yuzu-4bb1a5ca47c4135e867cd611c0e097f570bc721d.tar.lz yuzu-4bb1a5ca47c4135e867cd611c0e097f570bc721d.tar.xz yuzu-4bb1a5ca47c4135e867cd611c0e097f570bc721d.tar.zst yuzu-4bb1a5ca47c4135e867cd611c0e097f570bc721d.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/arm/dyncom/arm_dyncom_interpreter.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp index d9db0daa0..a81bb8e91 100644 --- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp +++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp @@ -51,22 +51,21 @@ typedef unsigned int (*shtop_fp_t)(ARMul_State* cpu, unsigned int sht_oper); // Defines a reservation granule of 2 words, which protects the first 2 words starting at the tag. // This is the smallest granule allowed by the v7 spec, and is coincidentally just large enough to // support LDR/STREXD. -static const ARMword RESERVATION_GRANULE_MASK = 0xFFFFFFF8; +static const u32 RESERVATION_GRANULE_MASK = 0xFFFFFFF8; // Exclusive memory access -static int exclusive_detect(ARMul_State* state, ARMword addr) { +static int exclusive_detect(ARMul_State* state, u32 addr) { if(state->exclusive_tag == (addr & RESERVATION_GRANULE_MASK)) return 0; else return -1; } -static void add_exclusive_addr(ARMul_State* state, ARMword addr){ +static void add_exclusive_addr(ARMul_State* state, u32 addr){ state->exclusive_tag = addr & RESERVATION_GRANULE_MASK; - return; } -static void remove_exclusive(ARMul_State* state, ARMword addr){ +static void remove_exclusive(ARMul_State* state, u32 addr){ state->exclusive_tag = 0xFFFFFFFF; } |