diff options
Diffstat (limited to 'src')
245 files changed, 400 insertions, 404 deletions
diff --git a/src/devices/bus/a7800/a78_slot.cpp b/src/devices/bus/a7800/a78_slot.cpp index cd0fa0269b7..93997f3fecd 100644 --- a/src/devices/bus/a7800/a78_slot.cpp +++ b/src/devices/bus/a7800/a78_slot.cpp @@ -523,7 +523,7 @@ std::string a78_cart_slot_device::get_default_card_software() if (open_image_file(mconfig().options())) { const char *slot_string; - dynamic_buffer head(128); + std::vector<UINT8> head(128); int type = A78_TYPE0, mapper; // Load and check the header diff --git a/src/devices/bus/a7800/a78_slot.h b/src/devices/bus/a7800/a78_slot.h index 0f4fd9d2e92..7267bce373a 100644 --- a/src/devices/bus/a7800/a78_slot.h +++ b/src/devices/bus/a7800/a78_slot.h @@ -69,8 +69,8 @@ protected: // internal state UINT8 *m_rom; UINT32 m_rom_size; - dynamic_buffer m_ram; - dynamic_buffer m_nvram; // HiScore cart can save scores! + std::vector<UINT8> m_ram; + std::vector<UINT8> m_nvram; // HiScore cart can save scores! // helpers UINT32 m_base_rom; int m_bank_mask; diff --git a/src/devices/bus/a800/a800_slot.cpp b/src/devices/bus/a800/a800_slot.cpp index 936e0849708..4aafc77f1d3 100644 --- a/src/devices/bus/a800/a800_slot.cpp +++ b/src/devices/bus/a800/a800_slot.cpp @@ -405,7 +405,7 @@ std::string a800_cart_slot_device::get_default_card_software() if (open_image_file(mconfig().options())) { const char *slot_string; - dynamic_buffer head(0x10); + std::vector<UINT8> head(0x10); UINT32 len = m_file->size(); int type = A800_8K; @@ -442,7 +442,7 @@ std::string a5200_cart_slot_device::get_default_card_software() if (open_image_file(mconfig().options())) { const char *slot_string; - dynamic_buffer head(0x10); + std::vector<UINT8> head(0x10); UINT32 len = m_file->size(); int type = A5200_8K; @@ -477,7 +477,7 @@ std::string xegs_cart_slot_device::get_default_card_software() if (open_image_file(mconfig().options())) { const char *slot_string; - dynamic_buffer head(0x10); + std::vector<UINT8> head(0x10); UINT32 len = m_file->size(); int type = A800_8K; diff --git a/src/devices/bus/a800/a800_slot.h b/src/devices/bus/a800/a800_slot.h index d1cf620bdc4..cc1b6ba275c 100644 --- a/src/devices/bus/a800/a800_slot.h +++ b/src/devices/bus/a800/a800_slot.h @@ -72,8 +72,8 @@ protected: // internal state UINT8 *m_rom; UINT32 m_rom_size; - dynamic_buffer m_ram; - dynamic_buffer m_nvram; // HiScore cart can save scores! + std::vector<UINT8> m_ram; + std::vector<UINT8> m_nvram; // HiScore cart can save scores! // helpers int m_bank_mask; }; diff --git a/src/devices/bus/amiga/zorro/a590.h b/src/devices/bus/amiga/zorro/a590.h index 252074a2e33..90dc2cd589e 100644 --- a/src/devices/bus/amiga/zorro/a590.h +++ b/src/devices/bus/amiga/zorro/a590.h @@ -62,7 +62,7 @@ protected: required_device<dmac_device> m_dmac; required_device<wd33c93_device> m_wdc; - dynamic_buffer m_ram; + std::vector<UINT8> m_ram; }; // ======================> a590_device diff --git a/src/devices/bus/apf/slot.h b/src/devices/bus/apf/slot.h index c2dba02fc08..709d2f396a0 100644 --- a/src/devices/bus/apf/slot.h +++ b/src/devices/bus/apf/slot.h @@ -47,7 +47,7 @@ protected: // internal state UINT8 *m_rom; UINT32 m_rom_size; - dynamic_buffer m_ram; + std::vector<UINT8> m_ram; }; diff --git a/src/devices/bus/astrocde/ram.h b/src/devices/bus/astrocde/ram.h index 673e7bef8d9..39d854827ac 100644 --- a/src/devices/bus/astrocde/ram.h +++ b/src/devices/bus/astrocde/ram.h @@ -26,7 +26,7 @@ public: virtual DECLARE_WRITE8_MEMBER(write) override; protected: - dynamic_buffer m_ram; + std::vector<UINT8> m_ram; required_ioport m_write_prot; }; @@ -71,7 +71,7 @@ public: virtual DECLARE_WRITE8_MEMBER(write) override; private: - dynamic_buffer m_ram; + std::vector<UINT8> m_ram; required_ioport m_write_prot; }; @@ -94,7 +94,7 @@ public: virtual DECLARE_WRITE8_MEMBER(write) override; private: - dynamic_buffer m_ram; + std::vector<UINT8> m_ram; required_ioport m_write_prot; }; @@ -117,7 +117,7 @@ public: virtual DECLARE_WRITE8_MEMBER(write) override; private: - dynamic_buffer m_ram; + std::vector<UINT8> m_ram; required_ioport m_write_prot; }; diff --git a/src/devices/bus/chanf/slot.h b/src/devices/bus/chanf/slot.h index f1d3f0d2c88..d34b57fdb04 100644 --- a/src/devices/bus/chanf/slot.h +++ b/src/devices/bus/chanf/slot.h @@ -51,7 +51,7 @@ protected: // internal state UINT8 *m_rom; UINT32 m_rom_size; - dynamic_buffer m_ram; + std::vector<UINT8> m_ram; }; diff --git a/src/devices/bus/cpc/symbfac2.h b/src/devices/bus/cpc/symbfac2.h index 04bc55bae4d..5f5671485aa 100644 --- a/src/devices/bus/cpc/symbfac2.h +++ b/src/devices/bus/cpc/symbfac2.h @@ -62,7 +62,7 @@ private: required_ioport m_mouse_y; required_ioport m_mouse_buttons; - dynamic_buffer m_rom_space; + std::vector<UINT8> m_rom_space; bool m_iohigh; UINT16 m_ide_data; diff --git a/src/devices/bus/gameboy/gb_slot.cpp b/src/devices/bus/gameboy/gb_slot.cpp index 157f5a6130e..c6182053665 100644 --- a/src/devices/bus/gameboy/gb_slot.cpp +++ b/src/devices/bus/gameboy/gb_slot.cpp @@ -597,7 +597,7 @@ std::string base_gb_cart_slot_device::get_default_card_software() { const char *slot_string; UINT32 len = m_file->size(), offset = 0; - dynamic_buffer rom(len); + std::vector<UINT8> rom(len); int type; m_file->read(&rom[0], len); diff --git a/src/devices/bus/gameboy/gb_slot.h b/src/devices/bus/gameboy/gb_slot.h index 75a8b4e7cde..d333c524b07 100644 --- a/src/devices/bus/gameboy/gb_slot.h +++ b/src/devices/bus/gameboy/gb_slot.h @@ -85,7 +85,7 @@ public: // internal state UINT8 *m_rom; UINT32 m_rom_size; - dynamic_buffer m_ram; + std::vector<UINT8> m_ram; // bankswitch variables // we access ROM/RAM banks through these bank maps diff --git a/src/devices/bus/gba/gba_slot.cpp b/src/devices/bus/gba/gba_slot.cpp index fc7c723ac15..ad03df06299 100644 --- a/src/devices/bus/gba/gba_slot.cpp +++ b/src/devices/bus/gba/gba_slot.cpp @@ -433,7 +433,7 @@ std::string gba_cart_slot_device::get_default_card_software() { const char *slot_string; UINT32 len = m_file->size(); - dynamic_buffer rom(len); + std::vector<UINT8> rom(len); int type; m_file->read(&rom[0], len); diff --git a/src/devices/bus/generic/slot.h b/src/devices/bus/generic/slot.h index a3e07f68ef4..429441b3663 100644 --- a/src/devices/bus/generic/slot.h +++ b/src/devices/bus/generic/slot.h @@ -45,7 +45,7 @@ public: // internal state UINT8 *m_rom; UINT32 m_rom_size; - dynamic_buffer m_ram; + std::vector<UINT8> m_ram; // this replaces m_rom for non-user configurable carts! optional_memory_region m_region; diff --git a/src/devices/bus/hp_optroms/hp_optrom.h b/src/devices/bus/hp_optroms/hp_optrom.h index 6ca5440cce5..0ddd24b26c9 100644 --- a/src/devices/bus/hp_optroms/hp_optrom.h +++ b/src/devices/bus/hp_optroms/hp_optrom.h @@ -61,7 +61,7 @@ public: protected: hp_optrom_cart_device *m_cart; - dynamic_buffer m_content; + std::vector<UINT8> m_content; offs_t m_base_addr; offs_t m_end_addr; }; diff --git a/src/devices/bus/intv/slot.cpp b/src/devices/bus/intv/slot.cpp index e0bc729ba70..eb60f1af14b 100644 --- a/src/devices/bus/intv/slot.cpp +++ b/src/devices/bus/intv/slot.cpp @@ -453,7 +453,7 @@ std::string intv_cart_slot_device::get_default_card_software() { const char *slot_string; UINT32 len = m_file->size(); - dynamic_buffer rom(len); + std::vector<UINT8> rom(len); int type = INTV_STD; m_file->read(&rom[0], len); diff --git a/src/devices/bus/intv/slot.h b/src/devices/bus/intv/slot.h index 11d88aed25c..37434b4e83d 100644 --- a/src/devices/bus/intv/slot.h +++ b/src/devices/bus/intv/slot.h @@ -83,7 +83,7 @@ protected: // internal state UINT8 *m_rom; UINT32 m_rom_size; - dynamic_buffer m_ram; + std::vector<UINT8> m_ram; }; diff --git a/src/devices/bus/isa/3c505.h b/src/devices/bus/isa/3c505.h index 3b2ede78aa2..127dc41afb6 100644 --- a/src/devices/bus/isa/3c505.h +++ b/src/devices/bus/isa/3c505.h @@ -182,7 +182,7 @@ private: threecom3c505_device *m_device; // pointer back to our device UINT16 m_length; - dynamic_buffer m_data; + std::vector<UINT8> m_data; }; /* data_buffer fifo (used to buffer the received data) */ diff --git a/src/devices/bus/isa/cga.h b/src/devices/bus/isa/cga.h index de6c6841e9f..8fdabd41ebb 100644 --- a/src/devices/bus/isa/cga.h +++ b/src/devices/bus/isa/cga.h @@ -78,7 +78,7 @@ public: UINT8 m_vsync; UINT8 m_hsync; size_t m_vram_size; - dynamic_buffer m_vram; + std::vector<UINT8> m_vram; bool m_superimpose; UINT8 m_plantronics; /* This should be moved into the appropriate subclass */ offs_t m_start_offset; diff --git a/src/devices/bus/isa/gus.h b/src/devices/bus/isa/gus.h index eb4413d3bd8..0370fd6ed80 100644 --- a/src/devices/bus/isa/gus.h +++ b/src/devices/bus/isa/gus.h @@ -191,7 +191,7 @@ public: void reset_irq(UINT8 source); void update_volume_ramps(); - dynamic_buffer m_wave_ram; + std::vector<UINT8> m_wave_ram; protected: // device-level overrides diff --git a/src/devices/bus/isa/hdc.h b/src/devices/bus/isa/hdc.h index fd1db1ad65d..9c43fb50d4a 100644 --- a/src/devices/bus/isa/hdc.h +++ b/src/devices/bus/isa/hdc.h @@ -70,7 +70,7 @@ protected: void get_chsn(); int test_ready(); - dynamic_buffer buffer; /* data buffer */ + std::vector<UINT8> buffer; /* data buffer */ UINT8 *buffer_ptr; /* data pointer */ int csb; /* command status byte */ int status; /* drive status */ diff --git a/src/devices/bus/isa/mda.h b/src/devices/bus/isa/mda.h index 1d987789b2b..fc761ead19b 100644 --- a/src/devices/bus/isa/mda.h +++ b/src/devices/bus/isa/mda.h @@ -55,7 +55,7 @@ public: UINT8 *m_chr_gen; UINT8 m_vsync; UINT8 m_hsync; - dynamic_buffer m_videoram; + std::vector<UINT8> m_videoram; UINT8 m_pixel; required_device<palette_device> m_palette; }; diff --git a/src/devices/bus/isa/num9rev.h b/src/devices/bus/isa/num9rev.h index bf185d5eb62..4fe64e19019 100644 --- a/src/devices/bus/isa/num9rev.h +++ b/src/devices/bus/isa/num9rev.h @@ -49,8 +49,8 @@ protected: private: required_device<upd7220_device> m_upd7220; required_device<palette_device> m_palette; - dynamic_buffer m_ram; - dynamic_buffer m_overlay; + std::vector<UINT8> m_ram; + std::vector<UINT8> m_overlay; UINT8 m_bank; UINT8 m_mode; diff --git a/src/devices/bus/isa/omti8621.h b/src/devices/bus/isa/omti8621.h index dbcd9f00103..7a81751bbe7 100644 --- a/src/devices/bus/isa/omti8621.h +++ b/src/devices/bus/isa/omti8621.h @@ -83,7 +83,7 @@ private: int command_status; // data buffer - dynamic_buffer sector_buffer; + std::vector<UINT8> sector_buffer; UINT8 *data_buffer; int data_length; int data_index; diff --git a/src/devices/bus/isa/sc499.h b/src/devices/bus/isa/sc499.h index ad536a66df0..7a832b53be2 100644 --- a/src/devices/bus/isa/sc499.h +++ b/src/devices/bus/isa/sc499.h @@ -53,7 +53,7 @@ protected: virtual void device_config_complete() override; virtual void device_start() override { }; - dynamic_buffer m_ctape_data; + std::vector<UINT8> m_ctape_data; }; // ======================> sc499_device @@ -138,7 +138,7 @@ private: UINT32 m_ctape_block_index; UINT64 m_image_length; - dynamic_buffer m_ctape_block_buffer; + std::vector<UINT8> m_ctape_block_buffer; required_device<sc499_ctape_image_device> m_image; enum line_state irq_state; diff --git a/src/devices/bus/m5/slot.h b/src/devices/bus/m5/slot.h index 27345e34a99..a31f89f0a49 100644 --- a/src/devices/bus/m5/slot.h +++ b/src/devices/bus/m5/slot.h @@ -51,7 +51,7 @@ protected: // internal state UINT8 *m_rom; UINT32 m_rom_size; - dynamic_buffer m_ram; + std::vector<UINT8> m_ram; }; diff --git a/src/devices/bus/megadrive/md_slot.cpp b/src/devices/bus/megadrive/md_slot.cpp index 1e796adb16b..246dc43cab8 100644 --- a/src/devices/bus/megadrive/md_slot.cpp +++ b/src/devices/bus/megadrive/md_slot.cpp @@ -471,7 +471,7 @@ image_init_result base_md_cart_slot_device::load_nonlist() unsigned char *ROM; bool is_smd, is_md; UINT32 tmplen = length(), offset, len; - dynamic_buffer tmpROM(tmplen); + std::vector<UINT8> tmpROM(tmplen); // STEP 1: store a (possibly headered) copy of the file and determine its type (SMD? MD? BIN?) fread(&tmpROM[0], tmplen); @@ -919,7 +919,7 @@ std::string base_md_cart_slot_device::get_default_card_software() { const char *slot_string; UINT32 len = m_file->size(), offset = 0; - dynamic_buffer rom(len); + std::vector<UINT8> rom(len); int type; m_file->read(&rom[0], len); diff --git a/src/devices/bus/msx_cart/cartridge.h b/src/devices/bus/msx_cart/cartridge.h index 6deb2140dea..6016d30202a 100644 --- a/src/devices/bus/msx_cart/cartridge.h +++ b/src/devices/bus/msx_cart/cartridge.h @@ -41,10 +41,10 @@ public: UINT32 get_sram_size() { return m_sram.size(); } protected: - dynamic_buffer m_rom; - dynamic_buffer m_ram; - dynamic_buffer m_rom_vlm5030; - dynamic_buffer m_sram; + std::vector<UINT8> m_rom; + std::vector<UINT8> m_ram; + std::vector<UINT8> m_rom_vlm5030; + std::vector<UINT8> m_sram; devcb_write_line m_out_irq_cb; }; diff --git a/src/devices/bus/msx_slot/cartridge.cpp b/src/devices/bus/msx_slot/cartridge.cpp index 19be1b77921..104f82b6bd5 100644 --- a/src/devices/bus/msx_slot/cartridge.cpp +++ b/src/devices/bus/msx_slot/cartridge.cpp @@ -277,7 +277,7 @@ std::string msx_slot_cartridge_device::get_default_card_software() { const char *slot_string = "nomapper"; UINT32 length = m_file->size(); - dynamic_buffer rom(length); + std::vector<UINT8> rom(length); int type = NOMAPPER; // Check if there's some mapper related information in the hashfiles diff --git a/src/devices/bus/msx_slot/panasonic08.h b/src/devices/bus/msx_slot/panasonic08.h index 18295c78598..b43d5646bba 100644 --- a/src/devices/bus/msx_slot/panasonic08.h +++ b/src/devices/bus/msx_slot/panasonic08.h @@ -39,7 +39,7 @@ private: UINT8 m_selected_bank[8]; const UINT8 *m_bank_base[8]; UINT8 m_control; - dynamic_buffer m_sram; + std::vector<UINT8> m_sram; void map_bank(int bank); }; diff --git a/src/devices/bus/neogeo/prot_cmc.cpp b/src/devices/bus/neogeo/prot_cmc.cpp index 7a91344aaad..41aabd2447f 100644 --- a/src/devices/bus/neogeo/prot_cmc.cpp +++ b/src/devices/bus/neogeo/prot_cmc.cpp @@ -501,7 +501,7 @@ void cmc_prot_device::decrypt(UINT8 *r0, UINT8 *r1, void cmc_prot_device::gfx_decrypt(UINT8* rom, UINT32 rom_size, int extra_xor) { int rpos; - dynamic_buffer buf(rom_size); + std::vector<UINT8> buf(rom_size); // Data xor for (rpos = 0; rpos < rom_size/4; rpos++) @@ -709,7 +709,7 @@ void cmc_prot_device::cmc50_m1_decrypt(UINT8* romcrypt, UINT32 romcrypt_size, UI size_t rom_size = 0x80000; UINT8* rom2 = romaudio; - dynamic_buffer buffer(rom_size); + std::vector<UINT8> buffer(rom_size); UINT16 key = generate_cs16(rom, 0x10000); diff --git a/src/devices/bus/neogeo/prot_cthd.cpp b/src/devices/bus/neogeo/prot_cthd.cpp index b2901a60d3e..a6ccee1a56d 100644 --- a/src/devices/bus/neogeo/prot_cthd.cpp +++ b/src/devices/bus/neogeo/prot_cthd.cpp @@ -35,7 +35,7 @@ void cthd_prot_device::fix_do(UINT8* sprrom, UINT32 sprrom_size, int start, int { int tilesize = 128; - dynamic_buffer rom(16 * tilesize); // 16 tiles buffer + std::vector<UINT8> rom(16 * tilesize); // 16 tiles buffer UINT8* realrom = sprrom + start * tilesize; for (int i = 0; i < (end-start)/16; i++) @@ -94,7 +94,7 @@ void cthd_prot_device::cthd2003_c(UINT8* sprrom, UINT32 sprrom_size, int pow) void cthd_prot_device::decrypt_cthd2003(UINT8* sprrom, UINT32 sprrom_size, UINT8* audiorom, UINT32 audiorom_size, UINT8* fixedrom, UINT32 fixedrom_size) { UINT8 *romdata = fixedrom; - dynamic_buffer tmp(8 * 128 * 128); + std::vector<UINT8> tmp(8 * 128 * 128); memcpy(&tmp[8 * 0 * 128], romdata + 8 * 0 * 128, 8 * 32 * 128); memcpy(&tmp[8 * 32 * 128], romdata + 8 * 64 * 128, 8 * 32 * 128); @@ -182,7 +182,7 @@ void cthd_prot_device::ct2k3sp_sx_decrypt( UINT8* fixedrom, UINT32 fixedrom_size { int rom_size = fixedrom_size; UINT8 *rom = fixedrom; - dynamic_buffer buf(rom_size); + std::vector<UINT8> buf(rom_size); memcpy(&buf[0], rom, rom_size); @@ -206,7 +206,7 @@ void cthd_prot_device::ct2k3sp_sx_decrypt( UINT8* fixedrom, UINT32 fixedrom_size void cthd_prot_device::decrypt_ct2k3sp(UINT8* sprrom, UINT32 sprrom_size, UINT8* audiorom, UINT32 audiorom_size, UINT8* fixedrom, UINT32 fixedrom_size) { UINT8 *romdata = audiorom + 0x10000; - dynamic_buffer tmp(8 * 128 * 128); + std::vector<UINT8> tmp(8 * 128 * 128); memcpy(&tmp[8 * 0 * 128], romdata + 8 * 0 * 128, 8 * 32 * 128); memcpy(&tmp[8 * 32 * 128], romdata + 8 * 64 * 128, 8 * 32 * 128); memcpy(&tmp[8 * 64 * 128], romdata + 8 * 32 * 128, 8 * 32 * 128); @@ -225,7 +225,7 @@ void cthd_prot_device::decrypt_ct2k3sp(UINT8* sprrom, UINT32 sprrom_size, UINT8* void cthd_prot_device::decrypt_ct2k3sa(UINT8* sprrom, UINT32 sprrom_size, UINT8* audiorom, UINT32 audiorom_size ) { UINT8 *romdata = audiorom + 0x10000; - dynamic_buffer tmp(8 * 128 * 128); + std::vector<UINT8> tmp(8 * 128 * 128); memcpy(&tmp[8 * 0 * 128], romdata + 8 * 0 * 128, 8 * 32 * 128); memcpy(&tmp[8 * 32 * 128], romdata + 8 * 64 * 128, 8 * 32 * 128); memcpy(&tmp[8 * 64 * 128], romdata + 8 * 32 * 128, 8 * 32 * 128); @@ -280,7 +280,7 @@ void cthd_prot_device::matrimbl_decrypt(UINT8* sprrom, UINT32 sprrom_size, UINT8 { // decrypt Z80 UINT8 *rom = audiorom + 0x10000; - dynamic_buffer buf(0x20000); + std::vector<UINT8> buf(0x20000); memcpy(&buf[0], rom, 0x20000); int j; diff --git a/src/devices/bus/neogeo/prot_kof2k2.cpp b/src/devices/bus/neogeo/prot_kof2k2.cpp index fb2c80fd2b0..5ec8c31f979 100644 --- a/src/devices/bus/neogeo/prot_kof2k2.cpp +++ b/src/devices/bus/neogeo/prot_kof2k2.cpp @@ -27,7 +27,7 @@ void kof2002_prot_device::kof2002_decrypt_68k(UINT8* cpurom, UINT32 cpurom_size) { static const int sec[]={0x100000,0x280000,0x300000,0x180000,0x000000,0x380000,0x200000,0x080000}; UINT8 *src = cpurom + 0x100000; - dynamic_buffer dst(0x400000); + std::vector<UINT8> dst(0x400000); memcpy(&dst[0], src, 0x400000); for (int i = 0; i < 8; ++i) @@ -39,7 +39,7 @@ void kof2002_prot_device::matrim_decrypt_68k(UINT8* cpurom, UINT32 cpurom_size) { static const int sec[]={0x100000,0x280000,0x300000,0x180000,0x000000,0x380000,0x200000,0x080000}; UINT8 *src = cpurom + 0x100000; - dynamic_buffer dst(0x400000); + std::vector<UINT8> dst(0x400000); memcpy(&dst[0], src, 0x400000); for (int i = 0; i < 8; ++i) @@ -51,7 +51,7 @@ void kof2002_prot_device::samsho5_decrypt_68k(UINT8* cpurom, UINT32 cpurom_size) { static const int sec[]={0x000000,0x080000,0x700000,0x680000,0x500000,0x180000,0x200000,0x480000,0x300000,0x780000,0x600000,0x280000,0x100000,0x580000,0x400000,0x380000}; UINT8 *src = cpurom; - dynamic_buffer dst(0x800000); + std::vector<UINT8> dst(0x800000); memcpy(&dst[0], src, 0x800000); for (int i = 0; i < 16; ++i) memcpy(src + i * 0x80000, &dst[sec[i]], 0x80000); @@ -62,7 +62,7 @@ void kof2002_prot_device::samsh5sp_decrypt_68k(UINT8* cpurom, UINT32 cpurom_size { static const int sec[]={0x000000,0x080000,0x500000,0x480000,0x600000,0x580000,0x700000,0x280000,0x100000,0x680000,0x400000,0x780000,0x200000,0x380000,0x300000,0x180000}; UINT8 *src = cpurom; - dynamic_buffer dst(0x800000); + std::vector<UINT8> dst(0x800000); memcpy(&dst[0], src, 0x800000); for (int i = 0; i < 16; ++i) diff --git a/src/devices/bus/neogeo/prot_kof2k3bl.cpp b/src/devices/bus/neogeo/prot_kof2k3bl.cpp index 5ef35dee9c5..35c2272fb3d 100644 --- a/src/devices/bus/neogeo/prot_kof2k3bl.cpp +++ b/src/devices/bus/neogeo/prot_kof2k3bl.cpp @@ -82,7 +82,7 @@ void kof2k3bl_prot_device::bl_px_decrypt(UINT8* cpurom, UINT32 cpurom_size) static const UINT8 sec[] = { 0x07, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 }; int rom_size = 0x800000; UINT8 *rom = cpurom; - dynamic_buffer buf(rom_size); + std::vector<UINT8> buf(rom_size); memcpy(&buf[0], rom, rom_size); for (int i = 0; i < rom_size / 0x100000; i++) diff --git a/src/devices/bus/neogeo/prot_kof98.cpp b/src/devices/bus/neogeo/prot_kof98.cpp index 9c41f709f2b..86da8a1b7f4 100644 --- a/src/devices/bus/neogeo/prot_kof98.cpp +++ b/src/devices/bus/neogeo/prot_kof98.cpp @@ -28,7 +28,7 @@ void kof98_prot_device::device_reset() void kof98_prot_device::decrypt_68k(UINT8* cpurom, UINT32 cpurom_size) { UINT8 *src = cpurom; - dynamic_buffer dst(0x200000); + std::vector<UINT8> dst(0x200000); int i, j, k; static const UINT32 sec[]={ 0x000000, 0x100000, 0x000004, 0x100004, 0x10000a, 0x00000a, 0x10000e, 0x00000e }; static const UINT32 pos[]={ 0x000, 0x004, 0x00a, 0x00e }; diff --git a/src/devices/bus/neogeo/prot_misc.cpp b/src/devices/bus/neogeo/prot_misc.cpp index c858e05f42b..70ded6a0f7f 100644 --- a/src/devices/bus/neogeo/prot_misc.cpp +++ b/src/devices/bus/neogeo/prot_misc.cpp @@ -48,7 +48,7 @@ void neoboot_prot_device::cx_decrypt(UINT8*sprrom, UINT32 sprrom_size) { int cx_size = sprrom_size; UINT8 *rom = sprrom; - dynamic_buffer buf(cx_size); + std::vector<UINT8> buf(cx_size); memcpy(&buf[0], rom, cx_size); @@ -64,7 +64,7 @@ void neoboot_prot_device::sx_decrypt(UINT8* fixed, UINT32 fixed_size, int value) if (value == 1) { - dynamic_buffer buf(sx_size); + std::vector<UINT8> buf(sx_size); memcpy(&buf[0], rom, sx_size); for (int i = 0; i < sx_size; i += 0x10) @@ -171,7 +171,7 @@ void neoboot_prot_device::kf2k5uni_mx_decrypt(UINT8* audiorom, UINT32 audiorom_s void neoboot_prot_device::decrypt_kof2k4se_68k(UINT8* cpurom, UINT32 cpurom_size) { UINT8 *src = cpurom + 0x100000; - dynamic_buffer dst(0x400000); + std::vector<UINT8> dst(0x400000); static const int sec[] = {0x300000,0x200000,0x100000,0x000000}; memcpy(&dst[0], src, 0x400000); @@ -196,7 +196,7 @@ void neoboot_prot_device::lans2004_decrypt_68k(UINT8* cpurom, UINT32 cpurom_size UINT16 *rom = (UINT16*)cpurom; static const int sec[] = { 0x3, 0x8, 0x7, 0xc, 0x1, 0xa, 0x6, 0xd }; - dynamic_buffer dst(0x600000); + std::vector<UINT8> dst(0x600000); for (int i = 0; i < 8; i++) memcpy (&dst[i * 0x20000], src + sec[i] * 0x20000, 0x20000); @@ -232,7 +232,7 @@ void neoboot_prot_device::samsho5b_px_decrypt(UINT8* cpurom, UINT32 cpurom_size) { int px_size = cpurom_size; UINT8 *rom = cpurom; - dynamic_buffer buf(px_size); + std::vector<UINT8> buf(px_size); memcpy(&buf[0], rom, px_size); @@ -311,7 +311,7 @@ void neoboot_prot_device::kog_px_decrypt(UINT8* cpurom, UINT32 cpurom_size) { // the protection chip does some *very* strange things to the rom UINT8 *src = cpurom; - dynamic_buffer dst(0x600000); + std::vector<UINT8> dst(0x600000); UINT16 *rom = (UINT16 *)cpurom; static const int sec[] = { 0x3, 0x8, 0x7, 0xc, 0x1, 0xa, 0x6, 0xd }; @@ -373,7 +373,7 @@ void neoboot_prot_device::svcboot_px_decrypt(UINT8* cpurom, UINT32 cpurom_size) static const UINT8 sec[] = { 0x06, 0x07, 0x01, 0x02, 0x03, 0x04, 0x05, 0x00 }; int size = cpurom_size; UINT8 *src = cpurom; - dynamic_buffer dst(size); + std::vector<UINT8> dst(size); for (int i = 0; i < size / 0x100000; i++) memcpy(&dst[i * 0x100000], &src[sec[i] * 0x100000], 0x100000); @@ -399,7 +399,7 @@ void neoboot_prot_device::svcboot_cx_decrypt(UINT8* sprrom, UINT32 sprrom_size) }; int size = sprrom_size; UINT8 *src = sprrom; - dynamic_buffer dst(size); + std::vector<UINT8> dst(size); memcpy(&dst[0], src, size); for (int i = 0; i < size / 0x80; i++) @@ -423,7 +423,7 @@ void neoboot_prot_device::svcplus_px_decrypt(UINT8* cpurom, UINT32 cpurom_size) static const int sec[] = { 0x00, 0x03, 0x02, 0x05, 0x04, 0x01 }; int size = cpurom_size; UINT8 *src = cpurom; - dynamic_buffer dst(size); + std::vector<UINT8> dst(size); memcpy(&dst[0], src, size); for (int i = 0; i < size / 2; i++) @@ -457,7 +457,7 @@ void neoboot_prot_device::svcplusa_px_decrypt(UINT8* cpurom, UINT32 cpurom_size) static const int sec[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x00 }; int size = cpurom_size; UINT8 *src = cpurom; - dynamic_buffer dst(size); + std::vector<UINT8> dst(size); memcpy(&dst[0], src, size); for (int i = 0; i < 6; i++) @@ -472,7 +472,7 @@ void neoboot_prot_device::svcsplus_px_decrypt(UINT8* cpurom, UINT32 cpurom_size) static const int sec[] = { 0x06, 0x07, 0x01, 0x02, 0x03, 0x04, 0x05, 0x00 }; int size = cpurom_size; UINT8 *src = cpurom; - dynamic_buffer dst(size); + std::vector<UINT8> dst(size); memcpy(&dst[0], src, size); for (int i = 0; i < size / 2; i++) @@ -514,7 +514,7 @@ void neoboot_prot_device::kof2002b_gfx_decrypt(UINT8 *src, int size) { 8, 0, 7, 6, 2, 1 }, }; - dynamic_buffer dst(0x10000); + std::vector<UINT8> dst(0x10000); for (int i = 0; i < size; i += 0x10000) { @@ -556,7 +556,7 @@ void neoboot_prot_device::kf2k2mp_decrypt(UINT8* cpurom, UINT32 cpurom_size) void neoboot_prot_device::kf2k2mp2_px_decrypt(UINT8* cpurom, UINT32 cpurom_size) { UINT8 *src = cpurom; - dynamic_buffer dst(0x600000); + std::vector<UINT8> dst(0x600000); memcpy(&dst[0x000000], &src[0x1C0000], 0x040000); memcpy(&dst[0x040000], &src[0x140000], 0x080000); @@ -571,7 +571,7 @@ void neoboot_prot_device::kf2k2mp2_px_decrypt(UINT8* cpurom, UINT32 cpurom_size) void neoboot_prot_device::kof10th_decrypt(UINT8* cpurom, UINT32 cpurom_size) { - dynamic_buffer dst(0x900000); + std::vector<UINT8> dst(0x900000); UINT8 *src = cpurom; memcpy(&dst[0x000000], src + 0x700000, 0x100000); // Correct (Verified in Uni-bios) diff --git a/src/devices/bus/neogeo/prot_pcm2.cpp b/src/devices/bus/neogeo/prot_pcm2.cpp index 3432eef4da2..2417075509a 100644 --- a/src/devices/bus/neogeo/prot_pcm2.cpp +++ b/src/devices/bus/neogeo/prot_pcm2.cpp @@ -75,7 +75,7 @@ void pcm2_prot_device::swap(UINT8* ymrom, UINT32 ymsize, int value) {0x4b,0xa4,0x63,0x46,0xf0,0x91,0xea,0x62}, {0x4b,0xa4,0x63,0x46,0xf0,0x91,0xea,0x62}}; - dynamic_buffer buf(0x1000000); + std::vector<UINT8> buf(0x1000000); int j, d; UINT8* src = ymrom; memcpy(&buf[0], src, 0x1000000); diff --git a/src/devices/bus/neogeo/prot_pvc.cpp b/src/devices/bus/neogeo/prot_pvc.cpp index 1de3383d5a3..8abdeb3ceb6 100644 --- a/src/devices/bus/neogeo/prot_pvc.cpp +++ b/src/devices/bus/neogeo/prot_pvc.cpp @@ -100,7 +100,7 @@ void pvc_prot_device::mslug5_decrypt_68k(UINT8* rom, UINT32 size) static const UINT8 xor1[0x20] = { 0xc2, 0x4b, 0x74, 0xfd, 0x0b, 0x34, 0xeb, 0xd7, 0x10, 0x6d, 0xf9, 0xce, 0x5d, 0xd5, 0x61, 0x29, 0xf5, 0xbe, 0x0d, 0x82, 0x72, 0x45, 0x0f, 0x24, 0xb3, 0x34, 0x1b, 0x99, 0xea, 0x09, 0xf3, 0x03 }; static const UINT8 xor2[0x20] = { 0x36, 0x09, 0xb0, 0x64, 0x95, 0x0f, 0x90, 0x42, 0x6e, 0x0f, 0x30, 0xf6, 0xe5, 0x08, 0x30, 0x64, 0x08, 0x04, 0x00, 0x2f, 0x72, 0x09, 0xa0, 0x13, 0xc9, 0x0b, 0xa0, 0x3e, 0xc2, 0x00, 0x40, 0x2b }; int rom_size = 0x800000; - dynamic_buffer buf(rom_size); + std::vector<UINT8> buf(rom_size); for (int i = 0; i < 0x100000; i++) rom[i] ^= xor1[(BYTE_XOR_LE(i) % 0x20)]; @@ -139,7 +139,7 @@ void pvc_prot_device::svc_px_decrypt(UINT8* rom, UINT32 size) static const UINT8 xor1[0x20] = { 0x3b, 0x6a, 0xf7, 0xb7, 0xe8, 0xa9, 0x20, 0x99, 0x9f, 0x39, 0x34, 0x0c, 0xc3, 0x9a, 0xa5, 0xc8, 0xb8, 0x18, 0xce, 0x56, 0x94, 0x44, 0xe3, 0x7a, 0xf7, 0xdd, 0x42, 0xf0, 0x18, 0x60, 0x92, 0x9f }; static const UINT8 xor2[0x20] = { 0x69, 0x0b, 0x60, 0xd6, 0x4f, 0x01, 0x40, 0x1a, 0x9f, 0x0b, 0xf0, 0x75, 0x58, 0x0e, 0x60, 0xb4, 0x14, 0x04, 0x20, 0xe4, 0xb9, 0x0d, 0x10, 0x89, 0xeb, 0x07, 0x30, 0x90, 0x50, 0x0e, 0x20, 0x26 }; int rom_size = 0x800000; - dynamic_buffer buf(rom_size); + std::vector<UINT8> buf(rom_size); for (int i = 0; i < 0x100000; i++) rom[i] ^= xor1[(BYTE_XOR_LE(i) % 0x20)]; @@ -177,7 +177,7 @@ void pvc_prot_device::kf2k3pcb_decrypt_68k(UINT8* rom, UINT32 size) { static const UINT8 xor2[ 0x20 ] = { 0xb4, 0x0f, 0x40, 0x6c, 0x38, 0x07, 0xd0, 0x3f, 0x53, 0x08, 0x80, 0xaa, 0xbe, 0x07, 0xc0, 0xfa, 0xd0, 0x08, 0x10, 0xd2, 0xf1, 0x03, 0x70, 0x7e, 0x87, 0x0b, 0x40, 0xf6, 0x2a, 0x0a, 0xe0, 0xf9 }; int rom_size = 0x900000; - dynamic_buffer buf(rom_size); + std::vector<UINT8> buf(rom_size); for (int i = 0; i < 0x100000; i++) rom[0x800000 + i] ^= rom[0x100002 | i]; @@ -215,7 +215,7 @@ void pvc_prot_device::kof2003_decrypt_68k(UINT8* rom, UINT32 size) static const UINT8 xor1[0x20] = { 0x3b, 0x6a, 0xf7, 0xb7, 0xe8, 0xa9, 0x20, 0x99, 0x9f, 0x39, 0x34, 0x0c, 0xc3, 0x9a, 0xa5, 0xc8, 0xb8, 0x18, 0xce, 0x56, 0x94, 0x44, 0xe3, 0x7a, 0xf7, 0xdd, 0x42, 0xf0, 0x18, 0x60, 0x92, 0x9f }; static const UINT8 xor2[0x20] = { 0x2f, 0x02, 0x60, 0xbb, 0x77, 0x01, 0x30, 0x08, 0xd8, 0x01, 0xa0, 0xdf, 0x37, 0x0a, 0xf0, 0x65, 0x28, 0x03, 0xd0, 0x23, 0xd3, 0x03, 0x70, 0x42, 0xbb, 0x06, 0xf0, 0x28, 0xba, 0x0f, 0xf0, 0x7a }; int rom_size = 0x900000; - dynamic_buffer buf(rom_size); + std::vector<UINT8> buf(rom_size); for (int i = 0; i < 0x100000; i++) rom[0x800000 + i] ^= rom[0x100002 | i]; @@ -256,7 +256,7 @@ void pvc_prot_device::kof2003h_decrypt_68k(UINT8* rom, UINT32 size) static const UINT8 xor1[0x20] = { 0xc2, 0x4b, 0x74, 0xfd, 0x0b, 0x34, 0xeb, 0xd7, 0x10, 0x6d, 0xf9, 0xce, 0x5d, 0xd5, 0x61, 0x29, 0xf5, 0xbe, 0x0d, 0x82, 0x72, 0x45, 0x0f, 0x24, 0xb3, 0x34, 0x1b, 0x99, 0xea, 0x09, 0xf3, 0x03 }; static const UINT8 xor2[0x20] = { 0x2b, 0x09, 0xd0, 0x7f, 0x51, 0x0b, 0x10, 0x4c, 0x5b, 0x07, 0x70, 0x9d, 0x3e, 0x0b, 0xb0, 0xb6, 0x54, 0x09, 0xe0, 0xcc, 0x3d, 0x0d, 0x80, 0x99, 0x87, 0x03, 0x90, 0x82, 0xfe, 0x04, 0x20, 0x18 }; int rom_size = 0x900000; - dynamic_buffer buf(rom_size); + std::vector<UINT8> buf(rom_size); for (int i = 0; i < 0x100000; i++) rom[0x800000 + i] ^= rom[0x100002 | i]; diff --git a/src/devices/bus/nes/aladdin.cpp b/src/devices/bus/nes/aladdin.cpp index 6ed293dccfd..d0f1ba00426 100644 --- a/src/devices/bus/nes/aladdin.cpp +++ b/src/devices/bus/nes/aladdin.cpp @@ -142,7 +142,7 @@ std::string nes_aladdin_slot_device::get_default_card_software() { const char *slot_string = "algn"; UINT32 len = m_file->size(); - dynamic_buffer rom(len); + std::vector<UINT8> rom(len); UINT8 mapper; m_file->read(&rom[0], len); diff --git a/src/devices/bus/nes/nes_ines.hxx b/src/devices/bus/nes/nes_ines.hxx index a3bf0ad803e..9fd1e5a90eb 100644 --- a/src/devices/bus/nes/nes_ines.hxx +++ b/src/devices/bus/nes/nes_ines.hxx @@ -798,7 +798,7 @@ void nes_cart_slot_device::call_load_ines() if (battery_size || mapper_sram_size) { UINT32 tot_size = battery_size + mapper_sram_size; - dynamic_buffer temp_nvram(tot_size); + std::vector<UINT8> temp_nvram(tot_size); battery_load(&temp_nvram[0], tot_size, 0x00); if (battery_size) { diff --git a/src/devices/bus/nes/nes_pcb.hxx b/src/devices/bus/nes/nes_pcb.hxx index e87a6d249a7..67a8d731cac 100644 --- a/src/devices/bus/nes/nes_pcb.hxx +++ b/src/devices/bus/nes/nes_pcb.hxx @@ -596,12 +596,12 @@ void nes_cart_slot_device::call_load_pcb() if (battery_size || mapper_sram_size) { UINT32 tot_size = battery_size + mapper_sram_size; - dynamic_buffer temp_nvram(tot_size); + std::vector<UINT8> temp_nvram(tot_size); // some games relies on specific battery patterns to work // (e.g. Silva Saga does not work with SRAM fully initialized to 0x00) // and we use the info from xml here to prepare a default NVRAM - dynamic_buffer default_nvram(tot_size); + std::vector<UINT8> default_nvram(tot_size); if (battery_size) memcpy(&default_nvram[0], get_software_region("bwram"), battery_size); if (mapper_sram_size) diff --git a/src/devices/bus/nes/nes_slot.cpp b/src/devices/bus/nes/nes_slot.cpp index 914bf8a935a..b63d2742246 100644 --- a/src/devices/bus/nes/nes_slot.cpp +++ b/src/devices/bus/nes/nes_slot.cpp @@ -886,7 +886,7 @@ void nes_cart_slot_device::call_unload() if (m_cart->get_battery_size() || m_cart->get_mapper_sram_size()) { UINT32 tot_size = m_cart->get_battery_size() + m_cart->get_mapper_sram_size(); - dynamic_buffer temp_nvram(tot_size); + std::vector<UINT8> temp_nvram(tot_size); if (m_cart->get_battery_size()) memcpy(&temp_nvram[0], m_cart->get_battery_base(), m_cart->get_battery_size()); if (m_cart->get_mapper_sram_size()) @@ -908,7 +908,7 @@ std::string nes_cart_slot_device::get_default_card_software() { const char *slot_string = "nrom"; UINT32 len = m_file->size(); - dynamic_buffer rom(len); + std::vector<UINT8> rom(len); m_file->read(&rom[0], len); diff --git a/src/devices/bus/nes/nes_slot.h b/src/devices/bus/nes/nes_slot.h index 27790c208e0..ab906ed6162 100644 --- a/src/devices/bus/nes/nes_slot.h +++ b/src/devices/bus/nes/nes_slot.h @@ -235,9 +235,9 @@ protected: UINT8 *m_prg; UINT8 *m_vrom; UINT8 *m_ciram; - dynamic_buffer m_prgram; - dynamic_buffer m_vram; - dynamic_buffer m_battery; + std::vector<UINT8> m_prgram; + std::vector<UINT8> m_vram; + std::vector<UINT8> m_battery; UINT32 m_prg_size; UINT32 m_vrom_size; @@ -248,7 +248,7 @@ protected: // these are specific of some boards but must be accessible from the driver // E.g. additional save ram for HKROM, X1-005 & X1-017 boards, or ExRAM for MMC5 UINT8 *m_mapper_sram; - dynamic_buffer m_ext_ntram; + std::vector<UINT8> m_ext_ntram; UINT32 m_mapper_sram_size; int m_ce_mask; diff --git a/src/devices/bus/nes/nes_unif.hxx b/src/devices/bus/nes/nes_unif.hxx index 6c95ece3e41..ff5d9e1384d 100644 --- a/src/devices/bus/nes/nes_unif.hxx +++ b/src/devices/bus/nes/nes_unif.hxx @@ -213,8 +213,8 @@ void nes_cart_slot_device::call_load_unif() bool mapr_chunk_found = FALSE, small_prg = FALSE; // allocate space to temporarily store PRG & CHR banks - dynamic_buffer temp_prg(256 * 0x4000); - dynamic_buffer temp_chr(256 * 0x2000); + std::vector<UINT8> temp_prg(256 * 0x4000); + std::vector<UINT8> temp_chr(256 * 0x2000); UINT8 temp_byte = 0; fseek(4, SEEK_SET); @@ -541,7 +541,7 @@ void nes_cart_slot_device::call_load_unif() if (battery_size || mapper_sram_size) { UINT32 tot_size = battery_size + mapper_sram_size; - dynamic_buffer temp_nvram(tot_size); + std::vector<UINT8> temp_nvram(tot_size); battery_load(&temp_nvram[0], tot_size, 0x00); if (battery_size) { diff --git a/src/devices/bus/nubus/nubus.h b/src/devices/bus/nubus/nubus.h index b7f5bed0646..cd0b69c1d27 100644 --- a/src/devices/bus/nubus/nubus.h +++ b/src/devices/bus/nubus/nubus.h @@ -171,7 +171,7 @@ public: const char *m_nubus_tag, *m_nubus_slottag; int m_slot; device_nubus_card_interface *m_next; - dynamic_buffer m_declaration_rom; + std::vector<UINT8> m_declaration_rom; }; #endif /* __NUBUS_H__ */ diff --git a/src/devices/bus/nubus/nubus_48gc.h b/src/devices/bus/nubus/nubus_48gc.h index 7764321ddb7..32c333113f7 100644 --- a/src/devices/bus/nubus/nubus_48gc.h +++ b/src/devices/bus/nubus/nubus_48gc.h @@ -41,7 +41,7 @@ protected: DECLARE_WRITE32_MEMBER(mac_48gc_w); public: - dynamic_buffer m_vram; + std::vector<UINT8> m_vram; UINT32 m_mode, m_vbl_disable, m_toggle, m_stride, m_base; UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs; UINT32 m_registers[0x100]; diff --git a/src/devices/bus/nubus/nubus_cb264.h b/src/devices/bus/nubus/nubus_cb264.h index 54466bb66f2..5caa7cf6545 100644 --- a/src/devices/bus/nubus/nubus_cb264.h +++ b/src/devices/bus/nubus/nubus_cb264.h @@ -39,7 +39,7 @@ protected: DECLARE_WRITE32_MEMBER(cb264_ramdac_w); public: - dynamic_buffer m_vram; + std::vector<UINT8> m_vram; UINT32 m_cb264_mode, m_cb264_vbl_disable, m_cb264_toggle; UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs; }; diff --git a/src/devices/bus/nubus/nubus_m2hires.h b/src/devices/bus/nubus/nubus_m2hires.h index 43c805f03fa..1f5f932e333 100644 --- a/src/devices/bus/nubus/nubus_m2hires.h +++ b/src/devices/bus/nubus/nubus_m2hires.h @@ -41,7 +41,7 @@ protected: DECLARE_WRITE32_MEMBER(vram_w); public: - dynamic_buffer m_vram; + std::vector<UINT8> m_vram; UINT32 *m_vram32; UINT32 m_mode, m_vbl_disable, m_toggle; UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs; diff --git a/src/devices/bus/nubus/nubus_m2video.h b/src/devices/bus/nubus/nubus_m2video.h index f30066a408a..1ed9e33f3c5 100644 --- a/src/devices/bus/nubus/nubus_m2video.h +++ b/src/devices/bus/nubus/nubus_m2video.h @@ -41,7 +41,7 @@ protected: DECLARE_WRITE32_MEMBER(vram_w); public: - dynamic_buffer m_vram; + std::vector<UINT8> m_vram; UINT32 *m_vram32; UINT32 m_mode, m_vbl_disable, m_toggle; UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs; diff --git a/src/devices/bus/nubus/nubus_radiustpd.h b/src/devices/bus/nubus/nubus_radiustpd.h index a1c3bd4ac6a..e227913a69b 100644 --- a/src/devices/bus/nubus/nubus_radiustpd.h +++ b/src/devices/bus/nubus/nubus_radiustpd.h @@ -41,7 +41,7 @@ protected: DECLARE_WRITE32_MEMBER(vram_w); public: - dynamic_buffer m_vram; + std::vector<UINT8> m_vram; UINT32 *m_vram32; UINT32 m_mode, m_vbl_disable, m_toggle; UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs; diff --git a/src/devices/bus/nubus/nubus_spec8.h b/src/devices/bus/nubus/nubus_spec8.h index dfbc23324f8..61af612c7a6 100644 --- a/src/devices/bus/nubus/nubus_spec8.h +++ b/src/devices/bus/nubus/nubus_spec8.h @@ -41,7 +41,7 @@ protected: DECLARE_WRITE32_MEMBER(vram_w); public: - dynamic_buffer m_vram; + std::vector<UINT8> m_vram; UINT32 *m_vram32; UINT32 m_mode, m_vbl_disable; UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs; diff --git a/src/devices/bus/nubus/nubus_specpdq.h b/src/devices/bus/nubus/nubus_specpdq.h index 0638114dde1..8b937ffbe64 100644 --- a/src/devices/bus/nubus/nubus_specpdq.h +++ b/src/devices/bus/nubus/nubus_specpdq.h @@ -41,7 +41,7 @@ protected: DECLARE_WRITE32_MEMBER(vram_w); public: - dynamic_buffer m_vram; + std::vector<UINT8> m_vram; UINT32 *m_vram32; UINT32 m_mode, m_vbl_disable; UINT32 m_palette_val[256], m_colors[3], m_count, m_clutoffs; diff --git a/src/devices/bus/nubus/nubus_vikbw.h b/src/devices/bus/nubus/nubus_vikbw.h index c299f637878..1a4935a62c5 100644 --- a/src/devices/bus/nubus/nubus_vikbw.h +++ b/src/devices/bus/nubus/nubus_vikbw.h @@ -39,7 +39,7 @@ protected: DECLARE_WRITE32_MEMBER(viking_disable_w); public: - dynamic_buffer m_vram; + std::vector<UINT8> m_vram; UINT32 m_vbl_disable, m_palette[2]; }; diff --git a/src/devices/bus/nubus/nubus_wsportrait.h b/src/devices/bus/nubus/nubus_wsportrait.h index 1c39b5a5ec1..8a499dd632d 100644 --- a/src/devices/bus/nubus/nubus_wsportrait.h +++ b/src/devices/bus/nubus/nubus_wsportrait.h @@ -41,7 +41,7 @@ protected: DECLARE_WRITE32_MEMBER(vram_w); public: - dynamic_buffer m_vram; + std::vector<UINT8> m_vram; UINT32 *m_vram32; UINT32 m_mode, m_vbl_disable, m_toggle; UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs; diff --git a/src/devices/bus/nubus/pds30_30hr.h b/src/devices/bus/nubus/pds30_30hr.h index 569401a8070..c243e05a382 100644 --- a/src/devices/bus/nubus/pds30_30hr.h +++ b/src/devices/bus/nubus/pds30_30hr.h @@ -41,7 +41,7 @@ protected: DECLARE_WRITE32_MEMBER(vram_w); public: - dynamic_buffer m_vram; + std::vector<UINT8> m_vram; UINT32 *m_vram32; UINT32 m_mode, m_vbl_disable, m_toggle; UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs; diff --git a/src/devices/bus/nubus/pds30_cb264.h b/src/devices/bus/nubus/pds30_cb264.h index f68e7085d5f..b327cb2aff5 100644 --- a/src/devices/bus/nubus/pds30_cb264.h +++ b/src/devices/bus/nubus/pds30_cb264.h @@ -41,7 +41,7 @@ protected: DECLARE_WRITE32_MEMBER(vram_w); public: - dynamic_buffer m_vram; + std::vector<UINT8> m_vram; UINT32 *m_vram32; UINT32 m_mode, m_vbl_disable, m_toggle; UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs; diff --git a/src/devices/bus/nubus/pds30_mc30.h b/src/devices/bus/nubus/pds30_mc30.h index 71327a0d0d8..2a953ee5a6f 100644 --- a/src/devices/bus/nubus/pds30_mc30.h +++ b/src/devices/bus/nubus/pds30_mc30.h @@ -41,7 +41,7 @@ protected: DECLARE_WRITE32_MEMBER(vram_w); public: - dynamic_buffer m_vram; + std::vector<UINT8> m_vram; UINT32 *m_vram32; UINT32 m_mode, m_vbl_disable, m_toggle; UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs; diff --git a/src/devices/bus/nubus/pds30_procolor816.h b/src/devices/bus/nubus/pds30_procolor816.h index a5922e4a1ed..482593cb549 100644 --- a/src/devices/bus/nubus/pds30_procolor816.h +++ b/src/devices/bus/nubus/pds30_procolor816.h @@ -41,7 +41,7 @@ protected: DECLARE_WRITE32_MEMBER(vram_w); public: - dynamic_buffer m_vram; + std::vector<UINT8> m_vram; UINT32 *m_vram32; UINT32 m_mode, m_vbl_disable, m_toggle; UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs; diff --git a/src/devices/bus/nubus/pds30_sigmalview.h b/src/devices/bus/nubus/pds30_sigmalview.h index c5cff0f68b8..3db62231f29 100644 --- a/src/devices/bus/nubus/pds30_sigmalview.h +++ b/src/devices/bus/nubus/pds30_sigmalview.h @@ -41,7 +41,7 @@ protected: DECLARE_WRITE32_MEMBER(vram_w); public: - dynamic_buffer m_vram; + std::vector<UINT8> m_vram; UINT32 *m_vram32; UINT32 m_vbl_disable, m_toggle; UINT32 m_palette[256]; diff --git a/src/devices/bus/odyssey2/slot.h b/src/devices/bus/odyssey2/slot.h index 50f04e74b7e..454239d8a5a 100644 --- a/src/devices/bus/odyssey2/slot.h +++ b/src/devices/bus/odyssey2/slot.h @@ -50,7 +50,7 @@ protected: // internal state UINT8 *m_rom; UINT32 m_rom_size; - dynamic_buffer m_ram; + std::vector<UINT8> m_ram; }; diff --git a/src/devices/bus/pc_kbd/iskr1030.h b/src/devices/bus/pc_kbd/iskr1030.h index 81178bbc854..dd3573f0f75 100644 --- a/src/devices/bus/pc_kbd/iskr1030.h +++ b/src/devices/bus/pc_kbd/iskr1030.h @@ -79,7 +79,7 @@ private: required_ioport m_md22; required_ioport m_md23; - dynamic_buffer m_ram; + std::vector<UINT8> m_ram; UINT8 m_bus; UINT8 m_p1; UINT8 m_p2; diff --git a/src/devices/bus/pce/pce_slot.cpp b/src/devices/bus/pce/pce_slot.cpp index 7c4a024fabd..db42af8281e 100644 --- a/src/devices/bus/pce/pce_slot.cpp +++ b/src/devices/bus/pce/pce_slot.cpp @@ -333,7 +333,7 @@ std::string pce_cart_slot_device::get_default_card_software() { const char *slot_string; UINT32 len = m_file->size(); - dynamic_buffer rom(len); + std::vector<UINT8> rom(len); int type; m_file->read(&rom[0], len); diff --git a/src/devices/bus/pce/pce_slot.h b/src/devices/bus/pce/pce_slot.h index 579945229bf..ccd7954b8a5 100644 --- a/src/devices/bus/pce/pce_slot.h +++ b/src/devices/bus/pce/pce_slot.h @@ -45,7 +45,7 @@ public: // internal state UINT8 *m_rom; UINT32 m_rom_size; - dynamic_buffer m_ram; + std::vector<UINT8> m_ram; void rom_map_setup(UINT32 size); diff --git a/src/devices/bus/saturn/sat_slot.h b/src/devices/bus/saturn/sat_slot.h index f87ce9bf0d3..5aec2dfdd40 100644 --- a/src/devices/bus/saturn/sat_slot.h +++ b/src/devices/bus/saturn/sat_slot.h @@ -55,7 +55,7 @@ protected: UINT32 m_rom_size; std::vector<UINT32> m_ext_dram0; std::vector<UINT32> m_ext_dram1; - dynamic_buffer m_ext_bram; + std::vector<UINT8> m_ext_bram; }; diff --git a/src/devices/bus/scsi/omti5100.cpp b/src/devices/bus/scsi/omti5100.cpp index c2c56ff5175..de40a68c32c 100644 --- a/src/devices/bus/scsi/omti5100.cpp +++ b/src/devices/bus/scsi/omti5100.cpp @@ -95,7 +95,7 @@ void omti5100_device::ExecCommand() int track = ((command[1]&0x1f)<<16 | command[2]<<8 | command[3]) / m_param[drive].sectors; if(((track % m_param[drive].heads) <= info->heads) && (track < (info->cylinders * m_param[drive].heads))) { - dynamic_buffer sector(info->sectorbytes); + std::vector<UINT8> sector(info->sectorbytes); memset(§or[0], 0xe5, info->sectorbytes); m_phase = SCSI_PHASE_STATUS; m_status_code = SCSI_STATUS_CODE_GOOD; diff --git a/src/devices/bus/scsi/s1410.cpp b/src/devices/bus/scsi/s1410.cpp index eaeaf51d461..b26b9b5aef7 100644 --- a/src/devices/bus/scsi/s1410.cpp +++ b/src/devices/bus/scsi/s1410.cpp @@ -256,7 +256,7 @@ void s1410_device::ExecCommand() if ((m_disk) && (m_blocks)) { - dynamic_buffer data(m_sector_bytes); + std::vector<UINT8> data(m_sector_bytes); memset(&data[0], 0xc6, m_sector_bytes); while (m_blocks > 0) diff --git a/src/devices/bus/scv/slot.cpp b/src/devices/bus/scv/slot.cpp index c8e05a1229b..d0554c44584 100644 --- a/src/devices/bus/scv/slot.cpp +++ b/src/devices/bus/scv/slot.cpp @@ -253,7 +253,7 @@ std::string scv_cart_slot_device::get_default_card_software() { const char *slot_string; UINT32 len = m_file->size(); - dynamic_buffer rom(len); + std::vector<UINT8> rom(len); int type; m_file->read(&rom[0], len); diff --git a/src/devices/bus/scv/slot.h b/src/devices/bus/scv/slot.h index cbf87dd7d06..d6168ebed81 100644 --- a/src/devices/bus/scv/slot.h +++ b/src/devices/bus/scv/slot.h @@ -51,7 +51,7 @@ protected: // internal state UINT8 *m_rom; UINT32 m_rom_size; - dynamic_buffer m_ram; + std::vector<UINT8> m_ram; }; diff --git a/src/devices/bus/sega8/sega8_slot.cpp b/src/devices/bus/sega8/sega8_slot.cpp index 04a1498bf84..3cfb14b4981 100644 --- a/src/devices/bus/sega8/sega8_slot.cpp +++ b/src/devices/bus/sega8/sega8_slot.cpp @@ -598,7 +598,7 @@ std::string sega8_cart_slot_device::get_default_card_software() { const char *slot_string; UINT32 len = m_file->size(), offset = 0; - dynamic_buffer rom(len); + std::vector<UINT8> rom(len); int type; m_file->read(&rom[0], len); diff --git a/src/devices/bus/sega8/sega8_slot.h b/src/devices/bus/sega8/sega8_slot.h index 5a0ce0af010..4d032e30b50 100644 --- a/src/devices/bus/sega8/sega8_slot.h +++ b/src/devices/bus/sega8/sega8_slot.h @@ -80,7 +80,7 @@ public: // internal state UINT8 *m_rom; UINT32 m_rom_size; - dynamic_buffer m_ram; + std::vector<UINT8> m_ram; int m_rom_page_count; bool has_battery; diff --git a/src/devices/bus/snes/snes_slot.cpp b/src/devices/bus/snes/snes_slot.cpp index df947c270b6..c70a1cac664 100644 --- a/src/devices/bus/snes/snes_slot.cpp +++ b/src/devices/bus/snes/snes_slot.cpp @@ -612,7 +612,7 @@ image_init_result base_sns_cart_slot_device::call_load() if (software_entry() == nullptr) { UINT32 tmplen = length(); - dynamic_buffer tmpROM(tmplen); + std::vector<UINT8> tmpROM(tmplen); fread(&tmpROM[0], tmplen); offset = snes_skip_header(&tmpROM[0], tmplen); fseek(offset, SEEK_SET); @@ -665,7 +665,7 @@ image_init_result base_sns_cart_slot_device::call_load() if (m_cart->get_nvram_size() || m_cart->get_rtc_ram_size()) { UINT32 tot_size = m_cart->get_nvram_size() + m_cart->get_rtc_ram_size(); - dynamic_buffer temp_nvram(tot_size); + std::vector<UINT8> temp_nvram(tot_size); battery_load(&temp_nvram[0], tot_size, 0xff); if (m_cart->get_nvram_size()) memcpy(m_cart->get_nvram_base(), &temp_nvram[0], m_cart->get_nvram_size()); @@ -695,7 +695,7 @@ void base_sns_cart_slot_device::call_unload() if (m_cart->get_nvram_size() || m_cart->get_rtc_ram_size()) { UINT32 tot_size = m_cart->get_nvram_size() + m_cart->get_rtc_ram_size(); - dynamic_buffer temp_nvram(tot_size); + std::vector<UINT8> temp_nvram(tot_size); if (m_cart->get_nvram_size()) memcpy(&temp_nvram[0], m_cart->get_nvram_base(), m_cart->get_nvram_size()); if (m_cart->get_rtc_ram_size()) @@ -998,7 +998,7 @@ std::string base_sns_cart_slot_device::get_default_card_software() const char *slot_string; UINT32 offset; UINT32 len = m_file->size(); - dynamic_buffer rom(len); + std::vector<UINT8> rom(len); int type = 0, addon = 0; m_file->read(&rom[0], len); diff --git a/src/devices/bus/snes/snes_slot.h b/src/devices/bus/snes/snes_slot.h index f6d4208eb1c..c86595d3557 100644 --- a/src/devices/bus/snes/snes_slot.h +++ b/src/devices/bus/snes/snes_slot.h @@ -136,9 +136,9 @@ public: // internal state UINT8 *m_rom; UINT32 m_rom_size; - dynamic_buffer m_nvram; - dynamic_buffer m_bios; - dynamic_buffer m_rtc_ram; // temp pointer to save RTC ram to nvram (will disappear when RTCs become devices) + std::vector<UINT8> m_nvram; + std::vector<UINT8> m_bios; + std::vector<UINT8> m_rtc_ram; // temp pointer to save RTC ram to nvram (will disappear when RTCs become devices) UINT8 rom_bank_map[256]; // 32K chunks of rom }; diff --git a/src/devices/bus/ti99x/gromport.h b/src/devices/bus/ti99x/gromport.h index 309a7d76558..34161cb6a5d 100644 --- a/src/devices/bus/ti99x/gromport.h +++ b/src/devices/bus/ti99x/gromport.h @@ -342,8 +342,8 @@ protected: int m_grom_address; // for gromemu int m_ram_page; // for super const char* m_tag; - dynamic_buffer m_nvram; // for MiniMemory - dynamic_buffer m_ram; // for MBX + std::vector<UINT8> m_nvram; // for MiniMemory + std::vector<UINT8> m_ram; // for MBX }; /******************** Standard cartridge ******************************/ diff --git a/src/devices/bus/vc4000/slot.h b/src/devices/bus/vc4000/slot.h index ed3425d0ddc..479da188c07 100644 --- a/src/devices/bus/vc4000/slot.h +++ b/src/devices/bus/vc4000/slot.h @@ -49,7 +49,7 @@ protected: // internal state UINT8 *m_rom; UINT32 m_rom_size; - dynamic_buffer m_ram; + std::vector<UINT8> m_ram; }; diff --git a/src/devices/bus/vcs/vcs_slot.cpp b/src/devices/bus/vcs/vcs_slot.cpp index deb811bed9a..e9b0a93900b 100644 --- a/src/devices/bus/vcs/vcs_slot.cpp +++ b/src/devices/bus/vcs/vcs_slot.cpp @@ -776,7 +776,7 @@ std::string vcs_cart_slot_device::get_default_card_software() { const char *slot_string; UINT32 len = m_file->size(); - dynamic_buffer rom(len); + std::vector<UINT8> rom(len); int type; m_file->read(&rom[0], len); diff --git a/src/devices/bus/vcs/vcs_slot.h b/src/devices/bus/vcs/vcs_slot.h index b8532dc216d..da08b7db743 100755 --- a/src/devices/bus/vcs/vcs_slot.h +++ b/src/devices/bus/vcs/vcs_slot.h @@ -76,7 +76,7 @@ protected: // internal state UINT8 *m_rom; UINT32 m_rom_size; - dynamic_buffer m_ram; + std::vector<UINT8> m_ram; }; diff --git a/src/devices/bus/vectrex/slot.cpp b/src/devices/bus/vectrex/slot.cpp index 28ead970a75..4063ed7b01c 100644 --- a/src/devices/bus/vectrex/slot.cpp +++ b/src/devices/bus/vectrex/slot.cpp @@ -212,7 +212,7 @@ std::string vectrex_cart_slot_device::get_default_card_software() { const char *slot_string; UINT32 size = m_file->size(); - dynamic_buffer rom(size); + std::vector<UINT8> rom(size); int type = VECTREX_STD; m_file->read(&rom[0], size); diff --git a/src/devices/bus/vidbrain/exp.h b/src/devices/bus/vidbrain/exp.h index c9cd6677b55..d7ef79f3528 100644 --- a/src/devices/bus/vidbrain/exp.h +++ b/src/devices/bus/vidbrain/exp.h @@ -94,8 +94,8 @@ protected: videobrain_expansion_slot_device *m_slot; - dynamic_buffer m_rom; - dynamic_buffer m_ram; + std::vector<UINT8> m_rom; + std::vector<UINT8> m_ram; size_t m_rom_mask; size_t m_ram_mask; diff --git a/src/devices/bus/wswan/slot.cpp b/src/devices/bus/wswan/slot.cpp index ea075b42cc4..abfa903a6a3 100644 --- a/src/devices/bus/wswan/slot.cpp +++ b/src/devices/bus/wswan/slot.cpp @@ -301,7 +301,7 @@ std::string ws_cart_slot_device::get_default_card_software() { const char *slot_string; UINT32 size = m_file->size(); - dynamic_buffer rom(size); + std::vector<UINT8> rom(size); int type; UINT32 nvram; diff --git a/src/devices/bus/wswan/slot.h b/src/devices/bus/wswan/slot.h index bd9d74fbe85..36ac1c43bc6 100644 --- a/src/devices/bus/wswan/slot.h +++ b/src/devices/bus/wswan/slot.h @@ -54,7 +54,7 @@ protected: // internal state UINT8 *m_rom; UINT32 m_rom_size; - dynamic_buffer m_nvram; + std::vector<UINT8> m_nvram; int m_bank_mask; bool m_has_rtc, m_is_rotated; diff --git a/src/devices/cpu/mc68hc11/mc68hc11.h b/src/devices/cpu/mc68hc11/mc68hc11.h index 047a1f559e2..e6d4f3e21fe 100644 --- a/src/devices/cpu/mc68hc11/mc68hc11.h +++ b/src/devices/cpu/mc68hc11/mc68hc11.h @@ -112,7 +112,7 @@ private: int m_ram_position; int m_reg_position; - dynamic_buffer m_internal_ram; + std::vector<UINT8> m_internal_ram; int m_has_extended_io; // extended I/O enable flag int m_internal_ram_size; diff --git a/src/devices/machine/at28c16.cpp b/src/devices/machine/at28c16.cpp index f54e28f8bda..bc6900924eb 100644 --- a/src/devices/machine/at28c16.cpp +++ b/src/devices/machine/at28c16.cpp @@ -136,7 +136,7 @@ void at28c16_device::nvram_default() void at28c16_device::nvram_read( emu_file &file ) { - dynamic_buffer buffer( AT28C16_TOTAL_BYTES ); + std::vector<UINT8> buffer( AT28C16_TOTAL_BYTES ); file.read( &buffer[0], AT28C16_TOTAL_BYTES ); @@ -153,7 +153,7 @@ void at28c16_device::nvram_read( emu_file &file ) void at28c16_device::nvram_write( emu_file &file ) { - dynamic_buffer buffer ( AT28C16_TOTAL_BYTES ); + std::vector<UINT8> buffer ( AT28C16_TOTAL_BYTES ); for( offs_t offs = 0; offs < AT28C16_TOTAL_BYTES; offs++ ) { diff --git a/src/devices/machine/at45dbxx.h b/src/devices/machine/at45dbxx.h index 40688fd786e..449d95f9651 100644 --- a/src/devices/machine/at45dbxx.h +++ b/src/devices/machine/at45dbxx.h @@ -76,12 +76,12 @@ protected: void write_byte(UINT8 data); // internal state - dynamic_buffer m_data; + std::vector<UINT8> m_data; UINT32 m_size; UINT8 m_mode; UINT8 m_status; - dynamic_buffer m_buffer1; - //dynamic_buffer m_buffer2; + std::vector<UINT8> m_buffer1; + //std::vector<UINT8> m_buffer2; UINT8 m_si_byte; UINT8 m_si_bits; UINT8 m_so_byte; diff --git a/src/devices/machine/atahle.h b/src/devices/machine/atahle.h index e26ad86b92c..29bc23bf9cd 100644 --- a/src/devices/machine/atahle.h +++ b/src/devices/machine/atahle.h @@ -175,7 +175,7 @@ protected: attotime MINIMUM_COMMAND_TIME; - dynamic_buffer m_buffer; + std::vector<UINT8> m_buffer; UINT16 m_buffer_offset; UINT16 m_buffer_size; UINT8 m_error; diff --git a/src/devices/machine/dp8390.cpp b/src/devices/machine/dp8390.cpp index 52e66168322..32d41d73896 100644 --- a/src/devices/machine/dp8390.cpp +++ b/src/devices/machine/dp8390.cpp @@ -64,7 +64,7 @@ void dp8390_device::check_dma_complete() { } void dp8390_device::do_tx() { - dynamic_buffer buf; + std::vector<UINT8> buf; int i; UINT32 high16 = (m_regs.dcr & 4)?m_regs.rsar<<16:0; if(m_reset) return; diff --git a/src/devices/machine/i2cmem.h b/src/devices/machine/i2cmem.h index 801aa6de3bd..797df97d70a 100644 --- a/src/devices/machine/i2cmem.h +++ b/src/devices/machine/i2cmem.h @@ -142,7 +142,7 @@ protected: int m_shift; int m_devsel; int m_byteaddr; - dynamic_buffer m_page; + std::vector<UINT8> m_page; int m_page_offset; }; diff --git a/src/devices/machine/laserdsc.h b/src/devices/machine/laserdsc.h index 1bb19bea0a0..7816bfa2d21 100644 --- a/src/devices/machine/laserdsc.h +++ b/src/devices/machine/laserdsc.h @@ -301,7 +301,7 @@ private: // disc parameters chd_file * m_disc; // handle to the disc itself - dynamic_buffer m_vbidata; // pointer to precomputed VBI data + std::vector<UINT8> m_vbidata; // pointer to precomputed VBI data int m_width; // width of video int m_height; // height of video UINT32 m_fps_times_1million; // frame rate of video diff --git a/src/devices/machine/mc146818.h b/src/devices/machine/mc146818.h index b7fffda3de7..a4651171179 100644 --- a/src/devices/machine/mc146818.h +++ b/src/devices/machine/mc146818.h @@ -172,7 +172,7 @@ private: // internal state UINT8 m_index; - dynamic_buffer m_data; + std::vector<UINT8> m_data; attotime m_last_refresh; diff --git a/src/devices/machine/nscsi_s1410.cpp b/src/devices/machine/nscsi_s1410.cpp index b486b4994e9..f1725329d9d 100644 --- a/src/devices/machine/nscsi_s1410.cpp +++ b/src/devices/machine/nscsi_s1410.cpp @@ -60,7 +60,7 @@ void nscsi_s1410_device::scsi_command() blocks = (bytes_per_sector == 256) ? 32 : 17; int track_length = blocks*bytes_per_sector; - dynamic_buffer data(track_length); + std::vector<UINT8> data(track_length); memset(&data[0], 0xc6, track_length); if(!hard_disk_write(harddisk, lba, &data[0])) { diff --git a/src/devices/machine/ram.h b/src/devices/machine/ram.h index 73e7430a6ce..73a62b61f8d 100644 --- a/src/devices/machine/ram.h +++ b/src/devices/machine/ram.h @@ -77,7 +77,7 @@ protected: private: // device state UINT32 m_size; - dynamic_buffer m_pointer; + std::vector<UINT8> m_pointer; // device config const char *m_default_size; diff --git a/src/devices/machine/serflash.h b/src/devices/machine/serflash.h index 9d3654fc9c3..e72432cc109 100644 --- a/src/devices/machine/serflash.h +++ b/src/devices/machine/serflash.h @@ -88,7 +88,7 @@ protected: UINT16 m_flash_page_index; - dynamic_buffer m_flashwritemap; + std::vector<UINT8> m_flashwritemap; UINT8 m_last_flash_cmd; diff --git a/src/devices/machine/stvcd.cpp b/src/devices/machine/stvcd.cpp index aed8d46aea1..f7e382ef176 100644 --- a/src/devices/machine/stvcd.cpp +++ b/src/devices/machine/stvcd.cpp @@ -2142,7 +2142,7 @@ void saturn_state::make_dir_current(UINT32 fad) { int i; UINT32 nextent, numentries; - dynamic_buffer sect(MAX_DIR_SIZE); + std::vector<UINT8> sect(MAX_DIR_SIZE); direntryT *curentry; memset(§[0], 0, MAX_DIR_SIZE); diff --git a/src/devices/machine/timekpr.h b/src/devices/machine/timekpr.h index f6ecb8dcbfc..e0e9aa6e60d 100644 --- a/src/devices/machine/timekpr.h +++ b/src/devices/machine/timekpr.h @@ -91,7 +91,7 @@ private: UINT8 m_year; UINT8 m_century; - dynamic_buffer m_data; + std::vector<UINT8> m_data; optional_region_ptr<UINT8> m_default_data; protected: diff --git a/src/devices/sound/spu.cpp b/src/devices/sound/spu.cpp index 3f8c9fe5bd6..b4e585a211a 100644 --- a/src/devices/sound/spu.cpp +++ b/src/devices/sound/spu.cpp @@ -475,7 +475,7 @@ public: *prev; }; - dynamic_buffer buffer; + std::vector<UINT8> buffer; unsigned int head, tail, in, diff --git a/src/devices/video/pc_vga.h b/src/devices/video/pc_vga.h index a7f0552ffdb..0e7652ee4ea 100644 --- a/src/devices/video/pc_vga.h +++ b/src/devices/video/pc_vga.h @@ -115,7 +115,7 @@ protected: int crtc_regcount; } svga_intf; - dynamic_buffer memory; + std::vector<UINT8> memory; UINT32 pens[16]; /* the current 16 pens */ UINT8 miscellaneous_output; diff --git a/src/emu/diimage.cpp b/src/emu/diimage.cpp index 50072d95995..c555204ad38 100644 --- a/src/emu/diimage.cpp +++ b/src/emu/diimage.cpp @@ -499,7 +499,7 @@ void device_image_interface::run_hash(void (*partialhash)(util::hash_collection util::hash_collection &hashes, const char *types) { UINT32 size; - dynamic_buffer buf; + std::vector<UINT8> buf; hashes.reset(); size = (UINT32) length(); diff --git a/src/emu/drawgfx.h b/src/emu/drawgfx.h index a5864511c2f..71b480d0b17 100644 --- a/src/emu/drawgfx.h +++ b/src/emu/drawgfx.h @@ -291,8 +291,8 @@ private: UINT32 m_dirtyseq; // sequence number; incremented each time a tile is dirtied UINT8 * m_gfxdata; // pointer to decoded pixel data, 8bpp - dynamic_buffer m_gfxdata_allocated; // allocated decoded pixel data, 8bpp - dynamic_buffer m_dirty; // dirty array for detecting chars that need decoding + std::vector<UINT8> m_gfxdata_allocated; // allocated decoded pixel data, 8bpp + std::vector<UINT8> m_dirty; // dirty array for detecting chars that need decoding std::vector<UINT32> m_pen_usage; // bitmask of pens that are used (pens 0-31 only) bool m_layout_is_raw; // raw layout? diff --git a/src/emu/emumem.h b/src/emu/emumem.h index c5ed0c10ba5..85242882d90 100644 --- a/src/emu/emumem.h +++ b/src/emu/emumem.h @@ -532,7 +532,7 @@ private: address_space & m_space; // which address space are we associated with? offs_t m_bytestart, m_byteend; // byte-normalized start/end for verifying a match UINT8 * m_data; // pointer to the data for this block - dynamic_buffer m_allocated; // pointer to the actually allocated block + std::vector<UINT8> m_allocated; // pointer to the actually allocated block }; @@ -694,7 +694,7 @@ private: // internal data running_machine & m_machine; std::string m_name; - dynamic_buffer m_buffer; + std::vector<UINT8> m_buffer; endianness_t m_endianness; UINT8 m_bitwidth; UINT8 m_bytewidth; diff --git a/src/emu/fileio.h b/src/emu/fileio.h index 218821f7aa5..930ff749c36 100644 --- a/src/emu/fileio.h +++ b/src/emu/fileio.h @@ -165,7 +165,7 @@ private: util::hash_collection m_hashes; // collection of hashes std::unique_ptr<util::archive_file> m_zipfile; // ZIP file pointer - dynamic_buffer m_zipdata; // ZIP file data + std::vector<UINT8> m_zipdata; // ZIP file data UINT64 m_ziplength; // ZIP file length bool m_remove_on_close; // flag: remove the file when closing diff --git a/src/emu/rendfont.cpp b/src/emu/rendfont.cpp index 7aebe9d9b35..fc2bef079ff 100644 --- a/src/emu/rendfont.cpp +++ b/src/emu/rendfont.cpp @@ -760,10 +760,10 @@ bool render_font::save_cached(const char *filename, UINT32 hash) try { // allocate an array to hold the character data - dynamic_buffer chartable(numchars * CACHED_CHAR_SIZE, 0); + std::vector<UINT8> chartable(numchars * CACHED_CHAR_SIZE, 0); // allocate a temp buffer to compress into - dynamic_buffer tempbuffer(65536); + std::vector<UINT8> tempbuffer(65536); // write the header UINT8 *dest = &tempbuffer[0]; diff --git a/src/emu/romload.cpp b/src/emu/romload.cpp index be05a4505bc..b1f9703e690 100644 --- a/src/emu/romload.cpp +++ b/src/emu/romload.cpp @@ -715,7 +715,7 @@ int rom_load_manager::read_rom_data(const rom_entry *parent_region, const rom_en /* use a temporary buffer for complex loads */ tempbufsize = std::min(TEMPBUFFER_MAX_SIZE, numbytes); - dynamic_buffer tempbuf(tempbufsize); + std::vector<UINT8> tempbuf(tempbufsize); /* chunky reads for complex loads */ skip += groupsize; diff --git a/src/frontend/mame/media_ident.cpp b/src/frontend/mame/media_ident.cpp index 892e9091247..4642cc84fb5 100644 --- a/src/frontend/mame/media_ident.cpp +++ b/src/frontend/mame/media_ident.cpp @@ -172,7 +172,7 @@ void media_identifier::identify_file(const char *name) void media_identifier::identify_data(const char *name, const UINT8 *data, int length) { // if this is a '.jed' file, process it into raw bits first - dynamic_buffer tempjed; + std::vector<UINT8> tempjed; jed_data jed; if (core_filename_ends_with(name, ".jed") && jed_parse(data, length, &jed) == JEDERR_NONE) { diff --git a/src/lib/formats/cassimg.cpp b/src/lib/formats/cassimg.cpp index ac2e9f56900..39e3176e121 100644 --- a/src/lib/formats/cassimg.cpp +++ b/src/lib/formats/cassimg.cpp @@ -870,8 +870,8 @@ cassette_image::error cassette_legacy_construct(cassette_image *cassette, cassette_image::error err; int length; int sample_count; - dynamic_buffer bytes; - dynamic_buffer chunk; + std::vector<UINT8> bytes; + std::vector<UINT8> chunk; std::vector<INT16> samples; int pos = 0; UINT64 offset = 0; diff --git a/src/lib/formats/ccvf_dsk.cpp b/src/lib/formats/ccvf_dsk.cpp index 8e30dcfff33..abce7fb55da 100644 --- a/src/lib/formats/ccvf_dsk.cpp +++ b/src/lib/formats/ccvf_dsk.cpp @@ -90,11 +90,11 @@ bool ccvf_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) const format &f = formats[0]; UINT64 size = io_generic_size(io); - dynamic_buffer img(size); + std::vector<UINT8> img(size); io_generic_read(io, &img[0], 0, size); std::string ccvf = std::string((const char *)&img[0], size); - dynamic_buffer bytes(78720); + std::vector<UINT8> bytes(78720); int start = 0, end = 0; std::string line; diff --git a/src/lib/formats/cqm_dsk.cpp b/src/lib/formats/cqm_dsk.cpp index ff191aec56c..94ba350c2a4 100644 --- a/src/lib/formats/cqm_dsk.cpp +++ b/src/lib/formats/cqm_dsk.cpp @@ -275,7 +275,7 @@ int cqm_format::identify(io_generic *io, UINT32 form_factor) bool cqm_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) { const int max_size = 4*1024*1024; // 4MB ought to be large enough for any floppy - dynamic_buffer imagebuf(max_size); + std::vector<UINT8> imagebuf(max_size); UINT8 header[CQM_HEADER_SIZE]; io_generic_read(io, header, 0, CQM_HEADER_SIZE); @@ -318,7 +318,7 @@ bool cqm_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) int base_cell_count = rate*60/rpm; int cqm_size = io_generic_size(io); - dynamic_buffer cqmbuf(cqm_size); + std::vector<UINT8> cqmbuf(cqm_size); io_generic_read(io, &cqmbuf[0], 0, cqm_size); // decode the RLE data diff --git a/src/lib/formats/csw_cas.cpp b/src/lib/formats/csw_cas.cpp index 3b07576254b..0790dd16dee 100644 --- a/src/lib/formats/csw_cas.cpp +++ b/src/lib/formats/csw_cas.cpp @@ -52,7 +52,7 @@ static int csw_cas_to_wav_size( const UINT8 *casdata, int caslen ) UINT8 CompressionType; UINT8 Flags; UINT8 HeaderExtensionLength; - dynamic_buffer gz_ptr; + std::vector<UINT8> gz_ptr; int total_size; z_stream d_stream; @@ -172,7 +172,7 @@ static int csw_cas_fill_wave( INT16 *buffer, int length, UINT8 *bytes ) UINT8 HeaderExtensionLength; INT8 Bit; - dynamic_buffer gz_ptr; + std::vector<UINT8> gz_ptr; int total_size; z_stream d_stream; int err; diff --git a/src/lib/formats/d64_dsk.cpp b/src/lib/formats/d64_dsk.cpp index b637d44c48c..2cece44c43a 100644 --- a/src/lib/formats/d64_dsk.cpp +++ b/src/lib/formats/d64_dsk.cpp @@ -215,7 +215,7 @@ bool d64_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) const format &f = formats[type]; UINT64 size = io_generic_size(io); - dynamic_buffer img; + std::vector<UINT8> img; if(size == (UINT32)f.sector_count*f.sector_base_size) { img.resize(size + f.sector_count); diff --git a/src/lib/formats/dfi_dsk.cpp b/src/lib/formats/dfi_dsk.cpp index e8bb38d6dd0..dae3d737b67 100644 --- a/src/lib/formats/dfi_dsk.cpp +++ b/src/lib/formats/dfi_dsk.cpp @@ -68,7 +68,7 @@ bool dfi_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) { UINT64 size = io_generic_size(io); UINT64 pos = 4; - dynamic_buffer data; + std::vector<UINT8> data; int onerev_time = 0; // time for one revolution, used to guess clock and rpm for DFE2 files unsigned long clock_rate = 100000000; // sample clock rate in megahertz int rpm=360; // drive rpm diff --git a/src/lib/formats/flopimg.cpp b/src/lib/formats/flopimg.cpp index 82f8d28ca93..72786f6422e 100644 --- a/src/lib/formats/flopimg.cpp +++ b/src/lib/formats/flopimg.cpp @@ -393,7 +393,7 @@ static floperr_t floppy_readwrite_sector(floppy_image_legacy *floppy, int head, floperr_t err; const struct FloppyCallbacks *fmt; size_t this_buffer_len; - dynamic_buffer alloc_buf; + std::vector<UINT8> alloc_buf; UINT32 sector_length; UINT8 *buffer_ptr = (UINT8 *)buffer; floperr_t (*read_sector)(floppy_image_legacy *floppy, int head, int track, int sector, void *buffer, size_t buflen); diff --git a/src/lib/formats/fsd_dsk.cpp b/src/lib/formats/fsd_dsk.cpp index 2d31be1123c..cbf474da116 100644 --- a/src/lib/formats/fsd_dsk.cpp +++ b/src/lib/formats/fsd_dsk.cpp @@ -104,7 +104,7 @@ bool fsd_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) result[0x20] = "Deleted Data"; UINT64 size = io_generic_size(io); - dynamic_buffer img(size); + std::vector<UINT8> img(size); io_generic_read(io, &img[0], 0, size); UINT64 pos; diff --git a/src/lib/formats/g64_dsk.cpp b/src/lib/formats/g64_dsk.cpp index e85b5c34682..302bfc0e842 100644 --- a/src/lib/formats/g64_dsk.cpp +++ b/src/lib/formats/g64_dsk.cpp @@ -41,7 +41,7 @@ int g64_format::identify(io_generic *io, UINT32 form_factor) bool g64_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) { UINT64 size = io_generic_size(io); - dynamic_buffer img(size); + std::vector<UINT8> img(size); io_generic_read(io, &img[0], 0, size); if (img[POS_VERSION]) { @@ -115,7 +115,7 @@ bool g64_format::save(io_generic *io, floppy_image *image) for (int head = 0; head < heads; head++) { int tracks_written = 0; - dynamic_buffer trackbuf(TRACK_LENGTH-2); + std::vector<UINT8> trackbuf(TRACK_LENGTH-2); for (int track = 0; track < TRACK_COUNT; track++) { UINT32 tpos = POS_TRACK_OFFSET + (track * 4); diff --git a/src/lib/formats/hxchfe_dsk.cpp b/src/lib/formats/hxchfe_dsk.cpp index cf959fdff32..1e532e140b2 100644 --- a/src/lib/formats/hxchfe_dsk.cpp +++ b/src/lib/formats/hxchfe_dsk.cpp @@ -233,7 +233,7 @@ bool hfe_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) } // Load the tracks - dynamic_buffer cylinder_buffer; + std::vector<UINT8> cylinder_buffer; for(int cyl=0; cyl < m_cylinders; cyl++) { // actual data read @@ -402,7 +402,7 @@ void hfe_format::generate_track_from_hfe_bitstream(int cyl, int head, int sample bool hfe_format::save(io_generic *io, floppy_image *image) { - dynamic_buffer cylbuf; + std::vector<UINT8> cylbuf; cylbuf.resize(0x6200); UINT8 header[HEADER_LENGTH]; diff --git a/src/lib/formats/hxcmfm_dsk.cpp b/src/lib/formats/hxcmfm_dsk.cpp index fe25f9158c9..07a05d3e2f6 100644 --- a/src/lib/formats/hxcmfm_dsk.cpp +++ b/src/lib/formats/hxcmfm_dsk.cpp @@ -76,7 +76,7 @@ bool mfm_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) // read header io_generic_read(io, &header, 0, sizeof(header)); int counter = 0; - dynamic_buffer trackbuf; + std::vector<UINT8> trackbuf; for(int track=0; track < header.number_of_track; track++) { for(int side=0; side < header.number_of_side; side++) { // read location of diff --git a/src/lib/formats/imd_dsk.cpp b/src/lib/formats/imd_dsk.cpp index 7683f890986..13f155b638a 100644 --- a/src/lib/formats/imd_dsk.cpp +++ b/src/lib/formats/imd_dsk.cpp @@ -423,7 +423,7 @@ int imd_format::identify(io_generic *io, UINT32 form_factor) bool imd_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) { UINT64 size = io_generic_size(io); - dynamic_buffer img(size); + std::vector<UINT8> img(size); io_generic_read(io, &img[0], 0, size); UINT64 pos; diff --git a/src/lib/formats/ipf_dsk.cpp b/src/lib/formats/ipf_dsk.cpp index 1292ce8b354..40ad1229ab8 100644 --- a/src/lib/formats/ipf_dsk.cpp +++ b/src/lib/formats/ipf_dsk.cpp @@ -45,7 +45,7 @@ int ipf_format::identify(io_generic *io, UINT32 form_factor) bool ipf_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) { UINT64 size = io_generic_size(io); - dynamic_buffer data(size); + std::vector<UINT8> data(size); io_generic_read(io, &data[0], 0, size); bool res = parse(data, image); return res; @@ -80,7 +80,7 @@ UINT32 ipf_format::crc32r(const UINT8 *data, UINT32 size) return ~crc; } -bool ipf_format::parse(dynamic_buffer &data, floppy_image *image) +bool ipf_format::parse(std::vector<UINT8> &data, floppy_image *image) { image->set_variant(floppy_image::DSDD); // Not handling anything else yet tcount = 84*2+1; // Usual max @@ -182,7 +182,7 @@ bool ipf_format::parse_data(const UINT8 *data, UINT32 &pos, UINT32 max_extra_siz return true; } -bool ipf_format::scan_one_tag(dynamic_buffer &data, UINT32 &pos, UINT8 *&tag, UINT32 &tsize) +bool ipf_format::scan_one_tag(std::vector<UINT8> &data, UINT32 &pos, UINT8 *&tag, UINT32 &tsize) { if(data.size()-pos < 12) return false; @@ -198,7 +198,7 @@ bool ipf_format::scan_one_tag(dynamic_buffer &data, UINT32 &pos, UINT8 *&tag, UI return true; } -bool ipf_format::scan_all_tags(dynamic_buffer &data) +bool ipf_format::scan_all_tags(std::vector<UINT8> &data) { UINT32 pos = 0; UINT32 size = data.size(); diff --git a/src/lib/formats/ipf_dsk.h b/src/lib/formats/ipf_dsk.h index a0a16d36daf..0df0e4c3285 100644 --- a/src/lib/formats/ipf_dsk.h +++ b/src/lib/formats/ipf_dsk.h @@ -50,8 +50,8 @@ private: bool parse_imge(const UINT8 *imge); bool parse_data(const UINT8 *data, UINT32 &pos, UINT32 max_extra_size); - bool scan_one_tag(dynamic_buffer &data, UINT32 &pos, UINT8 *&tag, UINT32 &tsize); - bool scan_all_tags(dynamic_buffer &data); + bool scan_one_tag(std::vector<UINT8> &data, UINT32 &pos, UINT8 *&tag, UINT32 &tsize); + bool scan_all_tags(std::vector<UINT8> &data); static UINT32 r32(const UINT8 *p); static UINT32 rb(const UINT8 *&p, int count); @@ -81,7 +81,7 @@ private: bool generate_track(track_info *t, floppy_image *image); bool generate_tracks(floppy_image *image); - bool parse(dynamic_buffer &data, floppy_image *image); + bool parse(std::vector<UINT8> &data, floppy_image *image); }; extern const floppy_format_type FLOPPY_IPF_FORMAT; diff --git a/src/lib/formats/kc_cas.cpp b/src/lib/formats/kc_cas.cpp index e357261ec5e..2e9638d19c9 100644 --- a/src/lib/formats/kc_cas.cpp +++ b/src/lib/formats/kc_cas.cpp @@ -212,7 +212,7 @@ static int kc_handle_tap(INT16 *buffer, const UINT8 *casdata) static int kc_handle_sss(INT16 *buffer, const UINT8 *casdata) { - dynamic_buffer sss(kc_image_size + 11); + std::vector<UINT8> sss(kc_image_size + 11); // tries to generate the missing head memset(&sss[0], 0xd3, 3); diff --git a/src/lib/formats/mfi_dsk.cpp b/src/lib/formats/mfi_dsk.cpp index b6d0f11e2c7..ea3eed8a29f 100644 --- a/src/lib/formats/mfi_dsk.cpp +++ b/src/lib/formats/mfi_dsk.cpp @@ -119,7 +119,7 @@ bool mfi_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) image->set_variant(h.variant); - dynamic_buffer compressed; + std::vector<UINT8> compressed; entry *ent = entries; for(unsigned int cyl=0; cyl <= (h.cyl_count - 1) << 2; cyl += 4 >> resolution) diff --git a/src/lib/formats/pasti_dsk.cpp b/src/lib/formats/pasti_dsk.cpp index 78e016991d9..9ddce45138a 100644 --- a/src/lib/formats/pasti_dsk.cpp +++ b/src/lib/formats/pasti_dsk.cpp @@ -64,7 +64,7 @@ bool pasti_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) UINT8 fh[16]; io_generic_read(io, fh, 0, 16); - dynamic_buffer raw_track; + std::vector<UINT8> raw_track; int tracks = fh[10]; int heads = 1+(tracks >= 160); diff --git a/src/lib/formats/td0_dsk.cpp b/src/lib/formats/td0_dsk.cpp index 69b3e5bfc14..51fa59488a6 100644 --- a/src/lib/formats/td0_dsk.cpp +++ b/src/lib/formats/td0_dsk.cpp @@ -838,7 +838,7 @@ bool td0_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) int track_spt; int offset = 0; const int max_size = 4*1024*1024; // 4MB ought to be large enough for any floppy - dynamic_buffer imagebuf(max_size); + std::vector<UINT8> imagebuf(max_size); UINT8 header[12]; io_generic_read(io, header, 0, 12); diff --git a/src/lib/formats/victor9k_dsk.cpp b/src/lib/formats/victor9k_dsk.cpp index bce82cdf028..5f0936a8048 100644 --- a/src/lib/formats/victor9k_dsk.cpp +++ b/src/lib/formats/victor9k_dsk.cpp @@ -257,7 +257,7 @@ bool victor9k_format::load(io_generic *io, UINT32 form_factor, floppy_image *ima const format &f = formats[type]; UINT64 size = io_generic_size(io); - dynamic_buffer img; + std::vector<UINT8> img; img.resize(size); io_generic_read(io, &img[0], 0, size); diff --git a/src/lib/util/avhuff.cpp b/src/lib/util/avhuff.cpp index 277f056c7ad..dbec214076a 100644 --- a/src/lib/util/avhuff.cpp +++ b/src/lib/util/avhuff.cpp @@ -308,7 +308,7 @@ UINT32 avhuff_encoder::raw_data_size(const UINT8 *data) } /** - * @fn avhuff_error avhuff_encoder::assemble_data(dynamic_buffer &buffer, bitmap_yuy16 &bitmap, UINT8 channels, UINT32 numsamples, INT16 **samples, UINT8 *metadata, UINT32 metadatasize) + * @fn avhuff_error avhuff_encoder::assemble_data(std::vector<UINT8> &buffer, bitmap_yuy16 &bitmap, UINT8 channels, UINT32 numsamples, INT16 **samples, UINT8 *metadata, UINT32 metadatasize) * * @brief ------------------------------------------------- * assemble_data - assemble a datastream from raw bits @@ -325,7 +325,7 @@ UINT32 avhuff_encoder::raw_data_size(const UINT8 *data) * @return An avhuff_error. */ -avhuff_error avhuff_encoder::assemble_data(dynamic_buffer &buffer, bitmap_yuy16 &bitmap, UINT8 channels, UINT32 numsamples, INT16 **samples, UINT8 *metadata, UINT32 metadatasize) +avhuff_error avhuff_encoder::assemble_data(std::vector<UINT8> &buffer, bitmap_yuy16 &bitmap, UINT8 channels, UINT32 numsamples, INT16 **samples, UINT8 *metadata, UINT32 metadatasize) { // sanity check the inputs if (metadatasize > 255) diff --git a/src/lib/util/avhuff.h b/src/lib/util/avhuff.h index cdaa3ec5f3a..ca1bd4cec49 100644 --- a/src/lib/util/avhuff.h +++ b/src/lib/util/avhuff.h @@ -90,7 +90,7 @@ public: // static helpers static UINT32 raw_data_size(const UINT8 *data); static UINT32 raw_data_size(UINT32 width, UINT32 height, UINT8 channels, UINT32 numsamples, UINT32 metadatasize = 0) { return 12 + channels * numsamples * 2 + width * height * 2; } - static avhuff_error assemble_data(dynamic_buffer &buffer, bitmap_yuy16 &bitmap, UINT8 channels, UINT32 numsamples, INT16 **samples, UINT8 *metadata = nullptr, UINT32 metadatasize = 0); + static avhuff_error assemble_data(std::vector<UINT8> &buffer, bitmap_yuy16 &bitmap, UINT8 channels, UINT32 numsamples, INT16 **samples, UINT8 *metadata = nullptr, UINT32 metadatasize = 0); private: // delta-RLE Huffman encoder @@ -127,7 +127,7 @@ private: deltarle_encoder m_crcontext; // audio encoding contexts - dynamic_buffer m_audiobuffer; + std::vector<UINT8> m_audiobuffer; #if AVHUFF_USE_FLAC flac_encoder m_flac_encoder; #else diff --git a/src/lib/util/cdrom.cpp b/src/lib/util/cdrom.cpp index 59a5b6cc18c..7b5dae18a4e 100644 --- a/src/lib/util/cdrom.cpp +++ b/src/lib/util/cdrom.cpp @@ -1225,7 +1225,7 @@ chd_error cdrom_parse_metadata(chd_file *chd, cdrom_toc *toc) printf("toc->numtrks = %u?!\n", toc->numtrks); /* look for old-style metadata */ - dynamic_buffer oldmetadata; + std::vector<UINT8> oldmetadata; err = chd->read_metadata(CDROM_OLD_METADATA_TAG, 0, oldmetadata); if (err != CHDERR_NONE) return err; diff --git a/src/lib/util/chd.cpp b/src/lib/util/chd.cpp index 07da646dca3..8bce55cb947 100644 --- a/src/lib/util/chd.cpp +++ b/src/lib/util/chd.cpp @@ -1271,7 +1271,7 @@ chd_error chd_file::read_metadata(chd_metadata_tag searchtag, UINT32 searchindex } /** - * @fn chd_error chd_file::read_metadata(chd_metadata_tag searchtag, UINT32 searchindex, dynamic_buffer &output) + * @fn chd_error chd_file::read_metadata(chd_metadata_tag searchtag, UINT32 searchindex, std::vector<UINT8> &output) * * @brief Reads a metadata. * @@ -1285,7 +1285,7 @@ chd_error chd_file::read_metadata(chd_metadata_tag searchtag, UINT32 searchindex * @return The metadata. */ -chd_error chd_file::read_metadata(chd_metadata_tag searchtag, UINT32 searchindex, dynamic_buffer &output) +chd_error chd_file::read_metadata(chd_metadata_tag searchtag, UINT32 searchindex, std::vector<UINT8> &output) { // wrap this for clean reporting try @@ -1349,7 +1349,7 @@ chd_error chd_file::read_metadata(chd_metadata_tag searchtag, UINT32 searchindex } /** - * @fn chd_error chd_file::read_metadata(chd_metadata_tag searchtag, UINT32 searchindex, dynamic_buffer &output, chd_metadata_tag &resulttag, UINT8 &resultflags) + * @fn chd_error chd_file::read_metadata(chd_metadata_tag searchtag, UINT32 searchindex, std::vector<UINT8> &output, chd_metadata_tag &resulttag, UINT8 &resultflags) * * @brief Reads a metadata. * @@ -1365,7 +1365,7 @@ chd_error chd_file::read_metadata(chd_metadata_tag searchtag, UINT32 searchindex * @return The metadata. */ -chd_error chd_file::read_metadata(chd_metadata_tag searchtag, UINT32 searchindex, dynamic_buffer &output, chd_metadata_tag &resulttag, UINT8 &resultflags) +chd_error chd_file::read_metadata(chd_metadata_tag searchtag, UINT32 searchindex, std::vector<UINT8> &output, chd_metadata_tag &resulttag, UINT8 &resultflags) { // wrap this for clean reporting try @@ -1530,7 +1530,7 @@ chd_error chd_file::clone_all_metadata(chd_file &source) try { // iterate over metadata entries in the source - dynamic_buffer filedata; + std::vector<UINT8> filedata; metadata_entry metaentry; metaentry.metatag = 0; metaentry.length = 0; @@ -1577,7 +1577,7 @@ util::sha1_t chd_file::compute_overall_sha1(util::sha1_t rawsha1) return rawsha1; // iterate over metadata - dynamic_buffer filedata; + std::vector<UINT8> filedata; std::vector<metadata_hash> hasharray; metadata_entry metaentry; for (bool has_data = metadata_find(CHDMETATAG_WILDCARD, 0, metaentry); has_data; has_data = metadata_find(CHDMETATAG_WILDCARD, 0, metaentry, true)) @@ -1931,7 +1931,7 @@ chd_error chd_file::compress_v5_map() util::crc16_t mapcrc = util::crc16_creator::simple(&m_rawmap[0], m_hunkcount * 12); // create a buffer to hold the RLE data - dynamic_buffer compression_rle(m_hunkcount); + std::vector<UINT8> compression_rle(m_hunkcount); UINT8 *dest = &compression_rle[0]; // use a huffman encoder for 16 different codes, maximum length is 8 bits @@ -2014,7 +2014,7 @@ chd_error chd_file::compress_v5_map() } // compute a tree and export it to the buffer - dynamic_buffer compressed(m_hunkcount * 6); + std::vector<UINT8> compressed(m_hunkcount * 6); bitstream_out bitbuf(&compressed[16], compressed.size() - 16); huffman_error err = encoder.compute_tree_from_histo(); if (err != HUFFERR_NONE) @@ -2155,7 +2155,7 @@ void chd_file::decompress_v5_map() UINT8 parentbits = rawbuf[14]; // now read the map - dynamic_buffer compressed(mapbytes); + std::vector<UINT8> compressed(mapbytes); file_read(m_mapoffset + 16, &compressed[0], mapbytes); bitstream_in bitbuf(&compressed[0], compressed.size()); diff --git a/src/lib/util/chd.h b/src/lib/util/chd.h index b0eb4143374..51c6fed0b54 100644 --- a/src/lib/util/chd.h +++ b/src/lib/util/chd.h @@ -349,12 +349,12 @@ public: // metadata management chd_error read_metadata(chd_metadata_tag searchtag, UINT32 searchindex, std::string &output); - chd_error read_metadata(chd_metadata_tag searchtag, UINT32 searchindex, dynamic_buffer &output); + chd_error read_metadata(chd_metadata_tag searchtag, UINT32 searchindex, std::vector<UINT8> &output); chd_error read_metadata(chd_metadata_tag searchtag, UINT32 searchindex, void *output, UINT32 outputlen, UINT32 &resultlen); - chd_error read_metadata(chd_metadata_tag searchtag, UINT32 searchindex, dynamic_buffer &output, chd_metadata_tag &resulttag, UINT8 &resultflags); + chd_error read_metadata(chd_metadata_tag searchtag, UINT32 searchindex, std::vector<UINT8> &output, chd_metadata_tag &resulttag, UINT8 &resultflags); chd_error write_metadata(chd_metadata_tag metatag, UINT32 metaindex, const void *inputbuf, UINT32 inputlen, UINT8 flags = CHD_MDFLAGS_CHECKSUM); chd_error write_metadata(chd_metadata_tag metatag, UINT32 metaindex, const std::string &input, UINT8 flags = CHD_MDFLAGS_CHECKSUM) { return write_metadata(metatag, metaindex, input.c_str(), input.length() + 1, flags); } - chd_error write_metadata(chd_metadata_tag metatag, UINT32 metaindex, const dynamic_buffer &input, UINT8 flags = CHD_MDFLAGS_CHECKSUM) { return write_metadata(metatag, metaindex, &input[0], input.size(), flags); } + chd_error write_metadata(chd_metadata_tag metatag, UINT32 metaindex, const std::vector<UINT8> &input, UINT8 flags = CHD_MDFLAGS_CHECKSUM) { return write_metadata(metatag, metaindex, &input[0], input.size(), flags); } chd_error delete_metadata(chd_metadata_tag metatag, UINT32 metaindex); chd_error clone_all_metadata(chd_file &source); @@ -428,14 +428,14 @@ private: // map information UINT32 m_mapentrybytes; // length of each entry in a map - dynamic_buffer m_rawmap; // raw map data + std::vector<UINT8> m_rawmap; // raw map data // compression management chd_decompressor * m_decompressor[4]; // array of decompression codecs - dynamic_buffer m_compressed; // temporary buffer for compressed data + std::vector<UINT8> m_compressed; // temporary buffer for compressed data // caching - dynamic_buffer m_cache; // single-hunk cache for partial reads/writes + std::vector<UINT8> m_cache; // single-hunk cache for partial reads/writes UINT32 m_cachehunk; // which hunk is in the cache? }; @@ -571,8 +571,8 @@ private: // work item thread static const int WORK_BUFFER_HUNKS = 256; osd_work_queue * m_work_queue; // queue for doing work on other threads - dynamic_buffer m_work_buffer; // buffer containing hunk data to work on - dynamic_buffer m_compressed_buffer;// buffer containing compressed data + std::vector<UINT8> m_work_buffer; // buffer containing hunk data to work on + std::vector<UINT8> m_compressed_buffer;// buffer containing compressed data work_item m_work_item[WORK_BUFFER_HUNKS]; // status of each hunk chd_compressor_group * m_codecs[WORK_MAX_THREADS]; // codecs to use diff --git a/src/lib/util/chdcodec.cpp b/src/lib/util/chdcodec.cpp index 041061c38e9..e2758f08a9e 100644 --- a/src/lib/util/chdcodec.cpp +++ b/src/lib/util/chdcodec.cpp @@ -258,7 +258,7 @@ private: flac_encoder m_encoder; z_stream m_deflater; chd_zlib_allocator m_allocator; - dynamic_buffer m_buffer; + std::vector<UINT8> m_buffer; }; @@ -281,7 +281,7 @@ private: flac_decoder m_decoder; z_stream m_inflater; chd_zlib_allocator m_allocator; - dynamic_buffer m_buffer; + std::vector<UINT8> m_buffer; }; @@ -350,7 +350,7 @@ private: // internal state _BaseCompressor m_base_compressor; _SubcodeCompressor m_subcode_compressor; - dynamic_buffer m_buffer; + std::vector<UINT8> m_buffer; }; @@ -410,7 +410,7 @@ private: // internal state _BaseDecompressor m_base_decompressor; _SubcodeDecompressor m_subcode_decompressor; - dynamic_buffer m_buffer; + std::vector<UINT8> m_buffer; }; diff --git a/src/lib/util/chdcodec.h b/src/lib/util/chdcodec.h index bfde8d2cde7..0b56cbdeb9c 100644 --- a/src/lib/util/chdcodec.h +++ b/src/lib/util/chdcodec.h @@ -154,10 +154,10 @@ private: // internal state UINT32 m_hunkbytes; // number of bytes in a hunk chd_compressor * m_compressor[4]; // array of active codecs - dynamic_buffer m_compress_test; // test buffer for compression + std::vector<UINT8> m_compress_test; // test buffer for compression #if CHDCODEC_VERIFY_COMPRESSION chd_decompressor * m_decompressor[4]; // array of active codecs - dynamic_buffer m_decompressed; // verification buffer + std::vector<UINT8> m_decompressed; // verification buffer #endif }; diff --git a/src/lib/util/corefile.cpp b/src/lib/util/corefile.cpp index ff8f3137cc0..54dbca51813 100644 --- a/src/lib/util/corefile.cpp +++ b/src/lib/util/corefile.cpp @@ -1221,7 +1221,7 @@ osd_file::error core_file::load(std::string const &filename, void **data, std::u return osd_file::error::NONE; } -osd_file::error core_file::load(std::string const &filename, dynamic_buffer &data) +osd_file::error core_file::load(std::string const &filename, std::vector<UINT8> &data) { ptr file; diff --git a/src/lib/util/corefile.h b/src/lib/util/corefile.h index efbda400202..70b966c394c 100644 --- a/src/lib/util/corefile.h +++ b/src/lib/util/corefile.h @@ -101,7 +101,7 @@ public: // open a file with the specified filename, read it into memory, and return a pointer static osd_file::error load(std::string const &filename, void **data, std::uint32_t &length); - static osd_file::error load(std::string const &filename, dynamic_buffer &data); + static osd_file::error load(std::string const &filename, std::vector<UINT8> &data); // ----- file write ----- diff --git a/src/lib/util/coretmpl.h b/src/lib/util/coretmpl.h index aff90713dbb..e94e467f2b2 100644 --- a/src/lib/util/coretmpl.h +++ b/src/lib/util/coretmpl.h @@ -21,10 +21,6 @@ #include <utility> #include <vector> - -typedef std::vector<UINT8> dynamic_buffer; - - // ======================> simple_list // a simple_list is a singly-linked list whose 'next' pointer is owned diff --git a/src/lib/util/huffman.cpp b/src/lib/util/huffman.cpp index 62756b89a17..c38d78853fb 100644 --- a/src/lib/util/huffman.cpp +++ b/src/lib/util/huffman.cpp @@ -316,7 +316,7 @@ huffman_error huffman_context_base::import_tree_huffman(bitstream_in &bitbuf) huffman_error huffman_context_base::export_tree_huffman(bitstream_out &bitbuf) { // first RLE compress the lengths of all the nodes - dynamic_buffer rle_data(m_numcodes); + std::vector<UINT8> rle_data(m_numcodes); UINT8 *dest = &rle_data[0]; std::vector<UINT16> rle_lengths(m_numcodes/3); UINT16 *lengths = &rle_lengths[0]; diff --git a/src/mame/drivers/8080bw.cpp b/src/mame/drivers/8080bw.cpp index 1cdd0ba5419..2883da6c1a3 100644 --- a/src/mame/drivers/8080bw.cpp +++ b/src/mame/drivers/8080bw.cpp @@ -2833,7 +2833,7 @@ DRIVER_INIT_MEMBER(_8080bw_state,vortex) { UINT8 *rom = memregion("maincpu")->base(); int length = memregion("maincpu")->bytes(); - dynamic_buffer buf1(length); + std::vector<UINT8> buf1(length); UINT32 x; for (x = 0; x < length; x++) { @@ -3247,7 +3247,7 @@ DRIVER_INIT_MEMBER(_8080bw_state,attackfc) { UINT8 *rom = memregion("maincpu")->base(); UINT32 len = memregion("maincpu")->bytes(); - dynamic_buffer buffer(len); + std::vector<UINT8> buffer(len); // swap a8/a9 for (int i = 0; i < len; i++) diff --git a/src/mame/drivers/abc80.cpp b/src/mame/drivers/abc80.cpp index 5537cb21126..31d0836c357 100644 --- a/src/mame/drivers/abc80.cpp +++ b/src/mame/drivers/abc80.cpp @@ -490,7 +490,7 @@ QUICKLOAD_LOAD_MEMBER( abc80_state, bac ) offs_t address = space.read_byte(BOFA + 1) << 8 | space.read_byte(BOFA); if (LOG) logerror("BOFA %04x\n",address); - dynamic_buffer data; + std::vector<UINT8> data; data.resize(quickload_size); image.fread(&data[0], quickload_size); for (int i = 1; i < quickload_size; i++) diff --git a/src/mame/drivers/alg.cpp b/src/mame/drivers/alg.cpp index 84db75d0179..7f39462df83 100644 --- a/src/mame/drivers/alg.cpp +++ b/src/mame/drivers/alg.cpp @@ -698,7 +698,7 @@ DRIVER_INIT_MEMBER(alg_state,palr1) UINT32 length = memregion("user2")->bytes(); UINT8 *rom = memregion("user2")->base(); - dynamic_buffer original(length); + std::vector<UINT8> original(length); UINT32 srcaddr; memcpy(&original[0], rom, length); @@ -717,7 +717,7 @@ DRIVER_INIT_MEMBER(alg_state,palr3) UINT32 length = memregion("user2")->bytes(); UINT8 *rom = memregion("user2")->base(); - dynamic_buffer original(length); + std::vector<UINT8> original(length); UINT32 srcaddr; memcpy(&original[0], rom, length); @@ -735,7 +735,7 @@ DRIVER_INIT_MEMBER(alg_state,palr6) UINT32 length = memregion("user2")->bytes(); UINT8 *rom = memregion("user2")->base(); - dynamic_buffer original(length); + std::vector<UINT8> original(length); UINT32 srcaddr; memcpy(&original[0], rom, length); diff --git a/src/mame/drivers/arkanoid.cpp b/src/mame/drivers/arkanoid.cpp index eb3f12a14f5..de4b3bf0375 100644 --- a/src/mame/drivers/arkanoid.cpp +++ b/src/mame/drivers/arkanoid.cpp @@ -2048,7 +2048,7 @@ DRIVER_INIT_MEMBER(arkanoid_state,block2) // the graphics on this bootleg have the data scrambled int tile; UINT8* srcgfx = memregion("gfx1")->base(); - dynamic_buffer buffer(0x18000); + std::vector<UINT8> buffer(0x18000); for (tile = 0; tile < 0x3000; tile++) { diff --git a/src/mame/drivers/backfire.cpp b/src/mame/drivers/backfire.cpp index 04714bcbaee..b63e0f1af08 100644 --- a/src/mame/drivers/backfire.cpp +++ b/src/mame/drivers/backfire.cpp @@ -678,7 +678,7 @@ void backfire_state::descramble_sound() { UINT8 *rom = memregion("ymz")->base(); int length = 0x200000; // only the first rom is swapped on backfire! - dynamic_buffer buf1(length); + std::vector<UINT8> buf1(length); UINT32 x; for (x = 0; x < length; x++) diff --git a/src/mame/drivers/balsente.cpp b/src/mame/drivers/balsente.cpp index 3a2dc41fd2b..c9204564cd4 100644 --- a/src/mame/drivers/balsente.cpp +++ b/src/mame/drivers/balsente.cpp @@ -2204,7 +2204,7 @@ void balsente_state::expand_roms(UINT8 cd_rom_mask) /* load EF from 0x2e000-0x30000 */ /* ROM region must be 0x40000 total */ - dynamic_buffer temp(0x20000); + std::vector<UINT8> temp(0x20000); { UINT8 *rom = memregion("maincpu")->base(); UINT32 len = memregion("maincpu")->bytes(); diff --git a/src/mame/drivers/beta.cpp b/src/mame/drivers/beta.cpp index f9b946f4cd0..b8a84700dc4 100644 --- a/src/mame/drivers/beta.cpp +++ b/src/mame/drivers/beta.cpp @@ -86,7 +86,7 @@ public: UINT16 m_eprom_addr; UINT8 m_eprom_data; UINT8 m_old_data; - dynamic_buffer m_eprom_rom; + std::vector<UINT8> m_eprom_rom; /* display state */ UINT8 m_ls145_p; diff --git a/src/mame/drivers/bfcobra.cpp b/src/mame/drivers/bfcobra.cpp index 3523fa6e492..81ac7473a95 100644 --- a/src/mame/drivers/bfcobra.cpp +++ b/src/mame/drivers/bfcobra.cpp @@ -1569,7 +1569,7 @@ DRIVER_INIT_MEMBER(bfcobra_state,bfcobra) UINT32 i; UINT8 *rom; - dynamic_buffer tmp(0x8000); + std::vector<UINT8> tmp(0x8000); rom = memregion("audiocpu")->base() + 0x8000; memcpy(&tmp[0], rom, 0x8000); diff --git a/src/mame/drivers/binbug.cpp b/src/mame/drivers/binbug.cpp index b0fb117513c..85062aeea0d 100644 --- a/src/mame/drivers/binbug.cpp +++ b/src/mame/drivers/binbug.cpp @@ -224,7 +224,7 @@ QUICKLOAD_LOAD_MEMBER( binbug_state, binbug ) int quick_addr = 0x440; int exec_addr; int quick_length; - dynamic_buffer quick_data; + std::vector<UINT8> quick_data; int read_; image_init_result result = image_init_result::FAIL; diff --git a/src/mame/drivers/blktiger.cpp b/src/mame/drivers/blktiger.cpp index 92eade7109d..7cd5d86a6eb 100644 --- a/src/mame/drivers/blktiger.cpp +++ b/src/mame/drivers/blktiger.cpp @@ -599,7 +599,7 @@ DRIVER_INIT_MEMBER(blktiger_state,blktigerb3) { UINT8 *src = memregion("audiocpu")->base(); int len = 0x8000; - dynamic_buffer buffer(len); + std::vector<UINT8> buffer(len); for (int i = 0; i < len; i++) { diff --git a/src/mame/drivers/casloopy.cpp b/src/mame/drivers/casloopy.cpp index f96a5f7bbed..f39366536eb 100644 --- a/src/mame/drivers/casloopy.cpp +++ b/src/mame/drivers/casloopy.cpp @@ -478,7 +478,7 @@ DEVICE_IMAGE_LOAD_MEMBER( casloopy_state, loopy_cart ) { UINT32 size = m_cart->common_get_size("rom"); UINT8 *SRC, *DST; - dynamic_buffer temp; + std::vector<UINT8> temp; temp.resize(size); m_cart->rom_alloc(size, GENERIC_ROM32_WIDTH, ENDIANNESS_LITTLE); diff --git a/src/mame/drivers/cave.cpp b/src/mame/drivers/cave.cpp index 77e0b1a4994..fd58d35cb61 100644 --- a/src/mame/drivers/cave.cpp +++ b/src/mame/drivers/cave.cpp @@ -4884,7 +4884,7 @@ DRIVER_INIT_MEMBER(cave_state,mazinger) membank("okibank2")->configure_entries(0, 4, &ROM[0x00000], 0x20000); /* decrypt sprites */ - dynamic_buffer buffer(len); + std::vector<UINT8> buffer(len); { int i; for (i = 0; i < len; i++) @@ -4946,7 +4946,7 @@ DRIVER_INIT_MEMBER(cave_state,pwrinst2j) membank("z80bank")->configure_entries(0, 8, &ROM[0x00000], 0x4000); - dynamic_buffer buffer(len); + std::vector<UINT8> buffer(len); { for(i = 0; i < len/2; i++) { @@ -4999,7 +4999,7 @@ DRIVER_INIT_MEMBER(cave_state,sailormn) membank("oki2bank2")->configure_entries(0, 0x10, &ROM[0x00000], 0x20000); /* decrypt sprites */ - dynamic_buffer buffer(len); + std::vector<UINT8> buffer(len); { int i; for (i = 0; i < len; i++) diff --git a/src/mame/drivers/cd2650.cpp b/src/mame/drivers/cd2650.cpp index 9e72052234a..a9da4aaa250 100644 --- a/src/mame/drivers/cd2650.cpp +++ b/src/mame/drivers/cd2650.cpp @@ -212,7 +212,7 @@ QUICKLOAD_LOAD_MEMBER( cd2650_state, cd2650 ) } else { - dynamic_buffer quick_data(quick_length); + std::vector<UINT8> quick_data(quick_length); int read_ = image.fread( &quick_data[0], quick_length); if (read_ != quick_length) { diff --git a/src/mame/drivers/coinmstr.cpp b/src/mame/drivers/coinmstr.cpp index 2b3c8ba4a9c..e699adeb329 100644 --- a/src/mame/drivers/coinmstr.cpp +++ b/src/mame/drivers/coinmstr.cpp @@ -1530,7 +1530,7 @@ DRIVER_INIT_MEMBER(coinmstr_state,coinmstr) { UINT8 *rom = memregion("user1")->base(); int length = memregion("user1")->bytes(); - dynamic_buffer buf(length); + std::vector<UINT8> buf(length); int i; memcpy(&buf[0],rom,length); diff --git a/src/mame/drivers/d6800.cpp b/src/mame/drivers/d6800.cpp index 8440b6aa783..3302f68dbc8 100644 --- a/src/mame/drivers/d6800.cpp +++ b/src/mame/drivers/d6800.cpp @@ -344,7 +344,7 @@ QUICKLOAD_LOAD_MEMBER( d6800_state, d6800 ) int quick_addr = 0x200; int exec_addr = 0xc000; int quick_length; - dynamic_buffer quick_data; + std::vector<UINT8> quick_data; int read_; image_init_result result = image_init_result::FAIL; diff --git a/src/mame/drivers/darkmist.cpp b/src/mame/drivers/darkmist.cpp index fcb6b54c6d8..9d71fa75ee8 100644 --- a/src/mame/drivers/darkmist.cpp +++ b/src/mame/drivers/darkmist.cpp @@ -325,7 +325,7 @@ ROM_END void darkmist_state::decrypt_fgbgtiles(UINT8* rom, int size) { - dynamic_buffer buf(0x40000); + std::vector<UINT8> buf(0x40000); /* data lines */ for (int i = 0;i < size/2;i++) { @@ -350,7 +350,7 @@ void darkmist_state::decrypt_fgbgtiles(UINT8* rom, int size) void darkmist_state::decrypt_gfx() { - dynamic_buffer buf(0x40000); + std::vector<UINT8> buf(0x40000); UINT8 *rom; int size; int i; @@ -416,7 +416,7 @@ DRIVER_INIT_MEMBER(darkmist_state,darkmist) { int i, len; UINT8 *ROM = memregion("maincpu")->base(); - dynamic_buffer buffer(0x10000); + std::vector<UINT8> buffer(0x10000); decrypt_gfx(); diff --git a/src/mame/drivers/dassault.cpp b/src/mame/drivers/dassault.cpp index b334031a98e..1e76ca2249f 100644 --- a/src/mame/drivers/dassault.cpp +++ b/src/mame/drivers/dassault.cpp @@ -1050,7 +1050,7 @@ DRIVER_INIT_MEMBER(dassault_state,dassault) { const UINT8 *src = memregion("gfx1")->base(); UINT8 *dst = memregion("gfx2")->base(); - dynamic_buffer tmp(0x80000); + std::vector<UINT8> tmp(0x80000); /* Playfield 4 also has access to the char graphics, make things easier by just copying the chars to both banks (if I just used a different gfx @@ -1065,7 +1065,7 @@ DRIVER_INIT_MEMBER(dassault_state,thndzone) { const UINT8 *src = memregion("gfx1")->base(); UINT8 *dst = memregion("gfx2")->base(); - dynamic_buffer tmp(0x80000); + std::vector<UINT8> tmp(0x80000); /* Playfield 4 also has access to the char graphics, make things easier by just copying the chars to both banks (if I just used a different gfx diff --git a/src/mame/drivers/ddayjlc.cpp b/src/mame/drivers/ddayjlc.cpp index c1766d41585..e221d23e27b 100644 --- a/src/mame/drivers/ddayjlc.cpp +++ b/src/mame/drivers/ddayjlc.cpp @@ -669,7 +669,7 @@ DRIVER_INIT_MEMBER(ddayjlc_state,ddayjlc) { UINT32 oldaddr, newadr, length,j; UINT8 *src, *dst; - dynamic_buffer temp(0x10000); + std::vector<UINT8> temp(0x10000); src = &temp[0]; dst = memregion("gfx1")->base(); length = memregion("gfx1")->bytes(); diff --git a/src/mame/drivers/deco156.cpp b/src/mame/drivers/deco156.cpp index 723e051c55a..be319f612bb 100644 --- a/src/mame/drivers/deco156.cpp +++ b/src/mame/drivers/deco156.cpp @@ -658,7 +658,7 @@ void deco156_state::descramble_sound( const char *tag ) { UINT8 *rom = memregion(tag)->base(); int length = memregion(tag)->bytes(); - dynamic_buffer buf1(length); + std::vector<UINT8> buf1(length); UINT32 x; for (x = 0; x < length; x++) diff --git a/src/mame/drivers/deco32.cpp b/src/mame/drivers/deco32.cpp index 5408597756a..a84589e5848 100644 --- a/src/mame/drivers/deco32.cpp +++ b/src/mame/drivers/deco32.cpp @@ -4042,7 +4042,7 @@ DRIVER_INIT_MEMBER(dragngun_state,lockload) DRIVER_INIT_MEMBER(deco32_state,tattass) { UINT8 *RAM = memregion("gfx1")->base(); - dynamic_buffer tmp(0x80000); + std::vector<UINT8> tmp(0x80000); /* Reorder bitplanes to make decoding easier */ memcpy(&tmp[0],RAM+0x80000,0x80000); @@ -4069,7 +4069,7 @@ DRIVER_INIT_MEMBER(deco32_state,tattass) DRIVER_INIT_MEMBER(deco32_state,nslasher) { UINT8 *RAM = memregion("gfx1")->base(); - dynamic_buffer tmp(0x80000); + std::vector<UINT8> tmp(0x80000); /* Reorder bitplanes to make decoding easier */ memcpy(&tmp[0],RAM+0x80000,0x80000); diff --git a/src/mame/drivers/deco_mlc.cpp b/src/mame/drivers/deco_mlc.cpp index 0365d844625..bcb9c107fec 100644 --- a/src/mame/drivers/deco_mlc.cpp +++ b/src/mame/drivers/deco_mlc.cpp @@ -848,7 +848,7 @@ void deco_mlc_state::descramble_sound( ) /* the same as simpl156 / heavy smash? */ UINT8 *rom = memregion("ymz")->base(); int length = memregion("ymz")->bytes(); - dynamic_buffer buf1(length); + std::vector<UINT8> buf1(length); UINT32 x; diff --git a/src/mame/drivers/dynax.cpp b/src/mame/drivers/dynax.cpp index 7f1c156e4f0..134c6c2e605 100644 --- a/src/mame/drivers/dynax.cpp +++ b/src/mame/drivers/dynax.cpp @@ -5516,7 +5516,7 @@ DRIVER_INIT_MEMBER(dynax_state,maya) /* Address lines scrambling on the blitter data roms */ { - dynamic_buffer rom(0xc0000); + std::vector<UINT8> rom(0xc0000); memcpy(&rom[0], gfx, 0xc0000); for (i = 0; i < 0xc0000; i++) gfx[i] = rom[BITSWAP24(i, 23, 22, 21, 20, 19, 18, 14, 15, 16, 17, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)]; @@ -5533,7 +5533,7 @@ DRIVER_INIT_MEMBER(dynax_state,mayac) /* Address lines scrambling on the blitter data roms */ { - dynamic_buffer rom(0xc0000); + std::vector<UINT8> rom(0xc0000); memcpy(&rom[0], gfx, 0xc0000); for (i = 0; i < 0xc0000; i++) gfx[i] = rom[BITSWAP24(i, 23, 22, 21, 20, 19, 18, 17, 14, 16, 15, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)]; @@ -6452,7 +6452,7 @@ DRIVER_INIT_MEMBER(dynax_state,mjelct3) int i; UINT8 *rom = memregion("maincpu")->base(); size_t size = memregion("maincpu")->bytes(); - dynamic_buffer rom1(size); + std::vector<UINT8> rom1(size); memcpy(&rom1[0], rom, size); for (i = 0; i < size; i++) @@ -6464,7 +6464,7 @@ DRIVER_INIT_MEMBER(dynax_state,mjelct3a) int i, j; UINT8 *rom = memregion("maincpu")->base(); size_t size = memregion("maincpu")->bytes(); - dynamic_buffer rom1(size); + std::vector<UINT8> rom1(size); memcpy(&rom1[0], rom, size); for (i = 0; i < size; i++) diff --git a/src/mame/drivers/eti660.cpp b/src/mame/drivers/eti660.cpp index c52f9e1f66f..74227888bb0 100644 --- a/src/mame/drivers/eti660.cpp +++ b/src/mame/drivers/eti660.cpp @@ -267,7 +267,7 @@ QUICKLOAD_LOAD_MEMBER( eti660_state, eti660 ) int i; int quick_addr = 0x600; int quick_length; - dynamic_buffer quick_data; + std::vector<UINT8> quick_data; int read_; image_init_result result = image_init_result::FAIL; diff --git a/src/mame/drivers/exerion.cpp b/src/mame/drivers/exerion.cpp index fb8bf40a063..97ae0912dc7 100644 --- a/src/mame/drivers/exerion.cpp +++ b/src/mame/drivers/exerion.cpp @@ -513,7 +513,7 @@ DRIVER_INIT_MEMBER(exerion_state,exerion) UINT8 *src, *dst; /* allocate some temporary space */ - dynamic_buffer temp(0x10000); + std::vector<UINT8> temp(0x10000); /* make a temporary copy of the character data */ src = &temp[0]; diff --git a/src/mame/drivers/fcombat.cpp b/src/mame/drivers/fcombat.cpp index 304f33b1e7c..43f8afc5682 100644 --- a/src/mame/drivers/fcombat.cpp +++ b/src/mame/drivers/fcombat.cpp @@ -331,7 +331,7 @@ DRIVER_INIT_MEMBER(fcombat_state,fcombat) UINT8 *src, *dst; /* allocate some temporary space */ - dynamic_buffer temp(0x10000); + std::vector<UINT8> temp(0x10000); /* make a temporary copy of the character data */ src = &temp[0]; diff --git a/src/mame/drivers/flyball.cpp b/src/mame/drivers/flyball.cpp index 450fcbabc82..c1bab2d6190 100644 --- a/src/mame/drivers/flyball.cpp +++ b/src/mame/drivers/flyball.cpp @@ -426,7 +426,7 @@ void flyball_state::machine_start() /* address bits 0 through 8 are inverted */ UINT8 *ROM = memregion("maincpu")->base(); int len = memregion("maincpu")->bytes(); - dynamic_buffer buf(len); + std::vector<UINT8> buf(len); for (int i = 0; i < len; i++) buf[i ^ 0x1ff] = ROM[i]; memcpy(ROM, &buf[0], len); diff --git a/src/mame/drivers/forte2.cpp b/src/mame/drivers/forte2.cpp index 8f770e467b7..6cd35edaa74 100644 --- a/src/mame/drivers/forte2.cpp +++ b/src/mame/drivers/forte2.cpp @@ -149,7 +149,7 @@ DRIVER_INIT_MEMBER(forte2_state,pesadelo) } // address line swap - dynamic_buffer buf(memsize); + std::vector<UINT8> buf(memsize); memcpy(&buf[0], mem, memsize); for (int i = 0; i < memsize; i++) { diff --git a/src/mame/drivers/funworld.cpp b/src/mame/drivers/funworld.cpp index 87c8742c2b9..1e0b4e18a4a 100644 --- a/src/mame/drivers/funworld.cpp +++ b/src/mame/drivers/funworld.cpp @@ -6175,7 +6175,7 @@ DRIVER_INIT_MEMBER(funworld_state, saloon) } { - dynamic_buffer buffer(size); + std::vector<UINT8> buffer(size); memcpy(&buffer[0], rom, size); @@ -6194,7 +6194,7 @@ DRIVER_INIT_MEMBER(funworld_state, saloon) ******************************/ { - dynamic_buffer buffer(sizeg); + std::vector<UINT8> buffer(sizeg); memcpy(&buffer[0], gfxrom, sizeg); /* address lines swap: fedcba9876543210 -> fedcb67584a39012 */ @@ -6219,7 +6219,7 @@ DRIVER_INIT_MEMBER(funworld_state, saloon) } { - dynamic_buffer buffer(sizep); + std::vector<UINT8> buffer(sizep); memcpy(&buffer[0], prom, sizep); @@ -6354,7 +6354,7 @@ DRIVER_INIT_MEMBER(funworld_state, dino4) } { - dynamic_buffer buffer(size); + std::vector<UINT8> buffer(size); memcpy(&buffer[0], rom, size); @@ -6373,7 +6373,7 @@ DRIVER_INIT_MEMBER(funworld_state, dino4) ******************************/ { - dynamic_buffer buffer(sizeg); + std::vector<UINT8> buffer(sizeg); memcpy(&buffer[0], gfxrom, sizeg); /* address lines swap: fedcba9876543210 -> fedcb67584a39012 */ @@ -6458,7 +6458,7 @@ static void decrypt_rcdino4(UINT8 *rom, int size, UINT8 *gfxrom, int sizeg, UINT } { - dynamic_buffer buffer(size); + std::vector<UINT8> buffer(size); memcpy(&buffer[0], rom, size); @@ -6477,7 +6477,7 @@ static void decrypt_rcdino4(UINT8 *rom, int size, UINT8 *gfxrom, int sizeg, UINT ******************************/ { - dynamic_buffer buffer(sizeg); + std::vector<UINT8> buffer(sizeg); memcpy(&buffer[0], gfxrom, sizeg); /* address lines swap: fedcba9876543210 -> fedcb67584a39012 */ diff --git a/src/mame/drivers/gaiden.cpp b/src/mame/drivers/gaiden.cpp index ca633313c58..d6556c5481d 100644 --- a/src/mame/drivers/gaiden.cpp +++ b/src/mame/drivers/gaiden.cpp @@ -1567,7 +1567,7 @@ void gaiden_state::descramble_drgnbowl(int descramble_cpu) if (descramble_cpu) { - dynamic_buffer buffer(size); + std::vector<UINT8> buffer(size); memcpy(&buffer[0], ROM, size); for( i = 0; i < size; i++ ) @@ -1584,7 +1584,7 @@ void gaiden_state::descramble_drgnbowl(int descramble_cpu) ROM = memregion("gfx2")->base(); size = memregion("gfx2")->bytes(); { - dynamic_buffer buffer(size); + std::vector<UINT8> buffer(size); memcpy(&buffer[0],ROM,size); for( i = 0; i < size; i++ ) @@ -1619,7 +1619,7 @@ void gaiden_state::descramble_mastninj_gfx(UINT8* src) /* rearrange gfx */ { - dynamic_buffer buffer(len); + std::vector<UINT8> buffer(len); int i; for (i = 0;i < len; i++) { @@ -1635,7 +1635,7 @@ void gaiden_state::descramble_mastninj_gfx(UINT8* src) } { - dynamic_buffer buffer(len); + std::vector<UINT8> buffer(len); int i; for (i = 0; i < len; i++) { diff --git a/src/mame/drivers/galaxian.cpp b/src/mame/drivers/galaxian.cpp index 955b76e9db5..0fa21ee33e7 100644 --- a/src/mame/drivers/galaxian.cpp +++ b/src/mame/drivers/galaxian.cpp @@ -6326,7 +6326,7 @@ void galaxian_state::decode_anteater_gfx() { UINT32 romlength = memregion("gfx1")->bytes(); UINT8 *rombase = memregion("gfx1")->base(); - dynamic_buffer scratch(romlength); + std::vector<UINT8> scratch(romlength); UINT32 offs; memcpy(&scratch[0], rombase, romlength); @@ -6345,7 +6345,7 @@ void galaxian_state::decode_losttomb_gfx() { UINT32 romlength = memregion("gfx1")->bytes(); UINT8 *rombase = memregion("gfx1")->base(); - dynamic_buffer scratch(romlength); + std::vector<UINT8> scratch(romlength); UINT32 offs; memcpy(&scratch[0], rombase, romlength); diff --git a/src/mame/drivers/galaxold.cpp b/src/mame/drivers/galaxold.cpp index 0617a794f28..9fffe24187b 100644 --- a/src/mame/drivers/galaxold.cpp +++ b/src/mame/drivers/galaxold.cpp @@ -2792,7 +2792,7 @@ DRIVER_INIT_MEMBER(galaxold_state,ckonggx) }; UINT8 *rom = memregion("maincpu")->base(); - dynamic_buffer buffer(0x5800); + std::vector<UINT8> buffer(0x5800); for (int i=0;i<88;i++) { diff --git a/src/mame/drivers/gauntlet.cpp b/src/mame/drivers/gauntlet.cpp index 4bb236869c5..87cf50209ee 100644 --- a/src/mame/drivers/gauntlet.cpp +++ b/src/mame/drivers/gauntlet.cpp @@ -1672,7 +1672,7 @@ DRIVER_INIT_MEMBER(gauntlet_state,gauntlet) DRIVER_INIT_MEMBER(gauntlet_state,vindctr2) { UINT8 *gfx2_base = memregion("gfx2")->base(); - dynamic_buffer data(0x8000); + std::vector<UINT8> data(0x8000); int i; common_init(1); diff --git a/src/mame/drivers/goldstar.cpp b/src/mame/drivers/goldstar.cpp index 01636756c80..9369b45b194 100644 --- a/src/mame/drivers/goldstar.cpp +++ b/src/mame/drivers/goldstar.cpp @@ -14929,7 +14929,7 @@ void cb3_state::do_blockswaps(UINT8* ROM) 0xa000, 0xa800, 0xb000, 0xb800, }; - dynamic_buffer buffer(0x10000); + std::vector<UINT8> buffer(0x10000); memcpy(&buffer[0], ROM, 0x10000); // swap some 0x800 blocks around.. diff --git a/src/mame/drivers/hng64.cpp b/src/mame/drivers/hng64.cpp index 6f3a85b5f35..b5f013580ba 100644 --- a/src/mame/drivers/hng64.cpp +++ b/src/mame/drivers/hng64.cpp @@ -1374,7 +1374,7 @@ static void hng64_reorder( UINT8* gfxregion, size_t gfxregionsize) // reorder them UINT8 tilesize = 4*8; // 4 bytes per line, 8 lines - dynamic_buffer buffer(gfxregionsize); + std::vector<UINT8> buffer(gfxregionsize); for (int i = 0; i < gfxregionsize/2; i += tilesize) { diff --git a/src/mame/drivers/homelab.cpp b/src/mame/drivers/homelab.cpp index 165537897b2..2efc82859f4 100644 --- a/src/mame/drivers/homelab.cpp +++ b/src/mame/drivers/homelab.cpp @@ -651,7 +651,7 @@ QUICKLOAD_LOAD_MEMBER( homelab_state,homelab) UINT16 quick_addr; UINT16 quick_length; UINT16 quick_end; - dynamic_buffer quick_data; + std::vector<UINT8> quick_data; char pgmname[256]; UINT16 args[2]; int read_; diff --git a/src/mame/drivers/igs011.cpp b/src/mame/drivers/igs011.cpp index d615313c397..80dd5d8e91f 100644 --- a/src/mame/drivers/igs011.cpp +++ b/src/mame/drivers/igs011.cpp @@ -985,7 +985,7 @@ void igs011_state::lhb2_decrypt_gfx() int i; unsigned rom_size = 0x200000; UINT8 *src = (UINT8 *) (memregion("blitter")->base()); - dynamic_buffer result_data(rom_size); + std::vector<UINT8> result_data(rom_size); for (i=0; i<rom_size; i++) result_data[i] = src[BITSWAP24(i, 23,22,21,20, 19, 17,16,15, 13,12, 10,9,8,7,6,5,4, 2,1, 3, 11, 14, 18, 0)]; @@ -998,7 +998,7 @@ void igs011_state::drgnwrld_gfx_decrypt() int i; unsigned rom_size = 0x400000; UINT8 *src = (UINT8 *) (memregion("blitter")->base()); - dynamic_buffer result_data(rom_size); + std::vector<UINT8> result_data(rom_size); for (i=0; i<rom_size; i++) result_data[i] = src[BITSWAP24(i, 23,22,21,20,19,18,17,16,15, 12, 13, 14, 11,10,9,8,7,6,5,4,3,2,1,0)]; diff --git a/src/mame/drivers/igs017.cpp b/src/mame/drivers/igs017.cpp index 8ef0bff0b4a..c2719ef35b9 100644 --- a/src/mame/drivers/igs017.cpp +++ b/src/mame/drivers/igs017.cpp @@ -435,7 +435,7 @@ void igs017_state::mgcs_decrypt_tiles() { int length = memregion("tilemaps")->bytes(); UINT8 *rom = memregion("tilemaps")->base(); - dynamic_buffer tmp(length); + std::vector<UINT8> tmp(length); int i; memcpy(&tmp[0],rom,length); @@ -495,7 +495,7 @@ void igs017_state::tarzan_decrypt_tiles() { int length = memregion("tilemaps")->bytes(); UINT8 *rom = memregion("tilemaps")->base(); - dynamic_buffer tmp(length); + std::vector<UINT8> tmp(length); int i; memcpy(&tmp[0],rom,length); @@ -752,7 +752,7 @@ void igs017_state::lhzb2_decrypt_tiles() { int length = memregion("tilemaps")->bytes(); UINT8 *rom = memregion("tilemaps")->base(); - dynamic_buffer tmp(length); + std::vector<UINT8> tmp(length); int i; int addr; @@ -977,7 +977,7 @@ void igs017_state::slqz2_decrypt_tiles() { int length = memregion("tilemaps")->bytes(); UINT8 *rom = memregion("tilemaps")->base(); - dynamic_buffer tmp(length); + std::vector<UINT8> tmp(length); int i; memcpy(&tmp[0],rom,length); diff --git a/src/mame/drivers/igs_m027.cpp b/src/mame/drivers/igs_m027.cpp index 48d85476b15..3edc07d09fb 100644 --- a/src/mame/drivers/igs_m027.cpp +++ b/src/mame/drivers/igs_m027.cpp @@ -208,7 +208,7 @@ void igs_m027_state::sdwx_gfx_decrypt() int i; unsigned rom_size = 0x80000; UINT8 *src = (UINT8 *) (memregion("tilemaps")->base()); - dynamic_buffer result_data(rom_size); + std::vector<UINT8> result_data(rom_size); for (i=0; i<rom_size; i++) result_data[i] = src[BITSWAP24(i, 23,22,21,20,19,18,17,16,15,14,13,12,11,8,7,6,10,9,5,4,3,2,1,0)]; diff --git a/src/mame/drivers/igspoker.cpp b/src/mame/drivers/igspoker.cpp index 8d976347e73..183088c3b78 100644 --- a/src/mame/drivers/igspoker.cpp +++ b/src/mame/drivers/igspoker.cpp @@ -2476,7 +2476,7 @@ DRIVER_INIT_MEMBER(igspoker_state,number10) /* Descramble graphic */ rom = memregion("gfx1")->base(); length = memregion("gfx1")->bytes(); - dynamic_buffer tmp(length); + std::vector<UINT8> tmp(length); memcpy(&tmp[0],rom,length); for (A = 0; A < length; A++) { diff --git a/src/mame/drivers/instruct.cpp b/src/mame/drivers/instruct.cpp index f4183a91466..13b7a632296 100644 --- a/src/mame/drivers/instruct.cpp +++ b/src/mame/drivers/instruct.cpp @@ -339,7 +339,7 @@ QUICKLOAD_LOAD_MEMBER( instruct_state, instruct ) } else { - dynamic_buffer quick_data(quick_length); + std::vector<UINT8> quick_data(quick_length); read_ = image.fread( &quick_data[0], quick_length); if (read_ != quick_length) { diff --git a/src/mame/drivers/jclub2.cpp b/src/mame/drivers/jclub2.cpp index 6d723807db8..daae934128e 100644 --- a/src/mame/drivers/jclub2.cpp +++ b/src/mame/drivers/jclub2.cpp @@ -1309,7 +1309,7 @@ DRIVER_INIT_MEMBER(darkhors_state,darkhors) if (eeprom != 0x00) { size_t len = memregion("eeprom")->bytes(); - dynamic_buffer temp(len); + std::vector<UINT8> temp(len); int i; for (i = 0; i < len; i++) temp[i] = eeprom[BITSWAP8(i,7,5,4,3,2,1,0,6)]; diff --git a/src/mame/drivers/kas89.cpp b/src/mame/drivers/kas89.cpp index e7f7c8305f7..206c51dfff5 100644 --- a/src/mame/drivers/kas89.cpp +++ b/src/mame/drivers/kas89.cpp @@ -842,7 +842,7 @@ DRIVER_INIT_MEMBER(kas89_state,kas89) } /* Unscrambling address lines */ - dynamic_buffer buf(memsize); + std::vector<UINT8> buf(memsize); memcpy(&buf[0], mem, memsize); for ( i = 0; i < memsize; i++ ) { diff --git a/src/mame/drivers/legionna.cpp b/src/mame/drivers/legionna.cpp index 08c4480e40b..814603b9900 100644 --- a/src/mame/drivers/legionna.cpp +++ b/src/mame/drivers/legionna.cpp @@ -1053,7 +1053,7 @@ void legionna_state::descramble_legionnaire_gfx(UINT8* src) int len = 0x10000; /* rearrange gfx */ - dynamic_buffer buffer(len); + std::vector<UINT8> buffer(len); { int i; for (i = 0;i < len; i++) diff --git a/src/mame/drivers/lynx.cpp b/src/mame/drivers/lynx.cpp index d878481b464..b6d6fa5349d 100644 --- a/src/mame/drivers/lynx.cpp +++ b/src/mame/drivers/lynx.cpp @@ -152,7 +152,7 @@ ROM_END QUICKLOAD_LOAD_MEMBER( lynx_state, lynx ) { address_space &space = m_maincpu->space(AS_PROGRAM); - dynamic_buffer data; + std::vector<UINT8> data; UINT8 *rom = memregion("maincpu")->base(); UINT8 header[10]; // 80 08 dw Start dw Len B S 9 3 UINT16 start, length; diff --git a/src/mame/drivers/megadriv.cpp b/src/mame/drivers/megadriv.cpp index 8630eb72396..c66df4adb8d 100644 --- a/src/mame/drivers/megadriv.cpp +++ b/src/mame/drivers/megadriv.cpp @@ -527,7 +527,7 @@ DRIVER_INIT_MEMBER(md_cons_state, md_jpn) DEVICE_IMAGE_LOAD_MEMBER( md_cons_state, _32x_cart ) { UINT32 length; - dynamic_buffer temp_copy; + std::vector<UINT8> temp_copy; UINT16 *ROM16; UINT32 *ROM32; int i; diff --git a/src/mame/drivers/megasys1.cpp b/src/mame/drivers/megasys1.cpp index d261df9b46e..842a07ee80f 100644 --- a/src/mame/drivers/megasys1.cpp +++ b/src/mame/drivers/megasys1.cpp @@ -4099,7 +4099,7 @@ void megasys1_state::rodland_gfx_unmangle(const char *region) | ((rom[i] & 0x48) << 1) | ((rom[i] & 0x10) << 2); - dynamic_buffer buffer(size); + std::vector<UINT8> buffer(size); memcpy(&buffer[0],rom,size); @@ -4125,7 +4125,7 @@ void megasys1_state::jitsupro_gfx_unmangle(const char *region) for (i = 0;i < size;i++) rom[i] = BITSWAP8(rom[i],0x4,0x3,0x5,0x7,0x6,0x2,0x1,0x0); - dynamic_buffer buffer(size); + std::vector<UINT8> buffer(size); memcpy(&buffer[0],rom,size); @@ -4149,7 +4149,7 @@ void megasys1_state::stdragona_gfx_unmangle(const char *region) for (i = 0;i < size;i++) rom[i] = BITSWAP8(rom[i],3,7,5,6,4,2,1,0); - dynamic_buffer buffer(size); + std::vector<UINT8> buffer(size); memcpy(&buffer[0],rom,size); diff --git a/src/mame/drivers/mitchell.cpp b/src/mame/drivers/mitchell.cpp index 8aa3921091d..a92ee546a95 100644 --- a/src/mame/drivers/mitchell.cpp +++ b/src/mame/drivers/mitchell.cpp @@ -2295,7 +2295,7 @@ DRIVER_INIT_MEMBER(mitchell_state,mstworld) { /* descramble the program rom .. */ int len = memregion("maincpu")->bytes(); - dynamic_buffer source(len); + std::vector<UINT8> source(len); UINT8* dst = memregion("maincpu")->base() ; int x; diff --git a/src/mame/drivers/multfish.cpp b/src/mame/drivers/multfish.cpp index 0cc66d4c57a..b913573702b 100644 --- a/src/mame/drivers/multfish.cpp +++ b/src/mame/drivers/multfish.cpp @@ -435,7 +435,7 @@ A12 <-> A13 UINT32 i,j,jscr,romoffset; UINT8 *igrosoft_gamble_gfx = memregion("gfx")->base(); - dynamic_buffer temprom(igrosoft_gamble_ROM_SIZE); + std::vector<UINT8> temprom(igrosoft_gamble_ROM_SIZE); /* ROM 1 decode */ @@ -506,7 +506,7 @@ static inline void rom_decodeh(UINT8 *romptr, UINT8 *tmprom, UINT8 xor_data, UIN static void lottery_decode(running_machine &machine, UINT8 xor12, UINT8 xor34, UINT8 xor56, UINT8 xor78, UINT32 xor_addr) { UINT8 *igrosoft_gamble_gfx = machine.root_device().memregion("gfx")->base(); - dynamic_buffer temprom(igrosoft_gamble_ROM_SIZE); + std::vector<UINT8> temprom(igrosoft_gamble_ROM_SIZE); /* ROMs decode */ rom_decodel(&igrosoft_gamble_gfx[0x000000], &temprom[0], xor12, xor_addr); @@ -545,7 +545,7 @@ static inline void roment_decodeh(UINT8 *romptr, UINT8 *tmprom, UINT8 xor_data, static void ent_decode(running_machine &machine, UINT8 xor12, UINT8 xor34, UINT8 xor56, UINT8 xor78, UINT32 xor_addr) { UINT8 *igrosoft_gamble_gfx = machine.root_device().memregion("gfx")->base(); - dynamic_buffer temprom(igrosoft_gamble_ROM_SIZE); + std::vector<UINT8> temprom(igrosoft_gamble_ROM_SIZE); /* ROMs decode */ roment_decodel(&igrosoft_gamble_gfx[0x000000], &temprom[0], xor12, xor_addr); diff --git a/src/mame/drivers/multigam.cpp b/src/mame/drivers/multigam.cpp index 3fbb31d4c79..e3f72a883a0 100644 --- a/src/mame/drivers/multigam.cpp +++ b/src/mame/drivers/multigam.cpp @@ -1420,7 +1420,7 @@ DRIVER_INIT_MEMBER(multigam_state,multigmt) { address_space &space = m_maincpu->space(AS_PROGRAM); - dynamic_buffer buf(0x80000); + std::vector<UINT8> buf(0x80000); UINT8 *rom; int size; int i; diff --git a/src/mame/drivers/mustache.cpp b/src/mame/drivers/mustache.cpp index b5c2d31db76..5703c6ffb74 100644 --- a/src/mame/drivers/mustache.cpp +++ b/src/mame/drivers/mustache.cpp @@ -239,7 +239,7 @@ DRIVER_INIT_MEMBER(mustache_state,mustache) int G2 = memregion("gfx2")->bytes()/2; UINT8 *gfx1 = memregion("gfx1")->base(); UINT8 *gfx2 = memregion("gfx2")->base(); - dynamic_buffer buf(G2*2); + std::vector<UINT8> buf(G2*2); /* BG data lines */ for (i=0;i<G1; i++) diff --git a/src/mame/drivers/namcos86.cpp b/src/mame/drivers/namcos86.cpp index 97b4dddd6bf..a2bd0bf6ca3 100644 --- a/src/mame/drivers/namcos86.cpp +++ b/src/mame/drivers/namcos86.cpp @@ -1673,7 +1673,7 @@ DRIVER_INIT_MEMBER(namcos86_state,namco86) size = memregion("gfx1")->bytes() * 2 / 3; { - dynamic_buffer buffer( size ); + std::vector<UINT8> buffer( size ); UINT8 *dest1 = gfx; UINT8 *dest2 = gfx + ( size / 2 ); UINT8 *mono = gfx + size; @@ -1696,7 +1696,7 @@ DRIVER_INIT_MEMBER(namcos86_state,namco86) size = memregion("gfx2")->bytes() * 2 / 3; { - dynamic_buffer buffer( size ); + std::vector<UINT8> buffer( size ); UINT8 *dest1 = gfx; UINT8 *dest2 = gfx + ( size / 2 ); UINT8 *mono = gfx + size; diff --git a/src/mame/drivers/neopcb.cpp b/src/mame/drivers/neopcb.cpp index f2802a5070b..199b2fab29f 100644 --- a/src/mame/drivers/neopcb.cpp +++ b/src/mame/drivers/neopcb.cpp @@ -242,7 +242,7 @@ void neopcb_state::svcpcb_gfx_decrypt() static const UINT8 xorval[4] = { 0x34, 0x21, 0xc4, 0xe9 }; int rom_size = memregion("sprites")->bytes(); UINT8 *rom = memregion("sprites")->base(); - dynamic_buffer buf(rom_size); + std::vector<UINT8> buf(rom_size); for (int i = 0; i < rom_size; i++) rom[i] ^= xorval[(i % 4)]; @@ -286,7 +286,7 @@ void neopcb_state::kf2k3pcb_gfx_decrypt() static const UINT8 xorval[4] = { 0x34, 0x21, 0xc4, 0xe9 }; int rom_size = memregion("sprites")->bytes(); UINT8 *rom = memregion("sprites")->base(); - dynamic_buffer buf(rom_size); + std::vector<UINT8> buf(rom_size); for (int i = 0; i < rom_size; i++) rom[ i ] ^= xorval[ (i % 4) ]; diff --git a/src/mame/drivers/ninjakd2.cpp b/src/mame/drivers/ninjakd2.cpp index 17b9bf4466b..2d0d58f4df4 100644 --- a/src/mame/drivers/ninjakd2.cpp +++ b/src/mame/drivers/ninjakd2.cpp @@ -1578,7 +1578,7 @@ void ninjakd2_state::lineswap_gfx_roms(const char *region, const int bit) { const int length = memregion(region)->bytes(); UINT8* const src = memregion(region)->base(); - dynamic_buffer temp(length); + std::vector<UINT8> temp(length); const int mask = (1 << (bit + 1)) - 1; for (int sa = 0; sa < length; sa++) diff --git a/src/mame/drivers/nmk16.cpp b/src/mame/drivers/nmk16.cpp index 00554d1a95c..6f75d9c5b69 100644 --- a/src/mame/drivers/nmk16.cpp +++ b/src/mame/drivers/nmk16.cpp @@ -5318,7 +5318,7 @@ static void decryptcode( running_machine &machine, int a23, int a22, int a21, in int i; UINT8 *RAM = machine.root_device().memregion( "maincpu" )->base(); size_t size = machine.root_device().memregion( "maincpu" )->bytes(); - dynamic_buffer buffer( size ); + std::vector<UINT8> buffer( size ); memcpy( &buffer[0], RAM, size ); for( i = 0; i < size; i++ ) diff --git a/src/mame/drivers/nova2001.cpp b/src/mame/drivers/nova2001.cpp index 4c8f3f174d9..fc1e89f98c0 100644 --- a/src/mame/drivers/nova2001.cpp +++ b/src/mame/drivers/nova2001.cpp @@ -977,7 +977,7 @@ void nova2001_state::lineswap_gfx_roms(const char *region, const int bit) UINT8* const src = memregion(region)->base(); - dynamic_buffer temp(length); + std::vector<UINT8> temp(length); const int mask = (1 << (bit + 1)) - 1; diff --git a/src/mame/drivers/panicr.cpp b/src/mame/drivers/panicr.cpp index a7035b9458f..8da2c984c08 100644 --- a/src/mame/drivers/panicr.cpp +++ b/src/mame/drivers/panicr.cpp @@ -714,7 +714,7 @@ ROM_END DRIVER_INIT_MEMBER(panicr_state,panicr) { - dynamic_buffer buf(0x80000); + std::vector<UINT8> buf(0x80000); UINT8 *rom; int size; int i,j; diff --git a/src/mame/drivers/pegasus.cpp b/src/mame/drivers/pegasus.cpp index 4a760e80320..fe4f163d20f 100644 --- a/src/mame/drivers/pegasus.cpp +++ b/src/mame/drivers/pegasus.cpp @@ -391,7 +391,7 @@ void pegasus_state::pegasus_decrypt_rom(UINT8 *ROM) bool doit = FALSE; UINT8 b; UINT16 j; - dynamic_buffer temp_copy; + std::vector<UINT8> temp_copy; temp_copy.resize(0x1000); if (ROM[0] == 0x02) doit = TRUE; diff --git a/src/mame/drivers/pengadvb.cpp b/src/mame/drivers/pengadvb.cpp index c27e512743f..647754bff02 100644 --- a/src/mame/drivers/pengadvb.cpp +++ b/src/mame/drivers/pengadvb.cpp @@ -288,7 +288,7 @@ void pengadvb_state::pengadvb_decrypt(const char* region) } // address line swap - dynamic_buffer buf(memsize); + std::vector<UINT8> buf(memsize); memcpy(&buf[0], mem, memsize); for (int i = 0; i < memsize; i++) { diff --git a/src/mame/drivers/peoplepc.cpp b/src/mame/drivers/peoplepc.cpp index 2146472f4e2..b3da96d75d6 100644 --- a/src/mame/drivers/peoplepc.cpp +++ b/src/mame/drivers/peoplepc.cpp @@ -44,7 +44,7 @@ public: required_device<gfxdecode_device> m_gfxdecode; required_shared_ptr<UINT16> m_gvram; required_shared_ptr<UINT16> m_cvram; - dynamic_buffer m_charram; + std::vector<UINT8> m_charram; MC6845_UPDATE_ROW(update_row); DECLARE_READ8_MEMBER(get_slave_ack); diff --git a/src/mame/drivers/phunsy.cpp b/src/mame/drivers/phunsy.cpp index d4693194ee6..753c15ac08e 100644 --- a/src/mame/drivers/phunsy.cpp +++ b/src/mame/drivers/phunsy.cpp @@ -282,7 +282,7 @@ QUICKLOAD_LOAD_MEMBER( phunsy_state, phunsy ) address_space &space = m_maincpu->space(AS_PROGRAM); UINT16 i; UINT16 quick_addr = 0x1800; - dynamic_buffer quick_data; + std::vector<UINT8> quick_data; image_init_result result = image_init_result::FAIL; int quick_length = image.length(); if (quick_length > 0x4000) diff --git a/src/mame/drivers/pipbug.cpp b/src/mame/drivers/pipbug.cpp index fd2bd2748fd..9088b21663f 100644 --- a/src/mame/drivers/pipbug.cpp +++ b/src/mame/drivers/pipbug.cpp @@ -96,7 +96,7 @@ QUICKLOAD_LOAD_MEMBER( pipbug_state, pipbug ) int quick_addr = 0x440; int exec_addr; int quick_length; - dynamic_buffer quick_data; + std::vector<UINT8> quick_data; int read_; image_init_result result = image_init_result::FAIL; diff --git a/src/mame/drivers/pirates.cpp b/src/mame/drivers/pirates.cpp index d0fe75dd6ad..99732d01edc 100644 --- a/src/mame/drivers/pirates.cpp +++ b/src/mame/drivers/pirates.cpp @@ -380,7 +380,7 @@ void pirates_state::decrypt_p() rom_size = memregion("gfx1")->bytes(); - dynamic_buffer buf(rom_size); + std::vector<UINT8> buf(rom_size); rom = memregion("gfx1")->base(); memcpy (&buf[0], rom, rom_size); @@ -403,7 +403,7 @@ void pirates_state::decrypt_s() rom_size = memregion("gfx2")->bytes(); - dynamic_buffer buf(rom_size); + std::vector<UINT8> buf(rom_size); rom = memregion("gfx2")->base(); memcpy (&buf[0], rom, rom_size); @@ -427,7 +427,7 @@ void pirates_state::decrypt_oki() rom_size = memregion("oki")->bytes(); - dynamic_buffer buf(rom_size); + std::vector<UINT8> buf(rom_size); rom = memregion("oki")->base(); memcpy (&buf[0], rom, rom_size); diff --git a/src/mame/drivers/popeye.cpp b/src/mame/drivers/popeye.cpp index 2d14f2edaae..09c70226e16 100644 --- a/src/mame/drivers/popeye.cpp +++ b/src/mame/drivers/popeye.cpp @@ -725,7 +725,7 @@ DRIVER_INIT_MEMBER(popeye_state,skyskipr) /* decrypt the program ROMs */ { - dynamic_buffer buffer(len); + std::vector<UINT8> buffer(len); int i; for (i = 0;i < len; i++) buffer[i] = BITSWAP8(rom[BITSWAP16(i,15,14,13,12,11,10,8,7,0,1,2,4,5,9,3,6) ^ 0xfc],3,4,2,5,1,6,0,7); @@ -744,7 +744,7 @@ DRIVER_INIT_MEMBER(popeye_state,popeye) /* decrypt the program ROMs */ { - dynamic_buffer buffer(len); + std::vector<UINT8> buffer(len); int i; for (i = 0;i < len; i++) buffer[i] = BITSWAP8(rom[BITSWAP16(i,15,14,13,12,11,10,8,7,6,3,9,5,4,2,1,0) ^ 0x3f],3,4,2,5,1,6,0,7); diff --git a/src/mame/drivers/r2dx_v33.cpp b/src/mame/drivers/r2dx_v33.cpp index cd6e0eabdc5..934a024d0d7 100644 --- a/src/mame/drivers/r2dx_v33.cpp +++ b/src/mame/drivers/r2dx_v33.cpp @@ -884,7 +884,7 @@ DRIVER_INIT_MEMBER(r2dx_v33_state,zerotm2k) UINT8 *src = memregion("gfx2")->base()+0x100000; int len = 0x080000; - dynamic_buffer buffer(len); + std::vector<UINT8> buffer(len); int i; for (i = 0; i < len; i ++) buffer[i] = src[BITSWAP32(i,31,30,29,28,27,26,25,24,23,22,21,20,19,18,17,16,15,14,13,12,11,10,9,8,7,5,6,4,3,2,1,0)]; diff --git a/src/mame/drivers/ravens.cpp b/src/mame/drivers/ravens.cpp index b49cdf6a5cb..fba58a10221 100644 --- a/src/mame/drivers/ravens.cpp +++ b/src/mame/drivers/ravens.cpp @@ -267,7 +267,7 @@ QUICKLOAD_LOAD_MEMBER( ravens_state, ravens ) int quick_addr = 0x900; int exec_addr; int quick_length; - dynamic_buffer quick_data; + std::vector<UINT8> quick_data; int read_; image_init_result result = image_init_result::FAIL; diff --git a/src/mame/drivers/rex6000.cpp b/src/mame/drivers/rex6000.cpp index 9de79b0adeb..509a6d69449 100644 --- a/src/mame/drivers/rex6000.cpp +++ b/src/mame/drivers/rex6000.cpp @@ -143,7 +143,7 @@ public: UINT32 screen_update_oz(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); private: - int oz_wzd_extract_tag(const dynamic_buffer &data, const char *tag, char *dest_buf); + int oz_wzd_extract_tag(const std::vector<UINT8> &data, const char *tag, char *dest_buf); UINT16 m_kb_mask; }; @@ -705,7 +705,7 @@ QUICKLOAD_LOAD_MEMBER( rex6000_state,rex6000) static const char magic[] = "ApplicationName:Addin"; UINT32 img_start = 0; - dynamic_buffer data(image.length()); + std::vector<UINT8> data(image.length()); image.fread(&data[0], image.length()); if(strncmp((const char*)&data[0], magic, 21)) @@ -720,7 +720,7 @@ QUICKLOAD_LOAD_MEMBER( rex6000_state,rex6000) return image_init_result::PASS; } -int oz750_state::oz_wzd_extract_tag(const dynamic_buffer &data, const char *tag, char *dest_buf) +int oz750_state::oz_wzd_extract_tag(const std::vector<UINT8> &data, const char *tag, char *dest_buf) { int tag_len = strlen(tag); UINT32 img_start = 0; @@ -755,7 +755,7 @@ int oz750_state::oz_wzd_extract_tag(const dynamic_buffer &data, const char *tag, QUICKLOAD_LOAD_MEMBER(oz750_state,oz750) { address_space* flash = &machine().device("flash0a")->memory().space(0); - dynamic_buffer data(image.length()); + std::vector<UINT8> data(image.length()); image.fread(&data[0], image.length()); const char *fs_type = "BSIC"; diff --git a/src/mame/drivers/segag80r.cpp b/src/mame/drivers/segag80r.cpp index 790f25e8ede..1ec19493e82 100644 --- a/src/mame/drivers/segag80r.cpp +++ b/src/mame/drivers/segag80r.cpp @@ -1410,7 +1410,7 @@ void segag80r_state::monsterb_expand_gfx(const char *region) /* expand the background ROMs; A11/A12 of each ROM is independently controlled via */ /* banking */ dest = memregion(region)->base(); - dynamic_buffer temp(0x4000); + std::vector<UINT8> temp(0x4000); memcpy(&temp[0], dest, 0x4000); /* 16 effective total banks */ diff --git a/src/mame/drivers/seta.cpp b/src/mame/drivers/seta.cpp index b1b479b72e7..170c3abbce1 100644 --- a/src/mame/drivers/seta.cpp +++ b/src/mame/drivers/seta.cpp @@ -11473,7 +11473,7 @@ DRIVER_INIT_MEMBER(seta_state,blandia) int rpos; rom_size = 0x80000; - dynamic_buffer buf(rom_size); + std::vector<UINT8> buf(rom_size); rom = memregion("gfx2")->base() + 0x40000; diff --git a/src/mame/drivers/simpl156.cpp b/src/mame/drivers/simpl156.cpp index 942d6dad243..e1738fa3468 100644 --- a/src/mame/drivers/simpl156.cpp +++ b/src/mame/drivers/simpl156.cpp @@ -1019,7 +1019,7 @@ DRIVER_INIT_MEMBER(simpl156_state,simpl156) { UINT8 *rom = memregion("okimusic")->base(); int length = memregion("okimusic")->bytes(); - dynamic_buffer buf1(length); + std::vector<UINT8> buf1(length); UINT32 x; diff --git a/src/mame/drivers/snowbros.cpp b/src/mame/drivers/snowbros.cpp index 4938d92f65e..8b87ba5efb4 100644 --- a/src/mame/drivers/snowbros.cpp +++ b/src/mame/drivers/snowbros.cpp @@ -2788,7 +2788,7 @@ DRIVER_INIT_MEMBER(snowbros_state,4in1boot) /* strange order */ { - dynamic_buffer buffer(len); + std::vector<UINT8> buffer(len); int i; for (i = 0;i < len; i++) if (i&1) buffer[i] = BITSWAP8(src[i],6,7,5,4,3,2,1,0); @@ -2802,7 +2802,7 @@ DRIVER_INIT_MEMBER(snowbros_state,4in1boot) /* strange order */ { - dynamic_buffer buffer(len); + std::vector<UINT8> buffer(len); int i; for (i = 0;i < len; i++) buffer[i] = src[i^0x4000]; @@ -2818,7 +2818,7 @@ DRIVER_INIT_MEMBER(snowbros_state,snowbro3) /* strange order */ { - dynamic_buffer buffer(len); + std::vector<UINT8> buffer(len); int i; for (i = 0;i < len; i++) buffer[i] = src[BITSWAP24(i,23,22,21,20,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5,3,4,1,2,0)]; diff --git a/src/mame/drivers/speedbal.cpp b/src/mame/drivers/speedbal.cpp index 354e0380446..0f92ffc75a1 100644 --- a/src/mame/drivers/speedbal.cpp +++ b/src/mame/drivers/speedbal.cpp @@ -293,7 +293,7 @@ DRIVER_INIT_MEMBER(speedbal_state,speedbal) { // sprite tiles are in an odd order, rearrange to simplify video drawing function UINT8* rom = memregion("sprites")->base(); - dynamic_buffer temp(0x200*128); + std::vector<UINT8> temp(0x200*128); for (int i=0;i<0x200;i++) { diff --git a/src/mame/drivers/supracan.cpp b/src/mame/drivers/supracan.cpp index 1b7c07036cc..bff1ed72fd6 100644 --- a/src/mame/drivers/supracan.cpp +++ b/src/mame/drivers/supracan.cpp @@ -165,7 +165,7 @@ public: emu_timer *m_line_on_timer; emu_timer *m_line_off_timer; - dynamic_buffer m_vram_addr_swapped; + std::vector<UINT8> m_vram_addr_swapped; UINT16 *m_pram; diff --git a/src/mame/drivers/tcl.cpp b/src/mame/drivers/tcl.cpp index 46f6f537572..a951a646e47 100644 --- a/src/mame/drivers/tcl.cpp +++ b/src/mame/drivers/tcl.cpp @@ -173,7 +173,7 @@ DRIVER_INIT_MEMBER(tcl_state,tcl) UINT8 *dest = memregion("maincpu")->base(); int len = memregion("maincpu")->bytes(); - dynamic_buffer src(len); + std::vector<UINT8> src(len); int i,idx=0; memcpy(&src[0], dest, len); diff --git a/src/mame/drivers/timex.cpp b/src/mame/drivers/timex.cpp index 5fd75e50487..8b63f982b80 100644 --- a/src/mame/drivers/timex.cpp +++ b/src/mame/drivers/timex.cpp @@ -606,7 +606,7 @@ DEVICE_IMAGE_LOAD_MEMBER( spectrum_state, timex_cart ) { UINT8 *DOCK; int chunks_in_file = 0; - dynamic_buffer header; + std::vector<UINT8> header; header.resize(9); if (size % 0x2000 != 9) diff --git a/src/mame/drivers/toki.cpp b/src/mame/drivers/toki.cpp index f3616913453..890280abee3 100644 --- a/src/mame/drivers/toki.cpp +++ b/src/mame/drivers/toki.cpp @@ -857,7 +857,7 @@ ROM_END DRIVER_INIT_MEMBER(toki_state,toki) { UINT8 *ROM = memregion("oki")->base(); - dynamic_buffer buffer(0x20000); + std::vector<UINT8> buffer(0x20000); int i; memcpy(&buffer[0],ROM,0x20000); @@ -870,7 +870,7 @@ DRIVER_INIT_MEMBER(toki_state,toki) DRIVER_INIT_MEMBER(toki_state,tokib) { - dynamic_buffer temp(65536 * 2); + std::vector<UINT8> temp(65536 * 2); int i, offs, len; UINT8 *rom; @@ -941,7 +941,7 @@ DRIVER_INIT_MEMBER(toki_state,jujuba) { UINT8 *ROM = memregion("oki")->base(); - dynamic_buffer buffer(0x20000); + std::vector<UINT8> buffer(0x20000); int i; memcpy(&buffer[0],ROM,0x20000); diff --git a/src/mame/drivers/travrusa.cpp b/src/mame/drivers/travrusa.cpp index 53d32598de5..50e099d023c 100644 --- a/src/mame/drivers/travrusa.cpp +++ b/src/mame/drivers/travrusa.cpp @@ -578,7 +578,7 @@ DRIVER_INIT_MEMBER(travrusa_state,motorace) { int A, j; UINT8 *rom = memregion("maincpu")->base(); - dynamic_buffer buffer(0x2000); + std::vector<UINT8> buffer(0x2000); memcpy(&buffer[0], rom, 0x2000); diff --git a/src/mame/drivers/uzebox.cpp b/src/mame/drivers/uzebox.cpp index 6e64f590e0b..fdfc00d374a 100644 --- a/src/mame/drivers/uzebox.cpp +++ b/src/mame/drivers/uzebox.cpp @@ -249,7 +249,7 @@ DEVICE_IMAGE_LOAD_MEMBER(uzebox_state, uzebox_cart) if (image.software_entry() == nullptr) { - dynamic_buffer data(size); + std::vector<UINT8> data(size); image.fread(&data[0], size); if (!strncmp((const char*)&data[0], "UZEBOX", 6)) diff --git a/src/mame/drivers/vc4000.cpp b/src/mame/drivers/vc4000.cpp index 66f1886b584..b8ae5425103 100644 --- a/src/mame/drivers/vc4000.cpp +++ b/src/mame/drivers/vc4000.cpp @@ -400,7 +400,7 @@ QUICKLOAD_LOAD_MEMBER( vc4000_state,vc4000) int i; int exec_addr; int quick_length; - dynamic_buffer quick_data; + std::vector<UINT8> quick_data; int read_; image_init_result result = image_init_result::FAIL; diff --git a/src/mame/drivers/wecleman.cpp b/src/mame/drivers/wecleman.cpp index 49253d6fdbd..4f5bac41fc5 100644 --- a/src/mame/drivers/wecleman.cpp +++ b/src/mame/drivers/wecleman.cpp @@ -1376,7 +1376,7 @@ void wecleman_state::wecleman_unpack_sprites() void wecleman_state::bitswap(UINT8 *src,size_t len,int _14,int _13,int _12,int _11,int _10,int _f,int _e,int _d,int _c,int _b,int _a,int _9,int _8,int _7,int _6,int _5,int _4,int _3,int _2,int _1,int _0) { - dynamic_buffer buffer(len); + std::vector<UINT8> buffer(len); int i; memcpy(&buffer[0],src,len); @@ -1655,7 +1655,7 @@ void wecleman_state::hotchase_sprite_decode( int num16_banks, int bank_size ) int i; base = memregion("gfx1")->base(); // sprites - dynamic_buffer temp( bank_size ); + std::vector<UINT8> temp( bank_size ); for( i = num16_banks; i >0; i-- ){ UINT8 *finish = base + 2*bank_size*i; diff --git a/src/mame/drivers/wink.cpp b/src/mame/drivers/wink.cpp index 2ea760fd7b1..44780a64522 100644 --- a/src/mame/drivers/wink.cpp +++ b/src/mame/drivers/wink.cpp @@ -428,7 +428,7 @@ DRIVER_INIT_MEMBER(wink_state,wink) { UINT32 i; UINT8 *ROM = memregion("maincpu")->base(); - dynamic_buffer buffer(0x8000); + std::vector<UINT8> buffer(0x8000); // protection module reverse engineered by HIGHWAYMAN diff --git a/src/mame/includes/advision.h b/src/mame/includes/advision.h index 125d57443ed..5912479f15c 100644 --- a/src/mame/includes/advision.h +++ b/src/mame/includes/advision.h @@ -65,7 +65,7 @@ public: int m_ea_bank; /* external RAM state */ - dynamic_buffer m_ext_ram; + std::vector<UINT8> m_ext_ram; int m_rambank; /* video state */ @@ -75,7 +75,7 @@ public: int m_video_bank; int m_video_hpos; UINT8 m_led_latch[8]; - dynamic_buffer m_display; + std::vector<UINT8> m_display; /* sound state */ int m_sound_cmd; diff --git a/src/mame/machine/amstrad.cpp b/src/mame/machine/amstrad.cpp index 07c5d060fe9..1cda012e914 100644 --- a/src/mame/machine/amstrad.cpp +++ b/src/mame/machine/amstrad.cpp @@ -3262,7 +3262,7 @@ MACHINE_RESET_MEMBER(amstrad_state,aleste) /* load snapshot */ SNAPSHOT_LOAD_MEMBER( amstrad_state,amstrad) { - dynamic_buffer snapshot; + std::vector<UINT8> snapshot; /* get file size */ if (snapshot_size < 8) @@ -3338,7 +3338,7 @@ DEVICE_IMAGE_LOAD_MEMBER(amstrad_state, amstrad_plus_cartridge) UINT32 offset = 0; UINT8 *crt = m_cart->get_rom_base(); - dynamic_buffer temp_copy; + std::vector<UINT8> temp_copy; temp_copy.resize(size); image.fread(&temp_copy[0], size); diff --git a/src/mame/machine/atarigen.h b/src/mame/machine/atarigen.h index ea8bc30a681..b73eb42dd50 100644 --- a/src/mame/machine/atarigen.h +++ b/src/mame/machine/atarigen.h @@ -391,7 +391,7 @@ public: UINT8 m_slapstic_num; UINT16 * m_slapstic; UINT8 m_slapstic_bank; - dynamic_buffer m_slapstic_bank0; + std::vector<UINT8> m_slapstic_bank0; offs_t m_slapstic_last_pc; offs_t m_slapstic_last_address; offs_t m_slapstic_base; diff --git a/src/mame/machine/bfm_comn.cpp b/src/mame/machine/bfm_comn.cpp index 9b917a75914..1faa709b40a 100644 --- a/src/mame/machine/bfm_comn.cpp +++ b/src/mame/machine/bfm_comn.cpp @@ -26,7 +26,7 @@ void bfm_decode_mainrom(running_machine &machine, const char *rom_region, UINT8* rom = machine.root_device().memregion(rom_region)->base(); { - dynamic_buffer tmp(0x10000); + std::vector<UINT8> tmp(0x10000); int i; memcpy(&tmp[0], rom, 0x10000); diff --git a/src/mame/machine/cbm_snqk.cpp b/src/mame/machine/cbm_snqk.cpp index f8a481a6143..988575ae54e 100644 --- a/src/mame/machine/cbm_snqk.cpp +++ b/src/mame/machine/cbm_snqk.cpp @@ -28,7 +28,7 @@ image_init_result general_cbm_loadsnap( device_image_interface &image, const cha address_space &space, offs_t offset, void (*cbm_sethiaddress)(address_space &space, UINT16 hiaddress) ) { char buffer[7]; - dynamic_buffer data; + std::vector<UINT8> data; UINT32 bytesread; UINT16 address = 0; int i; diff --git a/src/mame/machine/cybiko.cpp b/src/mame/machine/cybiko.cpp index bd28cdfd9ee..aa0d116b6dd 100644 --- a/src/mame/machine/cybiko.cpp +++ b/src/mame/machine/cybiko.cpp @@ -48,7 +48,7 @@ QUICKLOAD_LOAD_MEMBER( cybiko_state, cybikoxt ) address_space &dest = m_maincpu->space(AS_PROGRAM); UINT32 size = std::min(image.length(), UINT64(RAMDISK_SIZE)); - dynamic_buffer buffer(size); + std::vector<UINT8> buffer(size); image.fread(&buffer[0], size); for (int byte = 0; byte < size; byte++) dest.write_byte(0x400000 + byte, buffer[byte]); diff --git a/src/mame/machine/jalcrpt.cpp b/src/mame/machine/jalcrpt.cpp index e8e35f33c20..25efbd60f86 100644 --- a/src/mame/machine/jalcrpt.cpp +++ b/src/mame/machine/jalcrpt.cpp @@ -128,7 +128,7 @@ void ms32_rearrange_sprites(running_machine &machine, const char *region) source_data = machine.root_device().memregion ( region )->base(); source_size = machine.root_device().memregion( region )->bytes(); - dynamic_buffer result_data(source_size); + std::vector<UINT8> result_data(source_size); for(i=0; i<source_size; i++) { @@ -150,7 +150,7 @@ void decrypt_ms32_tx(running_machine &machine, int addr_xor,int data_xor, const source_data = machine.root_device().memregion ( region )->base(); source_size = machine.root_device().memregion( region )->bytes(); - dynamic_buffer result_data(source_size); + std::vector<UINT8> result_data(source_size); addr_xor ^= 0x1005d; @@ -201,7 +201,7 @@ void decrypt_ms32_bg(running_machine &machine, int addr_xor,int data_xor, const source_data = machine.root_device().memregion ( region )->base(); source_size = machine.root_device().memregion( region )->bytes(); - dynamic_buffer result_data(source_size); + std::vector<UINT8> result_data(source_size); addr_xor ^= 0xc1c5b; diff --git a/src/mame/machine/kaneko_calc3.cpp b/src/mame/machine/kaneko_calc3.cpp index 48969f7d3ef..dc5014df5cb 100644 --- a/src/mame/machine/kaneko_calc3.cpp +++ b/src/mame/machine/kaneko_calc3.cpp @@ -1552,7 +1552,7 @@ void kaneko_calc3_device::initial_scan_tables() for (x=0;x<numregions;x++) { - dynamic_buffer tmpdstram(0x2000); + std::vector<UINT8> tmpdstram(0x2000); #if VERBOSE_OUTPUT int length; #endif diff --git a/src/mame/machine/kc.cpp b/src/mame/machine/kc.cpp index a097690cc75..81c3dee8c34 100644 --- a/src/mame/machine/kc.cpp +++ b/src/mame/machine/kc.cpp @@ -40,7 +40,7 @@ QUICKLOAD_LOAD_MEMBER( kc_state,kc) if (size == 0) return image_init_result::FAIL; - dynamic_buffer data(size); + std::vector<UINT8> data(size); image.fread( &data[0], size); header = (struct kcc_header *) &data[0]; diff --git a/src/mame/machine/lviv.cpp b/src/mame/machine/lviv.cpp index 54d48c39058..51674216119 100644 --- a/src/mame/machine/lviv.cpp +++ b/src/mame/machine/lviv.cpp @@ -303,7 +303,7 @@ image_verify_result lviv_state::lviv_verify_snapshot(UINT8 * data, UINT32 size) SNAPSHOT_LOAD_MEMBER( lviv_state, lviv ) { - dynamic_buffer lviv_snapshot_data(LVIV_SNAPSHOT_SIZE); + std::vector<UINT8> lviv_snapshot_data(LVIV_SNAPSHOT_SIZE); image.fread( &lviv_snapshot_data[0], LVIV_SNAPSHOT_SIZE); diff --git a/src/mame/machine/microtan.cpp b/src/mame/machine/microtan.cpp index a4d1503aa35..70e50fa87d5 100644 --- a/src/mame/machine/microtan.cpp +++ b/src/mame/machine/microtan.cpp @@ -837,7 +837,7 @@ SNAPSHOT_LOAD_MEMBER( microtan_state, microtan ) QUICKLOAD_LOAD_MEMBER( microtan_state, microtan ) { int snapshot_size = 8263; /* magic size */ - dynamic_buffer snapshot_buff(snapshot_size, 0); + std::vector<UINT8> snapshot_buff(snapshot_size, 0); std::vector<char> buff(quickload_size + 1); image_init_result rc; diff --git a/src/mame/machine/msx_matsushita.h b/src/mame/machine/msx_matsushita.h index 70a30d705a6..8f9d6a3479c 100644 --- a/src/mame/machine/msx_matsushita.h +++ b/src/mame/machine/msx_matsushita.h @@ -39,7 +39,7 @@ private: required_device<nvram_device> m_nvram; devcb_write_line m_turbo_out_cb; UINT16 m_address; - dynamic_buffer m_sram; + std::vector<UINT8> m_sram; UINT8 m_nibble1; UINT8 m_nibble2; UINT8 m_pattern; diff --git a/src/mame/machine/pc9801_86.h b/src/mame/machine/pc9801_86.h index 52dd2eb7227..b29e74f43af 100644 --- a/src/mame/machine/pc9801_86.h +++ b/src/mame/machine/pc9801_86.h @@ -60,7 +60,7 @@ private: required_device<ym2608_device> m_opna; required_device<dac_word_interface> m_ldac; required_device<dac_word_interface> m_rdac; - dynamic_buffer m_queue; + std::vector<UINT8> m_queue; emu_timer *m_dac_timer; }; diff --git a/src/mame/machine/pgmprot_igs027a_type1.cpp b/src/mame/machine/pgmprot_igs027a_type1.cpp index 4d5b1f93638..46f642d80b6 100644 --- a/src/mame/machine/pgmprot_igs027a_type1.cpp +++ b/src/mame/machine/pgmprot_igs027a_type1.cpp @@ -384,7 +384,7 @@ void pgm_arm_type1_state::pgm_decode_kovlsqh2_tiles() void pgm_arm_type1_state::pgm_decode_kovlsqh2_sprites( UINT8 *src ) { int i, j; - dynamic_buffer dst(0x800000); + std::vector<UINT8> dst(0x800000); for (i = 0; i < 0x800000; i++) { diff --git a/src/mame/machine/pgmprot_igs027a_type3.cpp b/src/mame/machine/pgmprot_igs027a_type3.cpp index 5ed8e9f41e7..3c86c76cbd1 100644 --- a/src/mame/machine/pgmprot_igs027a_type3.cpp +++ b/src/mame/machine/pgmprot_igs027a_type3.cpp @@ -733,7 +733,7 @@ DRIVER_INIT_MEMBER(pgm_arm_type3_state,dmnfrnt) // todo, collapse these to an address swap void pgm_arm_type3_state::pgm_descramble_happy6(UINT8* src) { - dynamic_buffer buffer(0x800000); + std::vector<UINT8> buffer(0x800000); int writeaddress = 0; for (int j = 0; j < 0x800; j += 0x200) @@ -751,7 +751,7 @@ void pgm_arm_type3_state::pgm_descramble_happy6(UINT8* src) void pgm_arm_type3_state::pgm_descramble_happy6_2(UINT8* src) { - dynamic_buffer buffer(0x800000); + std::vector<UINT8> buffer(0x800000); int writeaddress = 0; for (int k = 0; k < 0x800000; k += 0x100000) { diff --git a/src/mame/machine/primo.cpp b/src/mame/machine/primo.cpp index a7dbf859fc6..4820a9a92a4 100644 --- a/src/mame/machine/primo.cpp +++ b/src/mame/machine/primo.cpp @@ -303,7 +303,7 @@ void primo_state::primo_setup_pss (UINT8* snapshot_data, UINT32 snapshot_size) SNAPSHOT_LOAD_MEMBER( primo_state, primo ) { - dynamic_buffer snapshot_data(snapshot_size); + std::vector<UINT8> snapshot_data(snapshot_size); if (image.fread(&snapshot_data[0], snapshot_size) != snapshot_size) { @@ -345,7 +345,7 @@ void primo_state::primo_setup_pp(UINT8* quickload_data, UINT32 quickload_size) QUICKLOAD_LOAD_MEMBER( primo_state, primo ) { - dynamic_buffer quickload_data(quickload_size); + std::vector<UINT8> quickload_data(quickload_size); if (image.fread(&quickload_data[0], quickload_size) != quickload_size) { diff --git a/src/mame/machine/scramble.cpp b/src/mame/machine/scramble.cpp index f304742d5f2..820d82399a8 100644 --- a/src/mame/machine/scramble.cpp +++ b/src/mame/machine/scramble.cpp @@ -376,7 +376,7 @@ DRIVER_INIT_MEMBER(scramble_state,rescue) RAM = memregion("gfx1")->base(); len = memregion("gfx1")->bytes(); - dynamic_buffer scratch(len); + std::vector<UINT8> scratch(len); memcpy(&scratch[0], RAM, len); @@ -409,7 +409,7 @@ DRIVER_INIT_MEMBER(scramble_state,minefld) RAM = memregion("gfx1")->base(); len = memregion("gfx1")->bytes(); - dynamic_buffer scratch(len); + std::vector<UINT8> scratch(len); memcpy(&scratch[0], RAM, len); diff --git a/src/mame/machine/segas32.cpp b/src/mame/machine/segas32.cpp index f2124c8c996..61db4618073 100644 --- a/src/mame/machine/segas32.cpp +++ b/src/mame/machine/segas32.cpp @@ -39,7 +39,7 @@ void segas32_state::decrypt_ga2_protrom() { int i; UINT8 *rom = memregion("mcu")->base(); - dynamic_buffer temp(0x100000); + std::vector<UINT8> temp(0x100000); // make copy of ROM so original can be overwritten memcpy(&temp[0], rom, 0x10000); diff --git a/src/mame/machine/spec_snqk.cpp b/src/mame/machine/spec_snqk.cpp index f95165c2c55..2ed7490c811 100644 --- a/src/mame/machine/spec_snqk.cpp +++ b/src/mame/machine/spec_snqk.cpp @@ -118,7 +118,7 @@ static void spectrum_page_basicrom(running_machine &machine) SNAPSHOT_LOAD_MEMBER( spectrum_state,spectrum) { - dynamic_buffer snapshot_data(snapshot_size); + std::vector<UINT8> snapshot_data(snapshot_size); image.fread(&snapshot_data[0], snapshot_size); @@ -2450,7 +2450,7 @@ void spectrum_setup_z80(running_machine &machine, UINT8 *snapdata, UINT32 snapsi QUICKLOAD_LOAD_MEMBER( spectrum_state,spectrum) { - dynamic_buffer quickload_data(quickload_size); + std::vector<UINT8> quickload_data(quickload_size); image.fread(&quickload_data[0], quickload_size); diff --git a/src/mame/machine/ti85.cpp b/src/mame/machine/ti85.cpp index 08eddb1db02..fdda0145f5d 100644 --- a/src/mame/machine/ti85.cpp +++ b/src/mame/machine/ti85.cpp @@ -1164,7 +1164,7 @@ void ti85_state::ti86_setup_snapshot (UINT8 * data) SNAPSHOT_LOAD_MEMBER( ti85_state, ti8x ) { int expected_snapshot_size = 0; - dynamic_buffer ti8x_snapshot_data; + std::vector<UINT8> ti8x_snapshot_data; if (!strncmp(machine().system().name, "ti85", 4)) expected_snapshot_size = TI85_SNAPSHOT_SIZE; diff --git a/src/mame/video/aeroboto.cpp b/src/mame/video/aeroboto.cpp index 8f8ab9629b3..88b62582929 100644 --- a/src/mame/video/aeroboto.cpp +++ b/src/mame/video/aeroboto.cpp @@ -57,7 +57,7 @@ void aeroboto_state::video_start() { int i; - dynamic_buffer temp(m_stars_length); + std::vector<UINT8> temp(m_stars_length); memcpy(&temp[0], m_stars_rom, m_stars_length); for (i = 0; i < m_stars_length; i++) diff --git a/src/mame/video/bfm_adr2.cpp b/src/mame/video/bfm_adr2.cpp index 1bc4615fd69..814afe1f294 100644 --- a/src/mame/video/bfm_adr2.cpp +++ b/src/mame/video/bfm_adr2.cpp @@ -482,7 +482,7 @@ void bfm_adder2_device::adder2_decode_char_roms() if ( p ) { - dynamic_buffer s( 0x40000 ); + std::vector<UINT8> s( 0x40000 ); { int x, y; diff --git a/src/mame/video/k053250.h b/src/mame/video/k053250.h index 2e5e956aa4b..cf657f301a8 100644 --- a/src/mame/video/k053250.h +++ b/src/mame/video/k053250.h @@ -43,7 +43,7 @@ private: // internal state required_region_ptr<UINT8> m_rom; - dynamic_buffer m_unpacked_rom; + std::vector<UINT8> m_unpacked_rom; std::vector<UINT16> m_ram; UINT16 *m_buffer[2]; UINT8 m_regs[8]; diff --git a/src/mame/video/pcd.h b/src/mame/video/pcd.h index 8976776d4d1..db3be8df6d0 100644 --- a/src/mame/video/pcd.h +++ b/src/mame/video/pcd.h @@ -54,8 +54,8 @@ private: required_ioport m_mouse_x; required_ioport m_mouse_y; - dynamic_buffer m_vram; - dynamic_buffer m_charram; + std::vector<UINT8> m_vram; + std::vector<UINT8> m_charram; UINT8 m_vram_sw, m_t1, m_p2; struct @@ -103,7 +103,7 @@ protected: void rcv_complete() override; void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: - dynamic_buffer m_vram; + std::vector<UINT8> m_vram; required_region_ptr<UINT8> m_charrom; devcb_write_line m_txd_handler; UINT8 m_term_key, m_term_char, m_term_stat, m_vram_latch_r[2], m_vram_latch_w[2], m_p1; diff --git a/src/mame/video/tceptor.cpp b/src/mame/video/tceptor.cpp index efb4bdd6580..cb0c4596413 100644 --- a/src/mame/video/tceptor.cpp +++ b/src/mame/video/tceptor.cpp @@ -240,7 +240,7 @@ void tceptor_state::decode_bg(const char * region) int len = 0x8000; int i; - dynamic_buffer buffer(len); + std::vector<UINT8> buffer(len); /* expand rom tc2-19.10d */ for (i = 0; i < len / 2; i++) diff --git a/src/mame/video/wswan.h b/src/mame/video/wswan.h index 3cad1155075..4c632fdf808 100644 --- a/src/mame/video/wswan.h +++ b/src/mame/video/wswan.h @@ -122,7 +122,7 @@ protected: int m_main_palette[8]; emu_timer *m_timer; - dynamic_buffer m_vram; + std::vector<UINT8> m_vram; UINT8 *m_palette_vram; UINT8 m_palette_port[0x20]; int m_pal[16][16]; diff --git a/src/osd/modules/output/win32_output.cpp b/src/osd/modules/output/win32_output.cpp index e9add1b515d..826aa3b9e04 100644 --- a/src/osd/modules/output/win32_output.cpp +++ b/src/osd/modules/output/win32_output.cpp @@ -303,7 +303,7 @@ LRESULT output_win32::send_id_string(HWND hwnd, LPARAM id) // allocate memory for the message datalen = sizeof(copydata_id_string) + strlen(name) + 1; - dynamic_buffer buffer(datalen); + std::vector<UINT8> buffer(datalen); copydata_id_string *temp = (copydata_id_string *)&buffer[0]; temp->id = id; strcpy(temp->string, name); diff --git a/src/tools/chdman.cpp b/src/tools/chdman.cpp index da385fac5ec..44431fd44cf 100644 --- a/src/tools/chdman.cpp +++ b/src/tools/chdman.cpp @@ -448,7 +448,7 @@ public: m_rawdata(info.bytes_per_frame) { } // getters - const dynamic_buffer &ldframedata() const { return m_ldframedata; } + const std::vector<UINT8> &ldframedata() const { return m_ldframedata; } // read interface virtual UINT32 read_data(void *_dest, UINT64 offset, UINT32 length) @@ -529,8 +529,8 @@ private: UINT32 m_start_frame; UINT32 m_frame_count; std::vector<INT16> m_audio[8]; - dynamic_buffer m_ldframedata; - dynamic_buffer m_rawdata; + std::vector<UINT8> m_ldframedata; + std::vector<UINT8> m_rawdata; }; @@ -1411,7 +1411,7 @@ static void do_info(parameters_t ¶ms) printf("Parent SHA1: %s\n", parent.as_string().c_str()); // print out metadata - dynamic_buffer buffer; + std::vector<UINT8> buffer; std::vector<metadata_index_info> info; for (int index = 0; ; index++) { @@ -1535,7 +1535,7 @@ static void do_verify(parameters_t ¶ms) report_error(0, "No verification to be done; CHD has no checksum"); // create an array to read into - dynamic_buffer buffer((TEMP_BUFFER_SIZE / input_chd.hunk_bytes()) * input_chd.hunk_bytes()); + std::vector<UINT8> buffer((TEMP_BUFFER_SIZE / input_chd.hunk_bytes()) * input_chd.hunk_bytes()); // read all the data and build up an SHA-1 util::sha1_creator rawsha1; @@ -1769,7 +1769,7 @@ static void do_create_hd(parameters_t ¶ms) } // process ident - dynamic_buffer identdata; + std::vector<UINT8> identdata; if (output_parent.opened()) output_parent.read_metadata(HARD_DISK_IDENT_METADATA_TAG, 0, identdata); auto ident_str = params.find(OPTION_IDENT); @@ -2130,7 +2130,7 @@ static void do_copy(parameters_t ¶ms) // process compression; we default to our current preferences using metadata to pick the type chd_codec_type compression[4]; { - dynamic_buffer metadata; + std::vector<UINT8> metadata; if (input_chd.read_metadata(HARD_DISK_METADATA_TAG, 0, metadata) == CHDERR_NONE) memcpy(compression, s_default_hd_compression, sizeof(compression)); else if (input_chd.read_metadata(AV_METADATA_TAG, 0, metadata) == CHDERR_NONE) @@ -2179,7 +2179,7 @@ static void do_copy(parameters_t ¶ms) report_error(1, "Error creating CHD file (%s): %s", output_chd_str->c_str(), chd_file::error_string(err)); // clone all the metadata, upgrading where appropriate - dynamic_buffer metadata; + std::vector<UINT8> metadata; chd_metadata_tag metatag; UINT8 metaflags; UINT32 index = 0; @@ -2278,7 +2278,7 @@ static void do_extract_raw(parameters_t ¶ms) report_error(1, "Unable to open file (%s)", output_file_str->second->c_str()); // copy all data - dynamic_buffer buffer((TEMP_BUFFER_SIZE / input_chd.hunk_bytes()) * input_chd.hunk_bytes()); + std::vector<UINT8> buffer((TEMP_BUFFER_SIZE / input_chd.hunk_bytes()) * input_chd.hunk_bytes()); for (UINT64 offset = input_start; offset < input_end; ) { progress(false, "Extracting, %.1f%% complete... \r", 100.0 * double(offset - input_start) / double(input_end - input_start)); @@ -2404,7 +2404,7 @@ static void do_extract_cd(parameters_t ¶ms) // iterate over tracks and copy all data UINT64 outputoffs = 0; UINT32 discoffs = 0; - dynamic_buffer buffer; + std::vector<UINT8> buffer; for (int tracknum = 0; tracknum < toc->numtrks; tracknum++) { std::string trackbin_name(basename); @@ -2701,7 +2701,7 @@ static void do_add_metadata(parameters_t ¶ms) // process file input auto file_str = params.find(OPTION_VALUE_FILE); - dynamic_buffer file; + std::vector<UINT8> file; if (file_str != params.end()) { osd_file::error filerr = util::core_file::load(file_str->second->c_str(), file); @@ -2816,7 +2816,7 @@ static void do_dump_metadata(parameters_t ¶ms) index = atoi(index_str->second->c_str()); // write the metadata - dynamic_buffer buffer; + std::vector<UINT8> buffer; chd_error err = input_chd.read_metadata(tag, index, buffer); if (err != CHDERR_NONE) report_error(1, "Error reading metadata: %s", chd_file::error_string(err)); diff --git a/src/tools/imgtool/iflopimg.cpp b/src/tools/imgtool/iflopimg.cpp index 65762312197..d5bcd0af483 100644 --- a/src/tools/imgtool/iflopimg.cpp +++ b/src/tools/imgtool/iflopimg.cpp @@ -324,7 +324,7 @@ static imgtoolerr_t imgtool_floppy_transfer_sector_tofrom_stream(imgtool::image { floperr_t err; floppy_image_legacy *floppy; - dynamic_buffer buffer; + std::vector<UINT8> buffer; floppy = imgtool_floppy(img); diff --git a/src/tools/imgtool/imghd.cpp b/src/tools/imgtool/imghd.cpp index 623b4e4c525..af55a235e61 100644 --- a/src/tools/imgtool/imghd.cpp +++ b/src/tools/imgtool/imghd.cpp @@ -99,7 +99,7 @@ imgtoolerr_t imghd_create(imgtool::stream &stream, UINT32 hunksize, UINT32 cylin } /* alloc and zero buffer */ - dynamic_buffer cache; + std::vector<UINT8> cache; cache.resize(hunksize); memset(&cache[0], 0, hunksize); diff --git a/src/tools/imgtool/main.cpp b/src/tools/imgtool/main.cpp index ea5440eb772..a202e7a72a1 100644 --- a/src/tools/imgtool/main.cpp +++ b/src/tools/imgtool/main.cpp @@ -629,7 +629,7 @@ static int cmd_writesector(const struct command *c, int argc, char *argv[]) imgtoolerr_t err; std::unique_ptr<imgtool::image> img; imgtool::stream *stream = nullptr; - dynamic_buffer buffer; + std::vector<UINT8> buffer; UINT32 size, track, head, sector; // attempt to open image diff --git a/src/tools/imgtool/modules/os9.cpp b/src/tools/imgtool/modules/os9.cpp index 8ccd98bc687..2ec56b7cbc1 100644 --- a/src/tools/imgtool/modules/os9.cpp +++ b/src/tools/imgtool/modules/os9.cpp @@ -713,7 +713,7 @@ static imgtoolerr_t os9_diskimage_open(imgtool::image &image, imgtool::stream::p static imgtoolerr_t os9_diskimage_create(imgtool::image &img, imgtool::stream::ptr &&stream, util::option_resolution *opts) { imgtoolerr_t err; - dynamic_buffer header; + std::vector<UINT8> header; UINT32 heads, tracks, sectors, sector_bytes, first_sector_id; UINT32 cluster_size, owner_id; UINT32 allocation_bitmap_bits, allocation_bitmap_lsns; @@ -1030,7 +1030,7 @@ static imgtoolerr_t os9_diskimage_writefile(imgtool::partition &partition, const imgtool::image &image(partition.image()); struct os9_fileinfo file_info; size_t write_size; - dynamic_buffer buf; + std::vector<UINT8> buf; int i = -1; UINT32 lsn = 0; UINT32 count = 0; diff --git a/src/tools/imgtool/modules/psion.cpp b/src/tools/imgtool/modules/psion.cpp index c30eab76528..0b25bfdefb6 100644 --- a/src/tools/imgtool/modules/psion.cpp +++ b/src/tools/imgtool/modules/psion.cpp @@ -290,7 +290,7 @@ UINT16 put_odb(imgtool::stream &instream, imgtool::stream &outstream, UINT8 file UINT16 put_ob3(imgtool::stream &instream, imgtool::stream &outstream) { UINT16 size = instream.size() - 6; - dynamic_buffer buffer(size); + std::vector<UINT8> buffer(size); instream.seek(6, SEEK_SET); instream.read(&buffer[0], size); diff --git a/src/tools/ldresample.cpp b/src/tools/ldresample.cpp index 9cc4f264a44..812ad590e20 100644 --- a/src/tools/ldresample.cpp +++ b/src/tools/ldresample.cpp @@ -472,7 +472,7 @@ printf("%5d: start=%10d (%5d.%03d) end=%10d (%5d.%03d)\n", read_chd(m_source, fieldnum, m_info, srcend - srcbegin); // assemble the final frame - dynamic_buffer buffer; + std::vector<UINT8> buffer; INT16 *sampledata[2] = { &m_info.lsound[0], &m_info.rsound[0] }; avhuff_encoder::assemble_data(buffer, m_info.bitmap, m_info.channels, m_info.samples, sampledata); memcpy(dest, &buffer[0], std::min(buffer.size(), size_t(datasize))); |