mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-09-06 15:29:07 +01:00
skyeye: Remove duplicate typedefs
citra already has its own typedefs like this.
This commit is contained in:
parent
b058ce6feb
commit
41e1cb12e5
4 changed files with 17 additions and 41 deletions
|
@ -1079,7 +1079,7 @@ typedef struct _cdp_inst {
|
||||||
unsigned int cp_num;
|
unsigned int cp_num;
|
||||||
unsigned int opcode_2;
|
unsigned int opcode_2;
|
||||||
unsigned int CRm;
|
unsigned int CRm;
|
||||||
uint32 inst;
|
unsigned int inst;
|
||||||
}cdp_inst;
|
}cdp_inst;
|
||||||
|
|
||||||
typedef struct _uxtb_inst {
|
typedef struct _uxtb_inst {
|
||||||
|
@ -3458,7 +3458,7 @@ static tdstate decode_thumb_instr(arm_processor *cpu, uint32_t inst, addr_t addr
|
||||||
tdstate ret = thumb_translate (addr, inst, arm_inst, inst_size);
|
tdstate ret = thumb_translate (addr, inst, arm_inst, inst_size);
|
||||||
if(ret == t_branch){
|
if(ret == t_branch){
|
||||||
// TODO: FIXME, endian should be judged
|
// TODO: FIXME, endian should be judged
|
||||||
uint32 tinstr;
|
u32 tinstr;
|
||||||
if((addr & 0x3) != 0)
|
if((addr & 0x3) != 0)
|
||||||
tinstr = inst >> 16;
|
tinstr = inst >> 16;
|
||||||
else
|
else
|
||||||
|
@ -3471,7 +3471,7 @@ static tdstate decode_thumb_instr(arm_processor *cpu, uint32_t inst, addr_t addr
|
||||||
case 26:
|
case 26:
|
||||||
case 27:
|
case 27:
|
||||||
if (((tinstr & 0x0F00) != 0x0E00) && ((tinstr & 0x0F00) != 0x0F00)){
|
if (((tinstr & 0x0F00) != 0x0E00) && ((tinstr & 0x0F00) != 0x0F00)){
|
||||||
uint32 cond = (tinstr & 0x0F00) >> 8;
|
u32 cond = (tinstr & 0x0F00) >> 8;
|
||||||
inst_index = table_length - 4;
|
inst_index = table_length - 4;
|
||||||
*ptr_inst_base = arm_instruction_trans[inst_index](tinstr, inst_index);
|
*ptr_inst_base = arm_instruction_trans[inst_index](tinstr, inst_index);
|
||||||
} else {
|
} else {
|
||||||
|
@ -6625,7 +6625,7 @@ unsigned InterpreterMainLoop(ARMul_State* state) {
|
||||||
BLX_1_THUMB:
|
BLX_1_THUMB:
|
||||||
{
|
{
|
||||||
// BLX 1 for armv5t and above
|
// BLX 1 for armv5t and above
|
||||||
uint32 tmp = cpu->Reg[15];
|
u32 tmp = cpu->Reg[15];
|
||||||
blx_1_thumb *inst_cream = (blx_1_thumb *)inst_base->component;
|
blx_1_thumb *inst_cream = (blx_1_thumb *)inst_base->component;
|
||||||
cpu->Reg[15] = (cpu->Reg[14] + inst_cream->imm) & 0xFFFFFFFC;
|
cpu->Reg[15] = (cpu->Reg[14] + inst_cream->imm) & 0xFFFFFFFC;
|
||||||
cpu->Reg[14] = ((tmp + 2) | 1);
|
cpu->Reg[14] = ((tmp + 2) | 1);
|
||||||
|
|
|
@ -24,8 +24,8 @@
|
||||||
void switch_mode(arm_core_t *core, uint32_t mode);
|
void switch_mode(arm_core_t *core, uint32_t mode);
|
||||||
|
|
||||||
/* FIXME, we temporarily think thumb instruction is always 16 bit */
|
/* FIXME, we temporarily think thumb instruction is always 16 bit */
|
||||||
static inline uint32 GET_INST_SIZE(arm_core_t* core){
|
static inline u32 GET_INST_SIZE(arm_core_t* core) {
|
||||||
return core->TFlag? 2 : 4;
|
return core->TFlag? 2 : 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -36,8 +36,8 @@ static inline uint32 GET_INST_SIZE(arm_core_t* core){
|
||||||
*
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
static inline addr_t CHECK_READ_REG15_WA(arm_core_t* core, int Rn){
|
static inline addr_t CHECK_READ_REG15_WA(arm_core_t* core, int Rn) {
|
||||||
return (Rn == 15)? ((core->Reg[15] & ~0x3) + GET_INST_SIZE(core) * 2) : core->Reg[Rn];
|
return (Rn == 15)? ((core->Reg[15] & ~0x3) + GET_INST_SIZE(core) * 2) : core->Reg[Rn];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -48,8 +48,8 @@ static inline addr_t CHECK_READ_REG15_WA(arm_core_t* core, int Rn){
|
||||||
*
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
static inline uint32 CHECK_READ_REG15(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];
|
return (Rn == 15)? ((core->Reg[15] & ~0x1) + GET_INST_SIZE(core) * 2) : core->Reg[Rn];
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -37,10 +37,10 @@ enum tdstate {
|
||||||
t_uninitialized,
|
t_uninitialized,
|
||||||
};
|
};
|
||||||
|
|
||||||
tdstate
|
tdstate thumb_translate(addr_t addr, u32 instr, u32* ainstr, u32* inst_size);
|
||||||
thumb_translate(addr_t addr, uint32_t instr, uint32_t* ainstr, uint32_t* inst_size);
|
|
||||||
static inline uint32 get_thumb_instr(uint32 instr, addr_t pc){
|
static inline u32 get_thumb_instr(u32 instr, addr_t pc) {
|
||||||
uint32 tinstr;
|
u32 tinstr;
|
||||||
if ((pc & 0x3) != 0)
|
if ((pc & 0x3) != 0)
|
||||||
tinstr = instr >> 16;
|
tinstr = instr >> 16;
|
||||||
else
|
else
|
||||||
|
|
|
@ -22,34 +22,10 @@
|
||||||
* 12/16/2006 Michael.Kang <blackfin.kang@gmail.com>
|
* 12/16/2006 Michael.Kang <blackfin.kang@gmail.com>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __SKYEYE_TYPES_H
|
#pragma once
|
||||||
#define __SKYEYE_TYPES_H
|
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <cstdint>
|
||||||
|
|
||||||
/*default machine word length */
|
|
||||||
|
|
||||||
#ifndef __BEOS__
|
|
||||||
/* To avoid the type conflict with the qemu */
|
|
||||||
#ifndef QEMU
|
|
||||||
typedef uint8_t uint8;
|
|
||||||
typedef uint16_t uint16;
|
|
||||||
typedef uint32_t uint32;
|
|
||||||
typedef uint64_t uint64;
|
|
||||||
|
|
||||||
typedef int8_t sint8;
|
|
||||||
typedef int16_t sint16;
|
|
||||||
typedef int32_t sint32;
|
|
||||||
typedef int64_t sint64;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef uint32_t address_t;
|
typedef uint32_t address_t;
|
||||||
typedef uint32_t uinteger_t;
|
|
||||||
typedef int32_t integer_t;
|
|
||||||
|
|
||||||
typedef uint32_t physical_address_t;
|
typedef uint32_t physical_address_t;
|
||||||
typedef uint32_t generic_address_t;
|
typedef uint32_t generic_address_t;
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
Loading…
Reference in a new issue