Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-24 06:30:04 +03:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Allow the non-DRC RSP core to build again

Browse Source 
(controlled by a #define like the SH-2 core) [Atari Ace]

---------- Forwarded message ----------
From: Atari Ace <atari_ace@verizon.net>

Date: Mon, Jul 5, 2010 at 3:50 PM
Subject: [patch] Fixup non-DRC rsp core
To: submit@mamedev.org
Cc: atariace@hotmail.com

Hi mamedev,

This patch fixes the non-DRC rsp core to be buildable again
(controlled by a #define like the sh2 core).  It also cleans up the
whitespace/commented-out code in that core as well.

~aa
This commit is contained in:
Phil Bennett 2010-07-15 11:22:07 +00:00
parent 84d2bf08e9
commit 5573c3f703
4 changed files with 243 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/emu/cpu/cpu.mak
View File

@ -1232,10 +1232,13 @@ $(CPUOBJ)/minx/minx.o: $(CPUSRC)/minx/minx.c \
ifneq ($(filter RSP,$(CPUS)),) ifneq ($(filter RSP,$(CPUS)),)
OBJDIRS += $(CPUOBJ)/rsp OBJDIRS += $(CPUOBJ)/rsp
CPUOBJS += $(CPUOBJ)/rsp/rspdrc.o $(CPUOBJ)/rsp/rspfe.o $(DRCOBJ) CPUOBJS += $(CPUOBJ)/rsp/rsp.o $(CPUOBJ)/rsp/rspdrc.o $(CPUOBJ)/rsp/rspfe.o $(DRCOBJ)
DASMOBJS += $(CPUOBJ)/rsp/rsp_dasm.o DASMOBJS += $(CPUOBJ)/rsp/rsp_dasm.o
endif endif
$(CPUOBJ)/rsp/rsp.o: $(CPUSRC)/rsp/rsp.c \
$(CPUSRC)/rsp/rsp.h
$(CPUOBJ)/rsp/rspdrc.o: $(CPUSRC)/rsp/rspdrc.c \ $(CPUOBJ)/rsp/rspdrc.o: $(CPUSRC)/rsp/rspdrc.c \
$(CPUSRC)/rsp/rsp.h \ $(CPUSRC)/rsp/rsp.h \
$(CPUSRC)/rsp/rspfe.h \ $(CPUSRC)/rsp/rspfe.h \

194
src/emu/cpu/rsp/rsp.c
View File

@ -10,6 +10,8 @@
CPU_DISASSEMBLE( rsp ); CPU_DISASSEMBLE( rsp );
#ifndef USE_RSPDRC
#define LOG_INSTRUCTION_EXECUTION 0 #define LOG_INSTRUCTION_EXECUTION 0
#define SAVE_DISASM 0 #define SAVE_DISASM 0
#define SAVE_DMEM 0 #define SAVE_DMEM 0
@ -183,11 +185,11 @@ static UINT32 get_cop0_reg(rsp_state *rsp, int reg)
{ {
if (reg >= 0 && reg < 8) if (reg >= 0 && reg < 8)
{ {
return (rsp->config->sp_reg_r)(rsp->program, reg, 0x00000000); return (rsp->config->sp_reg_r)(rsp->device, reg, 0x00000000);
} }
else if (reg >= 8 && reg < 16) else if (reg >= 8 && reg < 16)
{ {
return (rsp->config->dp_reg_r)(rsp->program, reg - 8, 0x00000000); return (rsp->config->dp_reg_r)(rsp->device, reg - 8, 0x00000000);
} }
else else
{ {
@ -199,11 +201,11 @@ static void set_cop0_reg(rsp_state *rsp, int reg, UINT32 data)
{ {
if (reg >= 0 && reg < 8) if (reg >= 0 && reg < 8)
{ {
(rsp->config->sp_reg_w)(rsp->program, reg, data, 0x00000000); (rsp->config->sp_reg_w)(rsp->device, reg, data, 0x00000000);
} }
else if (reg >= 8 && reg < 16) else if (reg >= 8 && reg < 16)
{ {
(rsp->config->dp_reg_w)(rsp->program, reg - 8, data, 0x00000000); (rsp->config->dp_reg_w)(rsp->device, reg - 8, data, 0x00000000);
} }
else else
{ {
@ -298,8 +300,8 @@ static const int vector_elements_2[16][8] =
static CPU_INIT( rsp ) static CPU_INIT( rsp )
{ {
rsp_state *rsp = get_safe_token(device); rsp_state *rsp = get_safe_token(device);
int regIdx; int regIdx;
int accumIdx; int accumIdx;
rsp->config = (const rsp_config *)device->baseconfig().static_config(); rsp->config = (const rsp_config *)device->baseconfig().static_config();
if (LOG_INSTRUCTION_EXECUTION) if (LOG_INSTRUCTION_EXECUTION)
@ -310,7 +312,7 @@ static CPU_INIT( rsp )
rsp->program = device->space(AS_PROGRAM); rsp->program = device->space(AS_PROGRAM);
#if 1 #if 1
// Inaccurate. RSP registers power on to a random state... // Inaccurate. RSP registers power on to a random state...
for(regIdx = 0; regIdx < 32; regIdx++ ) for(regIdx = 0; regIdx < 32; regIdx++ )
{ {
rsp->r[regIdx] = 0; rsp->r[regIdx] = 0;
@ -327,16 +329,16 @@ static CPU_INIT( rsp )
rsp->reciprocal_high = 0; rsp->reciprocal_high = 0;
#endif #endif
// ...except for the accumulators. // ...except for the accumulators.
// We're not calling mame_rand() because initializing something with mame_rand() // We're not calling mame_rand() because initializing something with mame_rand()
// makes me retch uncontrollably. // makes me retch uncontrollably.
for(accumIdx = 0; accumIdx < 8; accumIdx++ ) for(accumIdx = 0; accumIdx < 8; accumIdx++ )
{ {
rsp->accum[accumIdx].l = 0; rsp->accum[accumIdx].l = 0;
} }
rsp->sr = RSP_STATUS_HALT; rsp->sr = RSP_STATUS_HALT;
rsp->step_count = 0; rsp->step_count = 0;
} }
static CPU_EXIT( rsp ) static CPU_EXIT( rsp )
@ -1034,18 +1036,18 @@ INLINE UINT16 SATURATE_ACCUM(rsp_state *rsp, int accum, int slice, UINT16 negati
#if 0 #if 0
static float float_round(float input) static float float_round(float input)
{ {
INT32 integer = (INT32)input; INT32 integer = (INT32)input;
float fraction = input - (float)integer; float fraction = input - (float)integer;
float output = 0.0f; float output = 0.0f;
if( fraction >= 0.5f ) if( fraction >= 0.5f )
{ {
output = (float)( integer + 1 ); output = (float)( integer + 1 );
} }
else else
{ {
output = (float)integer; output = (float)integer;
} }
return output; return output;
} }
#endif #endif
@ -2668,19 +2670,19 @@ static CPU_EXECUTE( rsp )
// ------------------------------------------------ // ------------------------------------------------
// //
if (RTREG) if (RTREG)
{ {
if (RDREG == 2) if (RDREG == 2)
{ {
// Anciliary clipping flags // Anciliary clipping flags
RTVAL = rsp->flag[RDREG] & 0x00ff; RTVAL = rsp->flag[RDREG] & 0x00ff;
} }
else else
{ {
// All other flags are 16 bits but sign-extended at retrieval // All other flags are 16 bits but sign-extended at retrieval
RTVAL = (UINT32)rsp->flag[RDREG] | ( ( rsp->flag[RDREG] & 0x8000 ) ? 0xffff0000 : 0 ); RTVAL = (UINT32)rsp->flag[RDREG] | ( ( rsp->flag[RDREG] & 0x8000 ) ? 0xffff0000 : 0 );
} }
} }
break; break;
} }
case 0x04: /* MTC2 */ case 0x04: /* MTC2 */
@ -2787,14 +2789,14 @@ static CPU_EXECUTE( rsp )
if( rsp->sr & RSP_STATUS_SSTEP ) if( rsp->sr & RSP_STATUS_SSTEP )
{ {
if( rsp->step_count ) if( rsp->step_count )
{ {
rsp->step_count--; rsp->step_count--;
} }
else else
{ {
rsp->sr |= RSP_STATUS_BROKE; rsp->sr |= RSP_STATUS_BROKE;
} }
} }
if( rsp->sr & ( RSP_STATUS_HALT | RSP_STATUS_BROKE ) ) if( rsp->sr & ( RSP_STATUS_HALT | RSP_STATUS_BROKE ) )
@ -2818,43 +2820,43 @@ static CPU_SET_INFO( rsp )
{ {
/* --- the following bits of info are set as 64-bit signed integers --- */ /* --- the following bits of info are set as 64-bit signed integers --- */
case CPUINFO_INT_PC: case CPUINFO_INT_PC:
case CPUINFO_INT_REGISTER + RSP_PC: rsp->pc = info->i; break; case CPUINFO_INT_REGISTER + RSP_PC: rsp->pc = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R0: rsp->r[0] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R0: rsp->r[0] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R1: rsp->r[1] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R1: rsp->r[1] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R2: rsp->r[2] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R2: rsp->r[2] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R3: rsp->r[3] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R3: rsp->r[3] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R4: rsp->r[4] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R4: rsp->r[4] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R5: rsp->r[5] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R5: rsp->r[5] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R6: rsp->r[6] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R6: rsp->r[6] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R7: rsp->r[7] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R7: rsp->r[7] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R8: rsp->r[8] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R8: rsp->r[8] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R9: rsp->r[9] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R9: rsp->r[9] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R10: rsp->r[10] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R10: rsp->r[10] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R11: rsp->r[11] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R11: rsp->r[11] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R12: rsp->r[12] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R12: rsp->r[12] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R13: rsp->r[13] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R13: rsp->r[13] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R14: rsp->r[14] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R14: rsp->r[14] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R15: rsp->r[15] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R15: rsp->r[15] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R16: rsp->r[16] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R16: rsp->r[16] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R17: rsp->r[17] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R17: rsp->r[17] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R18: rsp->r[18] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R18: rsp->r[18] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R19: rsp->r[19] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R19: rsp->r[19] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R20: rsp->r[20] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R20: rsp->r[20] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R21: rsp->r[21] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R21: rsp->r[21] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R22: rsp->r[22] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R22: rsp->r[22] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R23: rsp->r[23] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R23: rsp->r[23] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R24: rsp->r[24] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R24: rsp->r[24] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R25: rsp->r[25] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R25: rsp->r[25] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R26: rsp->r[26] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R26: rsp->r[26] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R27: rsp->r[27] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R27: rsp->r[27] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R28: rsp->r[28] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R28: rsp->r[28] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R29: rsp->r[29] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R29: rsp->r[29] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R30: rsp->r[30] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R30: rsp->r[30] = info->i; break;
case CPUINFO_INT_SP: case CPUINFO_INT_SP:
case CPUINFO_INT_REGISTER + RSP_R31: rsp->r[31] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R31: rsp->r[31] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_SR: rsp->sr = info->i; break; case CPUINFO_INT_REGISTER + RSP_SR: rsp->sr = info->i; break;
case CPUINFO_INT_REGISTER + RSP_NEXTPC: rsp->nextpc = info->i; break; case CPUINFO_INT_REGISTER + RSP_NEXTPC: rsp->nextpc = info->i; break;
case CPUINFO_INT_REGISTER + RSP_STEPCNT: rsp->step_count = info->i; break; case CPUINFO_INT_REGISTER + RSP_STEPCNT: rsp->step_count = info->i; break;
} }
} }
@ -2928,7 +2930,7 @@ CPU_GET_INFO( rsp )
case CPUINFO_INT_REGISTER + RSP_R31: info->i = rsp->r[31]; break; case CPUINFO_INT_REGISTER + RSP_R31: info->i = rsp->r[31]; break;
case CPUINFO_INT_REGISTER + RSP_SR: info->i = rsp->sr; break; case CPUINFO_INT_REGISTER + RSP_SR: info->i = rsp->sr; break;
case CPUINFO_INT_REGISTER + RSP_NEXTPC: info->i = rsp->nextpc; break; case CPUINFO_INT_REGISTER + RSP_NEXTPC: info->i = rsp->nextpc; break;
case CPUINFO_INT_REGISTER + RSP_STEPCNT: info->i = rsp->step_count; break; case CPUINFO_INT_REGISTER + RSP_STEPCNT: info->i = rsp->step_count; break;
/* --- the following bits of info are returned as pointers to data or functions --- */ /* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(rsp); break; case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(rsp); break;
@ -2985,8 +2987,26 @@ CPU_GET_INFO( rsp )
case CPUINFO_STR_REGISTER + RSP_R31: sprintf(info->s, "R31: %08X", rsp->r[31]); break; case CPUINFO_STR_REGISTER + RSP_R31: sprintf(info->s, "R31: %08X", rsp->r[31]); break;
case CPUINFO_STR_REGISTER + RSP_SR: sprintf(info->s, "SR: %08X", rsp->sr); break; case CPUINFO_STR_REGISTER + RSP_SR: sprintf(info->s, "SR: %08X", rsp->sr); break;
case CPUINFO_STR_REGISTER + RSP_NEXTPC: sprintf(info->s, "NPC: %08X", rsp->nextpc);break; case CPUINFO_STR_REGISTER + RSP_NEXTPC: sprintf(info->s, "NPC: %08X", rsp->nextpc);break;
case CPUINFO_STR_REGISTER + RSP_STEPCNT: sprintf(info->s, "STEP: %d", rsp->step_count); break; case CPUINFO_STR_REGISTER + RSP_STEPCNT: sprintf(info->s, "STEP: %d", rsp->step_count); break;
} }
} }
void rspdrc_set_options(running_device *device, UINT32 options)
{
}
void rspdrc_add_imem(running_device *device, void *base)
{
}
void rspdrc_add_dmem(running_device *device, void *base)
{
}
void rspdrc_flush_drc_cache(running_device *device)
{
}
DEFINE_LEGACY_CPU_DEVICE(RSP, rsp); DEFINE_LEGACY_CPU_DEVICE(RSP, rsp);
#endif // USE_RSPDRC

4
src/emu/cpu/rsp/rsp.h
View File

@ -16,7 +16,7 @@
#ifndef __RSP_H__ #ifndef __RSP_H__
#define __RSP_H__ #define __RSP_H__
#define USE_RSPDRC
/*************************************************************************** /***************************************************************************
REGISTER ENUMERATION REGISTER ENUMERATION
@ -197,7 +197,7 @@ struct _rsp_state
VECTOR_REG v[32]; VECTOR_REG v[32];
UINT16 flag[4]; UINT16 flag[4];
UINT32 sr; UINT32 sr;
UINT32 step_count; UINT32 step_count;
ACCUMULATOR accum[8]; ACCUMULATOR accum[8];
INT32 square_root_res; INT32 square_root_res;

249
src/emu/cpu/rsp/rspdrc.c
View File

@ -31,6 +31,8 @@ CPU_DISASSEMBLE( rsp );
extern offs_t rsp_dasm_one(char *buffer, offs_t pc, UINT32 op); extern offs_t rsp_dasm_one(char *buffer, offs_t pc, UINT32 op);
#ifdef USE_RSPDRC
/*************************************************************************** /***************************************************************************
DEBUGGING DEBUGGING
***************************************************************************/ ***************************************************************************/
@ -546,12 +548,14 @@ void rspdrc_add_dmem(running_device *device, void *base)
debugging debugging
-------------------------------------------------*/ -------------------------------------------------*/
//static void cfunc_printf_debug(void *param) #ifdef UNUSED_FUNCTION
//{ static void cfunc_printf_debug(void *param)
// rsp_state *rsp = (rsp_state *)param; {
// printf(rsp->impstate->format, rsp->impstate->arg0, rsp->impstate->arg1); rsp_state *rsp = (rsp_state *)param;
// logerror(rsp->impstate->format, rsp->impstate->arg0, rsp->impstate->arg1); printf(rsp->impstate->format, rsp->impstate->arg0, rsp->impstate->arg1);
//} logerror(rsp->impstate->format, rsp->impstate->arg0, rsp->impstate->arg1);
}
#endif
/*------------------------------------------------- /*-------------------------------------------------
@ -559,13 +563,14 @@ void rspdrc_add_dmem(running_device *device, void *base)
debugging 64-bit values debugging 64-bit values
-------------------------------------------------*/ -------------------------------------------------*/
//static void cfunc_printf_debug64(void *param) #ifdef UNUSED_FUNCTION
//{ static void cfunc_printf_debug64(void *param)
// rsp_state *rsp = (rsp_state *)param; {
// printf(rsp->impstate->format, (UINT32)(rsp->impstate->arg64 >> 32), (UINT32)(rsp->impstate->arg64 & 0x00000000ffffffff)); rsp_state *rsp = (rsp_state *)param;
// logerror(rsp->impstate->format, (UINT32)(rsp->impstate->arg64 >> 32), (UINT32)(rsp->impstate->arg64 & 0x00000000ffffffff)); printf(rsp->impstate->format, (UINT32)(rsp->impstate->arg64 >> 32), (UINT32)(rsp->impstate->arg64 & 0x00000000ffffffff));
//} logerror(rsp->impstate->format, (UINT32)(rsp->impstate->arg64 >> 32), (UINT32)(rsp->impstate->arg64 & 0x00000000ffffffff));
}
#endif
static void cfunc_get_cop0_reg(void *param) static void cfunc_get_cop0_reg(void *param)
{ {
@ -713,14 +718,14 @@ static void rspcom_init(rsp_state *rsp, legacy_cpu_device *device, device_irq_ca
rsp->reciprocal_high = 0; rsp->reciprocal_high = 0;
#endif #endif
// ...except for the accumulators. // ...except for the accumulators.
for(accumIdx = 0; accumIdx < 8; accumIdx++ ) for(accumIdx = 0; accumIdx < 8; accumIdx++ )
{ {
rsp->accum[accumIdx].l = 0; rsp->accum[accumIdx].l = 0;
} }
rsp->sr = RSP_STATUS_HALT; rsp->sr = RSP_STATUS_HALT;
rsp->step_count = 0; rsp->step_count = 0;
} }
static CPU_INIT( rsp ) static CPU_INIT( rsp )
@ -1452,14 +1457,14 @@ static int generate_lwc2(rsp_state *rsp, drcuml_block *block, compiler_state *co
#endif #endif
case 0x07: /* LUV */ case 0x07: /* LUV */
#if (DRC_LUV) #if (DRC_LUV)
/* #ifdef UNUSED_CODE
ea = (base) ? rsp->r[base] + (offset * 8) : (offset * 8); ea = (base) ? rsp->r[base] + (offset * 8) : (offset * 8);
for (i=0; i < 8; i++) for (i=0; i < 8; i++)
{ {
W_VREG_S(dest, i, READ8(rsp, ea + (((16-index) + i) & 0xf)) << 7); W_VREG_S(dest, i, READ8(rsp, ea + (((16-index) + i) & 0xf)) << 7);
} }
*/ #endif
offset <<= 3; offset <<= 3;
UML_ADD(block, IREG(2), R32(RSREG), IMM(offset)); // add i2,<rsreg>,offset UML_ADD(block, IREG(2), R32(RSREG), IMM(offset)); // add i2,<rsreg>,offset
@ -2115,25 +2120,25 @@ static int generate_swc2(rsp_state *rsp, drcuml_block *block, compiler_state *co
#if (DRC_VMADN) #if (DRC_VMADN)
static void generate_saturate_accum_unsigned(rsp_state *rsp, drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, int accum) static void generate_saturate_accum_unsigned(rsp_state *rsp, drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, int accum)
{ {
/* #ifdef UNUSED_CODE
int skip, skip2; int skip, skip2;
UML_CMP(block, VACCUMWMH(accum), IMM(-32768)); UML_CMP(block, VACCUMWMH(accum), IMM(-32768));
UML_JMPc(block, IF_GE, skip = compiler->labelnum++); UML_JMPc(block, IF_GE, skip = compiler->labelnum++);
UML_MOV(block, IREG(0), IMM(0)); UML_MOV(block, IREG(0), IMM(0));
UML_JMP(block, skip2 = compiler->labelnum++); UML_JMP(block, skip2 = compiler->labelnum++);
UML_LABEL(block, skip); UML_LABEL(block, skip);
UML_CMP(block, VACCUMWMH(accum), IMM(32767)); UML_CMP(block, VACCUMWMH(accum), IMM(32767));
UML_JMPc(block, IF_L, skip = compiler->labelnum++); UML_JMPc(block, IF_L, skip = compiler->labelnum++);
UML_MOV(block, IREG(0), IMM(0x0000ffff)); UML_MOV(block, IREG(0), IMM(0x0000ffff));
UML_JMP(block, skip2); UML_JMP(block, skip2);
UML_LABEL(block, skip); UML_LABEL(block, skip);
UML_SEXT(block, IREG(0), VACCUMHL(accum), WORD); UML_SEXT(block, IREG(0), VACCUMHL(accum), WORD);
UML_AND(block, IREG(0), IREG(0), IMM(0x0000ffff)); UML_AND(block, IREG(0), IREG(0), IMM(0x0000ffff));
UML_LABEL(block, skip2); UML_LABEL(block, skip2);
*/ #endif
UML_SEXT(block, IREG(0), VACCUMHL(accum), WORD); UML_SEXT(block, IREG(0), VACCUMHL(accum), WORD);
UML_AND(block, IREG(0), IREG(0), IMM(0x0000ffff)); UML_AND(block, IREG(0), IREG(0), IMM(0x0000ffff));
UML_CMP(block, VACCUMWMH(accum), IMM(-32768)); UML_CMP(block, VACCUMWMH(accum), IMM(-32768));
@ -2210,18 +2215,18 @@ INLINE UINT16 SATURATE_ACCUM_SIGNED(rsp_state *rsp, int accum)
#if 0 #if 0
static float float_round(float input) static float float_round(float input)
{ {
INT32 integer = (INT32)input; INT32 integer = (INT32)input;
float fraction = input - (float)integer; float fraction = input - (float)integer;
float output = 0.0f; float output = 0.0f;
if( fraction >= 0.5f ) if( fraction >= 0.5f )
{ {
output = (float)( integer + 1 ); output = (float)( integer + 1 );
} }
else else
{ {
output = (float)integer; output = (float)integer;
} }
return output; return output;
} }
#endif #endif
@ -2865,23 +2870,23 @@ INLINE void cfunc_rsp_vmudm(void *param)
break; break;
} }
/* #ifdef UNUSED_CODE
for (i=0; i < 8; i++) for (i=0; i < 8; i++)
{ {
int del = VEC_EL_1(EL, i); int del = VEC_EL_1(EL, i);
int sel = VEC_EL_2(EL, del); int sel = VEC_EL_2(EL, del);
INT32 s1 = (INT32)(INT16)R_VREG_S(VS1REG, del); INT32 s1 = (INT32)(INT16)R_VREG_S(VS1REG, del);
INT32 s2 = (UINT16)R_VREG_S(VS2REG, sel); // not sign-extended INT32 s2 = (UINT16)R_VREG_S(VS2REG, sel); // not sign-extended
INT32 r = s1 * s2; INT32 r = s1 * s2;
W_ACCUM_H(del, (r < 0) ? 0xffff : 0); // sign-extend to 48-bit W_ACCUM_H(del, (r < 0) ? 0xffff : 0); // sign-extend to 48-bit
W_ACCUM_M(del, (INT16)(r >> 16)); W_ACCUM_M(del, (INT16)(r >> 16));
W_ACCUM_L(del, (UINT16)(r)); W_ACCUM_L(del, (UINT16)(r));
vres[del] = ACCUM(del).h.mid; vres[del] = ACCUM(del).h.mid;
} }
WRITEBACK_RESULT(); WRITEBACK_RESULT();
*/ #endif
} }
#endif #endif
@ -7306,10 +7311,12 @@ static void cfunc_unimplemented(void *param)
cfunc_fatalerror - a generic fatalerror call cfunc_fatalerror - a generic fatalerror call
-------------------------------------------------*/ -------------------------------------------------*/
//static void cfunc_fatalerror(void *param) #ifdef UNUSED_CODE
//{ static void cfunc_fatalerror(void *param)
//fatalerror("fatalerror"); {
//} fatalerror("fatalerror");
}
#endif
/*************************************************************************** /***************************************************************************
@ -7654,12 +7661,14 @@ static void generate_sequence_instruction(rsp_state *rsp, drcuml_block *block, c
} }
/* if we hit an unmapped address, fatal error */ /* if we hit an unmapped address, fatal error */
//if (desc->flags & OPFLAG_COMPILER_UNMAPPED) #if 0
//{ if (desc->flags & OPFLAG_COMPILER_UNMAPPED)
// UML_MOV(block, MEM(&rsp->pc), IMM(desc->pc)); // mov [pc],desc->pc {
// save_fast_iregs(rsp, block); UML_MOV(block, MEM(&rsp->pc), IMM(desc->pc)); // mov [pc],desc->pc
// UML_EXIT(block, IMM(EXECUTE_UNMAPPED_CODE)); // exit EXECUTE_UNMAPPED_CODE save_fast_iregs(rsp, block);
//} UML_EXIT(block, IMM(EXECUTE_UNMAPPED_CODE)); // exit EXECUTE_UNMAPPED_CODE
}
#endif
/* otherwise, unless this is a virtual no-op, it's a regular instruction */ /* otherwise, unless this is a virtual no-op, it's a regular instruction */
/*else*/ if (!(desc->flags & OPFLAG_VIRTUAL_NOOP)) /*else*/ if (!(desc->flags & OPFLAG_VIRTUAL_NOOP))
@ -8196,7 +8205,7 @@ static int generate_opcode(rsp_state *rsp, drcuml_block *block, compiler_state *
/* ----- unimplemented/illegal instructions ----- */ /* ----- unimplemented/illegal instructions ----- */
// default: /* ??? */ invalid_instruction(op); break; //default: /* ??? */ invalid_instruction(op); break;
} }
return FALSE; return FALSE;
@ -8547,43 +8556,43 @@ static CPU_SET_INFO( rsp )
{ {
/* --- the following bits of info are set as 64-bit signed integers --- */ /* --- the following bits of info are set as 64-bit signed integers --- */
case CPUINFO_INT_PC: case CPUINFO_INT_PC:
case CPUINFO_INT_REGISTER + RSP_PC: rsp->pc = info->i; break; case CPUINFO_INT_REGISTER + RSP_PC: rsp->pc = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R0: rsp->r[0] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R0: rsp->r[0] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R1: rsp->r[1] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R1: rsp->r[1] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R2: rsp->r[2] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R2: rsp->r[2] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R3: rsp->r[3] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R3: rsp->r[3] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R4: rsp->r[4] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R4: rsp->r[4] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R5: rsp->r[5] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R5: rsp->r[5] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R6: rsp->r[6] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R6: rsp->r[6] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R7: rsp->r[7] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R7: rsp->r[7] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R8: rsp->r[8] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R8: rsp->r[8] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R9: rsp->r[9] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R9: rsp->r[9] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R10: rsp->r[10] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R10: rsp->r[10] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R11: rsp->r[11] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R11: rsp->r[11] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R12: rsp->r[12] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R12: rsp->r[12] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R13: rsp->r[13] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R13: rsp->r[13] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R14: rsp->r[14] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R14: rsp->r[14] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R15: rsp->r[15] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R15: rsp->r[15] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R16: rsp->r[16] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R16: rsp->r[16] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R17: rsp->r[17] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R17: rsp->r[17] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R18: rsp->r[18] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R18: rsp->r[18] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R19: rsp->r[19] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R19: rsp->r[19] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R20: rsp->r[20] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R20: rsp->r[20] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R21: rsp->r[21] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R21: rsp->r[21] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R22: rsp->r[22] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R22: rsp->r[22] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R23: rsp->r[23] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R23: rsp->r[23] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R24: rsp->r[24] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R24: rsp->r[24] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R25: rsp->r[25] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R25: rsp->r[25] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R26: rsp->r[26] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R26: rsp->r[26] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R27: rsp->r[27] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R27: rsp->r[27] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R28: rsp->r[28] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R28: rsp->r[28] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R29: rsp->r[29] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R29: rsp->r[29] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_R30: rsp->r[30] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R30: rsp->r[30] = info->i; break;
case CPUINFO_INT_SP: case CPUINFO_INT_SP:
case CPUINFO_INT_REGISTER + RSP_R31: rsp->r[31] = info->i; break; case CPUINFO_INT_REGISTER + RSP_R31: rsp->r[31] = info->i; break;
case CPUINFO_INT_REGISTER + RSP_SR: rsp->sr = info->i; break; case CPUINFO_INT_REGISTER + RSP_SR: rsp->sr = info->i; break;
case CPUINFO_INT_REGISTER + RSP_NEXTPC: rsp->nextpc = info->i; break; case CPUINFO_INT_REGISTER + RSP_NEXTPC: rsp->nextpc = info->i; break;
case CPUINFO_INT_REGISTER + RSP_STEPCNT: rsp->step_count = info->i; break; case CPUINFO_INT_REGISTER + RSP_STEPCNT: rsp->step_count = info->i; break;
} }
} }
@ -8657,7 +8666,7 @@ CPU_GET_INFO( rsp )
case CPUINFO_INT_REGISTER + RSP_R31: info->i = rsp->r[31]; break; case CPUINFO_INT_REGISTER + RSP_R31: info->i = rsp->r[31]; break;
case CPUINFO_INT_REGISTER + RSP_SR: info->i = rsp->sr; break; case CPUINFO_INT_REGISTER + RSP_SR: info->i = rsp->sr; break;
case CPUINFO_INT_REGISTER + RSP_NEXTPC: info->i = rsp->nextpc; break; case CPUINFO_INT_REGISTER + RSP_NEXTPC: info->i = rsp->nextpc; break;
case CPUINFO_INT_REGISTER + RSP_STEPCNT: info->i = rsp->step_count; break; case CPUINFO_INT_REGISTER + RSP_STEPCNT: info->i = rsp->step_count; break;
/* --- the following bits of info are returned as pointers to data or functions --- */ /* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(rsp); break; case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(rsp); break;
@ -8714,8 +8723,10 @@ CPU_GET_INFO( rsp )
case CPUINFO_STR_REGISTER + RSP_R31: sprintf(info->s, "R31: %08X", rsp->r[31]); break; case CPUINFO_STR_REGISTER + RSP_R31: sprintf(info->s, "R31: %08X", rsp->r[31]); break;
case CPUINFO_STR_REGISTER + RSP_SR: sprintf(info->s, "SR: %08X", rsp->sr); break; case CPUINFO_STR_REGISTER + RSP_SR: sprintf(info->s, "SR: %08X", rsp->sr); break;
case CPUINFO_STR_REGISTER + RSP_NEXTPC: sprintf(info->s, "NPC: %08X", rsp->nextpc);break; case CPUINFO_STR_REGISTER + RSP_NEXTPC: sprintf(info->s, "NPC: %08X", rsp->nextpc);break;
case CPUINFO_STR_REGISTER + RSP_STEPCNT: sprintf(info->s, "STEP: %d", rsp->step_count); break; case CPUINFO_STR_REGISTER + RSP_STEPCNT: sprintf(info->s, "STEP: %d", rsp->step_count); break;
} }
} }
DEFINE_LEGACY_CPU_DEVICE(RSP, rsp); DEFINE_LEGACY_CPU_DEVICE(RSP, rsp);
#endif // USE_RSPDRC