Previous 15994 Revisions Next

r7474 Monday 1st March, 2010 at 16:56:46 UTC by Fabio Priuli
[SNES] minor refactorization
[src/mame/includes]snes.h
[src/mame/machine]snes.c
[src/mame/video]snes.c

src/mame/machine/snes.c
r7473r7474
817817         snes_ppu.screen_brightness = (data & 0x0f) + 1;
818818         break;
819819      case OBSEL:      /* Object size and data area designation */
820         snes_ppu.layer[SNES_OAM].data = ((data & 0x3) * 0x2000) << 1;
820         snes_ppu.layer[SNES_OAM].charmap = (data & 0x03) << 1;
821821         snes_ppu.oam.name_select = (((data & 0x18) >> 3) * 0x1000) << 1;
822822         /* Determine object size */
823823         switch ((data & 0xe0) >> 5)
r7473r7474
932932      case BG2SC:      /* Address for storing SC data BG2 SC size designation  */
933933      case BG3SC:      /* Address for storing SC data BG3 SC size designation  */
934934      case BG4SC:      /* Address for storing SC data BG4 SC size designation  */
935         snes_ppu.layer[offset - BG1SC].map = (data & 0xfc) << 9;
936         snes_ppu.layer[offset - BG1SC].map_size = data & 0x3;
935         snes_ppu.layer[offset - BG1SC].tilemap = data & 0xfc;
936         snes_ppu.layer[offset - BG1SC].tilemap_size = data & 0x3;
937937         break;
938938      case BG12NBA:   /* Address for BG 1 and 2 character data */
939         snes_ppu.layer[SNES_BG1].data = (data & 0xf) << 13;
940         snes_ppu.layer[SNES_BG2].data = (data & 0xf0) << 9;
939         snes_ppu.layer[SNES_BG1].charmap = (data & 0x0f);
940         snes_ppu.layer[SNES_BG2].charmap = (data & 0xf0) >> 4;
941941         break;
942942      case BG34NBA:   /* Address for BG 3 and 4 character data */
943         snes_ppu.layer[SNES_BG3].data = (data & 0xf) << 13;
944         snes_ppu.layer[SNES_BG4].data = (data & 0xf0) << 9;
943         snes_ppu.layer[SNES_BG3].charmap = (data & 0x0f);
944         snes_ppu.layer[SNES_BG4].charmap = (data & 0xf0) >> 4;
945945         break;
946946
947947      // Anomie says "H Current = (Byte<<8) | (Prev&~7) | ((Current>>8)&7); V Current = (Current<<8) | Prev;" and Prev is shared by all scrolls but in Mode 7!
r7473r7474
999999
10001000         if (data & 0xc)
10011001         {
1002            int md = (data & 0xc)>>2;
1002            int md = (data & 0xc) >> 2;
10031003
10041004            vram_fgr_count = vram_fgr_inccnts[md];
1005            vram_fgr_mask = (vram_fgr_count*8)-1;
1005            vram_fgr_mask = (vram_fgr_count * 8) - 1;
10061006            vram_fgr_shift = vram_fgr_shiftab[md];
10071007         }
10081008         else
r7473r7474
10221022            if (vram_fgr_count)
10231023            {
10241024               UINT32 rem = addr & vram_fgr_mask;
1025               UINT32 faddr = (addr & ~vram_fgr_mask) + (rem >> vram_fgr_shift) +
1026                         ((rem & (vram_fgr_count - 1)) << 3);
1025               UINT32 faddr = (addr & ~vram_fgr_mask) + (rem >> vram_fgr_shift) + ((rem & (vram_fgr_count - 1)) << 3);
10271026
10281027               vram_read_buffer = snes_vram[(faddr<<1)&0x1ffff] | snes_vram[((faddr<<1)+1) & 0x1ffff]<<8;
10291028            }
r7473r7474
10411040            if (vram_fgr_count)
10421041            {
10431042               UINT32 rem = addr & vram_fgr_mask;
1044               UINT32 faddr = (addr & ~vram_fgr_mask) + (rem >> vram_fgr_shift) +
1045                         ((rem & (vram_fgr_count - 1)) << 3);
1043               UINT32 faddr = (addr & ~vram_fgr_mask) + (rem >> vram_fgr_shift) + ((rem & (vram_fgr_count - 1)) << 3);
10461044
10471045               snes_vram[(faddr<<1)&0x1ffff] = data;
10481046            }
r7473r7474
10661064            if (vram_fgr_count)
10671065            {
10681066               UINT32 rem = addr & vram_fgr_mask;
1069               UINT32 faddr = (addr & ~vram_fgr_mask) + (rem >> vram_fgr_shift) +
1070                         ((rem & (vram_fgr_count - 1)) << 3);
1067               UINT32 faddr = (addr & ~vram_fgr_mask) + (rem >> vram_fgr_shift) + ((rem & (vram_fgr_count - 1)) << 3);
10711068
10721069               snes_vram[((faddr<<1)+1)&0x1ffff] = data;
10731070            }
src/mame/includes/snes.h
r7473r7474
452452{
453453   struct
454454   {
455      /* clipmasks */
456      UINT8 window1_enabled, window1_invert;
457      UINT8 window2_enabled, window2_invert;
458      UINT8 wlog_mask;
459      /* color math enabled */
455460      UINT8 color_math;
456      UINT32 data;
457      UINT32 map;
458      UINT8 map_size;
461
462      UINT8 charmap;
463      UINT8 tilemap;
464      UINT8 tilemap_size;
465
459466      UINT8 tile_size;
460467      UINT8 mosaic_enabled;   // actually used only for layers 0->3!
461468      UINT8 main_window_enabled;
462469      UINT8 sub_window_enabled;
463      UINT8 window1_enabled, window1_invert;
464      UINT8 window2_enabled, window2_invert;
465      UINT8 wlog_mask;
466470      struct
467471      {
468472         UINT16 horizontal;
src/mame/video/snes.c
r7473r7474
426426   INT8 line, tile_line;
427427   UINT8 priority;
428428   /* scrolling */
429   UINT32 basevmap;
429   UINT32 basevmap, charaddr;
430430   UINT16 vscroll, hscroll, vtilescroll;
431431//  UINT16 offset_per_tile_valid;
432432//  UINT8 offset_per_tile_mode;
r7473r7474
473473      vtilescroll -= 128;
474474
475475   /* Jump to base map address */
476   tmap = snes_ppu.layer[layer].map;
476   tmap = snes_ppu.layer[layer].tilemap << 9;
477   charaddr = snes_ppu.layer[layer].charmap << 13;
477478
478479   /* Offset vertically */
479   tmap += table_vscroll[snes_ppu.layer[layer].map_size & 3][(vtilescroll >> 5) & 3];
480   tmap += table_vscroll[snes_ppu.layer[layer].tilemap_size & 3][(vtilescroll >> 5) & 3];
480481   /* Scroll vertically */
481482   tmap += (vtilescroll & 0x1f) << 6;
482483   /* Remember this position */
483484   basevmap = tmap;
484485   /* Offset horizontally */
485   tmap += table_hscroll[snes_ppu.layer[layer].map_size & 3][(hscroll >> 5) & 3];
486   tmap += table_hscroll[snes_ppu.layer[layer].tilemap_size & 3][(hscroll >> 5) & 3];
486487   /* Scroll horizontally */
487488   tmap += (hscroll & 0x1f) << 1;
488489
r7473r7474
513514      /* Have we scrolled into the next map? */
514515      if (wrap_around_x && ((ii >> 1) >= 32 - (hscroll & 0x1f)))
515516      {
516         tmap = basevmap + table_hscroll[snes_ppu.layer[layer].map_size & 3][((hscroll >> 5) + 1) & 3];
517         tmap = basevmap + table_hscroll[snes_ppu.layer[layer].tilemap_size & 3][((hscroll >> 5) + 1) & 3];
517518         tmap -= ii;
518519         wrap_around_x = 0;   /* Make sure we don't do this again */
519520      }
520521      //if (tmap > 0x10000)
521522      //  tmap %= 0x10000;
522523
523      vflip = snes_vram[tmap + ii + 1] & 0x80;
524      hflip = snes_vram[tmap + ii + 1] & 0x40;
525      priority = ((snes_vram[tmap + ii + 1] & 0x20) >> 5) ? priority_b : priority_a;
526      pal = (color_depth == SNES_COLOR_DEPTH_8BPP && direct_colors == 0) ? 0 : (snes_vram[tmap + ii + 1] & 0x1c) << color_shift;      /* 8 palettes of (4 * color_shift) colours */
527      tile = (snes_vram[tmap + ii + 1] & 0x3) << 8;
528      tile |= snes_vram[tmap + ii] & 0xff;
524      /*
525      Tilemap format
526        vhopppcc cccccccc
529527
528        v/h  = Vertical/Horizontal flip this tile.
529        o    = Tile priority.
530        ppp  = Tile palette. The number of entries in the palette depends on the Mode and the BG.
531        cccccccccc = Tile number.
532      */
533      UINT16 tilemap = snes_vram[tmap + ii] | (snes_vram[tmap + ii + 1] << 8);
534      vflip = BIT(tilemap, 15);
535      hflip = BIT(tilemap, 14);
536      priority = BIT(tilemap, 13) ? priority_b : priority_a;
537      pal = (color_depth == SNES_COLOR_DEPTH_8BPP && direct_colors == 0) ? 0 : ((tilemap & 0x1c00) >> 8) << color_shift;   /* 8 palettes of (4 * color_shift) colours */
538      tile = tilemap & 0x03ff;
539
530540      /* Mode 0 palettes are layer specific */
531541      if (snes_ppu.mode == 0)
532542      {
r7473r7474
568578         {
569579            if (hflip)
570580            {
571               snes_draw_tile_x2(screen, color_planes, layer, snes_ppu.layer[layer].data + (tile * 8 * color_planes) + tile_line, ((ii >> 1) * (8 << (tile_size + 1))) - (hshift << 1) + 16, priority, hflip, pal);
572               snes_draw_tile_x2(screen, color_planes, layer, snes_ppu.layer[layer].data + ((tile + 2)  * 8 * color_planes) + tile_line, ((ii >> 1) * (8 << (tile_size + 1))) - (hshift << 1), priority, hflip, pal);
581               snes_draw_tile_x2(screen, color_planes, layer, charaddr + (tile * 8 * color_planes) + tile_line, ((ii >> 1) * (8 << (tile_size + 1))) - (hshift << 1) + 16, priority, hflip, pal);
582               snes_draw_tile_x2(screen, color_planes, layer, charaddr + ((tile + 2)  * 8 * color_planes) + tile_line, ((ii >> 1) * (8 << (tile_size + 1))) - (hshift << 1), priority, hflip, pal);
573583            }
574584            else
575585            {
576               snes_draw_tile_x2(screen, color_planes, layer, snes_ppu.layer[layer].data + (tile  * 8 * color_planes) + tile_line, ((ii >> 1) * (8 << (tile_size + 1))) - (hshift << 1), priority, hflip, pal);
577               snes_draw_tile_x2(screen, color_planes, layer, snes_ppu.layer[layer].data + ((tile + 2)  * 8 * color_planes) + tile_line, ((ii >> 1) * (8 << (tile_size + 1))) - (hshift << 1) + 16, priority, hflip, pal);
586               snes_draw_tile_x2(screen, color_planes, layer, charaddr + (tile  * 8 * color_planes) + tile_line, ((ii >> 1) * (8 << (tile_size + 1))) - (hshift << 1), priority, hflip, pal);
587               snes_draw_tile_x2(screen, color_planes, layer, charaddr + ((tile + 2)  * 8 * color_planes) + tile_line, ((ii >> 1) * (8 << (tile_size + 1))) - (hshift << 1) + 16, priority, hflip, pal);
578588            }
579589         }
580590         else   /* No Hi-Res: 2bpp, 4bpp & 8bpp */
581591         #endif
582592         {
583            snes_draw_tile_x2(screen, color_planes, layer, snes_ppu.layer[layer].data + (tile  * 8 * color_planes) + tile_line, ((ii >> 1) * (8 << tile_size)) - hshift, priority, hflip, pal, direct_colors);
593            snes_draw_tile_x2(screen, color_planes, layer, charaddr + (tile  * 8 * color_planes) + tile_line, ((ii >> 1) * (8 << tile_size)) - hshift, priority, hflip, pal, direct_colors);
584594         }
585595      }
586596      else   /* tile_size = 0 */
587597      {
588598         if (hires)   /* Hi-Res: 2bpp & 4bpp */
589            snes_draw_tile_x2(screen, color_planes, layer, snes_ppu.layer[layer].data + (tile  * 8 * color_planes) + tile_line, ((ii >> 1) * (8 << (tile_size + 1))) - (hshift << 1), priority, hflip, pal, direct_colors);
599            snes_draw_tile_x2(screen, color_planes, layer, charaddr + (tile  * 8 * color_planes) + tile_line, ((ii >> 1) * (8 << (tile_size + 1))) - (hshift << 1), priority, hflip, pal, direct_colors);
590600         else   /* No Hi-Res: 2bpp, 4bpp & 8bpp */
591            snes_draw_tile(screen, color_planes, layer, snes_ppu.layer[layer].data + (tile  * 8 * color_planes) + tile_line, ((ii >> 1) * (8 << tile_size)) - hshift, priority, hflip, pal, direct_colors);
601            snes_draw_tile(screen, color_planes, layer, charaddr + (tile  * 8 * color_planes) + tile_line, ((ii >> 1) * (8 << tile_size)) - hshift, priority, hflip, pal, direct_colors);
592602      }
593603   }
594604}
r7473r7474
753763   UINT16 tile;
754764   INT16 i, x, y;
755765   UINT8 *oamram = (UINT8 *)snes_oam;
756   UINT32 name_sel = 0;
766   UINT32 name_sel = 0, charaddr;
757767   static const UINT8 table_obj_priority[10][4] = {
758768                  {2, 5, 8, 11},   // mode 0
759769                  {1, 3, 6, 9},   // mode 1
r7473r7474
778788   curline /= snes_ppu.interlace;
779789   curline *= snes_ppu.obj_interlace;
780790
791   charaddr = snes_ppu.layer[SNES_OAM].charmap << 13;
792
781793   oam = 0x1ff;
782794   oam_extra = oam + 0x20;
783795   extra = 0;
r7473r7474
832844               if ((x + (count << 3) < SNES_SCR_WIDTH + 8))
833845               {
834846                  if (widemode)
835                     snes_draw_tile_object(screen, snes_ppu.layer[SNES_OAM].data + name_sel + tile + table_obj_offset[ys][xs] + line, x + (count++ << 3), priority, hflip, pal, blend, 1);
847                     snes_draw_tile_object(screen, charaddr + name_sel + tile + table_obj_offset[ys][xs] + line, x + (count++ << 3), priority, hflip, pal, blend, 1);
836848                  else
837                     snes_draw_tile_object(screen, snes_ppu.layer[SNES_OAM].data + name_sel + tile + table_obj_offset[ys][xs] + line, x + (count++ << 3), priority, hflip, pal, blend, 0);
849                     snes_draw_tile_object(screen, charaddr + name_sel + tile + table_obj_offset[ys][xs] + line, x + (count++ << 3), priority, hflip, pal, blend, 0);
838850               }
839851               time_over++;   /* Increase time_over. Should we stop drawing if exceeded 34 tiles? */
840852            }
r7473r7474
846858               if ((x + (xs << 3) < SNES_SCR_WIDTH + 8))
847859               {
848860                  if (widemode)
849                     snes_draw_tile_object(screen, snes_ppu.layer[SNES_OAM].data + name_sel + tile + table_obj_offset[ys][xs] + line, x + (xs << 3), priority, hflip, pal, blend, 1);
861                     snes_draw_tile_object(screen, charaddr + name_sel + tile + table_obj_offset[ys][xs] + line, x + (xs << 3), priority, hflip, pal, blend, 1);
850862                  else
851                     snes_draw_tile_object(screen, snes_ppu.layer[SNES_OAM].data + name_sel + tile + table_obj_offset[ys][xs] + line, x + (xs << 3), priority, hflip, pal, blend, 0);
863                     snes_draw_tile_object(screen, charaddr + name_sel + tile + table_obj_offset[ys][xs] + line, x + (xs << 3), priority, hflip, pal, blend, 0);
852864               }
853865               time_over++;   /* Increase time_over. Should we stop drawing if exceeded 34 tiles? */
854866            }
r7473r7474
13381350            (snes_ram[MOSAIC] & 0x1)?"m":" ",
13391351            snes_ram[BG1SC] & 0x3,
13401352            (snes_ram[BG1SC] & 0xfc) << 9,
1341            snes_ppu.layer[SNES_BG1].data );
1353            snes_ppu.layer[SNES_BG1].charmap << 13);
13421354      //ui_draw_text( t, SNES_DBG_HORZ_POS, y++ * 9 );
13431355      logerror("%s2 %s%s%s%s%s%c%s%s%d%s %d %4X %4X",
13441356            debug_options.bg_disabled[1]?" ":"*",
r7473r7474
13541366            (snes_ram[MOSAIC] & 0x2)?"m":" ",
13551367            snes_ram[BG2SC] & 0x3,
13561368            (snes_ram[BG2SC] & 0xfc) << 9,
1357            snes_ppu.layer[SNES_BG2].data );
1369            snes_ppu.layer[SNES_BG2].charmap << 13);
13581370      //ui_draw_text( t, SNES_DBG_HORZ_POS, y++ * 9 );
13591371      logerror("%s3 %s%s%s%s%s%c%s%s%d%s%s%d %4X %4X",
13601372            debug_options.bg_disabled[2]?" ":"*",
r7473r7474
13711383            (snes_ram[BGMODE] & 0x8)?"P":" ",
13721384            snes_ram[BG3SC] & 0x3,
13731385            (snes_ram[BG3SC] & 0xfc) << 9,
1374            snes_ppu.layer[SNES_BG3].data );
1386            snes_ppu.layer[SNES_BG3].charmap << 13);
13751387      //ui_draw_text( t, SNES_DBG_HORZ_POS, y++ * 9 );
13761388      logerror("%s4 %s%s%s%s%s%c%s%s%d%s %d %4X %4X",
13771389            debug_options.bg_disabled[3]?" ":"*",
r7473r7474
13871399            (snes_ram[MOSAIC] & 0x8)?"m":" ",
13881400            snes_ram[BG4SC] & 0x3,
13891401            (snes_ram[BG4SC] & 0xfc) << 9,
1390            snes_ppu.layer[SNES_BG4].data );
1402            snes_ppu.layer[SNES_BG4].charmap << 13 );
13911403      //ui_draw_text( t, SNES_DBG_HORZ_POS, y++ * 9 );
13921404      logerror("%sO %s%s%s%s%s%c%s%s%d%d       %4X",
13931405            debug_options.bg_disabled[4]?" ":"*",
r7473r7474
14001412            (snes_ram[WOBJSEL] & 0x2)?((snes_ram[WOBJSEL] & 0x1)?"o":"i"):" ",
14011413            (snes_ram[WOBJSEL] & 0x8)?((snes_ram[WOBJSEL] & 0x4)?"o":"i"):" ",
14021414            snes_ppu.oam.size[0], snes_ppu.oam.size[1],
1403            snes_ppu.layer[SNES_OAM].data );
1415            snes_ppu.layer[SNES_OAM].charmap << 13 );
14041416      //ui_draw_text( t, SNES_DBG_HORZ_POS, y++ * 9 );
14051417      logerror("%sB   %s  %c%s%s",
14061418            debug_options.bg_disabled[5]?" ":"*",

Previous 15994 Revisions Next


© 1998-2018 The MESS Team