diff options
-rw-r--r-- | docs/source/initialsetup/compilingmame.rst | 11 | ||||
-rw-r--r-- | src/mame/drivers/harddriv.cpp | 14 | ||||
-rw-r--r-- | src/mame/drivers/jaguar.cpp | 10 | ||||
-rw-r--r-- | src/mame/drivers/macquadra700.cpp | 11 | ||||
-rw-r--r-- | src/mame/drivers/midvunit.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/pc6001.cpp | 2 | ||||
-rw-r--r-- | src/mame/layout/hp3478a.lay | 33 | ||||
-rw-r--r-- | src/mame/video/bosco.cpp | 4 | ||||
-rw-r--r-- | src/mame/video/cave.cpp | 4 | ||||
-rw-r--r-- | src/mame/video/ms32.cpp | 2 | ||||
-rw-r--r-- | src/mame/video/nemesis.cpp | 2 | ||||
-rw-r--r-- | src/mame/video/shangkid.cpp | 2 | ||||
-rw-r--r-- | src/mame/video/system16.cpp | 8 | ||||
-rw-r--r-- | src/mame/video/wecleman.cpp | 2 |
14 files changed, 51 insertions, 56 deletions
diff --git a/docs/source/initialsetup/compilingmame.rst b/docs/source/initialsetup/compilingmame.rst index 8e5998a3a5e..b8789d74b6e 100644 --- a/docs/source/initialsetup/compilingmame.rst +++ b/docs/source/initialsetup/compilingmame.rst @@ -134,7 +134,7 @@ once:: pacman -S mingw-w64-i686-qt5 You could use these commands to install the current version of the -mame-essentials package and add the MAME package repository to yur pacman +mame-essentials package and add the MAME package repository to your pacman configuration:: curl -O "https://repo.mamedev.org/x86_64/mame-essentials-1.0.6-1-x86_64.pkg.tar.xz" @@ -175,11 +175,10 @@ work best in an MSYS2 terminal, while MinGW tools work best in a Microsoft command prompt. The most obvious symptom of this is that arrow keys don’t work in interactive -programs don’t work if you run them in the wrong kind of terminal. If you run -MinGW gdb or python from an MSYS2 terminal window, command history won’t work -and it may not be possible to interrupt an attached program with gdb. Similarly -it may be very difficult to edit using MSYS2 vim in a Microsoft command prompt -window. +programs if you run them in the wrong kind of terminal. If you run MinGW gdb or +python from an MSYS2 terminal window, command history won’t work and it may not +be possible to interrupt an attached program with gdb. Similarly it may be very +difficult to edit using MSYS2 vim in a Microsoft command prompt window. MAME is built using the MinGW compilers, so the MinGW directories are included earlier in the ``PATH`` for the build environments. If you want to use an diff --git a/src/mame/drivers/harddriv.cpp b/src/mame/drivers/harddriv.cpp index 76778e3da64..2578413f51e 100644 --- a/src/mame/drivers/harddriv.cpp +++ b/src/mame/drivers/harddriv.cpp @@ -5235,7 +5235,7 @@ void harddriv_state::init_strtdriv() /* set up protection hacks */ m_gsp->space(AS_PROGRAM).install_write_handler(0xfff960a0, 0xfff960af, write16smo_delegate(*this, FUNC(harddriv_state::hdgsp_protection_w))); - m_gsp_protection = (uint16_t *)(m_gsp_vram + ((0xfff960a0 - 0xffc00000) >> 3)); + m_gsp_protection = (uint16_t *)&m_gsp_vram[(0xfff960a0 - 0xffc00000) >> 3]; /* set up adsp speedup handlers */ m_adsp->space(AS_DATA).install_read_handler(0x1fff, 0x1fff, read16smo_delegate(*this, FUNC(harddriv_state::hdadsp_speedup_r))); @@ -5258,12 +5258,12 @@ void harddriv_state::init_hdrivair() /* synchronization */ m_dsp32->space(AS_PROGRAM).install_write_handler(0x613c00, 0x613c03, write32s_delegate(*this, FUNC(harddriv_state::rddsp32_sync0_w))); m_dsp32->space(AS_PROGRAM).install_write_handler(0x613e00, 0x613e03, write32s_delegate(*this, FUNC(harddriv_state::rddsp32_sync1_w))); - m_rddsp32_sync[0] = m_dsp32_ram + ((0x613c00 - 0x600000) >> 2); - m_rddsp32_sync[1] = m_dsp32_ram + ((0x613e00 - 0x600000) >> 2); + m_rddsp32_sync[0] = &m_dsp32_ram[(0x613c00 - 0x600000) >> 2]; + m_rddsp32_sync[1] = &m_dsp32_ram[(0x613e00 - 0x600000) >> 2]; /* set up protection hacks */ m_gsp->space(AS_PROGRAM).install_write_handler(0xfff960a0, 0xfff960af, write16smo_delegate(*this, FUNC(harddriv_state::hdgsp_protection_w))); - m_gsp_protection = (uint16_t *)(m_gsp_vram + ((0xfff960a0 - 0xffc00000) >> 3)); + m_gsp_protection = (uint16_t *)&m_gsp_vram[(0xfff960a0 - 0xffc00000) >> 3]; /* set up adsp speedup handlers */ m_adsp->space(AS_DATA).install_read_handler(0x1fff, 0x1fff, read16smo_delegate(*this, FUNC(harddriv_state::hdadsp_speedup_r))); @@ -5286,12 +5286,12 @@ void harddriv_state::init_hdrivairp() /* synchronization */ m_dsp32->space(AS_PROGRAM).install_write_handler(0x613c00, 0x613c03, write32s_delegate(*this, FUNC(harddriv_state::rddsp32_sync0_w))); m_dsp32->space(AS_PROGRAM).install_write_handler(0x613e00, 0x613e03, write32s_delegate(*this, FUNC(harddriv_state::rddsp32_sync1_w))); - m_rddsp32_sync[0] = m_dsp32_ram + ((0x613c00 - 0x600000) >> 2); - m_rddsp32_sync[1] = m_dsp32_ram + ((0x613e00 - 0x600000) >> 2); + m_rddsp32_sync[0] = &m_dsp32_ram[(0x613c00 - 0x600000) >> 2]; + m_rddsp32_sync[1] = &m_dsp32_ram[(0x613e00 - 0x600000) >> 2]; /* set up protection hacks */ m_gsp->space(AS_PROGRAM).install_write_handler(0xfff916c0, 0xfff916cf, write16smo_delegate(*this, FUNC(harddriv_state::hdgsp_protection_w))); - m_gsp_protection = (uint16_t *)(m_gsp_vram + ((0xfff916c0 - 0xffc00000) >> 3)); + m_gsp_protection = (uint16_t *)&m_gsp_vram[(0xfff916c0 - 0xffc00000) >> 3]; /* set up adsp speedup handlers */ m_adsp->space(AS_DATA).install_read_handler(0x1fff, 0x1fff, read16smo_delegate(*this, FUNC(harddriv_state::hdadsp_speedup_r))); diff --git a/src/mame/drivers/jaguar.cpp b/src/mame/drivers/jaguar.cpp index 51e98e9d6ad..97b0387a115 100644 --- a/src/mame/drivers/jaguar.cpp +++ b/src/mame/drivers/jaguar.cpp @@ -2523,7 +2523,7 @@ void jaguar_state::init_maxforce() /* install speedup for main CPU */ m_main_speedup_max_cycles = 120; m_maincpu->space(AS_PROGRAM).install_read_handler(0x1000865c, 0x1000865f, read32smo_delegate(*this, FUNC(jaguar_state::cojagr3k_main_speedup_r))); - m_main_speedup = m_mainram + 0x865c/4; + m_main_speedup = &m_mainram[0x865c/4]; #endif } @@ -2584,10 +2584,10 @@ void jaguar_state::init_freeze_common(offs_t main_speedup_addr) m_main_speedup_max_cycles = 200; if (main_speedup_addr != 0) { m_maincpu->space(AS_PROGRAM).install_read_handler(main_speedup_addr, main_speedup_addr + 3, read32smo_delegate(*this, FUNC(jaguar_state::cojagr3k_main_speedup_r))); - m_main_speedup = m_mainram + (main_speedup_addr - 0x10000000)/4; + m_main_speedup = &m_mainram[(main_speedup_addr - 0x10000000)/4]; } m_maincpu->space(AS_PROGRAM).install_read_handler(0x0400d900, 0x0400d900 + 3, read32smo_delegate(*this, FUNC(jaguar_state::main_gpu_wait_r))); - m_main_gpu_wait = m_shared_ram + 0xd900/4; + m_main_gpu_wait = &m_shared_ram[0xd900/4]; #endif } @@ -2607,8 +2607,8 @@ void jaguar_state::init_vcircle() /* install speedup for main CPU */ m_main_speedup_max_cycles = 50; m_maincpu->space(AS_PROGRAM).install_read_handler(0x12005b34, 0x12005b37, read32smo_delegate(*this, FUNC(jaguar_state::cojagr3k_main_speedup_r))); - m_main_speedup = m_mainram + 0x5b34/4; - m_main_speedup = m_mainram2 + 0x5b34/4; + m_main_speedup = &m_mainram[0x5b34/4]; + m_main_speedup = &m_mainram2[0x5b34/4]; // FIXME: overwriting immediately after assigning? #endif } diff --git a/src/mame/drivers/macquadra700.cpp b/src/mame/drivers/macquadra700.cpp index 87ff29c9005..1c68b50f296 100644 --- a/src/mame/drivers/macquadra700.cpp +++ b/src/mame/drivers/macquadra700.cpp @@ -101,6 +101,8 @@ private: virtual void machine_start() override; virtual void machine_reset() override; + virtual void video_start() override; + virtual void video_reset() override; uint32_t screen_update_dafb(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t dafb_r(offs_t offset, uint32_t mem_mask = ~0); @@ -111,8 +113,6 @@ private: TIMER_CALLBACK_MEMBER(dafb_vbl_tick); TIMER_CALLBACK_MEMBER(dafb_cursor_tick); - DECLARE_VIDEO_START(macdafb); - DECLARE_VIDEO_RESET(macdafb); u32 *m_ram_ptr, *m_rom_ptr; u32 m_ram_mask, m_ram_size, m_rom_size; @@ -335,7 +335,7 @@ TIMER_CALLBACK_MEMBER(macquadra_state::dafb_cursor_tick) m_cursor_timer->adjust(m_screen->time_until_pos(m_cursor_line, 0), 0); } -VIDEO_START_MEMBER(macquadra_state,macdafb) +void macquadra_state::video_start() // DAFB { m_vbl_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(macquadra_state::dafb_vbl_tick),this)); m_cursor_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(macquadra_state::dafb_cursor_tick),this)); @@ -344,7 +344,7 @@ VIDEO_START_MEMBER(macquadra_state,macdafb) m_cursor_timer->adjust(attotime::never); } -VIDEO_RESET_MEMBER(macquadra_state,macdafb) +void macquadra_state::video_reset() // DAFB { m_dafb_count = 0; m_dafb_clutoffs = 0; @@ -901,9 +901,6 @@ void macquadra_state::macqd700(machine_config &config) m_screen->set_visarea(0, 1152-1, 0, 870-1); m_screen->set_screen_update(FUNC(macquadra_state::screen_update_dafb)); - MCFG_VIDEO_START_OVERRIDE(macquadra_state,macdafb) - MCFG_VIDEO_RESET_OVERRIDE(macquadra_state,macdafb) - PALETTE(config, m_palette).set_entries(256); RTC3430042(config, m_rtc, XTAL(32'768)); diff --git a/src/mame/drivers/midvunit.cpp b/src/mame/drivers/midvunit.cpp index 28fd5c3004d..3e21f26c54f 100644 --- a/src/mame/drivers/midvunit.cpp +++ b/src/mame/drivers/midvunit.cpp @@ -153,7 +153,7 @@ void midvunit_state::midvunit_cmos_protect_w(uint32_t data) void midvunit_state::midvunit_cmos_w(offs_t offset, uint32_t data, uint32_t mem_mask) { if (!m_cmos_protected) - COMBINE_DATA(m_nvram + offset); + COMBINE_DATA(&m_nvram[offset]); } diff --git a/src/mame/drivers/pc6001.cpp b/src/mame/drivers/pc6001.cpp index 26c01fe5cae..706993bc3b7 100644 --- a/src/mame/drivers/pc6001.cpp +++ b/src/mame/drivers/pc6001.cpp @@ -186,7 +186,7 @@ void pc6001_state::system_latch_w(uint8_t data) { static const uint16_t startaddr[] = {0xC000, 0xE000, 0x8000, 0xA000 }; - m_video_ram = m_ram + startaddr[(data >> 1) & 0x03] - 0x8000; + m_video_ram = &m_ram[startaddr[(data >> 1) & 0x03] - 0x8000]; cassette_latch_control((data & 8) == 8); m_sys_latch = data; diff --git a/src/mame/layout/hp3478a.lay b/src/mame/layout/hp3478a.lay index c733d6d6732..083a46ab646 100644 --- a/src/mame/layout/hp3478a.lay +++ b/src/mame/layout/hp3478a.lay @@ -7,26 +7,25 @@ note, the led16seg renderer is hardcoded to have OFF segments darker than ON, wh TODO : fix that ? not sure if possible --> <mamelayout version="2"> - <element name="vfd"><led16segsc><color red="0.8" green="0.8" blue="0.8" /></led16segsc></element> + <element name="vfd"><led16segsc><color red="0.19" green="0.20" blue="0.22" /></led16segsc></element> <!-- set text for 12 annunciators --> - <element name="ann0"><text string="SRQ"></text></element> - <element name="ann1"><text string="LSTN"/></element> - <element name="ann2"><text string="TLK"/></element> - <element name="ann3"><text string="RMT"/></element> - <element name="ann4"><text string="MATH"/></element> - <element name="ann5"><text string="AZ OFF"/></element> - <element name="ann6"><text string="2Ω"></text></element> - <element name="ann7"><text string="4Ω"/></element> - <element name="ann8"><text string="M RNG"/></element> - <element name="ann9"><text string="S TRG"/></element> - <element name="ann10"><text string="CAL"/></element> - <element name="ann11"><text string="SHIFT"/></element> - + <element name="ann0"><text string="SRQ" /></element> + <element name="ann1"><text string="LSTN" /></element> + <element name="ann2"><text string="TLK" /></element> + <element name="ann3"><text string="RMT" /></element> + <element name="ann4"><text string="MATH" /></element> + <element name="ann5"><text string="AZ OFF" /></element> + <element name="ann6"><text string="2Ω" /></element> + <element name="ann7"><text string="4Ω" /></element> + <element name="ann8"><text string="M RNG" /></element> + <element name="ann9"><text string="S TRG" /></element> + <element name="ann10"><text string="CAL" /></element> + <element name="ann11"><text string="SHIFT" /></element> <element name="front"><rect><color red="0.6" green="0.63" blue="0.65" /></rect></element> - <element name="vfd_back"><rect><color red="0.29" green="0.33" blue="0.32" /></rect></element> + <element name="vfd_back"><rect><color red="0.46" green="0.44" blue="0.35" /></rect></element> <element name="button_digit_back"><rect><color red="0.75" green="0.75" blue="0.75" /></rect></element> <element name="hl" defstate="0"> @@ -123,8 +122,8 @@ TODO : fix that ? not sure if possible <param name="ann_xpos" start="9" increment="9" /> <element name="ann~ann_i~" ref="ann~ann_i~"> <bounds x="~ann_xpos~" y="24" width="8" height="3" /> - <color state="0" alpha="0.1" red="1.0" green="1.0" blue="1.0" /> - <color state="1" red="1.0" green="1.0" blue="1.0" /> + <color state="0" red="0.19" green="0.20" blue="0.22" alpha="0.13" /> + <color state="1" red="0.19" green="0.20" blue="0.22" /> </element> </repeat> diff --git a/src/mame/video/bosco.cpp b/src/mame/video/bosco.cpp index 8e7b869c3aa..3b5cb1b7264 100644 --- a/src/mame/video/bosco.cpp +++ b/src/mame/video/bosco.cpp @@ -124,10 +124,10 @@ VIDEO_START_MEMBER(bosco_state,bosco) m_bg_tilemap->configure_groups(*m_gfxdecode->gfx(0), 0x1f); m_fg_tilemap->configure_groups(*m_gfxdecode->gfx(0), 0x1f); - m_spriteram = m_videoram + 0x03d4; + m_spriteram = &m_videoram[0x03d4]; m_spriteram_size = 0x0c; m_spriteram2 = m_spriteram + 0x0800; - m_bosco_radarx = m_videoram + 0x03f0; + m_bosco_radarx = &m_videoram[0x03f0]; m_bosco_radary = m_bosco_radarx + 0x0800; m_bosco_starclr = 1; diff --git a/src/mame/video/cave.cpp b/src/mame/video/cave.cpp index e77bd0d7b5c..be07efda87c 100644 --- a/src/mame/video/cave.cpp +++ b/src/mame/video/cave.cpp @@ -237,7 +237,7 @@ void cave_state::get_sprite_info_cave(int chip) const int max_x = m_screen[chip]->width(); const int max_y = m_screen[chip]->height(); - const u16 *source = m_spriteram[chip] + (0x4000 / 2) * m_spriteram_bank[chip]; + const u16 *source = &m_spriteram[chip][(0x4000 / 2) * m_spriteram_bank[chip]]; const u16 *finish = source + (0x4000 / 2); u32 clk = 0; // used clock cycle for sprites @@ -367,7 +367,7 @@ void cave_state::get_sprite_info_donpachi(int chip) const int max_x = m_screen[chip]->width(); const int max_y = m_screen[chip]->height(); - const u16 *source = m_spriteram[chip] + (0x4000 / 2) * m_spriteram_bank[chip]; + const u16 *source = &m_spriteram[chip][(0x4000 / 2) * m_spriteram_bank[chip]]; const u16 *finish = source + (0x4000 / 2); u32 clk = 0; // used clock cycle for sprites diff --git a/src/mame/video/ms32.cpp b/src/mame/video/ms32.cpp index 96d42e82e92..c7addf9bb0a 100644 --- a/src/mame/video/ms32.cpp +++ b/src/mame/video/ms32.cpp @@ -271,7 +271,7 @@ void ms32_state::draw_roz(screen_device &screen, bitmap_ind16 &bitmap, const rec while (y <= maxy) { - u16 *lineaddr = m_lineram + 8 * (y & 0xff); + u16 *lineaddr = &m_lineram[8 * (y & 0xff)]; int start2x = (lineaddr[0x00/4] & 0xffff) | ((lineaddr[0x04/4] & 3) << 16); int start2y = (lineaddr[0x08/4] & 0xffff) | ((lineaddr[0x0c/4] & 3) << 16); diff --git a/src/mame/video/nemesis.cpp b/src/mame/video/nemesis.cpp index 29cf2fd05e1..ec253dad307 100644 --- a/src/mame/video/nemesis.cpp +++ b/src/mame/video/nemesis.cpp @@ -183,7 +183,7 @@ void nemesis_state::create_palette_lookups() void nemesis_state::nemesis_palette_word_w(offs_t offset, uint16_t data, uint16_t mem_mask) { - COMBINE_DATA(m_paletteram + offset); + COMBINE_DATA(&m_paletteram[offset]); data = m_paletteram[offset]; int r = (data >> 0) & 0x1f; diff --git a/src/mame/video/shangkid.cpp b/src/mame/video/shangkid.cpp index 02ab6742f17..31d5cc139b9 100644 --- a/src/mame/video/shangkid.cpp +++ b/src/mame/video/shangkid.cpp @@ -170,7 +170,7 @@ void shangkid_state::shangkid_draw_sprites(bitmap_ind16 &bitmap, const rectangle const uint8_t *source, *finish; finish = m_spriteram; - source = m_spriteram+0x200; + source = &m_spriteram[0x200]; while( source>finish ){ source -= 8; draw_sprite(source, bitmap,cliprect ); diff --git a/src/mame/video/system16.cpp b/src/mame/video/system16.cpp index 50e0f124c4e..7a2a891a573 100644 --- a/src/mame/video/system16.cpp +++ b/src/mame/video/system16.cpp @@ -228,7 +228,7 @@ void segas1x_bootleg_state::update_page( ) TILE_GET_INFO_MEMBER(segas1x_bootleg_state::get_bg_tile_info) { - const uint16_t *source = (m_bg_page[0][tile_index >> 11] << 11) + m_tileram; + const uint16_t *source = &m_tileram[m_bg_page[0][tile_index >> 11] << 11]; int data = source[tile_index & 0x7ff]; int tile_number = (data & 0xfff) | (((data & m_tilebank_switch) ? m_tile_bank[1] : m_tile_bank[0]) << 12); @@ -240,7 +240,7 @@ TILE_GET_INFO_MEMBER(segas1x_bootleg_state::get_bg_tile_info) TILE_GET_INFO_MEMBER(segas1x_bootleg_state::get_fg_tile_info) { - const uint16_t *source = (m_fg_page[0][tile_index >> 11] << 11) + m_tileram; + const uint16_t *source = &m_tileram[m_fg_page[0][tile_index >> 11] << 11]; int data = source[tile_index & 0x7ff]; int tile_number = (data & 0xfff) | (((data & m_tilebank_switch) ? m_tile_bank[1] : m_tile_bank[0]) << 12); @@ -252,7 +252,7 @@ TILE_GET_INFO_MEMBER(segas1x_bootleg_state::get_fg_tile_info) TILE_GET_INFO_MEMBER(segas1x_bootleg_state::get_bg2_tile_info) { - const uint16_t *source = (m_bg_page[1][tile_index >> 11] << 11) + m_tileram; + const uint16_t *source = &m_tileram[m_bg_page[1][tile_index >> 11] << 11]; int data = source[tile_index & 0x7ff]; int tile_number = (data & 0xfff) | (m_tile_bank[(data & 0x1000) >> 12] << 12); @@ -264,7 +264,7 @@ TILE_GET_INFO_MEMBER(segas1x_bootleg_state::get_bg2_tile_info) TILE_GET_INFO_MEMBER(segas1x_bootleg_state::get_fg2_tile_info) { - const uint16_t *source = (m_fg_page[1][tile_index >> 11] << 11) + m_tileram; + const uint16_t *source = &m_tileram[m_fg_page[1][tile_index >> 11] << 11]; int data = source[tile_index & 0x7ff]; int tile_number = (data & 0xfff) | (m_tile_bank[(data & 0x1000) >> 12] << 12); diff --git a/src/mame/video/wecleman.cpp b/src/mame/video/wecleman.cpp index b79c9fadc0a..10595ba01d7 100644 --- a/src/mame/video/wecleman.cpp +++ b/src/mame/video/wecleman.cpp @@ -1029,7 +1029,7 @@ uint32_t wecleman_state::screen_update_wecleman(screen_device &screen, bitmap_rg if (video_on) { - draw_cloud(bitmap, m_gfxdecode->gfx(0), m_pageram + 0x1800, BMP_PAD, BMP_PAD, 41, 20, cloud_sx, cloud_sy, 6, 5, m_cloud_blend/BLEND_STEPS, 0); + draw_cloud(bitmap, m_gfxdecode->gfx(0), &m_pageram[0x1800], BMP_PAD, BMP_PAD, 41, 20, cloud_sx, cloud_sy, 6, 5, m_cloud_blend/BLEND_STEPS, 0); } m_cloud_blend += m_cloud_ds; |