Previous 199869 Revisions Next

r17411 Wednesday 22nd August, 2012 at 20:58:21 UTC by Angelo Salese
Hooked up fastROM setting in the CPU core, nw
[src/emu/cpu/g65816]g65816.c g65816.h g65816cm.h g65816op.h
[src/mame/machine]snes.c

trunk/src/mame/machine/snes.c
r17410r17411
775775            space->machine().scheduler().timer_set(space->machine().primary_screen->time_until_pos(snes_ppu.beam.current_vert + 1), FUNC(snes_reset_hdma));
776776         break;
777777      case MEMSEL:   /* Access cycle designation in memory (2) area */
778         /* FIXME: Need to adjust the speed only during access of banks 0x80+
779             * Currently we are just increasing it no matter what */
780//          state->m_maincpu->set_clock_scale((data & 0x1) ? 1.335820896 : 1.0 );
781#ifdef SNES_DBG_REG_W
782         if ((data & 0x1) != (snes_ram[MEMSEL] & 0x1))
783            mame_printf_debug( "CPU speed: %f Mhz\n", (data & 0x1) ? 3.58 : 2.68 );
784#endif
778         cpu_set_reg(state->m_maincpu, _5A22_FASTROM, data & 1);
785779         break;
786780      case TIMEUP:   // IRQ Flag is cleared on both read and write
787781         snes_ram[TIMEUP] = 0;
trunk/src/emu/cpu/g65816/g65816.c
r17410r17411
365365   device->save_item(NAME(cpustate->ir));
366366   device->save_item(NAME(cpustate->irq_delay));
367367   device->save_item(NAME(cpustate->stopped));
368   device->save_item(NAME(cpustate->fastROM));
368369
369370   device->machine().save().register_postload(save_prepost_delegate(FUNC(g65816_restore_state), cpustate));
370371}
r17410r17411
496497            cpustate->flag_m & MFLAG_SET ? 'M':'.',
497498            cpustate->flag_x & XFLAG_SET ? 'X':'.',
498499            cpustate->flag_d & DFLAG_SET ? 'D':'.',
500
499501            cpustate->flag_i & IFLAG_SET ? 'I':'.',
500502            cpustate->flag_z == 0        ? 'Z':'.',
501503            cpustate->flag_c & CFLAG_SET ? 'C':'.');
r17410r17411
525527}
526528
527529/*
528SNES specific, used to handle master cycles
530SNES specific, used to handle master cycles, based off byuu's BSNES code
529531*/
530532
531533int bus_5A22_cycle_burst(g65816i_cpu_struct *cpustate, uint addr)
r17410r17411
534536      return 0;
535537
536538   if(addr & 0x408000) {
537      if(addr & 0x800000) return (1) ? 6 : 8; // TODO: fastROM setting
539      if(addr & 0x800000) return (cpustate->fastROM & 1) ? 6 : 8;
538540      return 8;
539541   }
540542   if((addr + 0x6000) & 0x4000) return 8;
r17410r17411
553555   cpustate->cpu_type = CPU_TYPE_5A22;
554556}
555557
558CPU_SET_INFO( _5a22 )
559{
560   g65816i_cpu_struct *cpustate = (device != NULL && device->token() != NULL) ? get_safe_token(device) : NULL;
556561
562   switch (state)
563   {
564      case CPUINFO_INT_REGISTER + _5A22_FASTROM:      g65816_set_reg(cpustate, _5A22_FASTROM, info->i); break;
565
566      default:                              CPU_SET_INFO_CALL(g65816);            break;
567   }
568}
569
557570CPU_GET_INFO( _5a22 )
558571{
572   g65816i_cpu_struct *cpustate = (device != NULL && device->token() != NULL) ? get_safe_token(device) : NULL;
573
559574   switch (state)
560575   {
561576      /* --- the following bits of info are returned as pointers to data or functions --- */
577      case CPUINFO_FCT_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(_5a22);      break;
562578      case CPUINFO_FCT_INIT:                     info->init = CPU_INIT_NAME(5a22);   break;
563579
564580      /* --- the following bits of info are returned as NULL-terminated strings --- */
565581      case DEVINFO_STR_NAME:                     strcpy(info->s, "5A22");         break;
582      case CPUINFO_INT_REGISTER + _5A22_FASTROM:      info->i = g65816_get_reg(cpustate, _5A22_FASTROM); break;
583      case CPUINFO_STR_REGISTER + _5A22_FASTROM:      sprintf(info->s, "fastROM:%d", cpustate->fastROM & 1 ? 1 : 0); break;
566584
567585      default:                              CPU_GET_INFO_CALL(g65816);            break;
568586   }
569587}
570588
589
571590DEFINE_LEGACY_CPU_DEVICE(G65816, g65816);
572591DEFINE_LEGACY_CPU_DEVICE(_5A22, _5a22);
573592
trunk/src/emu/cpu/g65816/g65816op.h
r17410r17411
23042304      case G65816_NMI_STATE: return LINE_NMI;
23052305      case G65816_IRQ_STATE: return LINE_IRQ;
23062306      case STATE_GENPCBASE: return REGISTER_PPC;
2307      case _5A22_FASTROM: return cpustate->fastROM;
23072308   }
23082309   return 0;
23092310}
r17410r17411
23372338      case G65816_PB: REGISTER_PB = MAKE_UINT_8(val); break;
23382339      case G65816_NMI_STATE: FTABLE_SET_LINE(cpustate, G65816_LINE_NMI, val == 0 ? CLEAR_LINE : ASSERT_LINE); break;
23392340      case G65816_IRQ_STATE: FTABLE_SET_LINE(cpustate, G65816_LINE_IRQ, val == 0 ? CLEAR_LINE : ASSERT_LINE); break;
2341      case _5A22_FASTROM: cpustate->fastROM = val; break;
23402342   }
23412343}
23422344
trunk/src/emu/cpu/g65816/g65816cm.h
r17410r17411
9191   uint flag_c;      /* Carry Flag */
9292   uint line_irq;      /* Status of the IRQ line */
9393   uint line_nmi;      /* Status of the NMI line */
94   uint fastROM;      /* SNES specific */
9495   uint ir;         /* Instruction Register */
9596   uint irq_delay;      /* delay 1 instruction before checking irq */
9697   device_irq_acknowledge_callback int_ack; /* Interrupt Acknowledge */
trunk/src/emu/cpu/g65816/g65816.h
r17410r17411
5353{
5454   G65816_PC=1, G65816_S, G65816_P, G65816_A, G65816_X, G65816_Y,
5555   G65816_PB, G65816_DB, G65816_D, G65816_E,
56   G65816_NMI_STATE, G65816_IRQ_STATE
56   G65816_NMI_STATE, G65816_IRQ_STATE,
57   _5A22_FASTROM
5758};
5859
5960/* Main interface function */

Previous 199869 Revisions Next

© 1997-2024 The MAME Team