Previous 15994 Revisions Next

r8370 Thursday 1st July, 2010 at 20:00:02 UTC by Fabio Priuli
[NES] wip:
- improved handling of internal mapper RAM (separately treating battery backed RAM and volatile RAM)
- updated MMC6, X1-005 and X1-017 boards to use the appropriate RAM
- converted MMC5 board to use the new code for mmc5_vram
[src/mess/includes]nes.h
[src/mess/machine]nes.c nes_mmc.c nes_pcb.c

src/mess/machine/nes_pcb.c
r8369r8370
13641364   write_lo = ((state->mmc6_reg & 0x30) == 0x30);
13651365
13661366   if (BIT(offset, 9) && write_hi)   // access to upper 1k
1367      state->mapper_ram[offset & (state->mapper_ram_size - 1)] = data;
1367      state->mapper_bram[offset & (state->mapper_bram_size - 1)] = data;
13681368
13691369   if (!BIT(offset, 9) && write_lo)   // access to lower 1k
1370      state->mapper_ram[offset & (state->mapper_ram_size - 1)] = data;
1370      state->mapper_bram[offset & (state->mapper_bram_size - 1)] = data;
13711371}
13721372
13731373static READ8_HANDLER( hkrom_m_r )
r8369r8370
13821382      return 0xff;   // here it should be open bus
13831383
13841384   if (BIT(offset, 9) && BIT(state->mmc6_reg, 7))   // access to upper 1k when upper read is enabled
1385      return state->mapper_ram[offset & (state->mapper_ram_size - 1)];
1385      return state->mapper_bram[offset & (state->mapper_bram_size - 1)];
13861386
13871387   if (!BIT(offset, 9) && BIT(state->mmc6_reg, 5))   // access to lower 1k when lower read is enabled
1388      return state->mapper_ram[offset & (state->mapper_ram_size - 1)];
1388      return state->mapper_bram[offset & (state->mapper_bram_size - 1)];
13891389
13901390   // If only one bank is enabled for reading, the other reads back as zero
13911391   return 0x00;
r8369r8370
18711871   /* $5c00 - $5fff: extended videoram attributes */
18721872   if ((offset >= 0x1b00) && (offset <= 0x1eff))
18731873   {
1874      return state->mmc5_vram[offset - 0x1b00];
1874      return state->mapper_ram[offset - 0x1b00];
18751875   }
18761876   
18771877   switch (offset)
r8369r8370
19161916   if ((offset >= 0x1b00) && (offset <= 0x1eff))
19171917   {
19181918      if (state->MMC5_vram_protect == 0x03)
1919         state->mmc5_vram[offset - 0x1b00] = data;
1919         state->mapper_ram[offset - 0x1b00] = data;
19201920      return;
19211921   }
19221922   
r8369r8370
42604260
42614261   if (offset >= 0x1f00 && state->mapper_ram != NULL && state->mmc_latch1 == 0xa3)
42624262      state->mapper_ram[offset & (state->mapper_ram_size - 1)] = data;
4263   else if (offset >= 0x1f00 && state->mapper_bram != NULL && state->mmc_latch1 == 0xa3)
4264      state->mapper_bram[offset & (state->mapper_bram_size - 1)] = data;
42634265}
42644266
42654267static READ8_HANDLER( x1005_m_r )
r8369r8370
42694271
42704272   if (offset >= 0x1f00 && state->mapper_ram != NULL && state->mmc_latch1 == 0xa3)
42714273      return state->mapper_ram[offset & (state->mapper_ram_size - 1)];
4274   else if (offset >= 0x1f00 && state->mapper_bram != NULL && state->mmc_latch1 == 0xa3)
4275      return state->mapper_bram[offset & (state->mapper_bram_size - 1)];
42724276
42734277   return 0xff;
42744278}
r8369r8370
43884392   LOG_MMC(("x1017_m_r, offset: %04x\n", offset));
43894393
43904394   // 2+2+1 KB of Internal RAM can be independently enabled/disabled!
4391   if (offset < 0x0800 && state->mapper_ram != NULL && state->mmc_reg[0] == 0xca)
4392      return state->mapper_ram[offset & (state->mapper_ram_size - 1)];
4393   if (offset < 0x1000 && state->mapper_ram != NULL && state->mmc_reg[1] == 0x69)
4394      return state->mapper_ram[offset & (state->mapper_ram_size - 1)];
4395   if (offset < 0x1800 && state->mapper_ram != NULL && state->mmc_reg[2] == 0x84)
4396      return state->mapper_ram[offset & (state->mapper_ram_size - 1)];
4395   if (offset < 0x0800 && state->mapper_bram != NULL && state->mmc_reg[0] == 0xca)
4396      return state->mapper_bram[offset & (state->mapper_bram_size - 1)];
4397   if (offset < 0x1000 && state->mapper_bram != NULL && state->mmc_reg[1] == 0x69)
4398      return state->mapper_bram[offset & (state->mapper_bram_size - 1)];
4399   if (offset < 0x1800 && state->mapper_bram != NULL && state->mmc_reg[2] == 0x84)
4400      return state->mapper_bram[offset & (state->mapper_bram_size - 1)];
43974401
43984402   return 0xff;
43994403}
src/mess/machine/nes.c
r8369r8370
189189{
190190   nes_state *state = (nes_state *)machine->driver_data;
191191
192   /* Some carts have extra RAM and require it on at startup, e.g. Metroid */
193   state->mid_ram_enable = 1;
194
195192   /* Reset the mapper variables. Will also mark the char-gen ram as dirty */
196193   if (state->disk_expansion && state->pcb_id == NO_BOARD)
197194      ppu2c0x_set_hblank_callback(state->ppu, fds_irq);
r8369r8370
231228
232229   state_save_register_global(machine, state->MMC5_floodtile);
233230   state_save_register_global(machine, state->MMC5_floodattr);
234   state_save_register_global_array(machine, state->mmc5_vram);
235231   state_save_register_global(machine, state->mmc5_vram_control);
236232
237233   state_save_register_global_array(machine, state->nes_vram_sprite);
238234   state_save_register_global(machine, state->last_frame_flip);
239   state_save_register_global(machine, state->mid_ram_enable);
240235
241236   // shared mapper variables
242237   state_save_register_global(machine, state->IRQ_enable);
r8369r8370
302297   if (state->battery)
303298      image->battery_save(state->battery_ram, state->battery_size);
304299
305   if (state->mapper_ram_size)
306      image->battery_save(state->mapper_ram, state->mapper_ram_size);
300   if (state->mapper_bram_size)
301      image->battery_save(state->mapper_bram, state->mapper_bram_size);
307302}
308303
309304
r8369r8370
876871            //FIXME: we also have to fix Action 52 PRG loading somewhere...
877872         }
878873
874         /* Allocate internal Mapper RAM for boards which require it */
875         if (state->pcb_id == STD_EXROM)
876            state->mapper_ram = auto_alloc_array(image.device().machine, UINT8, 0x400);
877         
878         if (state->pcb_id == TAITO_X1_005 || state->pcb_id == TAITO_X1_005_A)
879            state->mapper_bram = auto_alloc_array(image.device().machine, UINT8, 0x80);
880         
881         if (state->pcb_id == TAITO_X1_017)
882            state->mapper_bram = auto_alloc_array(image.device().machine, UINT8, 0x1400);
883         
884         if (state->pcb_id == NAMCOT_163)
885            state->mapper_ram = auto_alloc_array(image.device().machine, UINT8, 0x2000);
886         
879887         /* Position past the header */
880888         image.fseek(16, SEEK_SET);
881889
r8369r8370
13081316      state->prg_ram = (image.get_software_region("wram") != NULL) ? 1 : 0;
13091317      state->wram_size = image.get_software_region_length("wram");
13101318      state->mapper_ram_size = image.get_software_region_length("mapper_ram");
1319      state->mapper_bram_size = image.get_software_region_length("mapper_bram");
1320
13111321      if (state->prg_ram)
13121322         state->wram = auto_alloc_array(image.device().machine, UINT8, state->wram_size);
13131323      if (state->mapper_ram_size)
13141324         state->mapper_ram = auto_alloc_array(image.device().machine, UINT8, state->mapper_ram_size);
1325      if (state->mapper_bram_size)
1326         state->mapper_bram = auto_alloc_array(image.device().machine, UINT8, state->mapper_bram_size);
13151327
13161328      /* Check for mirroring */
13171329      if (image.get_feature("mirroring") != NULL)
r8369r8370
14131425
14141426   // Attempt to load a battery file for this ROM
14151427   // A few boards have internal RAM with a battery (MMC6, Taito X1-005 & X1-017, etc.)
1416   if (state->battery || state->mapper_ram_size)
1428   if (state->battery || state->mapper_bram_size)
14171429   {
1418      UINT8 *temp_nvram = auto_alloc_array(image.device().machine, UINT8, state->battery_size + state->mapper_ram_size);
1419      image.battery_load(temp_nvram, state->battery_size + state->mapper_ram_size, 0x00);
1430      UINT8 *temp_nvram = auto_alloc_array(image.device().machine, UINT8, state->battery_size + state->mapper_bram_size);
1431      image.battery_load(temp_nvram, state->battery_size + state->mapper_bram_size, 0x00);
14201432      if (state->battery)
14211433      {
14221434         state->battery_ram = auto_alloc_array(image.device().machine, UINT8, state->battery_size);
14231435         memcpy(state->battery_ram, temp_nvram, state->battery_size);
14241436      }
1425      if (state->mapper_ram_size)
1426         memcpy(state->mapper_ram, temp_nvram + state->battery_size, state->mapper_ram_size);
1437      if (state->mapper_bram_size)
1438         memcpy(state->mapper_bram, temp_nvram + state->battery_size, state->mapper_bram_size);
14271439
14281440      auto_free(image.device().machine, temp_nvram);
14291441   }
src/mess/machine/nes_mmc.c
r8369r8370
613613         base_ptr = state->vrom;
614614         break;
615615      case EXRAM:
616         base_ptr = state->mmc5_vram;
616         base_ptr = state->mapper_ram;
617617         break;
618618      case CIRAM:
619619      default:
src/mess/includes/nes.h
r8369r8370
8585
8686   int MMC5_floodtile;
8787   int MMC5_floodattr;
88   UINT8 mmc5_vram[0x400];
8988   int mmc5_vram_control;
9089   UINT8 mmc5_high_chr;
9190   UINT8 mmc5_split_scr;
r8369r8370
131130   UINT8      *ciram; //PPU nametable RAM - external to PPU!
132131   UINT8      *battery_ram;
133132   UINT8      *mapper_ram;
134   // Variables which can change
135   UINT8      mid_ram_enable;
133   UINT8      *mapper_bram;
136134
137
138135   /***** Mapper-related variables *****/
139136
140137   // common ones
r8369r8370
232229   UINT8 prg_ram;         // if there is PRG RAM with no backup
233230   UINT32 wram_size;
234231   UINT32 mapper_ram_size;
232   UINT32 mapper_bram_size;
235233
236234   int format;   // 1 = iNES, 2 = UNIF
237235

Previous 15994 Revisions Next


© 1998-2018 The MESS Team