More GCC 4.6 fixes (no whatsnew)

This commit is contained in:
R. Belmont 2011-05-30 02:19:30 +00:00
parent e74642d127
commit 1a23f8659b
4 changed files with 8 additions and 4 deletions

View File

@ -25,6 +25,8 @@
#include "cpu/drcuml.h"
#include "cpu/drcumlsh.h"
#ifdef PPC_USE_DRC
using namespace uml;
extern offs_t ppc_dasm_one(char *buffer, UINT32 pc, UINT32 op);
@ -2123,7 +2125,7 @@ static void generate_sequence_instruction(powerpc_state *ppc, drcuml_block *bloc
if (desc->pc == PROBE_ADDRESS)
{
UML_MOV(block, mem(&ppc->pc), desc->pc); // mov [pc],desc->pc
UML_CALLC(block, cfunc_printf_probe, (void *)desc->pc); // callc cfunc_printf_probe,desc->pc
UML_CALLC(block, cfunc_printf_probe, (void *)(FPTR)desc->pc); // callc cfunc_printf_probe,desc->pc
}
/* if we are debugging, call the debugger */
@ -4584,3 +4586,5 @@ DEFINE_LEGACY_CPU_DEVICE(PPC603E, ppc603e);
DEFINE_LEGACY_CPU_DEVICE(PPC603R, ppc603r);
DEFINE_LEGACY_CPU_DEVICE(PPC604, ppc604);
DEFINE_LEGACY_CPU_DEVICE(MPC8240, mpc8240);
#endif

View File

@ -709,7 +709,7 @@ static void start_handler(void *data, const char *tagname, const char **attribut
else if ( str_loadflag && !strcmp(str_loadflag, "fill") )
{
/* Handle 'fill' loadflag */
add_rom_entry( swlist, NULL, (const char*)atoi(str_value), offset, length, ROMENTRYTYPE_FILL );
add_rom_entry( swlist, NULL, (const char*)(FPTR)atoi(str_value), offset, length, ROMENTRYTYPE_FILL );
}
else
{

View File

@ -75,7 +75,7 @@ public:
INLINE const char *input_port_string_from_index(UINT32 index)
{
return input_port_string_from_token((const char *)index);
return input_port_string_from_token((const char *)(FPTR)index);
}

View File

@ -357,7 +357,7 @@ READ32_HANDLER( _3do_madam_r ) {
case 0x0670/4: case 0x0674/4: case 0x0678/4: case 0x067c/4:
case 0x0680/4: case 0x0684/4: case 0x0688/4: case 0x068c/4:
case 0x0690/4: case 0x0694/4: case 0x0698/4: case 0x069c/4:
return state->m_madam.mult[offset & 0xff];
return state->m_madam.mult[offset & 0x3f];
case 0x07f0/4:
return state->m_madam.mult_control;
case 0x07f8/4: