diff options
author | Lioncash <mathew1800@gmail.com> | 2015-01-30 21:58:45 +0100 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2015-01-30 22:17:02 +0100 |
commit | fc1a9e35fb995275176b49ff3a3250d1f29226ca (patch) | |
tree | 26886b13f82e99756569290c5571322b6775a5a6 /src/core/arm/dyncom | |
parent | arm: Get rid of armcpu.h and skyeye_types.h (diff) | |
download | yuzu-fc1a9e35fb995275176b49ff3a3250d1f29226ca.tar yuzu-fc1a9e35fb995275176b49ff3a3250d1f29226ca.tar.gz yuzu-fc1a9e35fb995275176b49ff3a3250d1f29226ca.tar.bz2 yuzu-fc1a9e35fb995275176b49ff3a3250d1f29226ca.tar.lz yuzu-fc1a9e35fb995275176b49ff3a3250d1f29226ca.tar.xz yuzu-fc1a9e35fb995275176b49ff3a3250d1f29226ca.tar.zst yuzu-fc1a9e35fb995275176b49ff3a3250d1f29226ca.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/arm/dyncom/arm_dyncom_run.h | 5 | ||||
-rw-r--r-- | src/core/arm/dyncom/arm_dyncom_thumb.h | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_run.h b/src/core/arm/dyncom/arm_dyncom_run.h index c477002b0..b1c0daaf7 100644 --- a/src/core/arm/dyncom/arm_dyncom_run.h +++ b/src/core/arm/dyncom/arm_dyncom_run.h @@ -16,8 +16,7 @@ * */ -#ifndef __ARM_DYNCOM_RUN__ -#define __ARM_DYNCOM_RUN__ +#pragma once void switch_mode(arm_core_t *core, uint32_t mode); @@ -49,5 +48,3 @@ static inline addr_t CHECK_READ_REG15_WA(arm_core_t* core, int Rn) { static inline u32 CHECK_READ_REG15(arm_core_t* core, int Rn) { return (Rn == 15)? ((core->Reg[15] & ~0x1) + GET_INST_SIZE(core) * 2) : core->Reg[Rn]; } - -#endif diff --git a/src/core/arm/dyncom/arm_dyncom_thumb.h b/src/core/arm/dyncom/arm_dyncom_thumb.h index 7ca8062bf..a1785abb8 100644 --- a/src/core/arm/dyncom/arm_dyncom_thumb.h +++ b/src/core/arm/dyncom/arm_dyncom_thumb.h @@ -24,8 +24,7 @@ * @date 2011-11-07 */ -#ifndef __ARM_DYNCOM_THUMB_H__ -#define __ARM_DYNCOM_THUMB_H__ +#pragma once #include "core/arm/skyeye_common/armdefs.h" @@ -46,5 +45,3 @@ static inline u32 get_thumb_instr(u32 instr, addr_t pc) { tinstr = instr & 0xFFFF; return tinstr; } - -#endif |