diff options
author | AJR <ajrhacker@users.noreply.github.com> | 2018-06-17 17:46:18 -0400 |
---|---|---|
committer | AJR <ajrhacker@users.noreply.github.com> | 2018-06-24 09:08:33 -0400 |
commit | b3afc83bde187412269b825d052116727aa3c1bd (patch) | |
tree | 98809c6cc5d861056842a4acfac24b11a14ecc8f /src/mame/machine | |
parent | 297b99c0faa2e70ed3fb5cc4c9ed60e40cd9af5a (diff) |
Allow passing std::unique_ptr<TYPE> directly to save_pointer and remove now-superfluous .get() in many drivers/devices (nw)
Diffstat (limited to 'src/mame/machine')
-rw-r--r-- | src/mame/machine/315-5881_crypt.cpp | 6 | ||||
-rw-r--r-- | src/mame/machine/3do.cpp | 16 | ||||
-rw-r--r-- | src/mame/machine/alpha8201.cpp | 2 | ||||
-rw-r--r-- | src/mame/machine/apple2gs.cpp | 2 | ||||
-rw-r--r-- | src/mame/machine/atarixga.cpp | 4 | ||||
-rw-r--r-- | src/mame/machine/docg3.cpp | 25 | ||||
-rw-r--r-- | src/mame/machine/k573dio.cpp | 2 | ||||
-rw-r--r-- | src/mame/machine/konppc.cpp | 6 | ||||
-rw-r--r-- | src/mame/machine/leland.cpp | 2 | ||||
-rw-r--r-- | src/mame/machine/megadriv.cpp | 2 | ||||
-rw-r--r-- | src/mame/machine/model1.cpp | 2 | ||||
-rw-r--r-- | src/mame/machine/namcoic.cpp | 2 | ||||
-rw-r--r-- | src/mame/machine/naomim1.cpp | 2 | ||||
-rw-r--r-- | src/mame/machine/naomim2.cpp | 2 | ||||
-rw-r--r-- | src/mame/machine/naomim4.cpp | 2 | ||||
-rw-r--r-- | src/mame/machine/nes.cpp | 2 | ||||
-rw-r--r-- | src/mame/machine/pce_cd.cpp | 12 | ||||
-rw-r--r-- | src/mame/machine/pgmprot_igs027a_type3.cpp | 4 | ||||
-rw-r--r-- | src/mame/machine/simpsons.cpp | 2 | ||||
-rw-r--r-- | src/mame/machine/sms.cpp | 4 | ||||
-rw-r--r-- | src/mame/machine/st0016.cpp | 6 |
21 files changed, 50 insertions, 57 deletions
diff --git a/src/mame/machine/315-5881_crypt.cpp b/src/mame/machine/315-5881_crypt.cpp index 49bbb102790..d536fb6c2ac 100644 --- a/src/mame/machine/315-5881_crypt.cpp +++ b/src/mame/machine/315-5881_crypt.cpp @@ -58,9 +58,9 @@ void sega_315_5881_crypt_device::device_start() m_read.bind_relative_to(*owner()); - save_pointer(NAME(buffer.get()), BUFFER_SIZE); - save_pointer(NAME(line_buffer.get()), LINE_SIZE); - save_pointer(NAME(line_buffer_prev.get()), LINE_SIZE); + save_pointer(NAME(buffer), BUFFER_SIZE); + save_pointer(NAME(line_buffer), LINE_SIZE); + save_pointer(NAME(line_buffer_prev), LINE_SIZE); save_item(NAME(prot_cur_address)); save_item(NAME(subkey)); save_item(NAME(enc_ready)); diff --git a/src/mame/machine/3do.cpp b/src/mame/machine/3do.cpp index 42772a69940..f2e91396a90 100644 --- a/src/mame/machine/3do.cpp +++ b/src/mame/machine/3do.cpp @@ -1116,15 +1116,11 @@ void _3do_state::m_clio_init() m_clio.revision = 0x02022000 /* 0x04000000 */; m_clio.unclerev = 0x03800000; m_clio.expctl = 0x80; /* ARM has the expansion bus */ - m_dspp.N = std::make_unique<uint16_t[]>(0x800 ); - m_dspp.EI = std::make_unique<uint16_t[]>(0x400 ); - m_dspp.EO = std::make_unique<uint16_t[]>(0x400 ); + m_dspp.N = make_unique_clear<uint16_t[]>(0x800); + m_dspp.EI = make_unique_clear<uint16_t[]>(0x400); + m_dspp.EO = make_unique_clear<uint16_t[]>(0x400); - memset(m_dspp.N.get(), 0, sizeof(uint16_t) * 0x400); - memset(m_dspp.EI.get(), 0, sizeof(uint16_t) * 0x400); - memset(m_dspp.EO.get(), 0, sizeof(uint16_t) * 0x400); - - save_pointer(NAME(m_dspp.N.get()), 0x800); - save_pointer(NAME(m_dspp.EI.get()), 0x400); - save_pointer(NAME(m_dspp.EO.get()), 0x400); + save_pointer(NAME(m_dspp.N), 0x800); + save_pointer(NAME(m_dspp.EI), 0x400); + save_pointer(NAME(m_dspp.EO), 0x400); } diff --git a/src/mame/machine/alpha8201.cpp b/src/mame/machine/alpha8201.cpp index fea973fb9e5..53cc7fec7b7 100644 --- a/src/mame/machine/alpha8201.cpp +++ b/src/mame/machine/alpha8201.cpp @@ -305,7 +305,7 @@ void alpha_8201_device::device_start() memset(m_mcu_r, 0, sizeof(m_mcu_r)); // register for savestates - save_pointer(NAME(m_shared_ram.get()), 0x400); + save_pointer(NAME(m_shared_ram), 0x400); save_item(NAME(m_bus)); save_item(NAME(m_mcu_address)); save_item(NAME(m_mcu_d)); diff --git a/src/mame/machine/apple2gs.cpp b/src/mame/machine/apple2gs.cpp index e678f61adf8..5ac18a3d759 100644 --- a/src/mame/machine/apple2gs.cpp +++ b/src/mame/machine/apple2gs.cpp @@ -1837,7 +1837,7 @@ void apple2gs_state::apple2gs_setup_memory() /* allocate memory for E00000-E1FFFF */ m_slowmem = make_unique_clear<uint8_t[]>(128*1024); - save_pointer(m_slowmem.get(), "APPLE2GS_SLOWMEM", 128*1024); + save_pointer(m_slowmem, "APPLE2GS_SLOWMEM", 128*1024); // install expanded memory // fair warning: other code assumes banks 0 and 1 are the first 128k of the RAM device, so you must install bank 1 at 0x10000 diff --git a/src/mame/machine/atarixga.cpp b/src/mame/machine/atarixga.cpp index d3858fcce86..968abee4048 100644 --- a/src/mame/machine/atarixga.cpp +++ b/src/mame/machine/atarixga.cpp @@ -74,7 +74,7 @@ void atari_136094_0072_device::device_start() { m_ram = std::make_unique<uint16_t[]>(RAM_WORDS); - save_pointer(NAME(m_ram.get()), RAM_WORDS * sizeof(uint16_t)); + save_pointer(NAME(m_ram), RAM_WORDS * sizeof(uint16_t)); save_item(NAME(m_address)); save_item(NAME(m_ciphertext)); } @@ -293,7 +293,7 @@ atari_136095_0072_device::atari_136095_0072_device(const machine_config &mconfig void atari_136095_0072_device::device_start() { m_ram = std::make_unique<uint16_t[]>(RAM_WORDS); - save_pointer(NAME(m_ram.get()), RAM_WORDS * sizeof(uint16_t)); + save_pointer(NAME(m_ram), RAM_WORDS * sizeof(uint16_t)); save_item(NAME(m_update.addr)); save_item(NAME(m_update.data)); diff --git a/src/mame/machine/docg3.cpp b/src/mame/machine/docg3.cpp index 717a3178734..5c582fc92d9 100644 --- a/src/mame/machine/docg3.cpp +++ b/src/mame/machine/docg3.cpp @@ -777,23 +777,20 @@ void diskonchip_g3_device::device_start() memset(m_sec_2, 0, sizeof(m_sec_2)); - m_data[0] = std::make_unique<uint8_t[]>(m_data_size[0]); - memset(m_data[0].get(), 0, sizeof(uint8_t) * m_data_size[0]); - m_data[1] = std::make_unique<uint8_t[]>(m_data_size[1]); - memset(m_data[1].get(), 0, sizeof(uint8_t) * m_data_size[1]); - m_data[2] = std::make_unique<uint8_t[]>(m_data_size[2]); - memset(m_data[2].get(), 0, sizeof(uint8_t) * m_data_size[2]); + m_data[0] = make_unique_clear<uint8_t[]>(m_data_size[0]); + m_data[1] = make_unique_clear<uint8_t[]>(m_data_size[1]); + m_data[2] = make_unique_clear<uint8_t[]>(m_data_size[2]); // diskonchip_load( device, "diskonchip"); - save_item( NAME(m_planes)); - save_item( NAME(m_blocks)); - save_item( NAME(m_pages)); - save_item( NAME(m_user_data_size)); - save_item( NAME(m_extra_area_size)); - save_pointer( NAME(m_data[0].get()), m_data_size[0]); - save_pointer( NAME(m_data[1].get()), m_data_size[1]); - save_pointer( NAME(m_data[2].get()), m_data_size[2]); + save_item(NAME(m_planes)); + save_item(NAME(m_blocks)); + save_item(NAME(m_pages)); + save_item(NAME(m_user_data_size)); + save_item(NAME(m_extra_area_size)); + save_pointer(NAME(m_data[0]), m_data_size[0]); + save_pointer(NAME(m_data[1]), m_data_size[1]); + save_pointer(NAME(m_data[2]), m_data_size[2]); } //------------------------------------------------- diff --git a/src/mame/machine/k573dio.cpp b/src/mame/machine/k573dio.cpp index 84e8e79d1d3..a83edb91e3e 100644 --- a/src/mame/machine/k573dio.cpp +++ b/src/mame/machine/k573dio.cpp @@ -113,7 +113,7 @@ void k573dio_device::device_start() { output_cb.resolve_safe(); ram = std::make_unique<uint16_t[]>(12 * 1024 * 1024 ); - save_pointer( NAME(ram.get()), 12 * 1024 * 1024 ); + save_pointer(NAME(ram), 12 * 1024 * 1024 ); } void k573dio_device::device_reset() diff --git a/src/mame/machine/konppc.cpp b/src/mame/machine/konppc.cpp index 866e8eee884..78a1bcc394c 100644 --- a/src/mame/machine/konppc.cpp +++ b/src/mame/machine/konppc.cpp @@ -49,13 +49,13 @@ void konppc_device::device_start() save_item(NAME(dsp_comm_ppc[i]), i); save_item(NAME(dsp_comm_sharc[i]), i); save_item(NAME(dsp_shared_ram_bank[i]), i); - save_pointer(NAME(dsp_shared_ram[i].get()), DSP_BANK_SIZE * 2 / sizeof(dsp_shared_ram[i][0]), i); + save_pointer(NAME(dsp_shared_ram[i]), DSP_BANK_SIZE * 2 / sizeof(dsp_shared_ram[i][0]), i); save_item(NAME(dsp_state[i]), i); save_item(NAME(nwk_device_sel[i]), i); save_item(NAME(nwk_fifo_read_ptr[i]), i); save_item(NAME(nwk_fifo_write_ptr[i]), i); - save_pointer(NAME(nwk_fifo[i].get()), 0x800, i); - save_pointer(NAME(nwk_ram[i].get()), 0x2000, i); + save_pointer(NAME(nwk_fifo[i]), 0x800, i); + save_pointer(NAME(nwk_ram[i]), 0x2000, i); } save_item(NAME(cgboard_id)); diff --git a/src/mame/machine/leland.cpp b/src/mame/machine/leland.cpp index 2db7de56531..59434792ff0 100644 --- a/src/mame/machine/leland.cpp +++ b/src/mame/machine/leland.cpp @@ -378,7 +378,7 @@ void ataxx_state::machine_start() save_item(NAME(m_xrom1_addr)); save_item(NAME(m_xrom2_addr)); save_item(NAME(m_battery_ram_enable)); - save_pointer(NAME(m_extra_tram.get()), ATAXX_EXTRA_TRAM_SIZE); + save_pointer(NAME(m_extra_tram), ATAXX_EXTRA_TRAM_SIZE); } diff --git a/src/mame/machine/megadriv.cpp b/src/mame/machine/megadriv.cpp index dab896511d9..07beee6f97e 100644 --- a/src/mame/machine/megadriv.cpp +++ b/src/mame/machine/megadriv.cpp @@ -997,7 +997,7 @@ void md_base_state::megadriv_init_common() save_item(NAME(m_genz80.z80_is_reset)); save_item(NAME(m_genz80.z80_has_bus)); save_item(NAME(m_genz80.z80_bank_addr)); - save_pointer(NAME(m_genz80.z80_prgram.get()), 0x2000); + save_pointer(NAME(m_genz80.z80_prgram), 0x2000); } m_maincpu->set_tas_write_callback(write8_delegate(FUNC(md_base_state::megadriv_tas_callback),this)); diff --git a/src/mame/machine/model1.cpp b/src/mame/machine/model1.cpp index 42329be3d31..c02b21d71ca 100644 --- a/src/mame/machine/model1.cpp +++ b/src/mame/machine/model1.cpp @@ -1728,7 +1728,7 @@ MACHINE_START_MEMBER(model1_state,model1) m_digits.resolve(); m_copro_ram_data = std::make_unique<u32[]>(0x8000); - save_pointer(NAME(m_copro_ram_data.get()), 0x8000); + save_pointer(NAME(m_copro_ram_data), 0x8000); save_item(NAME(m_v60_copro_ram_adr)); save_item(NAME(m_copro_hle_ram_scan_adr)); save_item(NAME(m_v60_copro_ram_latch)); diff --git a/src/mame/machine/namcoic.cpp b/src/mame/machine/namcoic.cpp index e5469defe3e..40f6f2809e2 100644 --- a/src/mame/machine/namcoic.cpp +++ b/src/mame/machine/namcoic.cpp @@ -58,7 +58,7 @@ void namcos2_shared_state::c123_tilemap_init( int gfxbank, void *maskBaseAddr, c } save_item(NAME(m_c123_TilemapInfo.control)); - save_pointer(NAME(m_c123_TilemapInfo.videoram.get()), 0x10000); + save_pointer(NAME(m_c123_TilemapInfo.videoram), 0x10000); } void namcos2_shared_state::c123_tilemap_draw( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int pri ) diff --git a/src/mame/machine/naomim1.cpp b/src/mame/machine/naomim1.cpp index 5cc4170f072..8e91c5b7cf9 100644 --- a/src/mame/machine/naomim1.cpp +++ b/src/mame/machine/naomim1.cpp @@ -47,7 +47,7 @@ void naomi_m1_board::device_start() buffer = std::make_unique<uint8_t[]>(BUFFER_SIZE); - save_pointer(NAME(buffer.get()), BUFFER_SIZE); + save_pointer(NAME(buffer), BUFFER_SIZE); save_item(NAME(dict)); save_item(NAME(hist)); save_item(NAME(rom_cur_address)); diff --git a/src/mame/machine/naomim2.cpp b/src/mame/machine/naomim2.cpp index 16123db826f..39e7b56c4fe 100644 --- a/src/mame/machine/naomim2.cpp +++ b/src/mame/machine/naomim2.cpp @@ -125,7 +125,7 @@ void naomi_m2_board::device_start() ram = std::make_unique<uint8_t[]>(RAM_SIZE); save_item(NAME(rom_cur_address)); - save_pointer(NAME(ram.get()), RAM_SIZE); + save_pointer(NAME(ram), RAM_SIZE); } void naomi_m2_board::device_reset() diff --git a/src/mame/machine/naomim4.cpp b/src/mame/machine/naomim4.cpp index f9baab8de51..9bb9992614e 100644 --- a/src/mame/machine/naomim4.cpp +++ b/src/mame/machine/naomim4.cpp @@ -72,7 +72,7 @@ void naomi_m4_board::device_start() buffer = std::make_unique<uint8_t[]>(BUFFER_SIZE); enc_init(); - save_pointer(NAME(buffer.get()), BUFFER_SIZE); + save_pointer(NAME(buffer), BUFFER_SIZE); save_item(NAME(rom_cur_address)); save_item(NAME(buffer_actual_size)); save_item(NAME(encryption)); diff --git a/src/mame/machine/nes.cpp b/src/mame/machine/nes.cpp index d5c03f161d3..9adc870ed8e 100644 --- a/src/mame/machine/nes.cpp +++ b/src/mame/machine/nes.cpp @@ -104,7 +104,7 @@ void nes_state::machine_start() // register saves save_item(NAME(m_last_frame_flip)); - save_pointer(NAME(m_ciram.get()), 0x800); + save_pointer(NAME(m_ciram), 0x800); } diff --git a/src/mame/machine/pce_cd.cpp b/src/mame/machine/pce_cd.cpp index a2bc3be4ae0..d70eea6efed 100644 --- a/src/mame/machine/pce_cd.cpp +++ b/src/mame/machine/pce_cd.cpp @@ -134,8 +134,8 @@ void pce_cd_device::device_start() // TODO: add proper restore for the cd data... save_item(NAME(m_regs)); - save_pointer(NAME(m_bram.get()), PCE_BRAM_SIZE * 2); - save_pointer(NAME(m_adpcm_ram.get()), PCE_ADPCM_RAM_SIZE); + save_pointer(NAME(m_bram), PCE_BRAM_SIZE * 2); + save_pointer(NAME(m_adpcm_ram), PCE_ADPCM_RAM_SIZE); save_item(NAME(m_bram_locked)); save_item(NAME(m_adpcm_read_ptr)); save_item(NAME(m_adpcm_read_buf)); @@ -161,16 +161,16 @@ void pce_cd_device::device_start() save_item(NAME(m_scsi_last_RST)); save_item(NAME(m_cd_motor_on)); save_item(NAME(m_selected)); - save_pointer(NAME(m_command_buffer.get()), PCE_CD_COMMAND_BUFFER_SIZE); + save_pointer(NAME(m_command_buffer), PCE_CD_COMMAND_BUFFER_SIZE); save_item(NAME(m_command_buffer_index)); save_item(NAME(m_status_sent)); save_item(NAME(m_message_after_status)); save_item(NAME(m_message_sent)); - save_pointer(NAME(m_data_buffer.get()), 8192); + save_pointer(NAME(m_data_buffer), 8192); save_item(NAME(m_data_buffer_size)); save_item(NAME(m_data_buffer_index)); save_item(NAME(m_data_transferred)); - save_pointer(NAME(m_acard_ram.get()), PCE_ACARD_RAM_SIZE); + save_pointer(NAME(m_acard_ram), PCE_ACARD_RAM_SIZE); save_item(NAME(m_acard_latch)); save_item(NAME(m_acard_ctrl)); save_item(NAME(m_acard_base_addr)); @@ -183,7 +183,7 @@ void pce_cd_device::device_start() save_item(NAME(m_last_frame)); save_item(NAME(m_cdda_status)); save_item(NAME(m_cdda_play_mode)); - save_pointer(NAME(m_subcode_buffer.get()), 96); + save_pointer(NAME(m_subcode_buffer), 96); save_item(NAME(m_end_mark)); save_item(NAME(m_cdda_volume)); save_item(NAME(m_adpcm_volume)); diff --git a/src/mame/machine/pgmprot_igs027a_type3.cpp b/src/mame/machine/pgmprot_igs027a_type3.cpp index d5474b1242d..a1ff65d223a 100644 --- a/src/mame/machine/pgmprot_igs027a_type3.cpp +++ b/src/mame/machine/pgmprot_igs027a_type3.cpp @@ -214,8 +214,8 @@ void pgm_arm_type3_state::svg_basic_init() m_svg_shareram[1] = std::make_unique<uint32_t[]>(0x20000 / 4); m_svg_ram_sel = 0; - save_pointer(NAME(m_svg_shareram[0].get()), 0x20000 / 4); - save_pointer(NAME(m_svg_shareram[1].get()), 0x20000 / 4); + save_pointer(NAME(m_svg_shareram[0]), 0x20000 / 4); + save_pointer(NAME(m_svg_shareram[1]), 0x20000 / 4); save_item(NAME(m_svg_ram_sel)); } diff --git a/src/mame/machine/simpsons.cpp b/src/mame/machine/simpsons.cpp index 19fc05c50d5..63eee71f583 100644 --- a/src/mame/machine/simpsons.cpp +++ b/src/mame/machine/simpsons.cpp @@ -74,7 +74,7 @@ void simpsons_state::machine_start() save_item(NAME(m_sprite_colorbase)); save_item(NAME(m_layer_colorbase)); save_item(NAME(m_layerpri)); - save_pointer(NAME(m_spriteram.get()), 0x1000 / 2); + save_pointer(NAME(m_spriteram), 0x1000 / 2); } void simpsons_state::machine_reset() diff --git a/src/mame/machine/sms.cpp b/src/mame/machine/sms.cpp index bd87deb4ed3..fde2dc580de 100644 --- a/src/mame/machine/sms.cpp +++ b/src/mame/machine/sms.cpp @@ -1044,7 +1044,7 @@ void sms_state::machine_start() if (m_mainram == nullptr) { m_mainram = make_unique_clear<uint8_t[]>(0x2000); - save_pointer(NAME(m_mainram.get()), 0x2000); + save_pointer(NAME(m_mainram), 0x2000); // alibaba and blockhol are ports of games for the MSX system. The // MSX bios usually initializes callback "vectors" at the top of RAM. @@ -1395,7 +1395,7 @@ VIDEO_START_MEMBER(sms_state,gamegear) save_item(NAME(m_prev_bitmap_copied)); save_item(NAME(m_prev_bitmap)); save_item(NAME(m_gg_sms_mode_bitmap)); - save_pointer(NAME(m_line_buffer.get()), 160 * 4); + save_pointer(NAME(m_line_buffer), 160 * 4); } VIDEO_RESET_MEMBER(sms_state,gamegear) diff --git a/src/mame/machine/st0016.cpp b/src/mame/machine/st0016.cpp index 8e22dc23bb3..eade55d08ed 100644 --- a/src/mame/machine/st0016.cpp +++ b/src/mame/machine/st0016.cpp @@ -573,9 +573,9 @@ void st0016_cpu_device::st0016_save_init() save_item(NAME(m_dma_offset)); //save_item(NAME(st0016_rom_bank)); save_item(NAME(st0016_vregs)); - save_pointer(NAME(m_charram.get()), MAX_CHAR_BANK*CHAR_BANK_SIZE); - save_pointer(NAME(st0016_paletteram.get()), MAX_PAL_BANK*PAL_BANK_SIZE); - save_pointer(NAME(st0016_spriteram.get()), MAX_SPR_BANK*SPR_BANK_SIZE); + save_pointer(NAME(m_charram), MAX_CHAR_BANK*CHAR_BANK_SIZE); + save_pointer(NAME(st0016_paletteram), MAX_PAL_BANK*PAL_BANK_SIZE); + save_pointer(NAME(st0016_spriteram), MAX_SPR_BANK*SPR_BANK_SIZE); } |