Previous 15994 Revisions Next

r7797 Monday 12th April, 2010 at 20:54:04 UTC by Fabio Priuli
[SNES] attempt to unify SRAM behavior
[src/mame/includes]snes.h
[src/mame/machine]snes.c
[src/mame/video]snes.c
[src/mess/drivers]snes.c

src/mame/machine/snes.c
r7796r7797
2525
2626/* -- Globals -- */
2727UINT8  *snes_ram = NULL;      /* 65816 ram */
28UINT8  *snes_vram = NULL;      /* Video RAM (Should be 16-bit, but it's easier this way) */
29UINT16 *snes_cgram = NULL;      /* Colour RAM */
30UINT16 *snes_oam = NULL;      /* Object Attribute Memory */
3128
3229UINT8 snes_has_addon_chip;
3330UINT32 snes_rom_size;
r7796r7797
994991      }
995992      else if ((snes_cart.mode == SNES_MODE_21) && (snes_cart.sram > 0))
996993      {
997         value = snes_ram[0x300000 + offset];
994         int mask = (snes_cart.sram - 1) | 0xff0000;   /* Limit SRAM size to what's actually present */
995         value = snes_ram[0x300000 + (offset & mask)];
998996      }
999997      else
1000998      {
r7796r7797
11551153            value = memory_read_byte(space, offset);
11561154         else if ((offset >= 0x300000) && (snes_cart.sram > 0))
11571155         {
1158            value = snes_ram[0x800000 + offset];   /* SRAM */
1156            int mask = (snes_cart.sram - 1) | 0xff0000;   /* Limit SRAM size to what's actually present */
1157            value = snes_ram[0x800000 + (offset & mask)];
11591158         }
11601159         else                  /* Area 0x6000-0x8000 with offset < 0x300000 is reserved */
11611160         {
r7796r7797
13041303      }
13051304      else if ((snes_cart.mode == SNES_MODE_21) && (snes_cart.sram > 0))
13061305      {
1307         snes_ram[0x300000 + offset] = data;
1306         int mask = (snes_cart.sram - 1) | 0xff0000;   /* Limit SRAM size to what's actually present */
1307         snes_ram[0x300000 + (offset & mask)] = data;
13081308      }
13091309      else
13101310         logerror("snes_w_bank2: Attempt to write to reserved address: %X = %02x\n", offset + 0x300000, data);
r7796r7797
13991399            memory_write_byte(space, offset, data);
14001400         else if ((offset >= 0x300000) && (snes_cart.sram > 0))
14011401         {
1402            snes_ram[0xb00000 + offset] = data;
1402            int mask = (snes_cart.sram - 1) | 0xff0000;   /* Limit SRAM size to what's actually present */
1403            snes_ram[0x800000 + (offset & mask)] = data;
14031404         }
14041405         else   /* Area in 0x6000-0x8000 && offset < 0x300000 is Reserved! */
14051406            logerror("snes_w_bank6: Attempt to write to reserved address: %X = %02x\n", offset + 0x800000, data);
r7796r7797
15791580{
15801581   snes_state *state = (snes_state *)machine->driver_data;
15811582   const address_space *cpu0space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
1582   int i, j;
1583   int i;
15831584
1584   /* Init VRAM */
1585   memset(snes_vram, 0, SNES_VRAM_SIZE);
1586
1587   /* Init Colour RAM */
1588   memset((UINT8 *)snes_cgram, 0, SNES_CGRAM_SIZE);
1589
1590   /* Init oam RAM */
1591   memset(snes_oam, 0xff, SNES_OAM_SIZE);
1592
15931585   /* Init work RAM - 0x55 isn't exactly right but it's close */
15941586   /* make sure it happens to the 65816 (CPU 0) */
15951587   for (i = 0; i < (128*1024); i++)
r7796r7797
15981590   }
15991591
16001592   /* Inititialize registers/variables */
1601   snes_ppu.update_windows = 1;
1602   snes_ppu.beam.latch_vert = 0;
1603   snes_ppu.beam.latch_horz = 0;
1604   snes_ppu.beam.current_vert = 0;
1605   snes_ppu.beam.current_horz = 0;
1606   snes_ppu.beam.last_visible_line = 240;
1607   snes_ppu.mode = 0;
1608   snes_ppu.ppu1_version = 1;   // 5C77 chip version number, read by STAT77, only '1' is known
1609   snes_ppu.ppu2_version = 3;   // 5C78 chip version number, read by STAT78, only '2' & '3' encountered so far.
1610
16111593   state->cgram_address = 0;
16121594   state->vram_read_offset = 2;
16131595   state->read_ophct = 0;
r7796r7797
16201602   state->oldjoy1_read = nss_oldjoy1_read;
16211603   state->oldjoy2_read = nss_oldjoy2_read;
16221604
1623   /* Inititialize mosaic table */
1624   for (j = 0; j < 16; j++)
1625   {
1626      for (i = 0; i < 4096; i++)
1627      {
1628         snes_ppu.mosaic_table[j][i] = (i / (j + 1)) * (j + 1);
1629      }
1630   }
1631
16321605   // set up some known register power-up defaults
16331606   snes_ram[WRIO] = 0xff;
16341607   snes_ram[VMAIN] = 0x80;
r7796r7797
16731646
16741647   // init frame counter so first line is 0
16751648   if (ATTOSECONDS_TO_HZ(video_screen_get_frame_period(machine->primary_screen).attoseconds) >= 59)
1676   {
16771649      snes_ppu.beam.current_vert = SNES_VTOTAL_NTSC;
1678   }
16791650   else
1680   {
16811651      snes_ppu.beam.current_vert = SNES_VTOTAL_PAL;
1682   }
16831652}
16841653
16851654
r7796r7797
16981667MACHINE_START( snes )
16991668{
17001669   snes_state *state = (snes_state *)machine->driver_data;
1701   snes_vram = auto_alloc_array(machine, UINT8, SNES_VRAM_SIZE);
1702   snes_cgram = auto_alloc_array(machine, UINT16, SNES_CGRAM_SIZE/2);
1703   snes_oam = auto_alloc_array(machine, UINT16, SNES_OAM_SIZE/2);
1670   int i;
1671
17041672   memory_set_direct_update_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), snes_direct);
17051673   memory_set_direct_update_handler(cputag_get_address_space(machine, "soundcpu", ADDRESS_SPACE_PROGRAM), spc_direct);
17061674
r7796r7797
17151683   snes_ram[WRDIVL] = 0xff;
17161684   snes_ram[WRDIVH] = 0xff;
17171685
1718   /* init DMA regs to be 0xff */
1719   {
1720      int i;
1721
1722      for(i=0;i<8;i++)
1723      {
1724         state->dma_channel[i].dmap = 0xff;
1725         state->dma_channel[i].dest_addr = 0xff;
1726         state->dma_channel[i].src_addr = 0xffff;
1727         state->dma_channel[i].bank = 0xff;
1728         state->dma_channel[i].trans_size = 0xffff;
1729         state->dma_channel[i].ibank = 0xff;
1730         state->dma_channel[i].hdma_addr = 0xffff;
1731         state->dma_channel[i].hdma_line_counter = 0xff;
1732         state->dma_channel[i].unk = 0xff;
1733      }
1734   }
1735
17361686   switch (snes_has_addon_chip)
17371687   {
17381688      case HAS_SDD1:
r7796r7797
17501700   }
17511701
17521702   snes_init_timers(machine);
1703
1704   for (i = 0; i < 6; i++)
1705   {
1706      state_save_register_item(machine, "snes_dma", NULL, i, state->dma_channel[i].dmap);
1707      state_save_register_item(machine, "snes_dma", NULL, i, state->dma_channel[i].dest_addr);
1708      state_save_register_item(machine, "snes_dma", NULL, i, state->dma_channel[i].src_addr);
1709      state_save_register_item(machine, "snes_dma", NULL, i, state->dma_channel[i].bank);
1710      state_save_register_item(machine, "snes_dma", NULL, i, state->dma_channel[i].trans_size);
1711      state_save_register_item(machine, "snes_dma", NULL, i, state->dma_channel[i].ibank);
1712      state_save_register_item(machine, "snes_dma", NULL, i, state->dma_channel[i].hdma_addr);
1713      state_save_register_item(machine, "snes_dma", NULL, i, state->dma_channel[i].hdma_line_counter);
1714      state_save_register_item(machine, "snes_dma", NULL, i, state->dma_channel[i].unk);
1715      state_save_register_item(machine, "snes_dma", NULL, i, state->dma_channel[i].do_transfer);
1716      state_save_register_item(machine, "snes_dma", NULL, i, state->dma_channel[i].dma_disabled);
1717   }
1718
1719   state_save_register_global(machine, state->htmult);
1720   state_save_register_global(machine, state->cgram_address);
1721   state_save_register_global(machine, state->vram_read_offset);
1722   state_save_register_global(machine, state->read_ophct);
1723   state_save_register_global(machine, state->read_opvct);
1724   state_save_register_global(machine, state->hblank_offset);
1725   state_save_register_global(machine, state->vram_fgr_high);
1726   state_save_register_global(machine, state->vram_fgr_increment);
1727   state_save_register_global(machine, state->vram_fgr_count);
1728   state_save_register_global(machine, state->vram_fgr_mask);
1729   state_save_register_global(machine, state->vram_fgr_shift);
1730   state_save_register_global(machine, state->vram_read_buffer);
1731   state_save_register_global(machine, state->wram_address);
1732   state_save_register_global(machine, state->htime);
1733   state_save_register_global(machine, state->vtime);
1734   state_save_register_global(machine, state->vmadd);
1735   state_save_register_global(machine, state->hdmaen);
1736   state_save_register_global(machine, state->joy1l);
1737   state_save_register_global(machine, state->joy1h);
1738   state_save_register_global(machine, state->joy2l);
1739   state_save_register_global(machine, state->joy2h);
1740   state_save_register_global(machine, state->joy3l);
1741   state_save_register_global(machine, state->joy3h);
1742   state_save_register_global(machine, state->joy4l);
1743   state_save_register_global(machine, state->joy4h);
1744   state_save_register_global_array(machine, state->data1);
1745   state_save_register_global_array(machine, state->data2);
1746   state_save_register_global_array(machine, state->read_idx);
1747
1748   for (i = 0; i < 2; i++)
1749   {
1750      state_save_register_item(machine, "snes_dma", NULL, i, state->joypad[i].buttons);
1751      state_save_register_item(machine, "snes_dma", NULL, i, state->mouse[i].x);
1752      state_save_register_item(machine, "snes_dma", NULL, i, state->mouse[i].oldx);
1753      state_save_register_item(machine, "snes_dma", NULL, i, state->mouse[i].y);
1754      state_save_register_item(machine, "snes_dma", NULL, i, state->mouse[i].oldy);
1755      state_save_register_item(machine, "snes_dma", NULL, i, state->mouse[i].buttons);
1756      state_save_register_item(machine, "snes_dma", NULL, i, state->mouse[i].deltax);
1757      state_save_register_item(machine, "snes_dma", NULL, i, state->mouse[i].deltay);
1758      state_save_register_item(machine, "snes_dma", NULL, i, state->mouse[i].speed);
1759      state_save_register_item(machine, "snes_dma", NULL, i, state->scope[i].x);
1760      state_save_register_item(machine, "snes_dma", NULL, i, state->scope[i].y);
1761      state_save_register_item(machine, "snes_dma", NULL, i, state->scope[i].buttons);
1762      state_save_register_item(machine, "snes_dma", NULL, i, state->scope[i].turbo_lock);
1763      state_save_register_item(machine, "snes_dma", NULL, i, state->scope[i].pause_lock);
1764      state_save_register_item(machine, "snes_dma", NULL, i, state->scope[i].fire_lock);
1765      state_save_register_item(machine, "snes_dma", NULL, i, state->scope[i].offscreen);
1766   }
17531767}
17541768
17551769MACHINE_RESET( snes )
17561770{
17571771   snes_state *state = (snes_state *)machine->driver_data;
1772   int i;
17581773
17591774   snes_init_ram(machine);
17601775
1776   /* init DMA regs to be 0xff */
1777   for(i = 0; i < 8; i++)
1778   {
1779      state->dma_channel[i].dmap = 0xff;
1780      state->dma_channel[i].dest_addr = 0xff;
1781      state->dma_channel[i].src_addr = 0xffff;
1782      state->dma_channel[i].bank = 0xff;
1783      state->dma_channel[i].trans_size = 0xffff;
1784      state->dma_channel[i].ibank = 0xff;
1785      state->dma_channel[i].hdma_addr = 0xffff;
1786      state->dma_channel[i].hdma_line_counter = 0xff;
1787      state->dma_channel[i].unk = 0xff;
1788   }
1789
17611790   /* Set STAT78 to NTSC or PAL */
17621791   if (ATTOSECONDS_TO_HZ(video_screen_get_frame_period(machine->primary_screen).attoseconds) >= 59.0f)
17631792      snes_ram[STAT78] = SNES_NTSC;
r7796r7797
17801809{
17811810   const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
17821811   UINT16 total_blocks, read_blocks;
1783   UINT8 *rom;
1812   UINT8 *rom;
17841813
17851814   rom = memory_region(machine, "user3");
1786   snes_ram = auto_alloc_array(machine, UINT8, 0x1400000);
1787   memset(snes_ram, 0, 0x1400000);
1815   snes_ram = auto_alloc_array_clear(machine, UINT8, 0x1400000);
17881816
17891817   /* all NSS games seem to use MODE 20 */
17901818   snes_cart.mode = SNES_MODE_20;
src/mame/includes/snes.h
r7796r7797
528528
529529extern void snes_latch_counters(running_machine *machine);
530530
531/* (PPU) Video related */
532extern UINT8  *snes_vram;         /* Video RAM (Should be 16-bit, but it's easier this way) */
533extern UINT16 *snes_cgram;         /* Colour RAM */
534extern UINT16 *snes_oam;         /* Object Attribute Memory */
535531extern UINT8  *snes_ram;         /* Main memory */
532
533
534/* (PPU) Video related */
536535struct SNES_PPU_STRUCT   /* once all the regs are saved in this structure, it would be better to reorganize it a bit... */
537536{
538537   struct
src/mame/video/snes.c
r7796r7797
131131   SNES_COLOR_DEPTH_8BPP
132132};
133133
134static UINT8  *snes_vram;      /* Video RAM (Should be 16-bit, but it's easier this way) */
135static UINT16 *snes_cgram;      /* Colour RAM */
136static UINT16 *snes_oam;      /* Object Attribute Memory */
137
134138/*****************************************
135139 * snes_get_bgcolor()
136140 *
r7796r7797
16551659
16561660VIDEO_START( snes )
16571661{
1662   int i,j;
1663
16581664#ifdef SNES_LAYER_DEBUG
16591665   memset(&debug_options, 0, sizeof(debug_options));
16601666#endif
1667
1668   snes_vram = auto_alloc_array(machine, UINT8, SNES_VRAM_SIZE);
1669   snes_cgram = auto_alloc_array(machine, UINT16, SNES_CGRAM_SIZE/2);
1670   snes_oam = auto_alloc_array(machine, UINT16, SNES_OAM_SIZE/2);
1671
1672   /* Inititialize registers/variables */
1673   snes_ppu.update_windows = 1;
1674   snes_ppu.beam.latch_vert = 0;
1675   snes_ppu.beam.latch_horz = 0;
1676   snes_ppu.beam.current_vert = 0;
1677   snes_ppu.beam.current_horz = 0;
1678   snes_ppu.beam.last_visible_line = 240;
1679   snes_ppu.mode = 0;
1680   snes_ppu.ppu1_version = 1;   // 5C77 chip version number, read by STAT77, only '1' is known
1681   snes_ppu.ppu2_version = 3;   // 5C78 chip version number, read by STAT78, only '2' & '3' encountered so far.
1682
1683   /* Inititialize mosaic table */
1684   for (j = 0; j < 16; j++)
1685   {
1686      for (i = 0; i < 4096; i++)
1687         snes_ppu.mosaic_table[j][i] = (i / (j + 1)) * (j + 1);
1688   }
1689
1690   /* Init VRAM */
1691   memset(snes_vram, 0, SNES_VRAM_SIZE);
1692
1693   /* Init Colour RAM */
1694   memset((UINT8 *)snes_cgram, 0, SNES_CGRAM_SIZE);
1695
1696   /* Init oam RAM */
1697   memset(snes_oam, 0xff, SNES_OAM_SIZE);
1698
1699   for (i = 0; i < 6; i++)
1700   {
1701      state_save_register_item(machine, "snes_ppu", NULL, i, snes_ppu.layer[i].window1_enabled);
1702      state_save_register_item(machine, "snes_ppu", NULL, i, snes_ppu.layer[i].window1_invert);
1703      state_save_register_item(machine, "snes_ppu", NULL, i, snes_ppu.layer[i].window2_enabled);
1704      state_save_register_item(machine, "snes_ppu", NULL, i, snes_ppu.layer[i].window2_invert);
1705      state_save_register_item(machine, "snes_ppu", NULL, i, snes_ppu.layer[i].wlog_mask);
1706      state_save_register_item(machine, "snes_ppu", NULL, i, snes_ppu.layer[i].color_math);
1707      state_save_register_item(machine, "snes_ppu", NULL, i, snes_ppu.layer[i].charmap);
1708      state_save_register_item(machine, "snes_ppu", NULL, i, snes_ppu.layer[i].tilemap);
1709      state_save_register_item(machine, "snes_ppu", NULL, i, snes_ppu.layer[i].tilemap_size);
1710      state_save_register_item(machine, "snes_ppu", NULL, i, snes_ppu.layer[i].tile_size);
1711      state_save_register_item(machine, "snes_ppu", NULL, i, snes_ppu.layer[i].mosaic_enabled);
1712      state_save_register_item(machine, "snes_ppu", NULL, i, snes_ppu.layer[i].main_window_enabled);
1713      state_save_register_item(machine, "snes_ppu", NULL, i, snes_ppu.layer[i].sub_window_enabled);
1714      state_save_register_item(machine, "snes_ppu", NULL, i, snes_ppu.layer[i].main_bg_enabled);
1715      state_save_register_item(machine, "snes_ppu", NULL, i, snes_ppu.layer[i].sub_bg_enabled);
1716      state_save_register_item(machine, "snes_ppu", NULL, i, snes_ppu.layer[i].hoffs);
1717      state_save_register_item(machine, "snes_ppu", NULL, i, snes_ppu.layer[i].voffs);
1718
1719      state_save_register_item_array(machine, "snes_ppu", NULL, i, snes_ppu.clipmasks[i]);
1720   }
1721
1722   state_save_register_global(machine, snes_ppu.oam.address_low);
1723   state_save_register_global(machine, snes_ppu.oam.address_high);
1724   state_save_register_global(machine, snes_ppu.oam.saved_address_low);
1725   state_save_register_global(machine, snes_ppu.oam.saved_address_high);
1726   state_save_register_global(machine, snes_ppu.oam.address);
1727   state_save_register_global(machine, snes_ppu.oam.priority_rotation);
1728   state_save_register_global(machine, snes_ppu.oam.next_charmap);
1729   state_save_register_global(machine, snes_ppu.oam.next_size);
1730   state_save_register_global(machine, snes_ppu.oam.size);
1731   state_save_register_global(machine, snes_ppu.oam.next_name_select);
1732   state_save_register_global(machine, snes_ppu.oam.name_select);
1733   state_save_register_global(machine, snes_ppu.oam.first_sprite);
1734   state_save_register_global(machine, snes_ppu.oam.flip);
1735   state_save_register_global(machine, snes_ppu.oam.write_latch);
1736
1737   state_save_register_global(machine, snes_ppu.beam.latch_horz);
1738   state_save_register_global(machine, snes_ppu.beam.latch_vert);
1739   state_save_register_global(machine, snes_ppu.beam.current_horz);
1740   state_save_register_global(machine, snes_ppu.beam.current_vert);
1741   state_save_register_global(machine, snes_ppu.beam.last_visible_line);
1742   state_save_register_global(machine, snes_ppu.beam.interlace_count);
1743
1744   state_save_register_global(machine, snes_ppu.mode7.repeat);
1745   state_save_register_global(machine, snes_ppu.mode7.hflip);
1746   state_save_register_global(machine, snes_ppu.mode7.vflip);
1747   state_save_register_global(machine, snes_ppu.mode7.matrix_a);
1748   state_save_register_global(machine, snes_ppu.mode7.matrix_b);
1749   state_save_register_global(machine, snes_ppu.mode7.matrix_c);
1750   state_save_register_global(machine, snes_ppu.mode7.matrix_d);
1751   state_save_register_global(machine, snes_ppu.mode7.origin_x);
1752   state_save_register_global(machine, snes_ppu.mode7.origin_y);
1753   state_save_register_global(machine, snes_ppu.mode7.hor_offset);
1754   state_save_register_global(machine, snes_ppu.mode7.ver_offset);
1755   state_save_register_global(machine, snes_ppu.mode7.extbg);
1756
1757   state_save_register_global(machine, snes_ppu.mosaic_size);
1758   state_save_register_global(machine, snes_ppu.clip_to_black);
1759   state_save_register_global(machine, snes_ppu.prevent_color_math);
1760   state_save_register_global(machine, snes_ppu.sub_add_mode);
1761   state_save_register_global(machine, snes_ppu.bg3_priority_bit);
1762   state_save_register_global(machine, snes_ppu.direct_color);
1763   state_save_register_global(machine, snes_ppu.ppu_last_scroll);
1764   state_save_register_global(machine, snes_ppu.mode7_last_scroll);
1765
1766   state_save_register_global(machine, snes_ppu.ppu1_open_bus);
1767   state_save_register_global(machine, snes_ppu.ppu2_open_bus);
1768   state_save_register_global(machine, snes_ppu.ppu1_version);
1769   state_save_register_global(machine, snes_ppu.ppu2_version);
1770   state_save_register_global(machine, snes_ppu.window1_left);
1771   state_save_register_global(machine, snes_ppu.window1_right);
1772   state_save_register_global(machine, snes_ppu.window2_left);
1773   state_save_register_global(machine, snes_ppu.window2_right);
1774
1775   state_save_register_global(machine, snes_ppu.update_windows);
1776   state_save_register_global(machine, snes_ppu.update_offsets);
1777   state_save_register_global(machine, snes_ppu.update_oam_list);
1778   state_save_register_global(machine, snes_ppu.mode);
1779   state_save_register_global(machine, snes_ppu.interlace);
1780   state_save_register_global(machine, snes_ppu.obj_interlace);
1781   state_save_register_global(machine, snes_ppu.screen_brightness);
1782   state_save_register_global(machine, snes_ppu.screen_disabled);
1783   state_save_register_global(machine, snes_ppu.pseudo_hires);
1784   state_save_register_global(machine, snes_ppu.color_modes);
1785   state_save_register_global(machine, snes_ppu.stat77_flags);
1786
1787   state_save_register_global_pointer(machine, snes_vram, SNES_VRAM_SIZE);
1788   state_save_register_global_pointer(machine, snes_cgram, SNES_CGRAM_SIZE/2);
1789   state_save_register_global_pointer(machine, snes_oam, SNES_OAM_SIZE/2);
16611790}
16621791
16631792VIDEO_UPDATE( snes )
src/mess/drivers/snes.c
r7796r7797
705705   MDRV_MACHINE_RESET(snes_mess)
706706
707707   /* video hardware */
708   MDRV_VIDEO_START(generic_bitmapped)
708   MDRV_VIDEO_START(snes)
709709   MDRV_VIDEO_UPDATE(snes)
710710
711711   MDRV_SCREEN_ADD("screen", RASTER)

Previous 15994 Revisions Next


© 1998-2018 The MESS Team