Make it compile again for -DTARGET_SKY
This commit is contained in:
parent
fc96bc860d
commit
ce4713dc3b
1 changed files with 33 additions and 32 deletions
|
@ -632,28 +632,29 @@ sim_store_register (sd,rn,memory,length)
|
||||||
HI1 = T2H_8(*(unsigned64*)memory);
|
HI1 = T2H_8(*(unsigned64*)memory);
|
||||||
return 8;
|
return 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* end-sanitize-r5900 */
|
/* end-sanitize-r5900 */
|
||||||
|
|
||||||
/* start-sanitize-sky */
|
/* start-sanitize-sky */
|
||||||
#ifdef TARGET_SKY
|
#ifdef TARGET_SKY
|
||||||
else if( rn > NUM_R5900_REGS ) {
|
if (rn > NUM_R5900_REGS)
|
||||||
rn = rn - NUM_R5900_REGS;
|
{
|
||||||
|
rn = rn - NUM_R5900_REGS;
|
||||||
if( rn < 16 )
|
|
||||||
vu_regs[0].i[rn] = T2H_2( *(unsigned short *) memory );
|
|
||||||
else if( rn < NUM_VU_REGS )
|
|
||||||
vu_regs[0].f[rn - 16] = T2H_4( *(unsigned int *) memory );
|
|
||||||
else {
|
|
||||||
rn = rn - NUM_VU_REGS;
|
|
||||||
|
|
||||||
if( rn < 16 )
|
if( rn < 16 )
|
||||||
vu_regs[1].i[rn] = T2H_2( *(unsigned short *) memory );
|
vu_regs[0].i[rn] = T2H_2( *(unsigned short *) memory );
|
||||||
else if( rn < NUM_VU_REGS )
|
else if( rn < NUM_VU_REGS )
|
||||||
vu_regs[1].f[rn - 16] = T2H_4( *(unsigned int *) memory );
|
vu_regs[0].f[rn - 16] = T2H_4( *(unsigned int *) memory );
|
||||||
else
|
else {
|
||||||
sim_io_eprintf( sd, "Invalid VU register (register store ignored)\n" );
|
rn = rn - NUM_VU_REGS;
|
||||||
|
|
||||||
|
if( rn < 16 )
|
||||||
|
vu_regs[1].i[rn] = T2H_2( *(unsigned short *) memory );
|
||||||
|
else if( rn < NUM_VU_REGS )
|
||||||
|
vu_regs[1].f[rn - 16] = T2H_4( *(unsigned int *) memory );
|
||||||
|
else
|
||||||
|
sim_io_eprintf( sd, "Invalid VU register (register store ignored)\n" );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
/* end-sanitize-sky */
|
/* end-sanitize-sky */
|
||||||
|
|
||||||
|
@ -721,31 +722,31 @@ sim_fetch_register (sd,rn,memory,length)
|
||||||
*((unsigned64*)memory) = H2T_8(HI1);
|
*((unsigned64*)memory) = H2T_8(HI1);
|
||||||
return 8;
|
return 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* end-sanitize-r5900 */
|
/* end-sanitize-r5900 */
|
||||||
|
|
||||||
/* start-sanitize-sky */
|
/* start-sanitize-sky */
|
||||||
#ifdef TARGET_SKY
|
#ifdef TARGET_SKY
|
||||||
if( rn > NUM_R5900_REGS ) {
|
if( rn > NUM_R5900_REGS )
|
||||||
rn = rn - NUM_R5900_REGS;
|
{
|
||||||
|
rn = rn - NUM_R5900_REGS;
|
||||||
if( rn < 16 )
|
|
||||||
*((unsigned short *) memory) = H2T_2( vu_regs[0].i[rn] );
|
|
||||||
else if( rn < NUM_VU_REGS )
|
|
||||||
*((unsigned int *) memory) = H2T_4( vu_regs[0].f[rn - 16] );
|
|
||||||
else {
|
|
||||||
rn = rn - NUM_VU_REGS;
|
|
||||||
|
|
||||||
if( rn < 16 )
|
if( rn < 16 )
|
||||||
(*(unsigned short *) memory) = H2T_2( vu_regs[1].i[rn] );
|
*((unsigned short *) memory) = H2T_2( vu_regs[0].i[rn] );
|
||||||
else if( rn < NUM_VU_REGS )
|
else if( rn < NUM_VU_REGS )
|
||||||
(*(unsigned int *) memory) = H2T_4( vu_regs[1].f[rn - 16] );
|
*((unsigned int *) memory) = H2T_4( vu_regs[0].f[rn - 16] );
|
||||||
else
|
else {
|
||||||
sim_io_eprintf( sd, "Invalid VU register (register fetch ignored)\n" );
|
rn = rn - NUM_VU_REGS;
|
||||||
|
|
||||||
|
if( rn < 16 )
|
||||||
|
(*(unsigned short *) memory) = H2T_2( vu_regs[1].i[rn] );
|
||||||
|
else if( rn < NUM_VU_REGS )
|
||||||
|
(*(unsigned int *) memory) = H2T_4( vu_regs[1].f[rn - 16] );
|
||||||
|
else
|
||||||
|
sim_io_eprintf( sd, "Invalid VU register (register fetch ignored)\n" );
|
||||||
|
}
|
||||||
|
return -1;
|
||||||
}
|
}
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* end-sanitize-sky */
|
/* end-sanitize-sky */
|
||||||
|
|
||||||
/* Any floating point register */
|
/* Any floating point register */
|
||||||
|
|
Loading…
Reference in a new issue