OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-12-18 18:00:07 +00:00
Code Issues Projects Releases Wiki Activity

dyncom: Remove an unnecessary typedef

Browse Source
This commit is contained in:
Lioncash 2015-07-28 03:41:25 -04:00
parent 89540ea761
commit 9be4ef3879
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/arm/dyncom/arm_dyncom_dec.cpp
View File

@ -5,7 +5,7 @@
#include "core/arm/dyncom/arm_dyncom_dec.h" #include "core/arm/dyncom/arm_dyncom_dec.h"
#include "core/arm/skyeye_common/armsupp.h" #include "core/arm/skyeye_common/armsupp.h"
const ISEITEM arm_instruction[] = { const InstructionSetEncodingItem arm_instruction[] = {
{ "vmla", 4, ARMVFP2, { 23, 27, 0x1C, 20, 21, 0x0, 9, 11, 0x5, 4, 4, 0 }}, { "vmla", 4, ARMVFP2, { 23, 27, 0x1C, 20, 21, 0x0, 9, 11, 0x5, 4, 4, 0 }},
{ "vmls", 7, ARMVFP2, { 28, 31, 0xF, 25, 27, 0x1, 23, 23, 1, 11, 11, 0, 8, 9, 0x2, 6, 6, 1, 4, 4, 0 }}, { "vmls", 7, ARMVFP2, { 28, 31, 0xF, 25, 27, 0x1, 23, 23, 1, 11, 11, 0, 8, 9, 0x2, 6, 6, 1, 4, 4, 0 }},
{ "vnmla", 4, ARMVFP2, { 23, 27, 0x1C, 20, 21, 0x1, 9, 11, 0x5, 4, 4, 0 }}, { "vnmla", 4, ARMVFP2, { 23, 27, 0x1C, 20, 21, 0x1, 9, 11, 0x5, 4, 4, 0 }},
@ -207,7 +207,7 @@ const ISEITEM arm_instruction[] = {
{ "bbl", 1, 0, { 25, 27, 0x00000005 }}, { "bbl", 1, 0, { 25, 27, 0x00000005 }},
}; };
const ISEITEM arm_exclusion_code[] = { const InstructionSetEncodingItem arm_exclusion_code[] = {
{ "vmla", 0, ARMVFP2, { 0 }}, { "vmla", 0, ARMVFP2, { 0 }},
{ "vmls", 0, ARMVFP2, { 0 }}, { "vmls", 0, ARMVFP2, { 0 }},
{ "vnmla", 0, ARMVFP2, { 0 }}, { "vnmla", 0, ARMVFP2, { 0 }},
@ -417,7 +417,7 @@ const ISEITEM arm_exclusion_code[] = {
ARMDecodeStatus DecodeARMInstruction(u32 instr, s32* idx) { ARMDecodeStatus DecodeARMInstruction(u32 instr, s32* idx) {
int n = 0; int n = 0;
int base = 0; int base = 0;
int instr_slots = sizeof(arm_instruction) / sizeof(ISEITEM); int instr_slots = sizeof(arm_instruction) / sizeof(InstructionSetEncodingItem);
ARMDecodeStatus ret = ARMDecodeStatus::FAILURE; ARMDecodeStatus ret = ARMDecodeStatus::FAILURE;
for (int i = 0; i < instr_slots; i++) { for (int i = 0; i < instr_slots; i++) {

6
src/core/arm/dyncom/arm_dyncom_dec.h
View File

@ -13,15 +13,13 @@ enum class ARMDecodeStatus {
ARMDecodeStatus DecodeARMInstruction(u32 instr, s32* idx); ARMDecodeStatus DecodeARMInstruction(u32 instr, s32* idx);
struct instruction_set_encoding_item { struct InstructionSetEncodingItem {
const char *name; const char *name;
int attribute_value; int attribute_value;
int version; int version;
u32 content[21]; u32 content[21];
}; };
typedef struct instruction_set_encoding_item ISEITEM;
// ARM versions // ARM versions
enum { enum {
INVALID = 0, INVALID = 0,
@ -38,4 +36,4 @@ enum {
ARMV6K, ARMV6K,
}; };
extern const ISEITEM arm_instruction[]; extern const InstructionSetEncodingItem arm_instruction[];