From: Stuart B. <sd...@nt...> - 2004-03-02 21:58:09
|
On Mon, Mar 01, 2004 at 01:16:20AM +0000, Philip Kendall wrote: > Now applied. Everyone feel free to play with the shiny new Scorpion > mode. > > Two little bits I'd appreciate comments on: > > Around about line 592 of z80.c: > > /* If it's a ROM page, just throw it away */ > if( page < 3 || page == 10 ) { > free( uncompressed ); > return LIBSPECTRUM_ERROR_NONE; > } > > Shouldn't that be page < 3 || page == 11? Page 10 contains > RAM page 7, while page 11 (possibly) contains the Multiface ROM. D'oh! Yes, you're right. That was meant to be 11, not 10. > Around about line 615 of z80.c: > > /* Now map onto RAM page numbers */ > page -= 3; > if( page > 10 ) > page--; > > which would map both pages 13 and 14 onto RAM page 10. Should > it be page > 7 (or equivalently, the page > 10 bit before > page -= 3)? D'oh! Yes, you're right. They were the wrong way round, although page > 7 looks a bit cleaner, on second thoughts. > This one may be a patch screwup, in which case > I'll point out the value of unified (or context) diffs :-)" D'oh! Yes, you're right. Unified diffs would have been much, much better. It wasn't a patch screwup, just me not thinking clearly. Z80 snapshots appear to be working now. I'll do some testing with some of the other emulators that have Scorpion support, to check that snapshots work, and to see what the correct display timings should be. I should have a small patch ready tomorrow. (Erm, I mean later today.) -- Stuart Brady |