diff --git a/hash/more/jaguar.xml b/hash/more/jaguar.xml index d8466cb28ec..eed359f6d24 100644 --- a/hash/more/jaguar.xml +++ b/hash/more/jaguar.xml @@ -1,24 +1,884 @@ - + + + 8biteer + ???? + unknown + + + + + + + + Action_Fighter + ???? + unknown + + + + + + + + Alien vs Predator (Alpha) + ???? + unknown + + + + + + + + Arkanna DEMO (2008) + ???? + unknown + + + + + + + + Arkanoid_-_Revenge_of_DoH + ???? + unknown + + + + + + + + Assassin DEMO (2008) + ???? + unknown + + + + + + + + Asteroid (2000) + ???? + unknown + + + + + + + + Atomic (2006) + ???? + unknown + + + + + + + + BADAPPLE + ???? + unknown + + + + + + + + BadCode 4m (2001) + ???? + unknown + + + + + + + + BadCode0 (1999) + ???? + unknown + + + + + + + + BadCode1 (2000) + ???? + unknown + + + + + + + + BadCode2 (2000) + ???? + unknown + + + + + + + + BadCode3 (2000) + ???? + unknown + + + + + + + + BadCode4n (2003) + ???? + unknown + + + + + + + + Barbarian + ???? + unknown + + + + + + + + BEEBRIS + ???? + unknown + + + + + + + + Bexagon + ???? + unknown + + + + + + + + BinaryLand (2023-12)(Rutledge, Rich) + ???? + unknown + + + + + + + + BinaryLand (2023-12)(Rutledge, Rich)[compo version] + ???? + unknown + + + + + + + + Black_Lamp + ???? + unknown + + + + + + + + BrainGames DEMO (2009) + ???? + unknown + + + + + + + + brazer + ???? + unknown + + + + + + + + Brutal Sports Football + ???? + unknown + + + + + + + + BubbleBobbleArcade + ???? + unknown + + + + + + + + Bubble_Bobble + ???? + unknown + + + + + + + + BuggyBoy + ???? + unknown + + + + + + + + Carrier_Command + ???? + unknown + + + + + + + + Colors Mouse DEMO (2008) + ???? + unknown + + + + + + + + Cybernoid + ???? + unknown + + + + + + + + Cybernoid2 + ???? + unknown + + + + + + + + Deflektor + ???? + unknown + + + + + + + + DEGZ + ???? + unknown + + + + + + + + DiamJag (2008) + ???? + unknown + + + + + + + + Do The Same (2009) + ???? + unknown + + + + + + + + downfall (2) + ???? + unknown + + + + + + Downfall ???? unknown - + + + + + + DRAGON - header + ???? + unknown + + + + + + + + expressway + ???? + unknown + + + + + + + + fcr-rls_jiffi + ???? + unknown + + + + + + + + Fernandez_Must_Die! + ???? + unknown + + + + + + + + Fire DEMO (2008) + ???? + unknown + + + + + + + + Fishes (2006) + ???? + unknown + + + + + + + + Flip Out! (World) + ???? + unknown + + + + + + + + Frog Feast DEMO (2006) + ???? + unknown + + + + + + + + Frogger_(Atari_ST) + ???? + unknown + + + + + + + + Frogz 64 Beta 1 + ???? + unknown + + + + + + + + Frogz 64 BETA + ???? + unknown + + + + + + + + Frogz 64 DEMO(1) + ???? + unknown + + + + + + + + Frogz 64 DEMO + ???? + unknown + + + + + + + + FROGZ 64 + ???? + unknown + + + + + + + + Frogz_I THINK PLAYER 2 WORKS NOW + ???? + unknown + + + + + + + + Frogz_snow + ???? + unknown + + + + + + + + Frog_Feast_(2006) + ???? + unknown + + + + + + + + Frog_Feast_(2006)_Not_working_game + ???? + unknown + + + + + + + + Gauntlet_2 + ???? + unknown + + + + + + + + genesis + ???? + unknown + + + + + + + + Hallo World (2008) + ???? + unknown + + + + + + + + hires + ???? + unknown + + + + + + + + Hubble Fade (2008) + ???? + unknown + + + + + + + + Hubble Nebula (2008) + ???? + unknown + + + + + + + + IKplus + ???? + unknown + + + + + + + + International Karate + ???? + unknown + + + + + + + + International_Karate_Plus + ???? + unknown + + + + + + + + Intro DEMO (2008) + ???? + unknown + + + + + + + + INVITKA + ???? + unknown + + + + + + + + JagCD DEMO + ???? + unknown + + + + + + + + JagFest Demo (2001) + ???? + unknown + + + + + + + + JagLion DEMO (2007) + ???? + unknown + + + + + + + + JagMania (2001) + ???? + unknown + + + + + + + + Jagmania (2008) + ???? + unknown + + + + + + + + JagRotate DEMO (2007) + ???? + unknown + + + + + + + + JagTOS (2008) + ???? + unknown + + + + + + + + JDC Example by Lars Hannig (2008) + ???? + unknown + + + + + + + + Joust! + ???? + unknown + + + + + + + + Joust + ???? + unknown + + + + + + + + JSSDemoII V1.0b (2002) + ???? + unknown + + + + + + + + Jungle Jag (2007) + ???? + unknown + + + + + + + + Klax + ???? + unknown + + + + + + + + Llamatron + ???? + unknown + + + + + + + + Mandelbrot Demo (2008) + ???? + unknown + + + + + + + + Martian Attack (2007) + ???? + unknown + + + + + + + + Mel 'O Dee's (2023-12)(Resistance)(PAL) + ???? + unknown + + + - - expressway + + MemDump v1.1 (2008) + ???? + unknown + + + + + + + + Mercenary_(No_Enter) + ???? + unknown + + + + + + + + Metro_Cross ???? unknown - + + + + + + MK1_DEMO + ???? + unknown + + + + + + + + Moon_Patrol_(Atari_ST) + ???? + unknown + + + @@ -42,333 +902,433 @@ - - Plasmosis (2024-03)(42Bastian) + + Ninja_Mission_(Atari_ST) ???? unknown - - + + - - raster32 (2024-02)(42Bastian) + + nyanjag_stereo_jiffi ???? unknown - - + + - - rocksoff + + Operation_Thunderbolt_(Atari_ST) ???? unknown - - + + - - SlamRacer Demo (2008) + + OSMOZYS (2007) ???? unknown - + - - SlamRacer Intro (2008) + + Outrun_(Not_Playable) ???? unknown - - + + - - SuperflyDX 1.1 + + Painter (1996) ???? unknown - - + + - - SuperflyDX 1.1_ProjectTempest + + PAULA Preview DEMO (2009) ???? unknown - - + + - - texturedPlaneJAG (2023-12)(atariBDSM) + + PAULA Preview DEMO 2 (2009) ???? unknown - - + + - - TNG DEMO (2008)(runs with gfx probs) + + Phase Zero (2000) (PD) [a1] ???? unknown - - + + - - tripper + + Plasmosis (2024-03)(42Bastian) ???? unknown - - + + - - [st]Action_Fighter + + ProjectW (2008) ???? unknown - + - - [st]Arkanoid_-_Revenge_of_DoH + + QSOUND DEMO (2008) + ???? + unknown + + + + + + + + R-Type ???? unknown - + - - [st]Barbarian + + raster32 (2024-02)(42Bastian) ???? unknown - - + + - - [st]Black_Lamp + + Removers Example 1 (2008) ???? unknown - - + + - - [st]Bubble_Bobble + + Removers Example 3 (2008) ???? unknown - - + + - - [st]BuggyBoy + + Removers Example 4 (2008) ???? unknown - - + + - - [st]Carrier_Command + + Removers Example 5 (2008) + ???? + unknown + + + + + + + + Return_to_Genesis ???? unknown - + - - [st]Cybernoid + + Revenge_of_the_Mutant_Camels ???? unknown - + - - [st]Deflektor + + RGC DEMO (2006) ???? unknown - + - - [st]Fernandez_Must_Die! + + rocksoff ???? unknown - + - - [st]Gauntlet_2 + + Rtype + ???? + unknown + + + + + + + + Scale DEMO (2008) + ???? + unknown + + + + + + + + SFDX64 + ???? + unknown + + + + + + + + SFDX_2keeprom ???? unknown - + - - [st]International_Karate_Plus + + Silly Venture 2024SE Invitro (2023-12)(Grey - Krystone - Mindthreat - Vasyl) ???? unknown - - + + - - [st]Joust! + + SkyCopter_II_(1996) ???? unknown - - + + - - [st]Klax + + SlamRacer Demo (2008) ???? unknown - - + + - - [st]Llamatron + + SlamRacer Intro (2008) ???? unknown - + - - [st]Mercenary_(No_Enter) + + Solomons Key ???? unknown - - + + - - [st]Metro_Cross + + Speedster_II_(1996) ???? unknown - + - - [st]Outrun_(Not_Playable) + + Starglider_2_(Atari_ST) ???? unknown - + - - [st]R-Type + + StarQuake_(Atari_ST) ???? unknown - + - - [st]Return_to_Genesis + + StormBringer ???? unknown - - + + - - [st]Revenge_of_the_Mutant_Camels + + SuperflyDX 1.1 ???? unknown - - + + - - [st]StormBringer + + SuperflyDX 1.1_ProjectTempest ???? unknown - - + + - [st]Super_Sprint + Super_Sprint ???? unknown - + + + + + + SWINIA COMPOFILLER (2023-12-09)(Tom Rain Production) + ???? + unknown + + + + + + + + texturedPlaneJAG (2023-12)(atariBDSM) + ???? + unknown + + + + + + + + TNG DEMO (2008)(runs with gfx probs) + ???? + unknown + + + + + + + + tripper + ???? + unknown + + + + + + + + Trojan (2023-12)(Rutledge, Rich) + ???? + unknown + + + diff --git a/src/mame/atari/jaguar.cpp b/src/mame/atari/jaguar.cpp index aae09bf16ff..e3932a7d949 100644 --- a/src/mame/atari/jaguar.cpp +++ b/src/mame/atari/jaguar.cpp @@ -1866,10 +1866,10 @@ void jaguar_state::jaguar(machine_config &config) DAC_16BIT_R2R_TWOS_COMPLEMENT(config, m_rdac, 0).add_route(ALL_OUTPUTS, "rspeaker", 1.0); // unknown DAC /* quickload */ - QUICKLOAD(config, "quickload", "abs,bin,cof,jag,prg").set_load_callback(FUNC(jaguar_state::quickload_cb)); + QUICKLOAD(config, "quickload", "abs,bin,cof,jag,prg,rom", attotime::from_seconds(1)).set_load_callback(FUNC(jaguar_state::quickload_cb)); /* cartridge */ - generic_cartslot_device &cartslot(GENERIC_CARTSLOT(config, "cartslot", generic_plain_slot, "jaguar_cart", "j64,rom,bin")); + generic_cartslot_device &cartslot(GENERIC_CARTSLOT(config, "cartslot", generic_plain_slot, "jaguar_cart", "j64")); cartslot.set_device_load(FUNC(jaguar_state::cart_load)); /* software lists */ @@ -1923,14 +1923,13 @@ void jaguarcd_state::init_jaguarcd() std::pair jaguar_state::quickload_cb(snapshot_image_device &image) { - offs_t quickload_begin = 0x4000, start = quickload_begin, skip = 0; + offs_t quickload_begin = 0x1000, start = 0x4000, skip = 0; - memset(m_shared_ram, 0, 0x200000); - offs_t quickload_size = std::min(offs_t(image.length()), 0x200000 - quickload_begin); + offs_t quickload_size = std::min(offs_t(image.length()), 0x20000 - start); - image.fread( &memregion("maincpu")->base()[quickload_begin], quickload_size); + image.fread( &m_shared_ram[quickload_begin], quickload_size); - fix_endian(&memregion("maincpu")->base()[quickload_begin], quickload_size); + fix_endian(&m_shared_ram[quickload_begin], quickload_size); /* Deal with some of the numerous homebrew header systems */ /* COF */ @@ -1966,18 +1965,29 @@ std::pair jaguar_state::quickload_cb(snapshot else /* JAG binary */ if (image.is_filetype("jag")) start = 0x5000; + else + if (image.is_filetype("rom")) + start = 0x802000; + quickload_size = image.length(); /* Now that we have the info, reload the file */ - if ((start != quickload_begin) || (skip)) + if ((start + quickload_size) < 0x200000) { memset(m_shared_ram, 0, 0x200000); - image.fseek(0, SEEK_SET); - image.fread( &m_shared_ram[(start-skip)/4], quickload_size); - quickload_begin = start; - fix_endian(&memregion("maincpu")->base()[(start-skip)&0xfffffc], quickload_size); + image.fseek(skip, SEEK_SET); + image.fread( &m_shared_ram[start/4], quickload_size-skip); + fix_endian(&m_shared_ram[start/4], quickload_size-skip); } - + else + if (start >= 0x800000) + { + image.fseek(skip, SEEK_SET); + image.fread( &m_cart_base[(start - 0x800000) / 4], quickload_size - skip); + fix_endian(&m_cart_base[(start - 0x800000) / 4], quickload_size - skip); + } + else + return std::make_pair(image_error::UNSUPPORTED, "Unsupported start address for this quickload."); /* Some programs are too lazy to set a stack pointer */ m_maincpu->set_state_int(M68K_SP, 0x1000); @@ -1997,13 +2007,6 @@ DEVICE_IMAGE_LOAD_MEMBER( jaguar_state::cart_load ) { size = image.length(); - /* .rom files load & run at 802000 */ - if (image.is_filetype("rom")) - { - load_offset = 0x2000; // fix load address - m_cart_base[0x101] = 0x802000; // fix exec address - } - /* Load cart into memory */ image.fread(&m_cart_base[load_offset/4], size); fix_endian(&m_cart_base[load_offset/4], size);