summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Lioncash2015-05-14 12:19:51 -0400
committerGravatar Lioncash2015-05-14 14:32:17 -0400
commit1e0255364c25d4ed341cbff47a1d835731064207 (patch)
treec4038e7872ee6536b27c24508d821a9af4c525c7 /src
parentdyncom: Remove unnecessary defines (diff)
downloadyuzu-1e0255364c25d4ed341cbff47a1d835731064207.tar.gz
yuzu-1e0255364c25d4ed341cbff47a1d835731064207.tar.xz
yuzu-1e0255364c25d4ed341cbff47a1d835731064207.zip
dyncom: Remove duplicate enums/prototypes
These are already defined in arm_dyncom_interpreter_dec.cpp.
Diffstat (limited to 'src')
-rw-r--r--src/core/arm/dyncom/arm_dyncom_interpreter.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
index 7ec2f3ef2..816c86c21 100644
--- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
+++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
@@ -13,6 +13,7 @@
13#include "core/mem_map.h" 13#include "core/mem_map.h"
14#include "core/hle/svc.h" 14#include "core/hle/svc.h"
15#include "core/arm/disassembler/arm_disasm.h" 15#include "core/arm/disassembler/arm_disasm.h"
16#include "core/arm/dyncom/arm_dyncom_dec.h"
16#include "core/arm/dyncom/arm_dyncom_interpreter.h" 17#include "core/arm/dyncom/arm_dyncom_interpreter.h"
17#include "core/arm/dyncom/arm_dyncom_thumb.h" 18#include "core/arm/dyncom/arm_dyncom_thumb.h"
18#include "core/arm/dyncom/arm_dyncom_run.h" 19#include "core/arm/dyncom/arm_dyncom_run.h"
@@ -1179,13 +1180,6 @@ static inline void *AllocBuffer(unsigned int size) {
1179 return (void *)&inst_buf[start]; 1180 return (void *)&inst_buf[start];
1180} 1181}
1181 1182
1182enum DECODE_STATUS {
1183 DECODE_SUCCESS,
1184 DECODE_FAILURE
1185};
1186
1187int decode_arm_instr(uint32_t instr, int32_t *idx);
1188
1189static shtop_fp_t get_shtop(unsigned int inst) { 1183static shtop_fp_t get_shtop(unsigned int inst) {
1190 if (BIT(inst, 25)) { 1184 if (BIT(inst, 25)) {
1191 return DPO(Immediate); 1185 return DPO(Immediate);