eden-emu
/
eden
mirror of https://git.eden-emu.dev/eden-emu/eden.git
1
0
Fork 0
Code Releases Wiki Activity
Browse Source

vfp: Get rid of the VFP_OFFSET macro

pull/15/merge
Lioncash 11 years ago
parent
14dcd98653
commit
f9cc6d6484
5 changed files with 69 additions and 64 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      src/core/arm/skyeye_common/arm_regformat.h
  2. 4
      src/core/arm/skyeye_common/armdefs.h
  3. 28
      src/core/arm/skyeye_common/vfp/vfp.cpp
  4. 2
      src/core/arm/skyeye_common/vfp/vfp.h
  5. 82
      src/core/arm/skyeye_common/vfp/vfpinstr.cpp

15
src/core/arm/skyeye_common/arm_regformat.h
View File

@ -51,13 +51,18 @@ enum {
EXCLUSIVE_STATE, EXCLUSIVE_STATE,
EXCLUSIVE_RESULT, EXCLUSIVE_RESULT,
// VFP registers
VFP_BASE,
VFP_FPSID = VFP_BASE,
MAX_REG_NUM,
};
// VFP system registers
enum {
VFP_FPSID,
VFP_FPSCR, VFP_FPSCR,
VFP_FPEXC, VFP_FPEXC,
MAX_REG_NUM,
// Not an actual register.
// All VFP system registers should be defined above this.
VFP_SYSTEM_REGISTER_COUNT
}; };
enum CP15Register { enum CP15Register {
@ -176,5 +181,3 @@ enum CP15Register {
// All registers should be defined above this. // All registers should be defined above this.
CP15_REGISTER_COUNT, CP15_REGISTER_COUNT,
}; };
#define VFP_OFFSET(x) (x - VFP_BASE)

4
src/core/arm/skyeye_common/armdefs.h
View File

@ -92,7 +92,9 @@ struct ARMul_State
ARMword exclusive_state; ARMword exclusive_state;
ARMword exclusive_result; ARMword exclusive_result;
ARMword CP15[CP15_REGISTER_COUNT]; ARMword CP15[CP15_REGISTER_COUNT];
ARMword VFP[3]; // FPSID, FPSCR, and FPEXC
// FPSID, FPSCR, and FPEXC
ARMword VFP[VFP_SYSTEM_REGISTER_COUNT];
// VFPv2 and VFPv3-D16 has 16 doubleword registers (D0-D16 or S0-S31). // VFPv2 and VFPv3-D16 has 16 doubleword registers (D0-D16 or S0-S31).
// VFPv3-D32/ASIMD may have up to 32 doubleword registers (D0-D31), // VFPv3-D32/ASIMD may have up to 32 doubleword registers (D0-D31),
// and only 32 singleword registers are accessible (S0-S31). // and only 32 singleword registers are accessible (S0-S31).

28
src/core/arm/skyeye_common/vfp/vfp.cpp
View File

@ -29,10 +29,10 @@
unsigned VFPInit(ARMul_State* state) unsigned VFPInit(ARMul_State* state)
{ {
state->VFP[VFP_OFFSET(VFP_FPSID)] = VFP_FPSID_IMPLMEN<<24 | VFP_FPSID_SW<<23 | VFP_FPSID_SUBARCH<<16 |
VFP_FPSID_PARTNUM<<8 | VFP_FPSID_VARIANT<<4 | VFP_FPSID_REVISION;
state->VFP[VFP_OFFSET(VFP_FPEXC)] = 0;
state->VFP[VFP_OFFSET(VFP_FPSCR)] = 0;
state->VFP[VFP_FPSID] = VFP_FPSID_IMPLMEN<<24 | VFP_FPSID_SW<<23 | VFP_FPSID_SUBARCH<<16 |
VFP_FPSID_PARTNUM<<8 | VFP_FPSID_VARIANT<<4 | VFP_FPSID_REVISION;
state->VFP[VFP_FPEXC] = 0;
state->VFP[VFP_FPSCR] = 0;
return 0; return 0;
} }
@ -314,11 +314,11 @@ unsigned VFPCDP(ARMul_State* state, unsigned type, u32 instr)
int exceptions = 0; int exceptions = 0;
if (CoProc == 10) if (CoProc == 10)
exceptions = vfp_single_cpdo(state, instr, state->VFP[VFP_OFFSET(VFP_FPSCR)]);
exceptions = vfp_single_cpdo(state, instr, state->VFP[VFP_FPSCR]);
else else
exceptions = vfp_double_cpdo(state, instr, state->VFP[VFP_OFFSET(VFP_FPSCR)]);
exceptions = vfp_double_cpdo(state, instr, state->VFP[VFP_FPSCR]);
vfp_raise_exceptions(state, exceptions, instr, state->VFP[VFP_OFFSET(VFP_FPSCR)]);
vfp_raise_exceptions(state, exceptions, instr, state->VFP[VFP_FPSCR]);
return ARMul_DONE; return ARMul_DONE;
} }
@ -344,11 +344,11 @@ void VMRS(ARMul_State* state, ARMword reg, ARMword Rt, ARMword* value)
{ {
if (Rt != 15) if (Rt != 15)
{ {
*value = state->VFP[VFP_OFFSET(VFP_FPSCR)];
*value = state->VFP[VFP_FPSCR];
} }
else else
{ {
*value = state->VFP[VFP_OFFSET(VFP_FPSCR)] ;
*value = state->VFP[VFP_FPSCR] ;
} }
} }
else else
@ -356,7 +356,7 @@ void VMRS(ARMul_State* state, ARMword reg, ARMword Rt, ARMword* value)
switch (reg) switch (reg)
{ {
case 0: case 0:
*value = state->VFP[VFP_OFFSET(VFP_FPSID)];
*value = state->VFP[VFP_FPSID];
break; break;
case 6: case 6:
/* MVFR1, VFPv3 only ? */ /* MVFR1, VFPv3 only ? */
@ -367,7 +367,7 @@ void VMRS(ARMul_State* state, ARMword reg, ARMword Rt, ARMword* value)
LOG_TRACE(Core_ARM11, "\tr%d <= MVFR0 unimplemented\n", Rt); LOG_TRACE(Core_ARM11, "\tr%d <= MVFR0 unimplemented\n", Rt);
break; break;
case 8: case 8:
*value = state->VFP[VFP_OFFSET(VFP_FPEXC)];
*value = state->VFP[VFP_FPEXC];
break; break;
default: default:
LOG_TRACE(Core_ARM11, "\tSUBARCHITECTURE DEFINED\n"); LOG_TRACE(Core_ARM11, "\tSUBARCHITECTURE DEFINED\n");
@ -407,11 +407,11 @@ void VMSR(ARMul_State* state, ARMword reg, ARMword Rt)
{ {
if (reg == 1) if (reg == 1)
{ {
state->VFP[VFP_OFFSET(VFP_FPSCR)] = state->Reg[Rt];
state->VFP[VFP_FPSCR] = state->Reg[Rt];
} }
else if (reg == 8) else if (reg == 8)
{ {
state->VFP[VFP_OFFSET(VFP_FPEXC)] = state->Reg[Rt];
state->VFP[VFP_FPEXC] = state->Reg[Rt];
} }
} }
@ -774,5 +774,5 @@ void vfp_raise_exceptions(ARMul_State* state, u32 exceptions, u32 inst, u32 fpsc
fpscr |= exceptions; fpscr |= exceptions;
state->VFP[VFP_OFFSET(VFP_FPSCR)] = fpscr;
state->VFP[VFP_FPSCR] = fpscr;
} }

2
src/core/arm/skyeye_common/vfp/vfp.h
View File

@ -25,7 +25,7 @@
#define VFP_DEBUG_UNIMPLEMENTED(x) LOG_ERROR(Core_ARM11, "in func %s, " #x " unimplemented\n", __FUNCTION__); exit(-1); #define VFP_DEBUG_UNIMPLEMENTED(x) LOG_ERROR(Core_ARM11, "in func %s, " #x " unimplemented\n", __FUNCTION__); exit(-1);
#define VFP_DEBUG_UNTESTED(x) LOG_TRACE(Core_ARM11, "in func %s, " #x " untested\n", __FUNCTION__); #define VFP_DEBUG_UNTESTED(x) LOG_TRACE(Core_ARM11, "in func %s, " #x " untested\n", __FUNCTION__);
#define CHECK_VFP_ENABLED #define CHECK_VFP_ENABLED
#define CHECK_VFP_CDP_RET vfp_raise_exceptions(cpu, ret, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]); //if (ret == -1) {printf("VFP CDP FAILURE %x\n", inst_cream->instr); exit(-1);}
#define CHECK_VFP_CDP_RET vfp_raise_exceptions(cpu, ret, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
unsigned VFPInit(ARMul_State* state); unsigned VFPInit(ARMul_State* state);
unsigned VFPMRC(ARMul_State* state, unsigned type, ARMword instr, ARMword* value); unsigned VFPMRC(ARMul_State* state, unsigned type, ARMword instr, ARMword* value);

82
src/core/arm/skyeye_common/vfp/vfpinstr.cpp
View File

@ -46,9 +46,9 @@ VMLA_INST:
int ret; int ret;
if (inst_cream->dp_operation) if (inst_cream->dp_operation)
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
else else
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
CHECK_VFP_CDP_RET; CHECK_VFP_CDP_RET;
} }
@ -96,9 +96,9 @@ VMLS_INST:
int ret; int ret;
if (inst_cream->dp_operation) if (inst_cream->dp_operation)
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
else else
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
CHECK_VFP_CDP_RET; CHECK_VFP_CDP_RET;
} }
@ -146,9 +146,9 @@ VNMLA_INST:
int ret; int ret;
if (inst_cream->dp_operation) if (inst_cream->dp_operation)
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
else else
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
CHECK_VFP_CDP_RET; CHECK_VFP_CDP_RET;
} }
@ -197,9 +197,9 @@ VNMLS_INST:
int ret; int ret;
if (inst_cream->dp_operation) if (inst_cream->dp_operation)
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
else else
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
CHECK_VFP_CDP_RET; CHECK_VFP_CDP_RET;
} }
@ -247,9 +247,9 @@ VNMUL_INST:
int ret; int ret;
if (inst_cream->dp_operation) if (inst_cream->dp_operation)
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
else else
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
CHECK_VFP_CDP_RET; CHECK_VFP_CDP_RET;
} }
@ -297,9 +297,9 @@ VMUL_INST:
int ret; int ret;
if (inst_cream->dp_operation) if (inst_cream->dp_operation)
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
else else
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
CHECK_VFP_CDP_RET; CHECK_VFP_CDP_RET;
} }
@ -347,9 +347,9 @@ VADD_INST:
int ret; int ret;
if (inst_cream->dp_operation) if (inst_cream->dp_operation)
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
else else
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
CHECK_VFP_CDP_RET; CHECK_VFP_CDP_RET;
} }
@ -397,9 +397,9 @@ VSUB_INST:
int ret; int ret;
if (inst_cream->dp_operation) if (inst_cream->dp_operation)
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
else else
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
CHECK_VFP_CDP_RET; CHECK_VFP_CDP_RET;
} }
@ -447,9 +447,9 @@ VDIV_INST:
int ret; int ret;
if (inst_cream->dp_operation) if (inst_cream->dp_operation)
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
else else
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
CHECK_VFP_CDP_RET; CHECK_VFP_CDP_RET;
} }
@ -591,9 +591,9 @@ VABS_INST:
int ret; int ret;
if (inst_cream->dp_operation) if (inst_cream->dp_operation)
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
else else
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
CHECK_VFP_CDP_RET; CHECK_VFP_CDP_RET;
} }
@ -642,9 +642,9 @@ VNEG_INST:
int ret; int ret;
if (inst_cream->dp_operation) if (inst_cream->dp_operation)
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
else else
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
CHECK_VFP_CDP_RET; CHECK_VFP_CDP_RET;
} }
@ -692,9 +692,9 @@ VSQRT_INST:
int ret; int ret;
if (inst_cream->dp_operation) if (inst_cream->dp_operation)
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
else else
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
CHECK_VFP_CDP_RET; CHECK_VFP_CDP_RET;
} }
@ -742,9 +742,9 @@ VCMP_INST:
int ret; int ret;
if (inst_cream->dp_operation) if (inst_cream->dp_operation)
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
else else
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
CHECK_VFP_CDP_RET; CHECK_VFP_CDP_RET;
} }
@ -792,9 +792,9 @@ VCMP2_INST:
int ret; int ret;
if (inst_cream->dp_operation) if (inst_cream->dp_operation)
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
else else
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
CHECK_VFP_CDP_RET; CHECK_VFP_CDP_RET;
} }
@ -842,9 +842,9 @@ VCVTBDS_INST:
int ret; int ret;
if (inst_cream->dp_operation) if (inst_cream->dp_operation)
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
else else
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
CHECK_VFP_CDP_RET; CHECK_VFP_CDP_RET;
} }
@ -894,9 +894,9 @@ VCVTBFF_INST:
int ret; int ret;
if (inst_cream->dp_operation) if (inst_cream->dp_operation)
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
else else
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
CHECK_VFP_CDP_RET; CHECK_VFP_CDP_RET;
} }
@ -944,9 +944,9 @@ VCVTBFI_INST:
int ret; int ret;
if (inst_cream->dp_operation) if (inst_cream->dp_operation)
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_double_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
else else
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_OFFSET(VFP_FPSCR)]);
ret = vfp_single_cpdo(cpu, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
CHECK_VFP_CDP_RET; CHECK_VFP_CDP_RET;
} }
@ -1146,14 +1146,14 @@ VMRS_INST:
{ {
if (inst_cream->Rt != 15) if (inst_cream->Rt != 15)
{ {
cpu->Reg[inst_cream->Rt] = cpu->VFP[VFP_OFFSET(VFP_FPSCR)];
cpu->Reg[inst_cream->Rt] = cpu->VFP[VFP_FPSCR];
} }
else else
{ {
cpu->NFlag = (cpu->VFP[VFP_OFFSET(VFP_FPSCR)] >> 31) & 1;
cpu->ZFlag = (cpu->VFP[VFP_OFFSET(VFP_FPSCR)] >> 30) & 1;
cpu->CFlag = (cpu->VFP[VFP_OFFSET(VFP_FPSCR)] >> 29) & 1;
cpu->VFlag = (cpu->VFP[VFP_OFFSET(VFP_FPSCR)] >> 28) & 1;
cpu->NFlag = (cpu->VFP[VFP_FPSCR] >> 31) & 1;
cpu->ZFlag = (cpu->VFP[VFP_FPSCR] >> 30) & 1;
cpu->CFlag = (cpu->VFP[VFP_FPSCR] >> 29) & 1;
cpu->VFlag = (cpu->VFP[VFP_FPSCR] >> 28) & 1;
} }
} }
else else
@ -1161,7 +1161,7 @@ VMRS_INST:
switch (inst_cream->reg) switch (inst_cream->reg)
{ {
case 0: case 0:
cpu->Reg[inst_cream->Rt] = cpu->VFP[VFP_OFFSET(VFP_FPSID)];
cpu->Reg[inst_cream->Rt] = cpu->VFP[VFP_FPSID];
break; break;
case 6: case 6:
/* MVFR1, VFPv3 only ? */ /* MVFR1, VFPv3 only ? */
@ -1172,7 +1172,7 @@ VMRS_INST:
LOG_TRACE(Core_ARM11, "\tr%d <= MVFR0 unimplemented\n", inst_cream->Rt); LOG_TRACE(Core_ARM11, "\tr%d <= MVFR0 unimplemented\n", inst_cream->Rt);
break; break;
case 8: case 8:
cpu->Reg[inst_cream->Rt] = cpu->VFP[VFP_OFFSET(VFP_FPEXC)];
cpu->Reg[inst_cream->Rt] = cpu->VFP[VFP_FPEXC];
break; break;
default: default:
break; break;

Write Preview
Loading…
Cancel
Save