diff options
| author | 2014-11-19 15:24:46 -0500 | |
|---|---|---|
| committer | 2014-11-19 15:24:46 -0500 | |
| commit | c0cd0fa78edc37795176c6fb45a52c1d015f3690 (patch) | |
| tree | 237f15dd9d986309000c995fde07088625e62239 /src/core/arm/dyncom | |
| parent | Merge pull request #208 from lioncash/statics (diff) | |
| parent | Remove tabs in all files except in skyeye imports and in generated GL code (diff) | |
| download | yuzu-c0cd0fa78edc37795176c6fb45a52c1d015f3690.tar.gz yuzu-c0cd0fa78edc37795176c6fb45a52c1d015f3690.tar.xz yuzu-c0cd0fa78edc37795176c6fb45a52c1d015f3690.zip | |
Merge pull request #211 from linkmauve/master
Remove trailing spaces from the entire project
Diffstat (limited to 'src/core/arm/dyncom')
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom.cpp | 4 | ||||
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom.h | 2 | ||||
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom_interpreter.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom.cpp b/src/core/arm/dyncom/arm_dyncom.cpp index a3ed3e31e..6c8ea211e 100644 --- a/src/core/arm/dyncom/arm_dyncom.cpp +++ b/src/core/arm/dyncom/arm_dyncom.cpp | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | // Copyright 2014 Citra Emulator Project | 1 | // Copyright 2014 Citra Emulator Project |
| 2 | // Licensed under GPLv2 | 2 | // Licensed under GPLv2 |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include "core/arm/skyeye_common/armcpu.h" | 5 | #include "core/arm/skyeye_common/armcpu.h" |
| 6 | #include "core/arm/skyeye_common/armemu.h" | 6 | #include "core/arm/skyeye_common/armemu.h" |
| @@ -113,7 +113,7 @@ void ARM_DynCom::ExecuteInstructions(int num_instructions) { | |||
| 113 | state->NumInstrsToExecute = num_instructions; | 113 | state->NumInstrsToExecute = num_instructions; |
| 114 | 114 | ||
| 115 | // Dyncom only breaks on instruction dispatch. This only happens on every instruction when | 115 | // Dyncom only breaks on instruction dispatch. This only happens on every instruction when |
| 116 | // executing one instruction at a time. Otherwise, if a block is being executed, more | 116 | // executing one instruction at a time. Otherwise, if a block is being executed, more |
| 117 | // instructions may actually be executed than specified. | 117 | // instructions may actually be executed than specified. |
| 118 | ticks += InterpreterMainLoop(state.get()); | 118 | ticks += InterpreterMainLoop(state.get()); |
| 119 | } | 119 | } |
diff --git a/src/core/arm/dyncom/arm_dyncom.h b/src/core/arm/dyncom/arm_dyncom.h index f3c70b7d3..51eea41ed 100644 --- a/src/core/arm/dyncom/arm_dyncom.h +++ b/src/core/arm/dyncom/arm_dyncom.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | // Copyright 2014 Citra Emulator Project | 1 | // Copyright 2014 Citra Emulator Project |
| 2 | // Licensed under GPLv2 | 2 | // Licensed under GPLv2 |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.h b/src/core/arm/dyncom/arm_dyncom_interpreter.h index c65eb23f7..3a2462f55 100644 --- a/src/core/arm/dyncom/arm_dyncom_interpreter.h +++ b/src/core/arm/dyncom/arm_dyncom_interpreter.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | // Copyright 2014 Citra Emulator Project | 1 | // Copyright 2014 Citra Emulator Project |
| 2 | // Licensed under GPLv2 | 2 | // Licensed under GPLv2 |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||