diff options
| author | 2015-04-12 22:53:48 +0200 | |
|---|---|---|
| committer | 2015-04-14 19:58:17 +0200 | |
| commit | 278cf84e5503d1829e837e21dc8c238bc8cab577 (patch) | |
| tree | 5d1f529f01fdfe3615879d3482bc9cf8294ec5d7 /src/mess/drivers | |
| parent | 75e8861950d520e83740b7b5747735f0286df145 (diff) | |
Replace dynamic_array with std::vector [O. Galibert]
Diffstat (limited to 'src/mess/drivers')
| -rw-r--r-- | src/mess/drivers/abc80.c | 2 | ||||
| -rw-r--r-- | src/mess/drivers/amiga.c | 4 | ||||
| -rw-r--r-- | src/mess/drivers/beta.c | 6 | ||||
| -rw-r--r-- | src/mess/drivers/binbug.c | 2 | ||||
| -rw-r--r-- | src/mess/drivers/casloopy.c | 4 | ||||
| -rw-r--r-- | src/mess/drivers/cd2650.c | 2 | ||||
| -rw-r--r-- | src/mess/drivers/d6800.c | 2 | ||||
| -rw-r--r-- | src/mess/drivers/homelab.c | 2 | ||||
| -rw-r--r-- | src/mess/drivers/hp16500.c | 2 | ||||
| -rw-r--r-- | src/mess/drivers/instruct.c | 2 | ||||
| -rw-r--r-- | src/mess/drivers/lynx.c | 2 | ||||
| -rw-r--r-- | src/mess/drivers/megadriv.c | 10 | ||||
| -rw-r--r-- | src/mess/drivers/pcd.c | 2 | ||||
| -rw-r--r-- | src/mess/drivers/pegasus.c | 2 | ||||
| -rw-r--r-- | src/mess/drivers/pipbug.c | 2 | ||||
| -rw-r--r-- | src/mess/drivers/psx.c | 4 | ||||
| -rw-r--r-- | src/mess/drivers/ravens.c | 2 | ||||
| -rw-r--r-- | src/mess/drivers/rex6000.c | 2 | ||||
| -rw-r--r-- | src/mess/drivers/supracan.c | 2 | ||||
| -rw-r--r-- | src/mess/drivers/ti99_4p.c | 4 | ||||
| -rw-r--r-- | src/mess/drivers/timex.c | 2 | ||||
| -rw-r--r-- | src/mess/drivers/uzebox.c | 6 | ||||
| -rw-r--r-- | src/mess/drivers/vc4000.c | 2 | ||||
| -rw-r--r-- | src/mess/drivers/vii.c | 12 | ||||
| -rw-r--r-- | src/mess/drivers/x68k.c | 4 |
25 files changed, 43 insertions, 43 deletions
diff --git a/src/mess/drivers/abc80.c b/src/mess/drivers/abc80.c index b312c50de29..c53e8bb1d23 100644 --- a/src/mess/drivers/abc80.c +++ b/src/mess/drivers/abc80.c @@ -486,7 +486,7 @@ QUICKLOAD_LOAD_MEMBER( abc80_state, bac ) dynamic_buffer data; data.resize(quickload_size); - image.fread(data, quickload_size); + image.fread(&data[0], quickload_size); for (int i = 1; i < quickload_size; i++) space.write_byte(address++, data[i]); diff --git a/src/mess/drivers/amiga.c b/src/mess/drivers/amiga.c index df51564a2d4..ff675b55226 100644 --- a/src/mess/drivers/amiga.c +++ b/src/mess/drivers/amiga.c @@ -51,7 +51,7 @@ protected: private: required_device<address_map_bank_device> m_bootrom; required_memory_bank m_wom; - dynamic_array<UINT16> m_wom_ram; + std::vector<UINT16> m_wom_ram; }; class a2000_state : public amiga_state @@ -557,7 +557,7 @@ void a1000_state::machine_start() // allocate 256kb for wom m_wom_ram.resize(256 * 1024 / 2); - m_wom->set_base(m_wom_ram); + m_wom->set_base(&m_wom_ram[0]); } void a1000_state::machine_reset() diff --git a/src/mess/drivers/beta.c b/src/mess/drivers/beta.c index e586d8a547e..0c410445a62 100644 --- a/src/mess/drivers/beta.c +++ b/src/mess/drivers/beta.c @@ -301,7 +301,7 @@ DEVICE_IMAGE_LOAD_MEMBER( beta_state, beta_eprom ) DEVICE_IMAGE_UNLOAD_MEMBER( beta_state, beta_eprom ) { if (image.software_entry() == NULL) - image.fwrite(m_eprom_rom, 0x800); + image.fwrite(&m_eprom_rom[0], 0x800); } /* Machine Initialization */ @@ -313,11 +313,11 @@ void beta_state::machine_start() m_eprom_rom.resize(0x800); if (!m_eprom->exists()) - memset(m_eprom_rom, 0xff, 0x800); + memset(&m_eprom_rom[0], 0xff, 0x800); else { astring region_tag; - memcpy(m_eprom_rom, memregion(region_tag.cpy(m_eprom->tag()).cat(GENERIC_ROM_REGION_TAG).c_str())->base(), 0x800); + memcpy(&m_eprom_rom[0], memregion(region_tag.cpy(m_eprom->tag()).cat(GENERIC_ROM_REGION_TAG).c_str())->base(), 0x800); } // state saving diff --git a/src/mess/drivers/binbug.c b/src/mess/drivers/binbug.c index f9166a2d0d1..1d050528887 100644 --- a/src/mess/drivers/binbug.c +++ b/src/mess/drivers/binbug.c @@ -242,7 +242,7 @@ QUICKLOAD_LOAD_MEMBER( binbug_state, binbug ) else { quick_data.resize(quick_length); - read_ = image.fread( quick_data, quick_length); + read_ = image.fread( &quick_data[0], quick_length); if (read_ != quick_length) { image.seterror(IMAGE_ERROR_INVALIDIMAGE, "Cannot read the file"); diff --git a/src/mess/drivers/casloopy.c b/src/mess/drivers/casloopy.c index 51e7eb991d7..ae6f16fab92 100644 --- a/src/mess/drivers/casloopy.c +++ b/src/mess/drivers/casloopy.c @@ -481,9 +481,9 @@ DEVICE_IMAGE_LOAD_MEMBER( casloopy_state, loopy_cart ) m_cart->rom_alloc(size, GENERIC_ROM32_WIDTH, ENDIANNESS_LITTLE); - SRC = temp; + SRC = &temp[0]; DST = m_cart->get_rom_base(); - m_cart->common_load_rom(temp, size, "rom"); + m_cart->common_load_rom(&temp[0], size, "rom"); // fix endianness for (int i = 0; i < 0x200000; i += 4) diff --git a/src/mess/drivers/cd2650.c b/src/mess/drivers/cd2650.c index 8bb763489ee..d6a621eecb9 100644 --- a/src/mess/drivers/cd2650.c +++ b/src/mess/drivers/cd2650.c @@ -213,7 +213,7 @@ QUICKLOAD_LOAD_MEMBER( cd2650_state, cd2650 ) else { dynamic_buffer quick_data(quick_length); - int read_ = image.fread( quick_data, quick_length); + int read_ = image.fread( &quick_data[0], quick_length); if (read_ != quick_length) { image.seterror(IMAGE_ERROR_INVALIDIMAGE, "Cannot read the file"); diff --git a/src/mess/drivers/d6800.c b/src/mess/drivers/d6800.c index ded15918508..8ead0a93a28 100644 --- a/src/mess/drivers/d6800.c +++ b/src/mess/drivers/d6800.c @@ -350,7 +350,7 @@ QUICKLOAD_LOAD_MEMBER( d6800_state, d6800 ) quick_length = image.length(); quick_data.resize(quick_length); - read_ = image.fread( quick_data, quick_length); + read_ = image.fread( &quick_data[0], quick_length); if (read_ != quick_length) { image.seterror(IMAGE_ERROR_INVALIDIMAGE, "Cannot read the file"); diff --git a/src/mess/drivers/homelab.c b/src/mess/drivers/homelab.c index 6f08d5e39a7..b876678e63d 100644 --- a/src/mess/drivers/homelab.c +++ b/src/mess/drivers/homelab.c @@ -659,7 +659,7 @@ QUICKLOAD_LOAD_MEMBER( homelab_state,homelab) quick_length = image.length(); quick_data.resize(quick_length); - read_ = image.fread( quick_data, quick_length); + read_ = image.fread( &quick_data[0], quick_length); if (read_ != quick_length) { image.seterror(IMAGE_ERROR_INVALIDIMAGE, "Cannot read the file"); diff --git a/src/mess/drivers/hp16500.c b/src/mess/drivers/hp16500.c index ea9f58d37a6..f5b2866b47d 100644 --- a/src/mess/drivers/hp16500.c +++ b/src/mess/drivers/hp16500.c @@ -68,7 +68,7 @@ public: UINT32 screen_update_hp16500a(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; - dynamic_array<UINT8> m_vram; + std::vector<UINT8> m_vram; UINT8 m_mask, m_val; diff --git a/src/mess/drivers/instruct.c b/src/mess/drivers/instruct.c index 3dad503aae1..92e49f900f9 100644 --- a/src/mess/drivers/instruct.c +++ b/src/mess/drivers/instruct.c @@ -340,7 +340,7 @@ QUICKLOAD_LOAD_MEMBER( instruct_state, instruct ) else { dynamic_buffer quick_data(quick_length); - read_ = image.fread( quick_data, quick_length); + read_ = image.fread( &quick_data[0], quick_length); if (read_ != quick_length) { image.seterror(IMAGE_ERROR_INVALIDIMAGE, "Cannot read the file"); diff --git a/src/mess/drivers/lynx.c b/src/mess/drivers/lynx.c index cd1bba163bb..edca9626e0e 100644 --- a/src/mess/drivers/lynx.c +++ b/src/mess/drivers/lynx.c @@ -168,7 +168,7 @@ QUICKLOAD_LOAD_MEMBER( lynx_state, lynx ) data.resize(length); - if (image.fread( data, length) != length) + if (image.fread( &data[0], length) != length) { return IMAGE_INIT_FAIL; } diff --git a/src/mess/drivers/megadriv.c b/src/mess/drivers/megadriv.c index 25ffbb0a446..03b6fa38ded 100644 --- a/src/mess/drivers/megadriv.c +++ b/src/mess/drivers/megadriv.c @@ -479,28 +479,28 @@ DEVICE_IMAGE_LOAD_MEMBER( md_cons_state, _32x_cart ) { length = image.length(); temp_copy.resize(length); - image.fread(temp_copy, length); + image.fread(&temp_copy[0], length); } else { length = image.get_software_region_length("rom"); temp_copy.resize(length); - memcpy(temp_copy, image.get_software_region("rom"), length); + memcpy(&temp_copy[0], image.get_software_region("rom"), length); } /* Copy the cart image in the locations the driver expects */ // Notice that, by using pick_integer, we are sure the code works on both LE and BE machines ROM16 = (UINT16 *) memregion("gamecart")->base(); for (i = 0; i < length; i += 2) - ROM16[i / 2] = pick_integer_be(temp_copy, i, 2); + ROM16[i / 2] = pick_integer_be(&temp_copy[0], i, 2); ROM32 = (UINT32 *) memregion("gamecart_sh2")->base(); for (i = 0; i < length; i += 4) - ROM32[i / 4] = pick_integer_be(temp_copy, i, 4); + ROM32[i / 4] = pick_integer_be(&temp_copy[0], i, 4); ROM16 = (UINT16 *) memregion("maincpu")->base(); for (i = 0x00; i < length; i += 2) - ROM16[i / 2] = pick_integer_be(temp_copy, i, 2); + ROM16[i / 2] = pick_integer_be(&temp_copy[0], i, 2); return IMAGE_INIT_PASS; } diff --git a/src/mess/drivers/pcd.c b/src/mess/drivers/pcd.c index f0ace2cec0e..cc717e1e5ba 100644 --- a/src/mess/drivers/pcd.c +++ b/src/mess/drivers/pcd.c @@ -132,7 +132,7 @@ void pcd_state::device_timer(emu_timer &timer, device_timer_id id, int param, vo void pcd_state::machine_start() { - m_gfxdecode->set_gfx(0, global_alloc(gfx_element(machine().device<palette_device>("palette"), pcd_charlayout, m_charram, 0, 1, 0))); + m_gfxdecode->set_gfx(0, global_alloc(gfx_element(machine().device<palette_device>("palette"), pcd_charlayout, &m_charram[0], 0, 1, 0))); m_req_hack = timer_alloc(); } diff --git a/src/mess/drivers/pegasus.c b/src/mess/drivers/pegasus.c index 35506b828ad..3971ea51613 100644 --- a/src/mess/drivers/pegasus.c +++ b/src/mess/drivers/pegasus.c @@ -409,7 +409,7 @@ void pegasus_state::pegasus_decrypt_rom(UINT8 *ROM) b = BITSWAP8(b, 3, 2, 1, 0, 7, 6, 5, 4); temp_copy[j & 0xfff] = b; } - memcpy(ROM, temp_copy, 0x1000); + memcpy(ROM, &temp_copy[0], 0x1000); } } diff --git a/src/mess/drivers/pipbug.c b/src/mess/drivers/pipbug.c index b4ff3876ffb..aeee886d7c2 100644 --- a/src/mess/drivers/pipbug.c +++ b/src/mess/drivers/pipbug.c @@ -114,7 +114,7 @@ QUICKLOAD_LOAD_MEMBER( pipbug_state, pipbug ) else { quick_data.resize(quick_length); - read_ = image.fread( quick_data, quick_length); + read_ = image.fread( &quick_data[0], quick_length); if (read_ != quick_length) { image.seterror(IMAGE_ERROR_INVALIDIMAGE, "Cannot read the file"); diff --git a/src/mess/drivers/psx.c b/src/mess/drivers/psx.c index 181d7c50a94..9d9948ed35e 100644 --- a/src/mess/drivers/psx.c +++ b/src/mess/drivers/psx.c @@ -394,11 +394,11 @@ int psx1_state::load_psf( cpu_device *cpu, unsigned char *p_n_file, int n_len ) n_uncompressed = 0x200000; p_n_uncompressed.resize( n_uncompressed ); - if( uncompress( p_n_uncompressed, &n_uncompressed, p_n_compressed, n_compressed ) != Z_OK ) + if( uncompress( &p_n_uncompressed[0], &n_uncompressed, p_n_compressed, n_compressed ) != Z_OK ) { logerror( "psx_exe_load: psf uncompress failed\n" ); } - else if( !load_psxexe( cpu, p_n_uncompressed, n_uncompressed ) ) + else if( !load_psxexe( cpu, &p_n_uncompressed[0], n_uncompressed ) ) { logerror( "psx_exe_load: psf load failed\n" ); } diff --git a/src/mess/drivers/ravens.c b/src/mess/drivers/ravens.c index 85cb98a5446..6ddc78ee326 100644 --- a/src/mess/drivers/ravens.c +++ b/src/mess/drivers/ravens.c @@ -285,7 +285,7 @@ QUICKLOAD_LOAD_MEMBER( ravens_state, ravens ) else { quick_data.resize(quick_length); - read_ = image.fread( quick_data, quick_length); + read_ = image.fread( &quick_data[0], quick_length); if (read_ != quick_length) { image.seterror(IMAGE_ERROR_INVALIDIMAGE, "Cannot read the file"); diff --git a/src/mess/drivers/rex6000.c b/src/mess/drivers/rex6000.c index a716b74105a..4ed55504c86 100644 --- a/src/mess/drivers/rex6000.c +++ b/src/mess/drivers/rex6000.c @@ -571,7 +571,7 @@ QUICKLOAD_LOAD_MEMBER( rex6000_state,rex6000) UINT32 img_start = 0; dynamic_buffer data(image.length()); - image.fread(data, image.length()); + image.fread(&data[0], image.length()); if(strncmp((const char*)&data[0], magic, 21)) return IMAGE_INIT_FAIL; diff --git a/src/mess/drivers/supracan.c b/src/mess/drivers/supracan.c index ec146da8aa1..a74aa15bdba 100644 --- a/src/mess/drivers/supracan.c +++ b/src/mess/drivers/supracan.c @@ -431,7 +431,7 @@ void supracan_state::video_start() m_sprite_final_bitmap.allocate(1024, 1024, BITMAP_FORMAT_IND16); m_vram_addr_swapped.resize(0x20000); // hack for 1bpp layer at startup - m_gfxdecode->gfx(4)->set_source(m_vram_addr_swapped); + m_gfxdecode->gfx(4)->set_source(&m_vram_addr_swapped[0]); m_gfxdecode->gfx(4)->set_xormask(0); m_tilemap_sizes[0][0] = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(supracan_state::get_supracan_tilemap0_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); diff --git a/src/mess/drivers/ti99_4p.c b/src/mess/drivers/ti99_4p.c index a6c59fb4d2f..03a8be64b4c 100644 --- a/src/mess/drivers/ti99_4p.c +++ b/src/mess/drivers/ti99_4p.c @@ -124,10 +124,10 @@ public: UINT16 *m_rom6b; // AMS RAM (1 Mib) - dynamic_array<UINT16> m_ram; + std::vector<UINT16> m_ram; // Scratch pad ram (1 KiB) - dynamic_array<UINT16> m_scratchpad; + std::vector<UINT16> m_scratchpad; // First joystick. 6 for TI-99/4A int m_firstjoy; diff --git a/src/mess/drivers/timex.c b/src/mess/drivers/timex.c index a42f182b1f0..fcf96c417f9 100644 --- a/src/mess/drivers/timex.c +++ b/src/mess/drivers/timex.c @@ -614,7 +614,7 @@ DEVICE_IMAGE_LOAD_MEMBER( spectrum_state, timex_cart ) DOCK = m_dock->get_rom_base(); // check header - image.fread(header, 9); + image.fread(&header[0], 9); for (int i = 0; i < 8; i++) if (header[i + 1] & 0x02) chunks_in_file++; diff --git a/src/mess/drivers/uzebox.c b/src/mess/drivers/uzebox.c index c85d8b2f033..a3b09b7621e 100644 --- a/src/mess/drivers/uzebox.c +++ b/src/mess/drivers/uzebox.c @@ -244,12 +244,12 @@ DEVICE_IMAGE_LOAD_MEMBER(uzebox_state, uzebox_cart) if (image.software_entry() == NULL) { dynamic_buffer data(size); - image.fread(data, size); + image.fread(&data[0], size); if (!strncmp((const char*)&data[0], "UZEBOX", 6)) - memcpy(m_cart->get_rom_base(), data + 0x200, size - 0x200); + memcpy(m_cart->get_rom_base(), &data[0x200], size - 0x200); else - memcpy(m_cart->get_rom_base(), data, size); + memcpy(m_cart->get_rom_base(), &data[0], size); } else memcpy(m_cart->get_rom_base(), image.get_software_region("rom"), size); diff --git a/src/mess/drivers/vc4000.c b/src/mess/drivers/vc4000.c index 6df1ee22355..c8ae073a799 100644 --- a/src/mess/drivers/vc4000.c +++ b/src/mess/drivers/vc4000.c @@ -404,7 +404,7 @@ QUICKLOAD_LOAD_MEMBER( vc4000_state,vc4000) quick_length = image.length(); quick_data.resize(quick_length); - read_ = image.fread( quick_data, quick_length); + read_ = image.fread( &quick_data[0], quick_length); if (read_ != quick_length) { image.seterror(IMAGE_ERROR_INVALIDIMAGE, "Cannot read the file"); diff --git a/src/mess/drivers/vii.c b/src/mess/drivers/vii.c index 81fa71770ae..78041843b8d 100644 --- a/src/mess/drivers/vii.c +++ b/src/mess/drivers/vii.c @@ -118,7 +118,7 @@ public: required_shared_ptr<UINT16> m_p_palette; required_shared_ptr<UINT16> m_p_spriteram; - dynamic_array<UINT16> m_p_cart; + std::vector<UINT16> m_p_cart; UINT32 m_current_bank; @@ -585,9 +585,9 @@ void vii_state::switch_bank(UINT32 bank) { m_current_bank = bank; if (m_cart_rom) - memcpy(m_p_cart, m_cart_rom->base() + 0x400000 * bank * 2, 0x400000 * 2); + memcpy(&m_p_cart[0], m_cart_rom->base() + 0x400000 * bank * 2, 0x400000 * 2); else - memcpy(m_p_cart, m_bios_rom->base() + 0x400000 * bank * 2, 0x400000 * 2); + memcpy(&m_p_cart[0], m_bios_rom->base() + 0x400000 * bank * 2, 0x400000 * 2); } } @@ -1025,12 +1025,12 @@ void vii_state::machine_start() { astring region_tag; m_cart_rom = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str()); - memcpy(m_p_cart, m_cart_rom->base(), 0x400000 * 2); + memcpy(&m_p_cart[0], m_cart_rom->base(), 0x400000 * 2); } else if (m_spg243_mode == SPG243_VII) // Vii bios is banked - memcpy(m_p_cart, m_bios_rom->base(), 0x400000 * 2); + memcpy(&m_p_cart[0], m_bios_rom->base(), 0x400000 * 2); else - memcpy(m_p_cart, memregion("maincpu")->base(), 0x400000 * 2); + memcpy(&m_p_cart[0], memregion("maincpu")->base(), 0x400000 * 2); m_video_regs[0x36] = 0xffff; m_video_regs[0x37] = 0xffff; diff --git a/src/mess/drivers/x68k.c b/src/mess/drivers/x68k.c index 2a3c1f98859..c28c784281e 100644 --- a/src/mess/drivers/x68k.c +++ b/src/mess/drivers/x68k.c @@ -863,7 +863,7 @@ WRITE16_MEMBER(x68k_state::x68k_sram_w) { if(m_sysport.sram_writeprotect == 0x31) { - COMBINE_DATA(m_nvram + offset); + COMBINE_DATA(&m_nvram[offset]); } } @@ -1571,7 +1571,7 @@ DRIVER_INIT_MEMBER(x68k_state,x68000) unsigned char* rom = memregion("maincpu")->base(); unsigned char* user2 = memregion("user2")->base(); - machine().device<nvram_device>("nvram")->set_base(m_nvram, m_nvram.bytes()); + machine().device<nvram_device>("nvram")->set_base(&m_nvram[0], m_nvram.size()*sizeof(m_nvram[0])); #ifdef USE_PREDEFINED_SRAM { |
