Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-23 14:19:01 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

PowerPC DRC no longer references active CPU.

Browse Source
This commit is contained in:
Aaron Giles 2008-11-26 19:49:42 +00:00
parent 5cfad18a84
commit c2ca1ef0cb
5 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emu/cpu/powerpc/drc_ops.c
View File

@ -132,7 +132,7 @@ static UINT32 *ppcdrc_getopptr(UINT32 address)
address &= ~0x07; address &= ~0x07;
} }
result = (UINT32 *) memory_decrypted_read_ptr(cpu_get_address_space(Machine->activecpu, ADDRESS_SPACE_PROGRAM), address); result = (UINT32 *) memory_decrypted_read_ptr(ppc.core->program, address);
if (result) if (result)
result += offset; result += offset;
return result; return result;

2
src/emu/cpu/powerpc/ppc_mem.c
View File

@ -209,7 +209,7 @@ static int ppc_translate_address(offs_t *addr_ptr, int flags)
| (((ppc.sdr1 & 0x01FF) & (hash >> 10)) << 16) | (((ppc.sdr1 & 0x01FF) & (hash >> 10)) << 16)
| ((hash & 0x03FF) << 6); | ((hash & 0x03FF) << 6);
pteg_ptr[hash_type] = memory_get_read_ptr(cpu_get_address_space(Machine->activecpu), ADDRESS_SPACE_PROGRAM), pteg_address); pteg_ptr[hash_type] = memory_get_read_ptr(ppc->program, pteg_address);
if (pteg_ptr[hash_type]) if (pteg_ptr[hash_type])
{ {
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)

23
src/emu/cpu/powerpc/ppccom.c
View File

@ -123,7 +123,7 @@ INLINE void set_xer(powerpc_state *ppc, UINT32 value)
INLINE UINT64 get_timebase(powerpc_state *ppc) INLINE UINT64 get_timebase(powerpc_state *ppc)
{ {
return (cpu_get_total_cycles(Machine->cpu[ppc->cpunum]) - ppc->tb_zero_cycles) / ppc->tb_divisor; return (cpu_get_total_cycles(ppc->device) - ppc->tb_zero_cycles) / ppc->tb_divisor;
} }
@ -133,7 +133,7 @@ INLINE UINT64 get_timebase(powerpc_state *ppc)
INLINE void set_timebase(powerpc_state *ppc, UINT64 newtb) INLINE void set_timebase(powerpc_state *ppc, UINT64 newtb)
{ {
ppc->tb_zero_cycles = cpu_get_total_cycles(Machine->activecpu) - newtb * ppc->tb_divisor; ppc->tb_zero_cycles = cpu_get_total_cycles(ppc->device) - newtb * ppc->tb_divisor;
} }
@ -144,7 +144,7 @@ INLINE void set_timebase(powerpc_state *ppc, UINT64 newtb)
INLINE UINT32 get_decrementer(powerpc_state *ppc) INLINE UINT32 get_decrementer(powerpc_state *ppc)
{ {
INT64 cycles_until_zero = ppc->dec_zero_cycles - cpu_get_total_cycles(Machine->cpu[ppc->cpunum]); INT64 cycles_until_zero = ppc->dec_zero_cycles - cpu_get_total_cycles(ppc->device);
cycles_until_zero = MAX(cycles_until_zero, 0); cycles_until_zero = MAX(cycles_until_zero, 0);
return cycles_until_zero / ppc->tb_divisor; return cycles_until_zero / ppc->tb_divisor;
} }
@ -161,13 +161,13 @@ INLINE void set_decrementer(powerpc_state *ppc, UINT32 newdec)
if (PRINTF_DECREMENTER) if (PRINTF_DECREMENTER)
{ {
UINT64 total = cpu_get_total_cycles(Machine->cpu[ppc->cpunum]); UINT64 total = cpu_get_total_cycles(ppc->device);
mame_printf_debug("set_decrementer: olddec=%08X newdec=%08X divisor=%d totalcyc=%08X%08X timer=%08X%08X\n", mame_printf_debug("set_decrementer: olddec=%08X newdec=%08X divisor=%d totalcyc=%08X%08X timer=%08X%08X\n",
curdec, newdec, ppc->tb_divisor, curdec, newdec, ppc->tb_divisor,
(UINT32)(total >> 32), (UINT32)total, (UINT32)(cycles_until_done >> 32), (UINT32)cycles_until_done); (UINT32)(total >> 32), (UINT32)total, (UINT32)(cycles_until_done >> 32), (UINT32)cycles_until_done);
} }
ppc->dec_zero_cycles = cpu_get_total_cycles(Machine->cpu[ppc->cpunum]) + cycles_until_done; ppc->dec_zero_cycles = cpu_get_total_cycles(ppc->device) + cycles_until_done;
timer_adjust_oneshot(ppc->decrementer_int_timer, cpu_clocks_to_attotime(ppc->device, cycles_until_done), 0); timer_adjust_oneshot(ppc->decrementer_int_timer, cpu_clocks_to_attotime(ppc->device, cycles_until_done), 0);
if ((INT32)curdec >= 0 && (INT32)newdec < 0) if ((INT32)curdec >= 0 && (INT32)newdec < 0)
@ -191,7 +191,6 @@ void ppccom_init(powerpc_state *ppc, powerpc_flavor flavor, UINT8 cap, int tb_di
/* initialize based on the config */ /* initialize based on the config */
memset(ppc, 0, sizeof(*ppc)); memset(ppc, 0, sizeof(*ppc));
ppc->cpunum = cpunum_get_active();
ppc->flavor = flavor; ppc->flavor = flavor;
ppc->cap = cap; ppc->cap = cap;
ppc->cache_line_size = 32; ppc->cache_line_size = 32;
@ -280,7 +279,7 @@ void ppccom_reset(powerpc_state *ppc)
ppc->msr = MSROEA_IP; ppc->msr = MSROEA_IP;
/* reset the decrementer */ /* reset the decrementer */
ppc->dec_zero_cycles = cpu_get_total_cycles(Machine->cpu[ppc->cpunum]); ppc->dec_zero_cycles = cpu_get_total_cycles(ppc->device);
decrementer_int_callback(Machine, ppc, 0); decrementer_int_callback(Machine, ppc, 0);
} }
@ -301,7 +300,7 @@ void ppccom_reset(powerpc_state *ppc)
ppc->spr[SPR603_HID0] = 1; ppc->spr[SPR603_HID0] = 1;
/* time base starts here */ /* time base starts here */
ppc->tb_zero_cycles = cpu_get_total_cycles(Machine->cpu[ppc->cpunum]); ppc->tb_zero_cycles = cpu_get_total_cycles(ppc->device);
/* clear interrupts */ /* clear interrupts */
ppc->irq_pending = 0; ppc->irq_pending = 0;
@ -428,7 +427,7 @@ static UINT32 ppccom_translate_address_internal(powerpc_state *ppc, int intentio
for (hashnum = 0; hashnum < 2; hashnum++) for (hashnum = 0; hashnum < 2; hashnum++)
{ {
offs_t ptegaddr = hashbase | ((hash << 6) & hashmask); offs_t ptegaddr = hashbase | ((hash << 6) & hashmask);
UINT32 *ptegptr = memory_get_read_ptr(cpu_get_address_space(Machine->activecpu, ADDRESS_SPACE_PROGRAM), ptegaddr); UINT32 *ptegptr = memory_get_read_ptr(ppc->program, ptegaddr);
/* should only have valid memory here, but make sure */ /* should only have valid memory here, but make sure */
if (ptegptr != NULL) if (ptegptr != NULL)
@ -1255,7 +1254,7 @@ static TIMER_CALLBACK( decrementer_int_callback )
/* advance by another full rev */ /* advance by another full rev */
ppc->dec_zero_cycles += (UINT64)ppc->tb_divisor << 32; ppc->dec_zero_cycles += (UINT64)ppc->tb_divisor << 32;
cycles_until_next = ppc->dec_zero_cycles - cpu_get_total_cycles(machine->cpu[ppc->cpunum]); cycles_until_next = ppc->dec_zero_cycles - cpu_get_total_cycles(ppc->device);
timer_adjust_oneshot(ppc->decrementer_int_timer, cpu_clocks_to_attotime(ppc->device, cycles_until_next), 0); timer_adjust_oneshot(ppc->decrementer_int_timer, cpu_clocks_to_attotime(ppc->device, cycles_until_next), 0);
} }
@ -1377,7 +1376,7 @@ static int ppc4xx_dma_fetch_transmit_byte(powerpc_state *ppc, int dmachan, UINT8
return FALSE; return FALSE;
/* fetch the data */ /* fetch the data */
cpu_push_context(Machine->cpu[ppc->cpunum]); cpu_push_context(ppc->device);
*byte = memory_read_byte(ppc->program, dmaregs[DCR4XX_DMADA0]++); *byte = memory_read_byte(ppc->program, dmaregs[DCR4XX_DMADA0]++);
ppc4xx_dma_decrement_count(ppc, dmachan); ppc4xx_dma_decrement_count(ppc, dmachan);
cpu_pop_context(); cpu_pop_context();
@ -1403,7 +1402,7 @@ static int ppc4xx_dma_handle_receive_byte(powerpc_state *ppc, int dmachan, UINT8
return FALSE; return FALSE;
/* store the data */ /* store the data */
cpu_push_context(Machine->cpu[ppc->cpunum]); cpu_push_context(ppc->device);
memory_write_byte(ppc->program, dmaregs[DCR4XX_DMADA0]++, byte); memory_write_byte(ppc->program, dmaregs[DCR4XX_DMADA0]++, byte);
ppc4xx_dma_decrement_count(ppc, dmachan); ppc4xx_dma_decrement_count(ppc, dmachan);
cpu_pop_context(); cpu_pop_context();

1
src/emu/cpu/powerpc/ppccom.h
View File

@ -552,7 +552,6 @@ struct _powerpc_state
UINT32 mmu603_r[4]; UINT32 mmu603_r[4];
/* internal stuff */ /* internal stuff */
int cpunum;
cpu_irq_callback irq_callback; cpu_irq_callback irq_callback;
const device_config *device; const device_config *device;
const address_space *program; const address_space *program;

4
src/emu/cpu/powerpc/ppcdrc.c
View File

@ -976,7 +976,7 @@ static void code_compile_block(drcuml_state *drcuml, UINT8 mode, offs_t pc)
} }
/* validate this code block if we're not pointing into ROM */ /* validate this code block if we're not pointing into ROM */
if (memory_get_write_ptr(cpu_get_address_space(Machine->activecpu, ADDRESS_SPACE_PROGRAM), seqhead->physpc) != NULL) if (memory_get_write_ptr(ppc->program, seqhead->physpc) != NULL)
generate_checksum_block(block, &compiler, seqhead, seqlast); // <checksum> generate_checksum_block(block, &compiler, seqhead, seqlast); // <checksum>
/* label this instruction, if it may be jumped to locally */ /* label this instruction, if it may be jumped to locally */
@ -1437,7 +1437,7 @@ static void static_generate_memory_accessor(drcuml_state *drcuml, int mode, int
/* on entry, address is in I0; data for writes is in I1; masks are in I2 */ /* on entry, address is in I0; data for writes is in I1; masks are in I2 */
/* on exit, read result is in I0 */ /* on exit, read result is in I0 */
/* routine trashes I0-I3 */ /* routine trashes I0-I3 */
int fastxor = BYTE8_XOR_BE(0) >> (cpu_get_databus_width(Machine->activecpu, ADDRESS_SPACE_PROGRAM) < 64); int fastxor = BYTE8_XOR_BE(0) >> (cpu_get_databus_width(ppc->device, ADDRESS_SPACE_PROGRAM) < 64);
drcuml_block *block; drcuml_block *block;
jmp_buf errorbuf; jmp_buf errorbuf;
int translate_type; int translate_type;