diff options
| author | 2015-01-30 15:58:45 -0500 | |
|---|---|---|
| committer | 2015-01-30 16:17:02 -0500 | |
| 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.gz yuzu-fc1a9e35fb995275176b49ff3a3250d1f29226ca.tar.xz yuzu-fc1a9e35fb995275176b49ff3a3250d1f29226ca.zip | |
arm: Move headers over to pragma once
Diffstat (limited to 'src/core/arm/dyncom')
| -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 @@ | |||
| 16 | * | 16 | * |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #ifndef __ARM_DYNCOM_RUN__ | 19 | #pragma once |
| 20 | #define __ARM_DYNCOM_RUN__ | ||
| 21 | 20 | ||
| 22 | void switch_mode(arm_core_t *core, uint32_t mode); | 21 | void switch_mode(arm_core_t *core, uint32_t mode); |
| 23 | 22 | ||
| @@ -49,5 +48,3 @@ static inline addr_t CHECK_READ_REG15_WA(arm_core_t* core, int Rn) { | |||
| 49 | static inline u32 CHECK_READ_REG15(arm_core_t* core, int Rn) { | 48 | static inline u32 CHECK_READ_REG15(arm_core_t* core, int Rn) { |
| 50 | return (Rn == 15)? ((core->Reg[15] & ~0x1) + GET_INST_SIZE(core) * 2) : core->Reg[Rn]; | 49 | return (Rn == 15)? ((core->Reg[15] & ~0x1) + GET_INST_SIZE(core) * 2) : core->Reg[Rn]; |
| 51 | } | 50 | } |
| 52 | |||
| 53 | #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 @@ | |||
| 24 | * @date 2011-11-07 | 24 | * @date 2011-11-07 |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #ifndef __ARM_DYNCOM_THUMB_H__ | 27 | #pragma once |
| 28 | #define __ARM_DYNCOM_THUMB_H__ | ||
| 29 | 28 | ||
| 30 | #include "core/arm/skyeye_common/armdefs.h" | 29 | #include "core/arm/skyeye_common/armdefs.h" |
| 31 | 30 | ||
| @@ -46,5 +45,3 @@ static inline u32 get_thumb_instr(u32 instr, addr_t pc) { | |||
| 46 | tinstr = instr & 0xFFFF; | 45 | tinstr = instr & 0xFFFF; |
| 47 | return tinstr; | 46 | return tinstr; |
| 48 | } | 47 | } |
| 49 | |||
| 50 | #endif | ||