RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 07:17:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

svp compiler: some fixes

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@380 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2008-03-12 18:30:44 +00:00
parent d527628282
commit e122fae6f4
4 changed files with 31 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Pico/carthw/svp/compiler.c
View file

@ -12,7 +12,7 @@ static int nblocks = 0;
static int iram_context = 0; static int iram_context = 0;
#ifndef ARM #ifndef ARM
#define DUMP_BLOCK 0x29d4 #define DUMP_BLOCK 0x2018
unsigned int tcache[512*1024]; unsigned int tcache[512*1024];
void regfile_load(void){} void regfile_load(void){}
void regfile_store(void){} void regfile_store(void){}
@ -565,6 +565,7 @@ static void ssp_pm_write(u32 d, int reg)
int inc = get_inc(mode); int inc = get_inc(mode);
((unsigned short *)svp->iram_rom)[addr&0x3ff] = d; ((unsigned short *)svp->iram_rom)[addr&0x3ff] = d;
ssp->pmac_write[reg] += inc; ssp->pmac_write[reg] += inc;
ssp->drc.iram_dirty = 1;
} }
rPMC.v = ssp->pmac_write[reg]; rPMC.v = ssp->pmac_write[reg];
@ -800,8 +801,8 @@ static void tr_flush_dirty_pmcrs(void)
if (dirty_regb & KRREG_PMC) { if (dirty_regb & KRREG_PMC) {
val = known_regs.pmc.v; val = known_regs.pmc.v;
emit_mov_const(A_COND_AL, 0, val); emit_mov_const(A_COND_AL, 1, val);
EOP_STR_IMM(0,7,0x400+SSP_PMC*4); EOP_STR_IMM(1,7,0x400+SSP_PMC*4);
if (known_regs.emu_status & (SSP_PMC_SET|SSP_PMC_HAVE_ADDR)) { if (known_regs.emu_status & (SSP_PMC_SET|SSP_PMC_HAVE_ADDR)) {
printf("!! SSP_PMC_SET|SSP_PMC_HAVE_ADDR set on flush\n"); printf("!! SSP_PMC_SET|SSP_PMC_HAVE_ADDR set on flush\n");
@ -813,20 +814,20 @@ static void tr_flush_dirty_pmcrs(void)
if (dirty_regb & (1 << (20+i))) { if (dirty_regb & (1 << (20+i))) {
if (val != known_regs.pmac_read[i]) { if (val != known_regs.pmac_read[i]) {
val = known_regs.pmac_read[i]; val = known_regs.pmac_read[i];
emit_mov_const(A_COND_AL, 0, val); emit_mov_const(A_COND_AL, 1, val);
} }
EOP_STR_IMM(0,7,0x454+i*4); // pmac_read EOP_STR_IMM(1,7,0x454+i*4); // pmac_read
} }
if (dirty_regb & (1 << (25+i))) { if (dirty_regb & (1 << (25+i))) {
if (val != known_regs.pmac_write[i]) { if (val != known_regs.pmac_write[i]) {
val = known_regs.pmac_write[i]; val = known_regs.pmac_write[i];
emit_mov_const(A_COND_AL, 0, val); emit_mov_const(A_COND_AL, 1, val);
} }
EOP_STR_IMM(0,7,0x46c+i*4); // pmac_write EOP_STR_IMM(1,7,0x46c+i*4); // pmac_write
} }
} }
dirty_regb &= ~0x3ff80000; dirty_regb &= ~0x3ff80000;
hostreg_r[0] = -1; hostreg_r[1] = -1;
} }
/* read bank word to r0 (upper bits zero). Thrashes r1. */ /* read bank word to r0 (upper bits zero). Thrashes r1. */
@ -1378,7 +1379,7 @@ static void tr_r0_to_AL(int const_val)
static void tr_r0_to_PMX(int reg) static void tr_r0_to_PMX(int reg)
{ {
#if 0 #if 1
if ((known_regb & KRREG_PMC) && (known_regs.emu_status & SSP_PMC_SET)) if ((known_regb & KRREG_PMC) && (known_regs.emu_status & SSP_PMC_SET))
{ {
known_regs.pmac_write[reg] = known_regs.pmc.v; known_regs.pmac_write[reg] = known_regs.pmc.v;
@ -1388,7 +1389,7 @@ static void tr_r0_to_PMX(int reg)
return; return;
} }
#endif #endif
#if 0 #if 1
if ((known_regb & KRREG_PMC) && (known_regb & (1 << (25+reg)))) if ((known_regb & KRREG_PMC) && (known_regb & (1 << (25+reg))))
{ {
int mode, addr; int mode, addr;
@ -1420,6 +1421,8 @@ static void tr_r0_to_PMX(int reg)
EOP_LDR_IMM(1,7,0x48c); // iram_ptr EOP_LDR_IMM(1,7,0x48c); // iram_ptr
emit_mov_const(A_COND_AL, 2, (addr&0x3ff)<<1); emit_mov_const(A_COND_AL, 2, (addr&0x3ff)<<1);
EOP_STRH_REG(0,1,2); // strh r0, [r1, r2] EOP_STRH_REG(0,1,2); // strh r0, [r1, r2]
EOP_MOV_IMM(1,0,1);
EOP_STR_IMM(1,7,0x494); // iram_dirty
known_regs.pmac_write[reg] += inc; known_regs.pmac_write[reg] += inc;
} }
else else
@ -1430,21 +1433,21 @@ static void tr_r0_to_PMX(int reg)
dirty_regb |= KRREG_PMC; dirty_regb |= KRREG_PMC;
dirty_regb |= 1 << (25+reg); dirty_regb |= 1 << (25+reg);
hostreg_r[1] = hostreg_r[2] = -1; hostreg_r[1] = hostreg_r[2] = -1;
return;
} }
known_regb &= ~KRREG_PMC; known_regb &= ~KRREG_PMC;
dirty_regb &= ~KRREG_PMC; dirty_regb &= ~KRREG_PMC;
known_regb &= ~(1 << (25+reg)); known_regb &= ~(1 << (25+reg));
dirty_regb &= ~(1 << (25+reg)); dirty_regb &= ~(1 << (25+reg));
#endif #else
EOP_MOV_REG_SIMPLE(3,0);
tr_flush_dirty_pmcrs(); tr_flush_dirty_pmcrs();
EOP_MOV_REG_SIMPLE(0,3);
hostreg_clear(); hostreg_clear();
known_regb &= ~KRREG_PMC; known_regb &= ~KRREG_PMC;
dirty_regb &= ~KRREG_PMC; dirty_regb &= ~KRREG_PMC;
known_regb &= ~(1 << (25+reg)); known_regb &= ~(1 << (25+reg));
dirty_regb &= ~(1 << (25+reg)); dirty_regb &= ~(1 << (25+reg));
#endif
// call the C code to handle this // call the C code to handle this
@ -1636,7 +1639,7 @@ static int translate_op(unsigned int op, int *pc, int imm)
if (op == 0) { ret++; break; } // nop if (op == 0) { ret++; break; } // nop
tmpv = op & 0xf; // src tmpv = op & 0xf; // src
tmpv2 = (op >> 4) & 0xf; // dst tmpv2 = (op >> 4) & 0xf; // dst
if (tmpv2 >= 8) return -1; // TODO //if (tmpv2 >= 8) return -1; // TODO
if (tmpv2 == SSP_A && tmpv == SSP_P) { // ld A, P if (tmpv2 == SSP_A && tmpv == SSP_P) { // ld A, P
tr_flush_dirty_P(); tr_flush_dirty_P();
EOP_MOV_REG_SIMPLE(5, 10); EOP_MOV_REG_SIMPLE(5, 10);
@ -2146,9 +2149,10 @@ PC = &dummy;
void ssp1601_dyn_reset(ssp1601_t *ssp) void ssp1601_dyn_reset(ssp1601_t *ssp)
{ {
ssp1601_reset_local(ssp); ssp1601_reset_local(ssp);
ssp->ptr_rom = (unsigned int) Pico.rom; ssp->drc.ptr_rom = (unsigned int) Pico.rom;
ssp->ptr_iram_rom = (unsigned int) svp->iram_rom; ssp->drc.ptr_iram_rom = (unsigned int) svp->iram_rom;
ssp->ptr_dram = (unsigned int) svp->dram; ssp->drc.ptr_dram = (unsigned int) svp->dram;
ssp->drc.iram_dirty = 0;
} }
void ssp1601_dyn_run(int cycles) void ssp1601_dyn_run(int cycles)
@ -2165,9 +2169,9 @@ void ssp1601_dyn_run(int cycles)
int (*trans_entry)(void); int (*trans_entry)(void);
if (rPC < 0x800/2) if (rPC < 0x800/2)
{ {
if (iram_dirty) { if (ssp->drc.iram_dirty) {
iram_context = get_iram_context(); iram_context = get_iram_context();
iram_dirty--; ssp->drc.iram_dirty--;
} }
if (block_table_iram[iram_context][rPC] == NULL) if (block_table_iram[iram_context][rPC] == NULL)
block_table_iram[iram_context][rPC] = translate_block(rPC); block_table_iram[iram_context][rPC] = translate_block(rPC);

5
Pico/carthw/svp/ssp16.c
View file

@ -374,9 +374,6 @@ static int g_cycles;
static int running = 0; static int running = 0;
static int last_iram = 0; static int last_iram = 0;
#endif #endif
#ifdef EMBED_INTERPRETER
static int iram_dirty = 0;
#endif
// ----------------------------------------------------- // -----------------------------------------------------
// register i/o handlers // register i/o handlers
@ -530,7 +527,7 @@ static u32 pm_io(int reg, int write, u32 d)
((unsigned short *)svp->iram_rom)[addr&0x3ff] = d; ((unsigned short *)svp->iram_rom)[addr&0x3ff] = d;
ssp->pmac_write[reg] += inc; ssp->pmac_write[reg] += inc;
#ifdef EMBED_INTERPRETER #ifdef EMBED_INTERPRETER
iram_dirty = 1; ssp->drc.iram_dirty = 1;
#endif #endif
} }
else else

15
Pico/carthw/svp/ssp16.h
View file

@ -52,15 +52,12 @@ typedef struct
#define SSP_WAIT_MASK 0xe000 #define SSP_WAIT_MASK 0xe000
unsigned int emu_status; // 484 unsigned int emu_status; // 484
/* used by recompiler only: */ /* used by recompiler only: */
unsigned int ptr_rom; // 488 struct {
unsigned int ptr_iram_rom; // 48c unsigned int ptr_rom; // 488
unsigned int ptr_dram; // 490 unsigned int ptr_iram_rom; // 48c
/* unsigned int ptr_dram; // 490
unsigned int blocktab; unsigned int iram_dirty; // 494
unsigned int blocktab_iram; } drc;
unsigned int iram_context;
*/
unsigned int pad[27];
} ssp1601_t; } ssp1601_t;

2
Pico/carthw/svp/svp.c
View file

@ -26,7 +26,7 @@ static carthw_state_chunk svp_states[] =
{ {
{ CHUNK_IRAM, 0x800, NULL }, { CHUNK_IRAM, 0x800, NULL },
{ CHUNK_DRAM, sizeof(svp->dram), NULL }, { CHUNK_DRAM, sizeof(svp->dram), NULL },
{ CHUNK_SSP, sizeof(svp->ssp1601), NULL }, { CHUNK_SSP, sizeof(svp->ssp1601) - sizeof(svp->ssp1601.drc), NULL },
{ 0, 0, NULL } { 0, 0, NULL }
}; };