New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

spg format + [tsconf_betadisc_flop.xml] updated games/demos [holub, tslabs] #11274

Closed

holub wants to merge 1 commit into mamedev:master from holub:softlist-spg

Contributor

holub commented May 24, 2023 •

edited

Loading

add spg file format
[tsconf_betadisc_flop.xml] soflist updates

spg format currently has no alternatives, because all existing don't support pagination with >128K RAM.

holub changed the title ~~spg format + softlist~~ spg format + tsconf_betadisc_flop.xml] updated games/demos

holub changed the title ~~spg format + tsconf_betadisc_flop.xml] updated games/demos~~ spg format + [tsconf_betadisc_flop.xml] updated games/demos

Contributor Author

holub commented Jun 4, 2023

Diff looks strange with others commits leaked into this PR after merge.
I can reopen if required.

Member

cuavas commented Jun 19, 2023

This seems to have got mixed up a bit with release branch commits from last month showing up as part of it. Could you merge or rebase to make GitHub less confused?

cuavas reviewed

View reviewed changes

Member

cuavas left a comment

Was the decompression code cribbed from somewhere? It seems to be somewhat lacking in error checking as well as having some odd characteristics.

src/mame/sinclair/spec_snqk.cpp Outdated Show resolved Hide resolved

src/mame/sinclair/spec_snqk.cpp Outdated Show resolved Hide resolved

src/mame/sinclair/spec_snqk.cpp Outdated Show resolved Hide resolved

src/mame/sinclair/spec_snqk.cpp Outdated Show resolved Hide resolved

src/mame/sinclair/spec_snqk.cpp Outdated Show resolved Hide resolved

src/mame/sinclair/spec_snqk.cpp Outdated Show resolved Hide resolved

src/mame/sinclair/spec_snqk.cpp

+              		u8 data;
+              	};
+              	spg_v10* spg = (spg_v10*)snapdata;

Member

cuavas Jun 19, 2023

You should check the size here.

Contributor Author

holub Jun 20, 2023

It's not possible because declared blocks array will always oversize real data. If that can cause problems I can separate blocks from struct and process them iteratively

Contributor Author

holub Jul 10, 2023

@cuavas sorry to bother... what is the preference here?

src/mame/sinclair/spec_snqk.cpp Outdated Show resolved Hide resolved

src/mame/sinclair/spec_snqk.cpp

Comment on lines +2847 to +2849

+              	u8 *data = &spg->data;
+              	for (u8 i = 0; i < spg->blocks_num; i++)
+              	{
+              			const u16 size = (spg->blocks[i].size512 + 1) * 512;
+              			const u8 page = spg->blocks[i].page;
+              			const u16 offs = (spg->blocks[i].address512) * 512;

Member

cuavas Jun 19, 2023

You don’t seem to have checked the size against the number of blocks to ensure the snapshot isn’t truncated.

Contributor Author

holub Jun 20, 2023 •

edited

Loading

It's possible to be trunketed. 256 is max allowed but snapshot can contain any less numbers of blocks.

src/mame/sinclair/spec_snqk.cpp Outdated Show resolved Hide resolved

tslabs commented Jun 19, 2023

Was the decompression code cribbed from somewhere? It seems to be somewhat lacking in error checking as well as having some odd characteristics.

The decompression code has been copied from https://github.com/tslabs/zx-evo/blame/master/pentevo/unreal/Unreal/depack.cpp with my permission to any modifications

holub requested a review from cuavas

June 21, 2023 00:04

holub changed the title ~~spg format + [tsconf_betadisc_flop.xml] updated games/demos~~ spg format + [tsconf_betadisc_flop.xml] updated [holub, tslabs]games/demos

holub changed the title ~~spg format + [tsconf_betadisc_flop.xml] updated [holub, tslabs]games/demos~~ spg format + [tsconf_betadisc_flop.xml] updated games/demos [holub, tslabs]

Contributor Author

holub commented Aug 28, 2023

@cuavas can you please take another look?


          spg format + softlist

bf96def

holub force-pushed the softlist-spg branch from 68ae9d7 to bf96def Compare

September 25, 2024 15:07

Member

cuavas commented Sep 25, 2024

This PR still has multiple things in it that might be better separated:

General cleanup and bug fixes in the Spectrum snapshot formats handling. This stuff should be easy to get merged if it’s isolated.
The SPG format handling stuff itself. This is a bit more complicated because it makes licensing messy if it gets pasted into the middle of a MAME source file. It would be easier to discuss this part on its own.
A bunch of SPG snapshots in a software list. They seem to have been added to a BetaDisc floppy image software list. Should they have a software list of their own, since they appear to be memory snapshots that don’t correspond to physical media? If the software list addition was isolated, it may be possible to get that merged with supported="no" to get the media images in circulation before the SPG format support is ready.

Contributor Author

holub commented Sep 25, 2024

Oh, I'm sorry for bothering. Tried to rebase it in order to revisit. Will close the PR and reopen when ready.

holub closed this

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet