armsx/ARMSX1
0
0
Fork 0
mirror of https://github.com/ARMSX2/ARMSX1.git synced 2026-08-24 16:53:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

Start working on timers

Browse Source
This commit is contained in:
allkern
2023-07-12 18:15:59 -03:00
parent 92da65261b
commit 0d4e9c675b
6 changed files with 65 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/main.c
+2
View File
@@ -32,7 +32,9 @@ int main(int argc, const char* argv[]) {
psx_gpu_t* gpu = psx_get_gpu(psx);
psx_gpu_set_event_callback(gpu, GPU_EVENT_DMODE, psxe_gpu_dmode_event_cb);
psx_gpu_set_event_callback(gpu, GPU_EVENT_VBLANK, psxe_gpu_vblank_event_cb);
psx_gpu_set_event_callback(gpu, GPU_EVENT_HBLANK, psxe_gpu_hblank_event_cb);
psx_gpu_set_udata(gpu, 0, screen);
psx_gpu_set_udata(gpu, 1, psx->timer);
psx_input_t* input = psx_input_create();
psx_input_init(input);
psx/cpu.c
+41 -18
View File
@@ -1421,6 +1421,17 @@ void psx_cpu_i_ctc2(psx_cpu_t* cpu) {
#define R_SY1 cpu->cop2_dr.sxy1[1]
#define R_SX2 cpu->cop2_dr.sxy2[0]
#define R_SY2 cpu->cop2_dr.sxy2[1]
#define R_SZ0 cpu->cop2_dr.sz0
#define R_SZ1 cpu->cop2_dr.sz1
#define R_SZ2 cpu->cop2_dr.sz2
#define R_SZ3 cpu->cop2_dr.sz3
#define R_ZSF3 cpu->cop2_cr.zsf3
#define R_ZSF4 cpu->cop2_cr.zsf4
#define R_OTZ cpu->cop2_dr.otz
#define CLAMPU32(v, min, max) ((uint32_t)v < (uint32_t)min ? min : ((uint32_t)v > (uint32_t)max ? max : (uint32_t)v))
#define CLAMPS32(v, min, max) ((int32_t)v < (int32_t)min ? min : ((int32_t)v > (int32_t)max ? max : (int32_t)v))
#define CLAMPS16(v, min, max) ((int16_t)v < (int16_t)min ? min : ((int16_t)v > (int16_t)max ? max : (int16_t)v))
void psx_cpu_i_gte(psx_cpu_t* cpu) {
DO_PENDING_LOAD;
@@ -1432,30 +1443,34 @@ void psx_gte_i_invalid(psx_cpu_t* cpu) {
log_fatal("invalid: Unimplemented GTE instruction %02x, %02x", cpu->opcode & 0x3f, cpu->opcode >> 25);
}
#define LA1S(v) (v > )
static const int16_t g_psx_gte_ir_clamp_table[] = {
-0x8000, 0x7fff, 0x0000, 0x7fff
};
void psx_gte_i_rtps(psx_cpu_t* cpu) {
int sf = (cpu->opcode >> 19) & 1;
int lm = (cpu->opcode >> 9) & 2;
int shift = 12 * sf;
uint64_t ssx = (R_TRX * 0x1000) + (R_RT11 * R_VX0 + R_RT12 * R_VY0 + R_RT13 * R_VZ0);
uint64_t ssy = (R_TRY * 0x1000) + (R_RT21 * R_VX0 + R_RT22 * R_VY0 + R_RT23 * R_VZ0);
uint64_t ssz = (R_TRZ * 0x1000) + (R_RT31 * R_VX0 + R_RT32 * R_VY0 + R_RT33 * R_VZ0);
int16_t ir_upper = g_psx_gte_ir_clamp_table[lm];
int16_t ir_lower = g_psx_gte_ir_clamp_table[lm + 1];
R_IR1 = R_MAC1;
R_IR2 = R_MAC2;
R_IR3 = R_MAC3;
// R_SZ3 = R_MAC3 << ((1 - sf) * 12)
// R_MAC0 = (((H*20000h/SZ3)+1)/2)*IR1+OFX, SX2=MAC0/10000h
// R_MAC0 = (((H*20000h/SZ3)+1)/2)*IR2+OFY, SY2=MAC0/10000h
// R_MAC0 = (((H*20000h/SZ3)+1)/2)*DQA+DQB, IR0=MAC0/1000h
R_MAC1 = (R_TRX << 12) + (R_RT11 * R_VX0 + R_RT12 * R_VY0 + R_RT13 * R_VZ0);
R_MAC2 = (R_TRY << 12) + (R_RT21 * R_VX0 + R_RT22 * R_VY0 + R_RT23 * R_VZ0);
R_MAC3 = (R_TRZ << 12) + (R_RT31 * R_VX0 + R_RT32 * R_VY0 + R_RT33 * R_VZ0);
R_IR1 = CLAMPS16(R_MAC1 >> shift, ir_lower, ir_upper);
R_IR2 = CLAMPS16(R_MAC2 >> shift, ir_lower, ir_upper);
R_IR3 = CLAMPS16(R_MAC3 >> shift, ir_lower, ir_upper);
R_SZ0 = R_SZ1;
R_SZ1 = R_SZ2;
R_SZ2 = R_SZ3;
R_SZ3 = CLAMPU32(R_MAC3 >> (12 * !sf), 0x0000, 0xffff);
}
void psx_gte_i_nclip(psx_cpu_t* cpu) {
uint32_t opz = R_SX0 * (R_SY1 - R_SY2) +
R_SX1 * (R_SY2 - R_SY0) +
R_SX2 * (R_SY0 - R_SY1);
R_MAC0 = opz;
R_MAC0 = R_SX0 * (R_SY1 - R_SY2) + R_SX1 * (R_SY2 - R_SY0) + R_SX2 * (R_SY0 - R_SY1);
}
void psx_gte_i_op(psx_cpu_t* cpu) {
@@ -1515,11 +1530,19 @@ void psx_gte_i_dpct(psx_cpu_t* cpu) {
}
void psx_gte_i_avsz3(psx_cpu_t* cpu) {
log_fatal("avsz3: Unimplemented GTE instruction");
R_MAC0 = R_ZSF3 * (R_SZ1 + R_SZ2 + R_SZ3);
uint32_t mac0 = R_MAC0 >> 12;
R_OTZ = CLAMPU32(mac0, 0x0000, 0xffff);
}
void psx_gte_i_avsz4(psx_cpu_t* cpu) {
log_fatal("avsz4: Unimplemented GTE instruction");
R_MAC0 = R_ZSF4 * (R_SZ0 + R_SZ1 + R_SZ2 + R_SZ3);
uint32_t mac0 = R_MAC0 >> 12;
R_OTZ = CLAMPU32(mac0, 0x0000, 0xffff);
}
void psx_gte_i_rtpt(psx_cpu_t* cpu) {
psx/dev/gpu.h
+2 -1
View File
@@ -25,7 +25,8 @@
enum {
GPU_EVENT_DMODE,
GPU_EVENT_VBLANK
GPU_EVENT_VBLANK,
GPU_EVENT_HBLANK
};
enum {
psx/dev/timer.c
+3 -31
View File
@@ -9,50 +9,22 @@ psx_timer_t* psx_timer_create() {
return (psx_timer_t*)malloc(sizeof(psx_timer_t));
}
void psx_timer_init(psx_timer_t* timer) {
void psx_timer_init(psx_timer_t* timer, psx_ic_t* ic) {
memset(timer, 0, sizeof(psx_timer_t));
timer->io_base = PSX_TIMER_BEGIN;
timer->io_size = PSX_TIMER_SIZE;
timer->ic = ic;
}
uint32_t psx_timer_read32(psx_timer_t* timer, uint32_t offset) {
if (offset == 0x20) {
return 0x000016b0;
}
int t = (offset >> 4) & 0x3;
int r = offset & 0xf;
if (r == 0) {
switch (t) {
case 0: return timer->t0_stub++;
case 1: return timer->t1_stub++;
case 2: return timer->t2_stub++;
}
}
log_fatal("Unhandled 32-bit TIMER read at offset %08x", offset);
return 0x0;
}
uint16_t psx_timer_read16(psx_timer_t* timer, uint32_t offset) {
if (offset == 0x20) {
return 0x000016b0;
}
int t = (offset >> 4) & 0x3;
int r = offset & 0xf;
if (r == 0) {
switch (t) {
case 0: return timer->t0_stub++;
case 1: return timer->t1_stub++;
case 2: return timer->t2_stub++;
}
}
log_fatal("Unhandled 16-bit TIMER read at offset %08x", offset);
return 0x0;
psx/dev/timer.h
+16 -4
View File
@@ -3,6 +3,9 @@
#include <stdint.h>
#include "ic.h"
#include "gpu.h"
#define PSX_TIMER_BEGIN 0x1f801100
#define PSX_TIMER_SIZE 0x30
#define PSX_TIMER_END 0x1f80112f
@@ -10,19 +13,28 @@
typedef struct {
uint32_t io_base, io_size;
uint32_t t0_stub;
uint32_t t1_stub;
uint32_t t2_stub;
psx_ic_t* ic;
struct {
uint32_t counter;
uint32_t mode;
uint32_t target;
uint32_t invalid;
} timer[3];
} psx_timer_t;
psx_timer_t* psx_timer_create();
void psx_timer_init(psx_timer_t*);
void psx_timer_init(psx_timer_t*, psx_ic_t*);
uint32_t psx_timer_read32(psx_timer_t*, uint32_t);
uint16_t psx_timer_read16(psx_timer_t*, uint32_t);
uint8_t psx_timer_read8(psx_timer_t*, uint32_t);
void psx_timer_write32(psx_timer_t*, uint32_t, uint32_t);
void psx_timer_write16(psx_timer_t*, uint32_t, uint16_t);
void psx_timer_write8(psx_timer_t*, uint32_t, uint8_t);
void psx_timer_update(psx_timer_t*);
void psx_timer_destroy(psx_timer_t*);
// Hblank event handler
void psxe_gpu_hblank_event_cb(psx_gpu_t*);
#endif
psx/psx.c
+1 -1
View File
@@ -111,7 +111,7 @@ void psx_init(psx_t* psx, const char* bios_path) {
psx_scratchpad_init(psx->scratchpad);
psx_gpu_init(psx->gpu, psx->ic);
psx_spu_init(psx->spu);
psx_timer_init(psx->timer);
psx_timer_init(psx->timer, psx->ic);
psx_cdrom_init(psx->cdrom, psx->ic);
psx_pad_init(psx->pad, psx->ic);
psx_bios_load(psx->bios, bios_path);