Emulation/cen64
1
0
Fork 0
mirror of https://github.com/n64dev/cen64.git synced 2024-06-22 22:12:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Try to reduce VR4300 cycle overhead as well.

Browse source
This commit is contained in:
Tyler J. Stachecki 2016-01-30 14:49:57 -05:00
parent e2e72821e2
commit 2b5eaa579d
2 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
vr4300/cpu.h
View file

@ -114,7 +114,27 @@ struct vr4300_stats {
cen64_cold int vr4300_init(struct vr4300 *vr4300, struct bus_controller *bus);
cen64_cold void vr4300_print_summary(struct vr4300_stats *stats);
cen64_flatten cen64_hot void vr4300_cycle(struct vr4300 *vr4300);
cen64_flatten cen64_hot void vr4300_cycle_(struct vr4300 *vr4300);
cen64_flatten cen64_hot static void vr4300_cycle(struct vr4300 *vr4300) {
struct vr4300_pipeline *pipeline = &vr4300->pipeline;
// Increment counters.
vr4300->regs[VR4300_CP0_REGISTER_COUNT]++;
if ((uint32_t) (vr4300->regs[VR4300_CP0_REGISTER_COUNT] >> 1) ==
(uint32_t) vr4300->regs[VR4300_CP0_REGISTER_COMPARE])
vr4300->regs[VR4300_CP0_REGISTER_CAUSE] |= 0x8000;
// We're stalling for something...
if (pipeline->cycles_to_stall > 0)
pipeline->cycles_to_stall--;
else
vr4300_cycle_(vr4300);
}
cen64_cold void vr4300_cycle_extra(struct vr4300 *vr4300, struct vr4300_stats *stats);
#endif

15
vr4300/pipeline.c
View file

@ -494,24 +494,13 @@ cen64_align(static const pipeline_function
};
// Advances the processor pipeline by one pclock.
void vr4300_cycle(struct vr4300 *vr4300) {
void vr4300_cycle_(struct vr4300 *vr4300) {
struct vr4300_pipeline *pipeline = &vr4300->pipeline;
// Increment counters.
vr4300->regs[VR4300_CP0_REGISTER_COUNT]++;
if ((uint32_t) (vr4300->regs[VR4300_CP0_REGISTER_COUNT] >> 1) ==
(uint32_t) vr4300->regs[VR4300_CP0_REGISTER_COMPARE])
vr4300->regs[VR4300_CP0_REGISTER_CAUSE] |= 0x8000;
// We're stalling for something...
if (pipeline->cycles_to_stall > 0)
pipeline->cycles_to_stall--;
// Ordinarily, we would need to check every pipeline stage to see if it is
// aborted, and conditionally not execute it. Since faults are rare, we'll
// only bother checking for aborted stages when we know they can be present.
else if (pipeline->fault_present + vr4300->regs[PIPELINE_CYCLE_TYPE])
if (pipeline->fault_present + vr4300->regs[PIPELINE_CYCLE_TYPE])
pipeline_function_lut[vr4300->regs[PIPELINE_CYCLE_TYPE]](vr4300);
else {