Previous 15994 Revisions Next

r7663 Monday 29th March, 2010 at 11:12:56 UTC by Fabio Priuli
[SNES] wip:
- moved some variables from snes_ram to driver state
- set a few addresses as open bus
- slightly changed SuperFX handlers not to access SNES WRAM
[src/emu/cpu/superfx]superfx.c
[src/mame/includes]snes.h
[src/mame/machine]snes.c
[src/mess/machine]snescart.c

src/mame/machine/snes.c
r7662r7663
137137   /* Vertical IRQ timer - only if horizontal isn't also enabled! */
138138   if ((snes_ram[NMITIMEN] & 0x20) && !(snes_ram[NMITIMEN] & 0x10))
139139   {
140      if (snes_ppu.beam.current_vert == (((snes_ram[VTIMEH] << 8) | snes_ram[VTIMEL]) & 0x1ff))
140      if (snes_ppu.beam.current_vert == state->vtime)
141141      {
142142         snes_ram[TIMEUP] = 0x80;   /* Indicate that irq occured */
143143         // IRQ latches the counters, do it now
r7662r7663
149149   if (snes_ram[NMITIMEN] & 0x10)
150150   {
151151      int setirq = 1;
152      int pixel = ((snes_ram[HTIMEH] << 8) | snes_ram[HTIMEL]) & 0x1ff;
152      int pixel = state->htime;
153153
154154      // is the HIRQ on a specific scanline?
155155      if (snes_ram[NMITIMEN] & 0x20)
156156      {
157         if (snes_ppu.beam.current_vert != (((snes_ram[VTIMEH] << 8) | snes_ram[VTIMEL]) & 0x1ff) )
157         if (snes_ppu.beam.current_vert != state->vtime)
158158         {
159159            setirq = 0;
160160         }
r7662r7663
238238         if (snes_ram[HDMAEN])
239239            snes_hdma(cpu0space);
240240
241         video_screen_update_partial(machine->primary_screen, (snes_ppu.interlace == 2) ? (snes_ppu.beam.current_vert*snes_ppu.interlace) : snes_ppu.beam.current_vert-1);
241         video_screen_update_partial(machine->primary_screen, (snes_ppu.interlace == 2) ? (snes_ppu.beam.current_vert * snes_ppu.interlace) : snes_ppu.beam.current_vert - 1);
242242      }
243243   }
244244
r7662r7663
773773         snes_ppu.ppu2_open_bus = value;
774774         return snes_ppu.ppu2_open_bus;
775775      case WMDATA:   /* Data to read from WRAM */
776         {
777            UINT32 addr = ((snes_ram[WMADDH] & 0x1) << 16) | (snes_ram[WMADDM] << 8) | snes_ram[WMADDL];
778
779            value = memory_read_byte(space, 0x7e0000 + addr++);
780            addr &= 0x1ffff;
781            snes_ram[WMADDH] = (addr >> 16) & 0x1;
782            snes_ram[WMADDM] = (addr >> 8) & 0xff;
783            snes_ram[WMADDL] = addr & 0xff;
784            return value;
785         }
786      case WMADDL:   /* Address to read/write to wram (low) */
787      case WMADDM:   /* Address to read/write to wram (mid) */
788      case WMADDH:   /* Address to read/write to wram (high) */
789         return snes_ram[offset];
776         value = memory_read_byte(space, 0x7e0000 + state->wram_address++);
777         state->wram_address &= 0x1ffff;
778         return value;
790779      case OLDJOY1:   /* Data for old NES controllers (JOYSER1) */
791780         if (snes_ram[offset] & 0x1)
792781            return 0 | (snes_open_bus_r(space, 0) & 0xfc); //correct?
r7662r7663
801790         value = state->oldjoy2_read(space->machine);
802791
803792         return value | 0x1c | (snes_open_bus_r(space, 0) & 0xe0); //correct?
804      case HTIMEL:
805      case HTIMEH:
806      case VTIMEL:
807      case VTIMEH:
808         return snes_ram[offset];
809793      case RDNMI:         /* NMI flag by v-blank and version number */
810794         value = (snes_ram[offset] & 0x8f) | (snes_open_bus_r(space, 0) & 0x70);
811795         snes_ram[offset] &= 0x7f;   /* NMI flag is reset on read */
r7662r7663
813797      case TIMEUP:      /* IRQ flag by H/V count timer */
814798         value = (snes_open_bus_r(space, 0) & 0x7f) | (snes_ram[TIMEUP] & 0x80);
815799         cpu_set_input_line(state->maincpu, G65816_LINE_IRQ, CLEAR_LINE );
816         snes_ram[TIMEUP] = 0;
800         snes_ram[TIMEUP] = 0;   // flag is cleared on both read and write
817801         return value;
818802      case HVBJOY:      /* H/V blank and joypad controller enable */
819803         // electronics test says hcounter 272 is start of hblank, which is beampos 363
r7662r7663
13541338#endif
13551339         break;
13561340      case WMDATA:   /* Data to write to WRAM */
1357         {
1358            UINT32 addr = ((snes_ram[WMADDH] & 0x1) << 16) | (snes_ram[WMADDM] << 8) | snes_ram[WMADDL];
1359            memory_write_byte(space, 0x7e0000 + addr++, data );
1360            addr &= 0x1ffff;
1361            snes_ram[WMADDH] = (addr >> 16) & 0x1;
1362            snes_ram[WMADDM] = (addr >> 8) & 0xff;
1363            snes_ram[WMADDL] = addr & 0xff;
1364            return;
1365         }
1341         memory_write_byte(space, 0x7e0000 + state->wram_address++, data );
1342         state->wram_address &= 0x1ffff;
1343         return;
13661344      case WMADDL:   /* Address to read/write to wram (low) */
1345         state->wram_address = (state->wram_address & 0xffff00) | (data <<  0);
1346         state->wram_address &= 0x1ffff;
1347         return;
13671348      case WMADDM:   /* Address to read/write to wram (mid) */
1349         state->wram_address = (state->wram_address & 0xff00ff) | (data <<  8);
1350         state->wram_address &= 0x1ffff;
1351         return;
13681352      case WMADDH:   /* Address to read/write to wram (high) */
1369         break;
1353         state->wram_address = (state->wram_address & 0x00ffff) | (data << 16);
1354         state->wram_address &= 0x1ffff;
1355         return;
13701356      case OLDJOY1:   /* Old NES joystick support */
13711357         if (((!(data & 0x1)) && (snes_ram[offset] & 0x1)))
13721358         {
r7662r7663
14221408         }
14231409         break;
14241410      case HTIMEL:   /* H-Count timer settings (low)  */
1411         state->htime = (state->htime & 0xff00) | (data <<  0);
1412         state->htime &= 0x1ff;
1413         return;
14251414      case HTIMEH:   /* H-Count timer settings (high) */
1415         state->htime = (state->htime & 0x00ff) | (data <<  8);
1416         state->htime &= 0x1ff;
1417         return;
14261418      case VTIMEL:   /* V-Count timer settings (low)  */
1419         state->vtime = (state->vtime & 0xff00) | (data <<  0);
1420         state->vtime &= 0x1ff;
1421         return;
14271422      case VTIMEH:   /* V-Count timer settings (high) */
1428         break;
1423         state->vtime = (state->vtime & 0x00ff) | (data <<  8);
1424         state->vtime &= 0x1ff;
1425         return;
14291426      case MDMAEN:   /* DMA channel designation and trigger */
14301427         snes_dma(space, data);
14311428         data = 0;   /* Once DMA is done we need to reset all bits to 0 */
r7662r7663
14431440            mame_printf_debug( "CPU speed: %f Mhz\n", (data & 0x1) ? 3.58 : 2.68 );
14441441#endif
14451442         break;
1446      case TIMEUP:
1447         snes_ram[TIMEUP] = data &~0x7f;
1443      case TIMEUP:   // IRQ Flag is cleared on both read and write
1444         snes_ram[TIMEUP] = 0;
14481445         return;
14491446      /* Following are read-only */
14501447      case HVBJOY:   /* H/V blank and joypad enable */
r7662r7663
16061603/* 0x000000 - 0x2fffff */
16071604READ8_HANDLER( snes_r_bank1 )
16081605{
1609   snes_state *state = (snes_state *)space->machine->driver_data;
16101606   UINT8 value;
16111607   UINT16 address = offset & 0xffff;
16121608
r7662r7663
16161612      value = snes_r_io(space, address);
16171613   else if (address < 0x8000)
16181614   {
1619      if (snes_has_addon_chip == HAS_SUPERFX && state->superfx != NULL)
1620         value = snes_ram[0x700000 + (address & 0x1fff)];
1615      if (snes_has_addon_chip == HAS_SUPERFX)
1616         value = snes_ram[0xf00000 + (address & 0x1fff)];   // here it should 0xe00000 but there are mirroring issues
16211617      else if (snes_has_addon_chip == HAS_OBC1)
16221618         value = obc1_read(space, offset);
16231619      else if ((snes_has_addon_chip == HAS_DSP2) && (offset >= 0x200000))
r7662r7663
16271623      else if (snes_has_addon_chip == HAS_CX4)
16281624         value = CX4_read(address - 0x6000);
16291625      else if (snes_has_addon_chip == HAS_SPC7110 || snes_has_addon_chip == HAS_SPC7110_RTC)
1630      {
16311626         value = snes_ram[0x306000 + (offset & 0x1fff)];
1632      }
16331627      else
16341628      {
16351629         logerror( "snes_r_bank1: Unmapped external chip read: %04x\n", address );
r7662r7663
16601654      value = snes_r_io(space, address);
16611655   else if (address < 0x8000)                              /* SRAM for mode_21, Reserved othewise */
16621656   {
1663      if (snes_has_addon_chip == HAS_OBC1)
1657      if (snes_has_addon_chip == HAS_SUPERFX)
1658         value = snes_ram[0xf00000 + (address & 0x1fff)];   // here it should 0xe00000 but there are mirroring issues
1659      else if (snes_has_addon_chip == HAS_OBC1)
16641660         value = obc1_read (space, offset);
16651661      else if (snes_has_addon_chip == HAS_DSP2)
16661662         value = (address < 0x7000) ? dsp2_read() : 0x00;
16671663      else if (snes_has_addon_chip == HAS_SPC7110 || snes_has_addon_chip == HAS_SPC7110_RTC)
1668      {
16691664         value = snes_ram[0x306000 + (offset & 0x1fff)];
1670      }
16711665      else if ((snes_cart.mode == SNES_MODE_21) && (snes_cart.sram > 0))
16721666      {
16731667         int mask = ((snes_cart.sram * 1024) - 1);            /* Limit SRAM size to what's actually present */
r7662r7663
17011695   UINT8 value;
17021696   UINT16 address = offset & 0xffff;
17031697
1704   if (snes_has_addon_chip == HAS_SUPERFX)
1698   if ((snes_cart.mode & 5) && !(snes_has_addon_chip == HAS_SUPERFX))   /* Mode 20 & 22 */
17051699   {
1706      //printf( "snes_r_bank3: %08x\n", offset );
1707      return snes_ram[0x400000 + offset];
1708   }
1709   else if (snes_cart.mode & 5)                     /* Mode 20 & 22 */
1710   {
1711      if ((address < 0x8000) && (snes_cart.mode == SNES_MODE_20)) //FIXME: check this
1712      {
1700      if ((address < 0x8000) && (snes_cart.mode == SNES_MODE_20))
17131701         value = 0xff;                     /* Reserved */
1714         //value =  snes_ram[0x200000 + ((offset & ~0x8000) | 0x8000)];  // is this hack still needed?   /* Reserved */
1715      }
17161702      else
17171703         value = snes_ram[0x400000 + offset];
17181704   }
1719   else                                 /* Mode 21 & 25 */
1705   else                                 /* Mode 21 & 25 + SuperFX games */
17201706      value = snes_ram[0x400000 + offset];
17211707
17221708   return value;
r7662r7663
17251711/* 0x600000 - 0x6fffff */
17261712READ8_HANDLER( snes_r_bank4 )
17271713{
1728   snes_state *state = (snes_state *)space->machine->driver_data;
17291714   UINT8 value = 0xff;
17301715   UINT16 address = offset & 0xffff;
17311716
1732   if (snes_has_addon_chip == HAS_SUPERFX && state->superfx != NULL)
1733   {
1734      value = snes_ram[0x600000 + offset];
1735   }
1717   if (snes_has_addon_chip == HAS_SUPERFX)
1718      value = snes_ram[0xe00000 + offset];
17361719   else if (snes_has_addon_chip == HAS_ST010 && offset >= 0x80000 && address < 0x1000)
1737   {
17381720      value = st010_read(address);
1739   }
17401721   else if (snes_cart.mode & 5)                     /* Mode 20 & 22 */
17411722   {
17421723      if (address >= 0x8000)
r7662r7663
17591740/* 0x700000 - 0x7dffff */
17601741READ8_HANDLER( snes_r_bank5 )
17611742{
1762   snes_state *state = (snes_state *)space->machine->driver_data;
17631743   UINT8 value;
17641744   UINT16 address = offset & 0xffff;
17651745
1766   if (snes_has_addon_chip == HAS_SUPERFX && state->superfx != NULL)
1746   if (snes_has_addon_chip == HAS_SUPERFX)
1747      value = snes_ram[0xf00000 + offset];
1748   else if ((snes_cart.mode & 5) && (address < 0x8000))      /* Mode 20 & 22 */
17671749   {
1768      value = snes_ram[0x700000 + offset];
1769   }
1770   else if ((snes_cart.mode & 5) &&(address < 0x8000))      /* Mode 20 & 22 */
1771   {
17721750      if (snes_cart.sram > 0)
17731751      {
17741752         int mask = ((snes_cart.sram * 1024) - 1) | 0xff0000;   /* Limit SRAM size to what's actually present */
r7662r7663
17761754      }
17771755      else
17781756      {
1779         logerror( "snes_r_bank5: Unmapped external chip read: %04x\n", address );
1757         logerror("snes_r_bank5: Unmapped external chip read: %04x\n", address);
17801758         value = 0xff;                        /* Reserved */
17811759      }
17821760   }
17831761   else
1784   {
17851762      value = snes_ram[0x700000 + offset];
1786   }
17871763
17881764   return value;
17891765}
r7662r7663
17911767/* 0x800000 - 0xbfffff */
17921768READ8_HANDLER( snes_r_bank6 )
17931769{
1794   snes_state *state = (snes_state *)space->machine->driver_data;
17951770   UINT8 value = 0;
17961771   UINT16 address = offset & 0xffff;
17971772
1798   if (address < 0x8000)
1773   if (snes_has_addon_chip == HAS_SUPERFX)
1774      value = memory_read_byte(space, offset);
1775   else if (address < 0x8000)
17991776   {
1800      if (address >= 0x6000 && snes_has_addon_chip == HAS_SUPERFX && state->superfx != NULL)
1801         logerror( "snes_r_bank6 hit in Super FX mode, please fix me\n" );
1802      else if (snes_cart.mode != SNES_MODE_25)
1777      if (snes_cart.mode != SNES_MODE_25)
18031778         value = memory_read_byte(space, offset);
18041779      else if (snes_has_addon_chip == HAS_CX4)
18051780      {
r7662r7663
18171792         }
18181793         else                  /* Area 0x6000-0x8000 with offset < 0x300000 is reserved */
18191794         {
1820            logerror( "snes_r_bank6: Unmapped external chip read: %04x\n", address );
1795            logerror("snes_r_bank6: Unmapped external chip read: %04x\n", address);
18211796            value = 0xff;
18221797         }
18231798      }
r7662r7663
18391814/* 0xc00000 - 0xffffff */
18401815READ8_HANDLER( snes_r_bank7 )
18411816{
1842   snes_state *state = (snes_state *)space->machine->driver_data;
18431817   UINT8 value = 0;
18441818   UINT16 address = offset & 0xffff;
18451819
18461820   if (snes_has_addon_chip == HAS_SDD1)
1847   {
1848      return sdd1_read(space->machine, offset);
1849   }
1850   else if (snes_has_addon_chip == HAS_SUPERFX && state->superfx != NULL)
1851   {
1852      logerror( "snes_r_bank7 hit in Super FX mode, please fix me\n" );
1853   }
1821      value = sdd1_read(space->machine, offset);
18541822   else if (snes_has_addon_chip == HAS_ST010 && offset >= 0x280000 && offset < 0x300000 && address < 0x1000)
1855   {
18561823      value = st010_read(address);
1857   }
1858   else if (snes_cart.mode & 5)            /* Mode 20 & 22 */
1824   else if ((snes_cart.mode & 5) && !(snes_has_addon_chip == HAS_SUPERFX))      /* Mode 20 & 22 */
18591825   {
18601826      if (address < 0x8000)
1861      {
18621827         value = memory_read_byte(space, 0x400000 + offset);
1863      }
18641828      else
18651829         value = snes_ram[0xc00000 + offset];
18661830   }
1867   else                        /* Mode 21 & 25 */
1831   else                        /* Mode 21 & 25 + SuperFX Games */
18681832      value = snes_ram[0xc00000 + offset];
18691833
18701834   return value;
r7662r7663
18831847   else if (address < 0x8000)
18841848   {
18851849      if (snes_has_addon_chip == HAS_SUPERFX)
1886         snes_ram[0x700000 + (address & 0x1fff)] = data;
1850         snes_ram[0xf00000 + (address & 0x1fff)] = data;   // here it should 0xe00000 but there are mirroring issues
18871851      else if (snes_has_addon_chip == HAS_OBC1)
18881852         obc1_write(space, offset, data);
18891853      else if ((snes_has_addon_chip == HAS_DSP2) && (offset >= 0x200000))
r7662r7663
19201884      snes_w_io(space, address, data);
19211885   else if (address < 0x8000)                  /* SRAM for mode_21, Reserved othewise */
19221886   {
1923      if (snes_has_addon_chip == HAS_OBC1)
1887      if (snes_has_addon_chip == HAS_SUPERFX)
1888         snes_ram[0xf00000 + (address & 0x1fff)] = data;   // here it should 0xe00000 but there are mirroring issues
1889      else if (snes_has_addon_chip == HAS_OBC1)
19241890         obc1_write(space, offset, data);
19251891      else if (snes_has_addon_chip == HAS_DSP2)
19261892         dsp2_write(data);
r7662r7663
19311897      else if ((snes_cart.mode == SNES_MODE_21) && (snes_cart.sram > 0))
19321898      {
19331899         int mask = ((snes_cart.sram * 1024) - 1);         /* Limit SRAM size to what's actually present */
1934         logerror( "snes_w_bank2 hit in Super FX mode, please fix me if necessary\n" );
19351900         offset -= 0x6000;
19361901         snes_ram[0x306000 + (offset & mask)] = data;
19371902      }
r7662r7663
19541919/* 0x600000 - 0x6fffff */
19551920WRITE8_HANDLER( snes_w_bank4 )
19561921{
1957   snes_state *state = (snes_state *)space->machine->driver_data;
19581922   UINT16 address = offset & 0xffff;
19591923
1960   if (snes_has_addon_chip == HAS_SUPERFX && state->superfx != NULL)
1961   {
1962      snes_ram[0x600000 + offset] = data;
1963   }
1924   if (snes_has_addon_chip == HAS_SUPERFX)
1925      snes_ram[0xe00000 + offset] = data;
19641926   else if (snes_has_addon_chip == HAS_ST010 && offset >= 0x80000 && address < 0x1000)
1965   {
19661927      st010_write(address, data);
1967   }
19681928   else if (snes_cart.mode & 5)               /* Mode 20 & 22 */
19691929   {
19701930      if (address >= 0x8000)
1971      {
19721931         logerror("Attempt to write to ROM address: %X\n", offset + 0x600000);
1973      }
19741932      else if (snes_has_addon_chip == HAS_DSP1)
1975      {
19761933         dsp1_set_dr(data);
1977      }
19781934      else
1979      {
19801935         logerror("snes_w_bank4: Attempt to write to reserved address: %X = %02x\n", offset + 0x600000, data);
1981      }
19821936   }
19831937   else if (snes_cart.mode & 0x0a)
1984   {
19851938      logerror("Attempt to write to ROM address: %X\n", offset + 0x600000);
1986   }
19871939}
19881940
19891941/* 0x700000 - 0x7dffff */
19901942WRITE8_HANDLER( snes_w_bank5 )
19911943{
1992   snes_state *state = (snes_state *)space->machine->driver_data;
19931944   UINT16 address = offset & 0xffff;
19941945
1995   if (snes_has_addon_chip == HAS_SUPERFX && state->superfx != NULL)
1996   {
1997      snes_ram[0x700000 + offset] = data;
1998   }
1946   if (snes_has_addon_chip == HAS_SUPERFX)
1947      snes_ram[0xf00000 + offset] = data;
19991948   else if ((snes_cart.mode & 5) && (address < 0x8000))         /* Mode 20 & 22 */
20001949   {
20011950      if (snes_cart.sram > 0)
r7662r7663
20041953         snes_ram[0x700000 + (offset & mask)] = data;
20051954      }
20061955      else
2007      {
20081956         logerror("snes_w_bank5: Attempt to write to reserved address: %X = %02x\n", offset + 0x700000, data);
2009      }
20101957   }
20111958   else if (snes_cart.mode & 0x0a)
2012   {
20131959      logerror("Attempt to write to ROM address: %X\n", offset + 0x700000);
2014   }
20151960}
20161961
20171962
20181963/* 0x800000 - 0xbfffff */
20191964WRITE8_HANDLER( snes_w_bank6 )
20201965{
2021   snes_state *state = (snes_state *)space->machine->driver_data;
20221966   UINT16 address = offset & 0xffff;
20231967
2024   if (address < 0x8000)
1968   if (snes_has_addon_chip == HAS_SUPERFX)
1969      memory_write_byte(space, offset, data);
1970   else if (address < 0x8000)
20251971   {
2026      if (address >= 0x6000 && snes_has_addon_chip == HAS_SUPERFX && state->superfx != NULL)
1972      if (snes_has_addon_chip == HAS_CX4)
20271973      {
2028         logerror( "snes_w_bank6 hit (RAM) in Super FX mode, please fix me\n" );
2029      }
2030      else if (snes_has_addon_chip == HAS_CX4)
2031      {
20321974         //printf( "R: CX4 hit from 0x800000\n" );
20331975      }
20341976      if (snes_cart.mode != SNES_MODE_25)
2035      {
2036         if (offset < 0x300000)
2037            snes_w_bank1(space, offset, data);
2038         else
2039            snes_w_bank2(space, offset - 0x300000, data);
2040      }
1977         memory_write_byte(space, offset, data);
20411978      else   /* Mode 25 has SRAM not mirrored from lower banks */
20421979      {
20431980         if (address < 0x6000)
2044         {
2045            if (offset < 0x300000)
2046               snes_w_bank1(space, offset, data);
2047            else
2048               snes_w_bank2(space, offset - 0x300000, data);
2049         }
1981            memory_write_byte(space, offset, data);
20501982         else if ((offset >= 0x300000) && (snes_cart.sram > 0))
20511983         {
20521984            int mask = ((snes_cart.sram * 1024) - 1);         /* Limit SRAM size to what's actually present */
r7662r7663
20651997      dsp3_write(address, data);
20661998   else if ((snes_has_addon_chip == HAS_DSP4) && (offset >= 0x300000) && (address < 0xc000))
20671999      dsp4_write(data);
2068   else if (snes_has_addon_chip == HAS_SUPERFX && state->superfx != NULL)
2069      logerror( "snes_w_bank6 hit (ROM) in Super FX mode, please fix me\n" );
20702000   else
20712001      logerror("Attempt to write to ROM address: %X\n", offset + 0x800000);
20722002}
r7662r7663
20752005/* 0xc00000 - 0xffffff */
20762006WRITE8_HANDLER( snes_w_bank7 )
20772007{
2078   snes_state *state = (snes_state *)space->machine->driver_data;
20792008   UINT16 address = offset & 0xffff;
20802009
2081   if (snes_has_addon_chip == HAS_SUPERFX && state->superfx != NULL)
2010   if (snes_has_addon_chip == HAS_SUPERFX)
20822011   {
20832012      if (offset >= 0x200000)
2084      {
2085         logerror( "snes_w_bank7 hit (ROM) in Super FX mode, please fix me\n" );
2086      }
2013         snes_ram[0xc00000 + offset] = data;      // SFX RAM
20872014      else
2088      {
2089         logerror( "snes_w_bank7 hit (RAM) in Super FX mode, please fix me\n" );
2090      }
2015         logerror("Attempt to write to ROM address: %X\n", offset + 0xc00000);
20912016   }
20922017   else if (snes_has_addon_chip == HAS_ST010 && offset >= 0x280000 && offset < 0x300000 && address < 0x1000)
2093   {
20942018      st010_write(address, data);
2095   }
20962019   else if (snes_cart.mode & 5)            /* Mode 20 & 22 */
20972020   {
20982021      if (address < 0x8000)
r7662r7663
23912314
23922315   // reset does this to these registers
23932316   snes_ram[NMITIMEN] = 0;
2394   snes_ram[HTIMEL] = 0xff;
2395   snes_ram[HTIMEH] = 0x1;
2396   snes_ram[VTIMEL] = 0xff;
2397   snes_ram[VTIMEH] = 0x1;
2317   state->htime = 0x1ff;
2318   state->vtime = 0x1ff;
23982319
23992320   state->htmult = 1;
24002321   snes_ppu.interlace = 1;
r7662r7663
28842805
28852806READ8_HANDLER( superfx_r_bank3 )
28862807{
2887   //printf( "superfx_r_bank3: %08x = %02x\n", 0x600000 + offset, snes_ram[0x600000 + offset] );
2888   return snes_ram[0x600000 + offset];
2808   /* IMPORTANT: SFX RAM sits in 0x600000-0x7fffff, and it's mirrored in 0xe00000-0xffffff. However, SNES
2809   has only access to 0x600000-0x7d00000 (because there is WRAM after that), hence we directly use the mirror
2810   as the place where to write & read SFX RAM. SNES handlers have been setup accordingly. */
2811   //printf("superfx_r_bank3: %08x = %02x\n", offset, snes_ram[0xe00000 + offset]);
2812   return snes_ram[0xe00000 + offset];
28892813}
28902814
28912815WRITE8_HANDLER( superfx_w_bank1 )
28922816{
2893   printf( "Attempting to write to cart ROM: %08x = %02x\n", offset, data );
2817   printf("Attempting to write to cart ROM: %08x = %02x\n", offset, data);
28942818   // Do nothing; can't write to cart ROM.
28952819}
28962820
28972821WRITE8_HANDLER( superfx_w_bank2 )
28982822{
2899   printf( "Attempting to write to cart ROM: %08x = %02x\n", 0x400000 + offset, data );
2823   printf("Attempting to write to cart ROM: %08x = %02x\n", 0x400000 + offset, data);
29002824   // Do nothing; can't write to cart ROM.
29012825}
29022826
29032827WRITE8_HANDLER( superfx_w_bank3 )
29042828{
2905   //printf( "superfx_w_bank3: %08x = %02x\n", 0x600000 + offset, data );
2906   snes_ram[0x600000 + offset] = data;
2829   /* IMPORTANT: SFX RAM sits in 0x600000-0x7f00000, and it's mirrored in 0xe00000-0xff00000. However, SNES
2830   has only access to 0x600000-0x7d00000 (because there is WRAM after that), hence we directly use the mirror
2831   as the place where to write & read SFX RAM. SNES handlers have been setup accordingly. */
2832   //printf("superfx_w_bank3: %08x = %02x\n", offset, data);
2833   snes_ram[0xe00000 + offset] = data;
29072834}
src/mame/includes/snes.h
r7662r7663
2323#define DOTCLK_NTSC   (MCLK_NTSC/4)
2424#define DOTCLK_PAL   (MCLK_PAL/4)
2525
26#define SNES_LAYER_DEBUG 
26#define SNES_LAYER_DEBUG  1
2727
2828/* Debug definitions */
2929#ifdef MAME_DEBUG
r7662r7663
392392   UINT8                 read_ophct, read_opvct;
393393   UINT16                hblank_offset;
394394   UINT16                vram_fgr_high, vram_fgr_increment, vram_fgr_count, vram_fgr_mask, vram_fgr_shift, vram_read_buffer;
395   UINT32                wram_address;
396   UINT16                htime, vtime;
395397
396398   /* timers */
397399   emu_timer             *scanline_timer;
src/emu/cpu/superfx/superfx.c
r7662r7663
6161   cache_t cache;
6262   pixelcache_t pixelcache[2];
6363
64    running_device *device;
65    const address_space *program;
66    int icount;
64   running_device *device;
65   const address_space *program;
66   int icount;
6767};
6868
6969INLINE superfx_state *get_safe_token(running_device *device)
7070{
71    assert(device != NULL);
72    assert(device->token != NULL);
73    assert(device->type == CPU);
74    assert(cpu_get_type(device) == CPU_SUPERFX);
75    return (superfx_state *)device->token;
71   assert(device != NULL);
72   assert(device->token != NULL);
73   assert(device->type == CPU);
74   assert(cpu_get_type(device) == CPU_SUPERFX);
75   return (superfx_state *)device->token;
7676}
7777
7878/*****************************************************************************/
r7662r7663
648648
649649/*****************************************************************************/
650650
651static void superfx_register_save( running_device *device )
652{
653   superfx_state *cpustate = get_safe_token(device);
654   int i;
655
656   state_save_register_device_item(device, 0, cpustate->pipeline);
657   state_save_register_device_item(device, 0, cpustate->ramaddr);
658
659   state_save_register_device_item_array(device, 0, cpustate->r);
660   state_save_register_device_item(device, 0, cpustate->sfr);
661   state_save_register_device_item(device, 0, cpustate->pbr);
662   state_save_register_device_item(device, 0, cpustate->rombr);
663   state_save_register_device_item(device, 0, cpustate->rambr);
664   state_save_register_device_item(device, 0, cpustate->cbr);
665   state_save_register_device_item(device, 0, cpustate->scbr);
666   state_save_register_device_item(device, 0, cpustate->scmr);
667   state_save_register_device_item(device, 0, cpustate->colr);
668   state_save_register_device_item(device, 0, cpustate->por);
669   state_save_register_device_item(device, 0, cpustate->bramr);
670   state_save_register_device_item(device, 0, cpustate->vcr);
671   state_save_register_device_item(device, 0, cpustate->cfgr);
672   state_save_register_device_item(device, 0, cpustate->clsr);
673
674   state_save_register_device_item(device, 0, cpustate->romcl);
675   state_save_register_device_item(device, 0, cpustate->romdr);
676
677   state_save_register_device_item(device, 0, cpustate->ramcl);
678   state_save_register_device_item(device, 0, cpustate->ramar);
679   state_save_register_device_item(device, 0, cpustate->ramdr);
680
681   state_save_register_device_item(device, 0, cpustate->sreg_idx);
682   state_save_register_device_item(device, 0, cpustate->dreg_idx);
683   state_save_register_device_item(device, 0, cpustate->r15_modified);
684
685   state_save_register_device_item(device, 0, cpustate->irq);
686
687   state_save_register_device_item(device, 0, cpustate->cache_access_speed);
688   state_save_register_device_item(device, 0, cpustate->memory_access_speed);
689
690   state_save_register_device_item_array(device, 0, cpustate->cache.buffer);
691   state_save_register_device_item_array(device, 0, cpustate->cache.valid);
692
693   for (i = 0; i < 2; i++)
694   {
695      state_save_register_device_item(device, i, cpustate->pixelcache[i].offset);
696      state_save_register_device_item(device, i, cpustate->pixelcache[i].bitpend);
697      state_save_register_device_item_array(device, i, cpustate->pixelcache[i].data);
698   }
699
700   state_save_register_device_item(device, 0, cpustate->icount);
701}
702
651703static CPU_INIT( superfx )
652704{
653705   int i;
654    superfx_state *cpustate = get_safe_token(device);
706   superfx_state *cpustate = get_safe_token(device);
655707
656708   for(i = 0; i < 16; i++)
657709   {
r7662r7663
679731   superfx_memory_reset(cpustate);
680732   superfx_update_speed(cpustate);
681733
682    cpustate->device = device;
683    cpustate->program = device->space(AS_PROGRAM);
734   cpustate->device = device;
735   cpustate->program = device->space(AS_PROGRAM);
684736
685737   if (device->baseconfig().static_config != NULL)
686738   {
r7662r7663
688740   }
689741
690742   devcb_resolve_write_line(&cpustate->out_irq_func, &cpustate->config.out_irq_func, device);
743
744   superfx_register_save(device);
691745}
692746
693747static CPU_EXIT( superfx )
r7662r7663
698752{
699753   int i;
700754
701    superfx_state *cpustate = get_safe_token(device);
755   superfx_state *cpustate = get_safe_token(device);
702756
703757   for(i = 0; i < 16; i++)
704758   {
r7662r7663
756810
757811      debugger_instruction_hook(device, (cpustate->pbr << 16) | cpustate->r[15]);
758812
759        op = superfx_peekpipe(cpustate);
813      op = superfx_peekpipe(cpustate);
760814
761815      switch(op)
762816      {
r7662r7663
10981152            superfx_regs_reset(cpustate);
10991153            break;
11001154
1101                    case 0x71: case 0x72: case 0x73: case 0x74: case 0x75: case 0x76: case 0x77:
1155         case 0x71: case 0x72: case 0x73: case 0x74: case 0x75: case 0x76: case 0x77:
11021156         case 0x78: case 0x79: case 0x7a: case 0x7b: case 0x7c: case 0x7d: case 0x7e: case 0x7f: // AND / BIC / ANDI / BICI
11031157            switch(cpustate->sfr & SUPERFX_SFR_ALT)
11041158            {
r7662r7663
12841338            superfx_regs_reset(cpustate);
12851339            break;
12861340
1287                    case 0xc1: case 0xc2: case 0xc3: case 0xc4: case 0xc5: case 0xc6: case 0xc7:
1341         case 0xc1: case 0xc2: case 0xc3: case 0xc4: case 0xc5: case 0xc6: case 0xc7:
12881342         case 0xc8: case 0xc9: case 0xca: case 0xcb: case 0xcc: case 0xcd: case 0xce: case 0xcf: // OR / XOR / ORI / XORI
12891343            switch(cpustate->sfr & SUPERFX_SFR_ALT)
12901344            {
r7662r7663
14081462      //printf( " r8:%04x  r9:%04x r10:%04x r11:%04x r12:%04x r13:%04x r14:%04x r15:%04x\n",  cpustate->r[8],  cpustate->r[9], cpustate->r[10], cpustate->r[11], cpustate->r[12], cpustate->r[13], cpustate->r[14], cpustate->r[15] );
14091463      //printf( "sfr:%04x\n", cpustate->sfr );
14101464
1411        --cpustate->icount;
1412    }
1465      --cpustate->icount;
1466   }
14131467
1414    return cycles - cpustate->icount;
1468   return cycles - cpustate->icount;
14151469}
14161470
14171471/*****************************************************************************/
r7662r7663
14201474{
14211475   superfx_state *cpustate = get_safe_token(device);
14221476
1423    UINT8      op = *(UINT8 *)(opram + 0);
1424    UINT8  param0 = *(UINT8 *)(opram + 1);
1425    UINT8  param1 = *(UINT8 *)(opram + 2);
1426   UINT16    alt = cpustate->sfr & SUPERFX_SFR_ALT;
1477   UINT8  op = *(UINT8 *)(opram + 0);
1478   UINT8  param0 = *(UINT8 *)(opram + 1);
1479   UINT8  param1 = *(UINT8 *)(opram + 2);
1480   UINT16 alt = cpustate->sfr & SUPERFX_SFR_ALT;
14271481
1428    return superfx_dasm_one(buffer, pc, op, param0, param1, alt);
1482   return superfx_dasm_one(buffer, pc, op, param0, param1, alt);
14291483}
14301484
14311485/*****************************************************************************/
14321486
14331487static CPU_SET_INFO( superfx )
14341488{
1435    superfx_state *cpustate = get_safe_token(device);
1489   superfx_state *cpustate = get_safe_token(device);
14361490
1437    switch (state)
1438    {
1439        /* --- the following bits of info are set as 64-bit signed integers --- */
1440        case CPUINFO_INT_PC:
1441        case CPUINFO_INT_REGISTER + SUPERFX_PC:        cpustate->r[15] = info->i;      break;
1442       case CPUINFO_INT_REGISTER + SUPERFX_DREG:      info->i = cpustate->dreg_idx;   break;
1443       case CPUINFO_INT_REGISTER + SUPERFX_SREG:      info->i = cpustate->sreg_idx;   break;
1444        case CPUINFO_INT_REGISTER + SUPERFX_R0:         cpustate->r[0] = info->i;      break;
1445        case CPUINFO_INT_REGISTER + SUPERFX_R1:         cpustate->r[1] = info->i;      break;
1446        case CPUINFO_INT_REGISTER + SUPERFX_R2:         cpustate->r[2] = info->i;      break;
1447        case CPUINFO_INT_REGISTER + SUPERFX_R3:         cpustate->r[3] = info->i;      break;
1448        case CPUINFO_INT_REGISTER + SUPERFX_R4:         cpustate->r[4] = info->i;      break;
1449        case CPUINFO_INT_REGISTER + SUPERFX_R5:         cpustate->r[5] = info->i;      break;
1450        case CPUINFO_INT_REGISTER + SUPERFX_R6:         cpustate->r[6] = info->i;      break;
1451        case CPUINFO_INT_REGISTER + SUPERFX_R7:         cpustate->r[7] = info->i;      break;
1452        case CPUINFO_INT_REGISTER + SUPERFX_R8:         cpustate->r[8] = info->i;      break;
1453        case CPUINFO_INT_REGISTER + SUPERFX_R9:         cpustate->r[9] = info->i;      break;
1454        case CPUINFO_INT_REGISTER + SUPERFX_R10:        cpustate->r[10] = info->i;      break;
1455        case CPUINFO_INT_REGISTER + SUPERFX_R11:        cpustate->r[11] = info->i;      break;
1456        case CPUINFO_INT_REGISTER + SUPERFX_R12:        cpustate->r[12] = info->i;      break;
1457        case CPUINFO_INT_REGISTER + SUPERFX_R13:        cpustate->r[13] = info->i;      break;
1458        case CPUINFO_INT_REGISTER + SUPERFX_R14:        cpustate->r[14] = info->i;      break;
1459        case CPUINFO_INT_REGISTER + SUPERFX_R15:        cpustate->r[15] = info->i;      break;
1460        case CPUINFO_INT_REGISTER + SUPERFX_SFR:       cpustate->sfr = info->i;       break;
1461        case CPUINFO_INT_REGISTER + SUPERFX_PBR:       cpustate->pbr = info->i;      break;
1462       case CPUINFO_INT_REGISTER + SUPERFX_ROMBR:      cpustate->rombr = info->i;      break;
1463       case CPUINFO_INT_REGISTER + SUPERFX_RAMBR:      cpustate->rambr = info->i;      break;
1464       case CPUINFO_INT_REGISTER + SUPERFX_CBR:      cpustate->cbr = info->i;      break;
1465       case CPUINFO_INT_REGISTER + SUPERFX_SCBR:      cpustate->scbr = info->i;      break;
1466       case CPUINFO_INT_REGISTER + SUPERFX_SCMR:      cpustate->scmr = info->i;      break;
1467       case CPUINFO_INT_REGISTER + SUPERFX_COLR:      cpustate->colr = info->i;      break;
1468       case CPUINFO_INT_REGISTER + SUPERFX_POR:      cpustate->por = info->i;      break;
1469       case CPUINFO_INT_REGISTER + SUPERFX_BRAMR:      cpustate->bramr = info->i;      break;
1470       case CPUINFO_INT_REGISTER + SUPERFX_VCR:      cpustate->vcr = info->i;      break;
1471       case CPUINFO_INT_REGISTER + SUPERFX_CFGR:      cpustate->cfgr = info->i;      break;
1472       case CPUINFO_INT_REGISTER + SUPERFX_CLSR:      cpustate->clsr = info->i;      break;
1473       case CPUINFO_INT_REGISTER + SUPERFX_ROMCL:      cpustate->romcl = info->i;      break;
1474       case CPUINFO_INT_REGISTER + SUPERFX_ROMDR:      cpustate->romdr = info->i;      break;
1475       case CPUINFO_INT_REGISTER + SUPERFX_RAMCL:      cpustate->ramcl = info->i;      break;
1476       case CPUINFO_INT_REGISTER + SUPERFX_RAMAR:      cpustate->ramar = info->i;      break;
1477       case CPUINFO_INT_REGISTER + SUPERFX_RAMDR:      cpustate->ramdr = info->i;      break;
1478       case CPUINFO_INT_REGISTER + SUPERFX_RAMADDR:   cpustate->ramaddr = info->i;   break;
1491   switch (state)
1492   {
1493   /* --- the following bits of info are set as 64-bit signed integers --- */
1494   case CPUINFO_INT_PC:
1495   case CPUINFO_INT_REGISTER + SUPERFX_PC:        cpustate->r[15] = info->i;      break;
1496   case CPUINFO_INT_REGISTER + SUPERFX_DREG:      info->i = cpustate->dreg_idx;   break;
1497   case CPUINFO_INT_REGISTER + SUPERFX_SREG:      info->i = cpustate->sreg_idx;   break;
1498   case CPUINFO_INT_REGISTER + SUPERFX_R0:         cpustate->r[0] = info->i;      break;
1499   case CPUINFO_INT_REGISTER + SUPERFX_R1:         cpustate->r[1] = info->i;      break;
1500   case CPUINFO_INT_REGISTER + SUPERFX_R2:         cpustate->r[2] = info->i;      break;
1501   case CPUINFO_INT_REGISTER + SUPERFX_R3:         cpustate->r[3] = info->i;      break;
1502   case CPUINFO_INT_REGISTER + SUPERFX_R4:         cpustate->r[4] = info->i;      break;
1503   case CPUINFO_INT_REGISTER + SUPERFX_R5:         cpustate->r[5] = info->i;      break;
1504   case CPUINFO_INT_REGISTER + SUPERFX_R6:         cpustate->r[6] = info->i;      break;
1505   case CPUINFO_INT_REGISTER + SUPERFX_R7:         cpustate->r[7] = info->i;      break;
1506   case CPUINFO_INT_REGISTER + SUPERFX_R8:         cpustate->r[8] = info->i;      break;
1507   case CPUINFO_INT_REGISTER + SUPERFX_R9:         cpustate->r[9] = info->i;      break;
1508   case CPUINFO_INT_REGISTER + SUPERFX_R10:        cpustate->r[10] = info->i;      break;
1509   case CPUINFO_INT_REGISTER + SUPERFX_R11:        cpustate->r[11] = info->i;      break;
1510   case CPUINFO_INT_REGISTER + SUPERFX_R12:        cpustate->r[12] = info->i;      break;
1511   case CPUINFO_INT_REGISTER + SUPERFX_R13:        cpustate->r[13] = info->i;      break;
1512   case CPUINFO_INT_REGISTER + SUPERFX_R14:        cpustate->r[14] = info->i;      break;
1513   case CPUINFO_INT_REGISTER + SUPERFX_R15:        cpustate->r[15] = info->i;      break;
1514   case CPUINFO_INT_REGISTER + SUPERFX_SFR:       cpustate->sfr = info->i;       break;
1515   case CPUINFO_INT_REGISTER + SUPERFX_PBR:       cpustate->pbr = info->i;      break;
1516   case CPUINFO_INT_REGISTER + SUPERFX_ROMBR:      cpustate->rombr = info->i;      break;
1517   case CPUINFO_INT_REGISTER + SUPERFX_RAMBR:      cpustate->rambr = info->i;      break;
1518   case CPUINFO_INT_REGISTER + SUPERFX_CBR:      cpustate->cbr = info->i;      break;
1519   case CPUINFO_INT_REGISTER + SUPERFX_SCBR:      cpustate->scbr = info->i;      break;
1520   case CPUINFO_INT_REGISTER + SUPERFX_SCMR:      cpustate->scmr = info->i;      break;
1521   case CPUINFO_INT_REGISTER + SUPERFX_COLR:      cpustate->colr = info->i;      break;
1522   case CPUINFO_INT_REGISTER + SUPERFX_POR:      cpustate->por = info->i;      break;
1523   case CPUINFO_INT_REGISTER + SUPERFX_BRAMR:      cpustate->bramr = info->i;      break;
1524   case CPUINFO_INT_REGISTER + SUPERFX_VCR:      cpustate->vcr = info->i;      break;
1525   case CPUINFO_INT_REGISTER + SUPERFX_CFGR:      cpustate->cfgr = info->i;      break;
1526   case CPUINFO_INT_REGISTER + SUPERFX_CLSR:      cpustate->clsr = info->i;      break;
1527   case CPUINFO_INT_REGISTER + SUPERFX_ROMCL:      cpustate->romcl = info->i;      break;
1528   case CPUINFO_INT_REGISTER + SUPERFX_ROMDR:      cpustate->romdr = info->i;      break;
1529   case CPUINFO_INT_REGISTER + SUPERFX_RAMCL:      cpustate->ramcl = info->i;      break;
1530   case CPUINFO_INT_REGISTER + SUPERFX_RAMAR:      cpustate->ramar = info->i;      break;
1531   case CPUINFO_INT_REGISTER + SUPERFX_RAMDR:      cpustate->ramdr = info->i;      break;
1532   case CPUINFO_INT_REGISTER + SUPERFX_RAMADDR:   cpustate->ramaddr = info->i;   break;
14791533    }
14801534}
14811535
14821536CPU_GET_INFO( superfx )
14831537{
1484    superfx_state *cpustate = (device != NULL && device->token != NULL) ? get_safe_token(device) : NULL;
1538   superfx_state *cpustate = (device != NULL && device->token != NULL) ? get_safe_token(device) : NULL;
14851539
1486    switch(state)
1487    {
1488        /* --- the following bits of info are returned as 64-bit signed integers --- */
1489        case CPUINFO_INT_CONTEXT_SIZE:             info->i = sizeof(superfx_state);               break;
1490        case CPUINFO_INT_INPUT_LINES:              info->i = 0;                                   break;
1491        case CPUINFO_INT_DEFAULT_IRQ_VECTOR:       info->i = 0;                                   break;
1492        case DEVINFO_INT_ENDIANNESS:               info->i = ENDIANNESS_LITTLE;                   break;
1493        case CPUINFO_INT_CLOCK_MULTIPLIER:         info->i = 1;                                   break;
1494        case CPUINFO_INT_CLOCK_DIVIDER:            info->i = 1;                                   break;
1495        case CPUINFO_INT_MIN_INSTRUCTION_BYTES:    info->i = 1;                                   break;
1496        case CPUINFO_INT_MAX_INSTRUCTION_BYTES:    info->i = 3;                                   break;
1497        case CPUINFO_INT_MIN_CYCLES:               info->i = 1;                                   break;
1498        case CPUINFO_INT_MAX_CYCLES:               info->i = 1;                                   break;
1540   switch(state)
1541   {
1542   /* --- the following bits of info are returned as 64-bit signed integers --- */
1543   case CPUINFO_INT_CONTEXT_SIZE:             info->i = sizeof(superfx_state);               break;
1544   case CPUINFO_INT_INPUT_LINES:              info->i = 0;                                   break;
1545   case CPUINFO_INT_DEFAULT_IRQ_VECTOR:       info->i = 0;                                   break;
1546   case DEVINFO_INT_ENDIANNESS:               info->i = ENDIANNESS_LITTLE;                   break;
1547   case CPUINFO_INT_CLOCK_MULTIPLIER:         info->i = 1;                                   break;
1548   case CPUINFO_INT_CLOCK_DIVIDER:            info->i = 1;                                   break;
1549   case CPUINFO_INT_MIN_INSTRUCTION_BYTES:    info->i = 1;                                   break;
1550   case CPUINFO_INT_MAX_INSTRUCTION_BYTES:    info->i = 3;                                   break;
1551   case CPUINFO_INT_MIN_CYCLES:               info->i = 1;                                   break;
1552   case CPUINFO_INT_MAX_CYCLES:               info->i = 1;                                   break;
14991553
1500        case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM:    info->i = 8;                                  break;
1501        case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM:    info->i = 32;                                 break;
1502        case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM:    info->i = 0;                                  break;
1503        case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA:       info->i = 0;                                  break;
1504        case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA:       info->i = 0;                                  break;
1505        case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA:       info->i = 0;                                  break;
1506        case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO:         info->i = 0;                                  break;
1507        case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO:         info->i = 0;                                  break;
1508        case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO:         info->i = 0;                                  break;
1554   case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM:    info->i = 8;                                  break;
1555   case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM:    info->i = 32;                                 break;
1556   case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM:    info->i = 0;                                  break;
1557   case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA:       info->i = 0;                                  break;
1558   case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA:       info->i = 0;                                  break;
1559   case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA:       info->i = 0;                                  break;
1560   case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO:         info->i = 0;                                  break;
1561   case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO:         info->i = 0;                                  break;
1562   case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO:         info->i = 0;                                  break;
15091563
1510        case CPUINFO_INT_PC:    /* intentional fallthrough */
1511        case CPUINFO_INT_REGISTER + SUPERFX_PC:       info->i = ((cpustate->pbr << 16) | cpustate->r[15]) - 1; break;
1512       case CPUINFO_INT_REGISTER + SUPERFX_DREG:      info->i = cpustate->dreg_idx;   break;
1513       case CPUINFO_INT_REGISTER + SUPERFX_SREG:      info->i = cpustate->sreg_idx;   break;
1514        case CPUINFO_INT_REGISTER + SUPERFX_R0:         info->i = cpustate->r[0];      break;
1515        case CPUINFO_INT_REGISTER + SUPERFX_R1:         info->i = cpustate->r[1];      break;
1516        case CPUINFO_INT_REGISTER + SUPERFX_R2:         info->i = cpustate->r[2];      break;
1517        case CPUINFO_INT_REGISTER + SUPERFX_R3:         info->i = cpustate->r[3];      break;
1518        case CPUINFO_INT_REGISTER + SUPERFX_R4:         info->i = cpustate->r[4];      break;
1519        case CPUINFO_INT_REGISTER + SUPERFX_R5:         info->i = cpustate->r[5];      break;
1520        case CPUINFO_INT_REGISTER + SUPERFX_R6:         info->i = cpustate->r[6];      break;
1521        case CPUINFO_INT_REGISTER + SUPERFX_R7:         info->i = cpustate->r[7];      break;
1522        case CPUINFO_INT_REGISTER + SUPERFX_R8:         info->i = cpustate->r[8];      break;
1523        case CPUINFO_INT_REGISTER + SUPERFX_R9:         info->i = cpustate->r[9];      break;
1524        case CPUINFO_INT_REGISTER + SUPERFX_R10:        info->i = cpustate->r[10];      break;
1525        case CPUINFO_INT_REGISTER + SUPERFX_R11:        info->i = cpustate->r[11];      break;
1526        case CPUINFO_INT_REGISTER + SUPERFX_R12:        info->i = cpustate->r[12];      break;
1527        case CPUINFO_INT_REGISTER + SUPERFX_R13:        info->i = cpustate->r[13];      break;
1528        case CPUINFO_INT_REGISTER + SUPERFX_R14:        info->i = cpustate->r[14];      break;
1529        case CPUINFO_INT_REGISTER + SUPERFX_R15:        info->i = cpustate->r[15];      break;
1530        case CPUINFO_INT_REGISTER + SUPERFX_SFR:      info->i = cpustate->sfr;      break;
1531        case CPUINFO_INT_REGISTER + SUPERFX_PBR:       info->i = cpustate->sfr;      break;
1532       case CPUINFO_INT_REGISTER + SUPERFX_ROMBR:      info->i = cpustate->rombr;      break;
1533       case CPUINFO_INT_REGISTER + SUPERFX_RAMBR:      info->i = cpustate->rambr;      break;
1534       case CPUINFO_INT_REGISTER + SUPERFX_CBR:      info->i = cpustate->cbr;      break;
1535       case CPUINFO_INT_REGISTER + SUPERFX_SCBR:      info->i = cpustate->scbr;      break;
1536       case CPUINFO_INT_REGISTER + SUPERFX_SCMR:      info->i = cpustate->scmr;      break;
1537       case CPUINFO_INT_REGISTER + SUPERFX_COLR:      info->i = cpustate->colr;      break;
1538       case CPUINFO_INT_REGISTER + SUPERFX_POR:      info->i = cpustate->por;      break;
1539       case CPUINFO_INT_REGISTER + SUPERFX_BRAMR:      info->i = cpustate->bramr;      break;
1540       case CPUINFO_INT_REGISTER + SUPERFX_VCR:      info->i = cpustate->vcr;      break;
1541       case CPUINFO_INT_REGISTER + SUPERFX_CFGR:      info->i = cpustate->cfgr;      break;
1542       case CPUINFO_INT_REGISTER + SUPERFX_CLSR:      info->i = cpustate->clsr;      break;
1543       case CPUINFO_INT_REGISTER + SUPERFX_ROMCL:      info->i = cpustate->romcl;      break;
1544       case CPUINFO_INT_REGISTER + SUPERFX_ROMDR:      info->i = cpustate->romdr;      break;
1545       case CPUINFO_INT_REGISTER + SUPERFX_RAMCL:      info->i = cpustate->ramcl;      break;
1546       case CPUINFO_INT_REGISTER + SUPERFX_RAMAR:      info->i = cpustate->ramar;      break;
1547       case CPUINFO_INT_REGISTER + SUPERFX_RAMDR:      info->i = cpustate->ramdr;      break;
1548       case CPUINFO_INT_REGISTER + SUPERFX_RAMADDR:   info->i = cpustate->ramaddr;   break;
1564   case CPUINFO_INT_PC:    /* intentional fallthrough */
1565   case CPUINFO_INT_REGISTER + SUPERFX_PC:       info->i = ((cpustate->pbr << 16) | cpustate->r[15]) - 1; break;
1566   case CPUINFO_INT_REGISTER + SUPERFX_DREG:      info->i = cpustate->dreg_idx;   break;
1567   case CPUINFO_INT_REGISTER + SUPERFX_SREG:      info->i = cpustate->sreg_idx;   break;
1568   case CPUINFO_INT_REGISTER + SUPERFX_R0:         info->i = cpustate->r[0];      break;
1569   case CPUINFO_INT_REGISTER + SUPERFX_R1:         info->i = cpustate->r[1];      break;
1570   case CPUINFO_INT_REGISTER + SUPERFX_R2:         info->i = cpustate->r[2];      break;
1571   case CPUINFO_INT_REGISTER + SUPERFX_R3:         info->i = cpustate->r[3];      break;
1572   case CPUINFO_INT_REGISTER + SUPERFX_R4:         info->i = cpustate->r[4];      break;
1573   case CPUINFO_INT_REGISTER + SUPERFX_R5:         info->i = cpustate->r[5];      break;
1574   case CPUINFO_INT_REGISTER + SUPERFX_R6:         info->i = cpustate->r[6];      break;
1575   case CPUINFO_INT_REGISTER + SUPERFX_R7:         info->i = cpustate->r[7];      break;
1576   case CPUINFO_INT_REGISTER + SUPERFX_R8:         info->i = cpustate->r[8];      break;
1577   case CPUINFO_INT_REGISTER + SUPERFX_R9:         info->i = cpustate->r[9];      break;
1578   case CPUINFO_INT_REGISTER + SUPERFX_R10:        info->i = cpustate->r[10];      break;
1579   case CPUINFO_INT_REGISTER + SUPERFX_R11:        info->i = cpustate->r[11];      break;
1580   case CPUINFO_INT_REGISTER + SUPERFX_R12:        info->i = cpustate->r[12];      break;
1581   case CPUINFO_INT_REGISTER + SUPERFX_R13:        info->i = cpustate->r[13];      break;
1582   case CPUINFO_INT_REGISTER + SUPERFX_R14:        info->i = cpustate->r[14];      break;
1583   case CPUINFO_INT_REGISTER + SUPERFX_R15:        info->i = cpustate->r[15];      break;
1584   case CPUINFO_INT_REGISTER + SUPERFX_SFR:      info->i = cpustate->sfr;      break;
1585   case CPUINFO_INT_REGISTER + SUPERFX_PBR:       info->i = cpustate->sfr;      break;
1586   case CPUINFO_INT_REGISTER + SUPERFX_ROMBR:      info->i = cpustate->rombr;      break;
1587   case CPUINFO_INT_REGISTER + SUPERFX_RAMBR:      info->i = cpustate->rambr;      break;
1588   case CPUINFO_INT_REGISTER + SUPERFX_CBR:      info->i = cpustate->cbr;      break;
1589   case CPUINFO_INT_REGISTER + SUPERFX_SCBR:      info->i = cpustate->scbr;      break;
1590   case CPUINFO_INT_REGISTER + SUPERFX_SCMR:      info->i = cpustate->scmr;      break;
1591   case CPUINFO_INT_REGISTER + SUPERFX_COLR:      info->i = cpustate->colr;      break;
1592   case CPUINFO_INT_REGISTER + SUPERFX_POR:      info->i = cpustate->por;      break;
1593   case CPUINFO_INT_REGISTER + SUPERFX_BRAMR:      info->i = cpustate->bramr;      break;
1594   case CPUINFO_INT_REGISTER + SUPERFX_VCR:      info->i = cpustate->vcr;      break;
1595   case CPUINFO_INT_REGISTER + SUPERFX_CFGR:      info->i = cpustate->cfgr;      break;
1596   case CPUINFO_INT_REGISTER + SUPERFX_CLSR:      info->i = cpustate->clsr;      break;
1597   case CPUINFO_INT_REGISTER + SUPERFX_ROMCL:      info->i = cpustate->romcl;      break;
1598   case CPUINFO_INT_REGISTER + SUPERFX_ROMDR:      info->i = cpustate->romdr;      break;
1599   case CPUINFO_INT_REGISTER + SUPERFX_RAMCL:      info->i = cpustate->ramcl;      break;
1600   case CPUINFO_INT_REGISTER + SUPERFX_RAMAR:      info->i = cpustate->ramar;      break;
1601   case CPUINFO_INT_REGISTER + SUPERFX_RAMDR:      info->i = cpustate->ramdr;      break;
1602   case CPUINFO_INT_REGISTER + SUPERFX_RAMADDR:   info->i = cpustate->ramaddr;   break;
15491603
15501604        /* --- the following bits of info are returned as pointers to data or functions --- */
1551        case CPUINFO_FCT_SET_INFO:              info->setinfo = CPU_SET_INFO_NAME(superfx);           break;
1552        case CPUINFO_FCT_INIT:                  info->init = CPU_INIT_NAME(superfx);                  break;
1553        case CPUINFO_FCT_RESET:                 info->reset = CPU_RESET_NAME(superfx);                break;
1554        case CPUINFO_FCT_EXIT:                  info->exit = CPU_EXIT_NAME(superfx);                  break;
1555        case CPUINFO_FCT_EXECUTE:               info->execute = CPU_EXECUTE_NAME(superfx);            break;
1556        case CPUINFO_FCT_BURN:                  info->burn = NULL;                                    break;
1557        case CPUINFO_FCT_DISASSEMBLE:           info->disassemble = CPU_DISASSEMBLE_NAME(superfx);      break;
1558        case CPUINFO_PTR_INSTRUCTION_COUNTER:   info->icount = &cpustate->icount;                     break;
1605   case CPUINFO_FCT_SET_INFO:              info->setinfo = CPU_SET_INFO_NAME(superfx);           break;
1606   case CPUINFO_FCT_INIT:                  info->init = CPU_INIT_NAME(superfx);                  break;
1607   case CPUINFO_FCT_RESET:                 info->reset = CPU_RESET_NAME(superfx);                break;
1608   case CPUINFO_FCT_EXIT:                  info->exit = CPU_EXIT_NAME(superfx);                  break;
1609   case CPUINFO_FCT_EXECUTE:               info->execute = CPU_EXECUTE_NAME(superfx);            break;
1610   case CPUINFO_FCT_BURN:                  info->burn = NULL;                                    break;
1611   case CPUINFO_FCT_DISASSEMBLE:           info->disassemble = CPU_DISASSEMBLE_NAME(superfx);      break;
1612   case CPUINFO_PTR_INSTRUCTION_COUNTER:   info->icount = &cpustate->icount;                     break;
15591613
15601614        /* --- the following bits of info are returned as NULL-terminated strings --- */
1561        case DEVINFO_STR_NAME:                          strcpy(info->s, "SuperFX");                  break;
1562        case DEVINFO_STR_FAMILY:                      strcpy(info->s, "SuperFX");                  break;
1563        case DEVINFO_STR_VERSION:                     strcpy(info->s, "1.0");                     break;
1564        case DEVINFO_STR_SOURCE_FILE:                   strcpy(info->s, __FILE__);                  break;
1565        case DEVINFO_STR_CREDITS:                     strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team");   break;
1615   case DEVINFO_STR_NAME:                          strcpy(info->s, "SuperFX");                  break;
1616   case DEVINFO_STR_FAMILY:                      strcpy(info->s, "SuperFX");                  break;
1617   case DEVINFO_STR_VERSION:                     strcpy(info->s, "1.0");                     break;
1618   case DEVINFO_STR_SOURCE_FILE:                   strcpy(info->s, __FILE__);                  break;
1619   case DEVINFO_STR_CREDITS:                     strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team");   break;
15661620
1567        case CPUINFO_STR_FLAGS:                         strcpy(info->s, " ");                     break;
1621   case CPUINFO_STR_FLAGS:                         strcpy(info->s, " ");                     break;
15681622
1569        case CPUINFO_STR_REGISTER + SUPERFX_PC:         sprintf(info->s, "PC:      %06X", (cpustate->pbr << 16) | cpustate->r[15]); break;
1570       case CPUINFO_STR_REGISTER + SUPERFX_DREG:      sprintf(info->s, "DREG:    R%d",  cpustate->dreg_idx);   break;
1571       case CPUINFO_STR_REGISTER + SUPERFX_SREG:      sprintf(info->s, "SREG:    R%d",  cpustate->sreg_idx);   break;
1572        case CPUINFO_STR_REGISTER + SUPERFX_R0:         sprintf(info->s, "R0:      %04X", cpustate->r[0]);      break;
1573        case CPUINFO_STR_REGISTER + SUPERFX_R1:         sprintf(info->s, "R1:      %04X", cpustate->r[1]);      break;
1574        case CPUINFO_STR_REGISTER + SUPERFX_R2:         sprintf(info->s, "R2:      %04X", cpustate->r[2]);      break;
1575        case CPUINFO_STR_REGISTER + SUPERFX_R3:         sprintf(info->s, "R3:      %04X", cpustate->r[3]);      break;
1576        case CPUINFO_STR_REGISTER + SUPERFX_R4:         sprintf(info->s, "R4:      %04X", cpustate->r[4]);      break;
1577        case CPUINFO_STR_REGISTER + SUPERFX_R5:         sprintf(info->s, "R5:      %04X", cpustate->r[5]);      break;
1578        case CPUINFO_STR_REGISTER + SUPERFX_R6:         sprintf(info->s, "R6:      %04X", cpustate->r[6]);      break;
1579        case CPUINFO_STR_REGISTER + SUPERFX_R7:         sprintf(info->s, "R7:      %04X", cpustate->r[7]);      break;
1580        case CPUINFO_STR_REGISTER + SUPERFX_R8:         sprintf(info->s, "R8:      %04X", cpustate->r[8]);      break;
1581        case CPUINFO_STR_REGISTER + SUPERFX_R9:         sprintf(info->s, "R9:      %04X", cpustate->r[9]);      break;
1582        case CPUINFO_STR_REGISTER + SUPERFX_R10:        sprintf(info->s, "R10:     %04X", cpustate->r[10]);      break;
1583        case CPUINFO_STR_REGISTER + SUPERFX_R11:        sprintf(info->s, "R11:     %04X", cpustate->r[11]);      break;
1584        case CPUINFO_STR_REGISTER + SUPERFX_R12:        sprintf(info->s, "R12:     %04X", cpustate->r[12]);      break;
1585        case CPUINFO_STR_REGISTER + SUPERFX_R13:        sprintf(info->s, "R13:     %04X", cpustate->r[13]);      break;
1586        case CPUINFO_STR_REGISTER + SUPERFX_R14:        sprintf(info->s, "R14:     %04X", cpustate->r[14]);      break;
1587        case CPUINFO_STR_REGISTER + SUPERFX_R15:        sprintf(info->s, "R15:     %04X", cpustate->r[15]);      break;
1588        case CPUINFO_STR_REGISTER + SUPERFX_SFR:       sprintf(info->s, "SFR:     %04X", cpustate->sfr);      break;
1589        case CPUINFO_STR_REGISTER + SUPERFX_PBR:       sprintf(info->s, "PBR:     %02X", cpustate->sfr);      break;
1590       case CPUINFO_STR_REGISTER + SUPERFX_ROMBR:      sprintf(info->s, "ROMBR:   %02X", cpustate->rombr);      break;
1591       case CPUINFO_STR_REGISTER + SUPERFX_RAMBR:      sprintf(info->s, "RAMBR:   %02X", cpustate->rambr);      break;
1592       case CPUINFO_STR_REGISTER + SUPERFX_CBR:      sprintf(info->s, "CBR:     %04X", cpustate->cbr);      break;
1593       case CPUINFO_STR_REGISTER + SUPERFX_SCBR:      sprintf(info->s, "SCBR:    %02X", cpustate->scbr);      break;
1594       case CPUINFO_STR_REGISTER + SUPERFX_SCMR:      sprintf(info->s, "SCMR:    %02X", cpustate->scmr);      break;
1595       case CPUINFO_STR_REGISTER + SUPERFX_COLR:      sprintf(info->s, "COLR     %02X", cpustate->colr);      break;
1596       case CPUINFO_STR_REGISTER + SUPERFX_POR:      sprintf(info->s, "POR:     %02X", cpustate->por);      break;
1597       case CPUINFO_STR_REGISTER + SUPERFX_BRAMR:      sprintf(info->s, "BRAMR:   %02X", cpustate->bramr);      break;
1598       case CPUINFO_STR_REGISTER + SUPERFX_VCR:      sprintf(info->s, "VCR:     %02X", cpustate->vcr);      break;
1599       case CPUINFO_STR_REGISTER + SUPERFX_CFGR:      sprintf(info->s, "CFGR:    %02X", cpustate->cfgr);      break;
1600       case CPUINFO_STR_REGISTER + SUPERFX_CLSR:      sprintf(info->s, "CLSR:    %02X", cpustate->clsr);      break;
1601       case CPUINFO_STR_REGISTER + SUPERFX_ROMCL:      sprintf(info->s, "ROMCL:   %08X", cpustate->romcl);      break;
1602       case CPUINFO_STR_REGISTER + SUPERFX_ROMDR:      sprintf(info->s, "ROMDR:   %02X", cpustate->romdr);      break;
1603       case CPUINFO_STR_REGISTER + SUPERFX_RAMCL:      sprintf(info->s, "RAMCL:   %08X", cpustate->ramcl);      break;
1604       case CPUINFO_STR_REGISTER + SUPERFX_RAMAR:      sprintf(info->s, "RAMAR:   %04X", cpustate->ramar);      break;
1605       case CPUINFO_STR_REGISTER + SUPERFX_RAMDR:      sprintf(info->s, "RAMDR:   %02X", cpustate->ramdr);      break;
1606       case CPUINFO_STR_REGISTER + SUPERFX_RAMADDR:   sprintf(info->s, "RAMADDR: %04X", cpustate->ramaddr);   break;
1623   case CPUINFO_STR_REGISTER + SUPERFX_PC:         sprintf(info->s, "PC:      %06X", (cpustate->pbr << 16) | cpustate->r[15]); break;
1624   case CPUINFO_STR_REGISTER + SUPERFX_DREG:      sprintf(info->s, "DREG:    R%d",  cpustate->dreg_idx);   break;
1625   case CPUINFO_STR_REGISTER + SUPERFX_SREG:      sprintf(info->s, "SREG:    R%d",  cpustate->sreg_idx);   break;
1626   case CPUINFO_STR_REGISTER + SUPERFX_R0:         sprintf(info->s, "R0:      %04X", cpustate->r[0]);      break;
1627   case CPUINFO_STR_REGISTER + SUPERFX_R1:         sprintf(info->s, "R1:      %04X", cpustate->r[1]);      break;
1628   case CPUINFO_STR_REGISTER + SUPERFX_R2:         sprintf(info->s, "R2:      %04X", cpustate->r[2]);      break;
1629   case CPUINFO_STR_REGISTER + SUPERFX_R3:         sprintf(info->s, "R3:      %04X", cpustate->r[3]);      break;
1630   case CPUINFO_STR_REGISTER + SUPERFX_R4:         sprintf(info->s, "R4:      %04X", cpustate->r[4]);      break;
1631   case CPUINFO_STR_REGISTER + SUPERFX_R5:         sprintf(info->s, "R5:      %04X", cpustate->r[5]);      break;
1632   case CPUINFO_STR_REGISTER + SUPERFX_R6:         sprintf(info->s, "R6:      %04X", cpustate->r[6]);      break;
1633   case CPUINFO_STR_REGISTER + SUPERFX_R7:         sprintf(info->s, "R7:      %04X", cpustate->r[7]);      break;
1634   case CPUINFO_STR_REGISTER + SUPERFX_R8:         sprintf(info->s, "R8:      %04X", cpustate->r[8]);      break;
1635   case CPUINFO_STR_REGISTER + SUPERFX_R9:         sprintf(info->s, "R9:      %04X", cpustate->r[9]);      break;
1636   case CPUINFO_STR_REGISTER + SUPERFX_R10:        sprintf(info->s, "R10:     %04X", cpustate->r[10]);      break;
1637   case CPUINFO_STR_REGISTER + SUPERFX_R11:        sprintf(info->s, "R11:     %04X", cpustate->r[11]);      break;
1638   case CPUINFO_STR_REGISTER + SUPERFX_R12:        sprintf(info->s, "R12:     %04X", cpustate->r[12]);      break;
1639   case CPUINFO_STR_REGISTER + SUPERFX_R13:        sprintf(info->s, "R13:     %04X", cpustate->r[13]);      break;
1640   case CPUINFO_STR_REGISTER + SUPERFX_R14:        sprintf(info->s, "R14:     %04X", cpustate->r[14]);      break;
1641   case CPUINFO_STR_REGISTER + SUPERFX_R15:        sprintf(info->s, "R15:     %04X", cpustate->r[15]);      break;
1642   case CPUINFO_STR_REGISTER + SUPERFX_SFR:       sprintf(info->s, "SFR:     %04X", cpustate->sfr);      break;
1643   case CPUINFO_STR_REGISTER + SUPERFX_PBR:       sprintf(info->s, "PBR:     %02X", cpustate->sfr);      break;
1644   case CPUINFO_STR_REGISTER + SUPERFX_ROMBR:      sprintf(info->s, "ROMBR:   %02X", cpustate->rombr);      break;
1645   case CPUINFO_STR_REGISTER + SUPERFX_RAMBR:      sprintf(info->s, "RAMBR:   %02X", cpustate->rambr);      break;
1646   case CPUINFO_STR_REGISTER + SUPERFX_CBR:      sprintf(info->s, "CBR:     %04X", cpustate->cbr);      break;
1647   case CPUINFO_STR_REGISTER + SUPERFX_SCBR:      sprintf(info->s, "SCBR:    %02X", cpustate->scbr);      break;
1648   case CPUINFO_STR_REGISTER + SUPERFX_SCMR:      sprintf(info->s, "SCMR:    %02X", cpustate->scmr);      break;
1649   case CPUINFO_STR_REGISTER + SUPERFX_COLR:      sprintf(info->s, "COLR     %02X", cpustate->colr);      break;
1650   case CPUINFO_STR_REGISTER + SUPERFX_POR:      sprintf(info->s, "POR:     %02X", cpustate->por);      break;
1651   case CPUINFO_STR_REGISTER + SUPERFX_BRAMR:      sprintf(info->s, "BRAMR:   %02X", cpustate->bramr);      break;
1652   case CPUINFO_STR_REGISTER + SUPERFX_VCR:      sprintf(info->s, "VCR:     %02X", cpustate->vcr);      break;
1653   case CPUINFO_STR_REGISTER + SUPERFX_CFGR:      sprintf(info->s, "CFGR:    %02X", cpustate->cfgr);      break;
1654   case CPUINFO_STR_REGISTER + SUPERFX_CLSR:      sprintf(info->s, "CLSR:    %02X", cpustate->clsr);      break;
1655   case CPUINFO_STR_REGISTER + SUPERFX_ROMCL:      sprintf(info->s, "ROMCL:   %08X", cpustate->romcl);      break;
1656   case CPUINFO_STR_REGISTER + SUPERFX_ROMDR:      sprintf(info->s, "ROMDR:   %02X", cpustate->romdr);      break;
1657   case CPUINFO_STR_REGISTER + SUPERFX_RAMCL:      sprintf(info->s, "RAMCL:   %08X", cpustate->ramcl);      break;
1658   case CPUINFO_STR_REGISTER + SUPERFX_RAMAR:      sprintf(info->s, "RAMAR:   %04X", cpustate->ramar);      break;
1659   case CPUINFO_STR_REGISTER + SUPERFX_RAMDR:      sprintf(info->s, "RAMDR:   %02X", cpustate->ramdr);      break;
1660   case CPUINFO_STR_REGISTER + SUPERFX_RAMADDR:   sprintf(info->s, "RAMADDR: %04X", cpustate->ramaddr);   break;
16071661    }
16081662}
src/mess/machine/snescart.c
r7662r7663
208208static void snes_machine_stop(running_machine *machine)
209209{
210210   /* Save SRAM */
211   if( snes_cart.sram > 0 )
211   if (snes_cart.sram > 0)
212212      snes_save_sram(machine);
213213}
214214
r7662r7663
350350   /*int length;*/
351351
352352   snes_ram = memory_region(machine, "maincpu");
353   memset( snes_ram, 0, 0x1000000 );
353   memset(snes_ram, 0, 0x1000000);
354354
355355   snes_rom_size = image_length(image);
356356
r7662r7663
364364   }
365365   else if ((header[0] | (header[1] << 8)) == (((snes_rom_size - 512) / 1024) / 8))
366366   {
367      /* Some headers have the rom size at the start, if this matches with the
368         * actual rom size, we probably have a header */
367      /* Some headers have the rom size at the start, if this matches with the actual rom size, we probably have a header */
369368      logerror("Found header(size) - Skipped\n");
370369   }
371370   else if ((snes_rom_size % 0x8000) == 512)
372371   {
373      /* As a last check we'll see if there's exactly 512 bytes extra to this
374         * image. */
372      /* As a last check we'll see if there's exactly 512 bytes extra to this image. */
375373      logerror("Found header(extra) - Skipped\n");
376374   }
377375   else
r7662r7663
405403      /* a few games require 512k, however we store twice as much to be sure to cover the various mirrors */
406404      snes_cart.sram_max = 0x100000;
407405   }
408   else if( valid_mode21 >= valid_mode25 )
406   else if (valid_mode21 >= valid_mode25)
409407   {
410408      snes_cart.mode = SNES_MODE_21;   // HiRom
411409      snes_cart.sram_max = 0x20000;
r7662r7663
563561         * 0x7f are overwritten by WRAM). Each block is also mirrored in banks 0x80 to 0xff (up to 0xff for real)
564562         */
565563         /* SuperFX games needs this different loading routine */
566         if(((temp_buffer[0x007fd6] >= 0x13 && temp_buffer[0x007fd6] <= 0x15) || temp_buffer[0x007fd6] == 0x1a) && (temp_buffer[0x007fd5] == 0x20))
564         if (((temp_buffer[0x007fd6] >= 0x13 && temp_buffer[0x007fd6] <= 0x15) || temp_buffer[0x007fd6] == 0x1a) && (temp_buffer[0x007fd5] == 0x20))
567565         {
568566            while (read_blocks < 64 && read_blocks < total_blocks)
569567            {
r7662r7663
571569               memcpy(&snes_ram[0x008000 + read_blocks * 0x10000], &ROM[0x000000 + read_blocks * 0x8000], 0x8000);
572570               /* Mirroring at banks 80-bf from 8000-ffff */
573571               memcpy(&snes_ram[0x808000 + read_blocks * 0x10000], &snes_ram[0x8000 + (read_blocks * 0x10000)], 0x8000);
572               /* Mirroring at banks 40-5f and c0-df */
573               memcpy(&snes_ram[0x400000 + read_blocks * 0x8000], &snes_ram[0x8000 + (read_blocks * 0x10000)], total_blocks * 0x8000);
574               memcpy(&snes_ram[0xc00000 + read_blocks * 0x8000], &snes_ram[0x8000 + (read_blocks * 0x10000)], total_blocks * 0x8000);
575
574576               read_blocks++;
575577            }
576            /* Loading data secondary, filling full 64k banks from 0x400000 to 600000 */
577            memcpy(&snes_ram[0x400000], &ROM[0x000000], total_blocks * 0x8000);
578            /* mirror at c00000-e00000 */
579            memcpy(&snes_ram[0xc00000], &snes_ram[0x400000], total_blocks * 0x8000);
578            /* SuperFX games are supposed to contain 64 blocks! */
579            if (read_blocks < total_blocks)
580            {
581               logerror("This image has been identified as a SuperFX game, but it's too large!\n");
582               logerror("Please verify if it's corrupted. If it's not please report this as a bug.\n");
583               return INIT_FAIL;
584            }
580585         }
581586         else
582587         {
r7662r7663
606611
607612   /* Find the amount of sram */
608613   snes_cart.sram = snes_r_bank1(space, 0x00ffd8);
609   if( snes_cart.sram > 0 )
614   if (snes_cart.sram > 0)
610615   {
611616      snes_cart.sram = ((1 << (snes_cart.sram + 3)) / 8);
612      if( snes_cart.sram > snes_cart.sram_max )
617      if (snes_cart.sram > snes_cart.sram_max)
613618         snes_cart.sram = snes_cart.sram_max;
614619   }
615620

Previous 15994 Revisions Next


© 1998-2018 The MESS Team