ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/TASVideos/bizhawk into Release

This commit is contained in:
hegyak 2015-07-15 08:45:46 -07:00
parent 9253ebee42 7b25254b72
commit eaaeb0ec9d
14 changed files with 219 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -883,8 +883,8 @@ namespace BizHawk.Client.EmuHawk
if (e is RomLoader.RomErrorArgs)
{
var args = e as RomLoader.RomErrorArgs;
var firmwaredialog = new FirmwaresConfig(true).ShowDialog();
args.Retry = firmwaredialog == DialogResult.Retry;
var result = new FirmwaresConfig(true, args.RomPath).ShowDialog();
args.Retry = result == DialogResult.Retry;
}
else
{

4
BizHawk.Client.EmuHawk/config/FirmwaresConfig.Designer.cs generated
View File

@ -282,8 +282,8 @@
this.tbbCloseReload.Image = ((System.Drawing.Image)(resources.GetObject("tbbCloseReload.Image")));
this.tbbCloseReload.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tbbCloseReload.Name = "tbbCloseReload";
this.tbbCloseReload.Size = new System.Drawing.Size(119, 22);
this.tbbCloseReload.Text = "Close and load ROM";
this.tbbCloseReload.Size = new System.Drawing.Size(129, 22);
this.tbbCloseReload.Text = "Close and reload ROM";
this.tbbCloseReload.ToolTipText = "Close and reload ROM";
this.tbbCloseReload.Visible = false;
this.tbbCloseReload.Click += new System.EventHandler(this.tbbCloseReload_Click);

15
BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
View File

@ -57,8 +57,6 @@ namespace BizHawk.Client.EmuHawk
private const int idMissing = 1;
private const int idOk = 2;
RomLoader.RomErrorArgs RomErrorArgs;
Font fixedFont, boldFont, boldFixedFont;
class ListViewSorter : IComparer
@ -82,7 +80,7 @@ namespace BizHawk.Client.EmuHawk
string currSelectorDir;
ListViewSorter listviewSorter;
public FirmwaresConfig(bool retryLoadRom = false)
public FirmwaresConfig(bool retryLoadRom = false, string reloadRomPath = null)
{
InitializeComponent();
@ -96,6 +94,17 @@ namespace BizHawk.Client.EmuHawk
toolStripSeparator1.Visible = true;
tbbCloseReload.Visible = true;
tbbCloseReload.Enabled = true;
if (string.IsNullOrWhiteSpace(reloadRomPath))
{
tbbCloseReload.ToolTipText = "Close Firmware Manager and reload ROM";
}
else
{
tbbCloseReload.ToolTipText = "Close Firmware Manager and reload " + reloadRomPath;
}
}
}

11
BizHawk.Emulation.DiscSystem/Disc.cs
View File

@ -88,10 +88,15 @@ namespace BizHawk.Emulation.DiscSystem
internal List<IDisposable> DisposableResources = new List<IDisposable>();
/// <summary>
/// The sectors on the disc
/// TODO - replace with delegate (much faster disc loading, support of reading of arbitrary lead-out and lead-in sectors)
/// The sectors on the disc. Don't use this directly! Use the SectorSynthProvider instead.
/// TODO - eliminate this entirely and do entirely with the delegate (much faster disc loading... but massively annoying architecture inside-out logic)
/// </summary>
internal List<ISectorSynthJob2448> Sectors = new List<ISectorSynthJob2448>();
internal List<ISectorSynthJob2448> _Sectors = new List<ISectorSynthJob2448>();
/// <summary>
/// ISectorSynthProvider instance for the disc. May be daisy-chained
/// </summary>
internal ISectorSynthProvider SynthProvider;
/// <summary>
/// Parameters set during disc loading which can be referenced by the sector synthesizers

4
BizHawk.Emulation.DiscSystem/DiscFormats/CCD_format.cs
View File

@ -565,7 +565,7 @@ namespace BizHawk.Emulation.DiscSystem
Policy = IN_DiscMountPolicy,
TrackType = pregapTrackType
};
disc.Sectors.Add(ss_gap);
disc._Sectors.Add(ss_gap);
int qRelMSF = i - 150;
@ -590,7 +590,7 @@ namespace BizHawk.Emulation.DiscSystem
//(the TOC is unreliable, and the Track records are redundant)
for (int i = 0; i < loadResults.NumImgSectors; i++)
{
disc.Sectors.Add(synth);
disc._Sectors.Add(synth);
}
return disc;

12
BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Load.cs
View File

@ -162,7 +162,7 @@ namespace BizHawk.Emulation.DiscSystem.CUE
toc_sq.min = BCD2.FromDecimal(0);
toc_sq.sec = BCD2.FromDecimal(0);
toc_sq.frame = BCD2.FromDecimal(0);
toc_sq.AP_Timestamp = new Timestamp(OUT_Disc.Sectors.Count);
toc_sq.AP_Timestamp = new Timestamp(OUT_Disc._Sectors.Count);
OUT_Disc.RawTOCEntries.Add(new RawTOCEntry { QData = toc_sq });
}
@ -322,14 +322,14 @@ namespace BizHawk.Emulation.DiscSystem.CUE
ss.sq.SetStatus(ADR, (EControlQ)(int)qTrack.CompiledCueTrack.Flags);
ss.sq.q_tno = BCD2.FromDecimal(cct.Number);
ss.sq.q_index = BCD2.FromDecimal(curr_index);
ss.sq.AP_Timestamp = new Timestamp(OUT_Disc.Sectors.Count);
ss.sq.AP_Timestamp = new Timestamp(OUT_Disc._Sectors.Count);
ss.sq.Timestamp = new Timestamp(qRelMSF);
//setup subP
if (curr_index == 0)
ss.Pause = true;
OUT_Disc.Sectors.Add(ss);
OUT_Disc._Sectors.Add(ss);
relMSF++;
if (cct.IsFinalInFile)
@ -363,14 +363,14 @@ namespace BizHawk.Emulation.DiscSystem.CUE
ss.sq.SetStatus(ADR, (EControlQ)(int)cct.Flags);
ss.sq.q_tno = BCD2.FromDecimal(cct.Number);
ss.sq.q_index = BCD2.FromDecimal(curr_index);
ss.sq.AP_Timestamp = new Timestamp(OUT_Disc.Sectors.Count);
ss.sq.AP_Timestamp = new Timestamp(OUT_Disc._Sectors.Count);
ss.sq.Timestamp = new Timestamp(relMSF);
//-subP-
//always paused--is this good enough?
ss.Pause = true;
OUT_Disc.Sectors.Add(ss);
OUT_Disc._Sectors.Add(ss);
relMSF++;
}
@ -383,7 +383,7 @@ namespace BizHawk.Emulation.DiscSystem.CUE
IN_FirstRecordedTrackNumber = IN_CompileJob.OUT_CompiledDiscInfo.FirstRecordedTrackNumber,
IN_LastRecordedTrackNumber = IN_CompileJob.OUT_CompiledDiscInfo.LastRecordedTrackNumber,
IN_Session1Format = IN_CompileJob.OUT_CompiledDiscInfo.SessionFormat,
IN_LeadoutTimestamp = new Timestamp(OUT_Disc.Sectors.Count) //do we need a +150?
IN_LeadoutTimestamp = new Timestamp(OUT_Disc._Sectors.Count) //do we need a +150?
};
TOCMiscInfo.Run(OUT_Disc.RawTOCEntries);

13
BizHawk.Emulation.DiscSystem/DiscMountJob.MednaDisc.cs
View File

@ -41,18 +41,7 @@ namespace BizHawk.Emulation.DiscSystem
//this is the sole sector synthesizer we'll need
var synth = new SS_MednaDisc();
//make sector interfaces:
for (int i = 0; i < 150; i++)
{
disc.Sectors.Add(synth);
}
//2. actual sectors
for (int i = 0; i < nSectors; i++)
{
disc.Sectors.Add(synth);
}
OUT_Disc.SynthProvider = new SimpleSectorSynthProvider() { SS = synth };
//ADR (q-Mode) is necessarily 0x01 for a RawTOCEntry
const int kADR = 1;

23
BizHawk.Emulation.DiscSystem/DiscMountJob.cs
View File

@ -70,10 +70,23 @@ namespace BizHawk.Emulation.DiscSystem
var tocSynth = new Synthesize_DiscTOC_From_RawTOCEntries_Job() { Entries = OUT_Disc.RawTOCEntries };
tocSynth.Run();
OUT_Disc.TOC = tocSynth.Result;
//2. Structure frmo TOCRaw
//2. Structure from TOCRaw
var structureSynth = new Synthesize_DiscStructure_From_DiscTOC_Job() { IN_Disc = OUT_Disc, TOCRaw = OUT_Disc.TOC };
structureSynth.Run();
OUT_Disc.Structure = structureSynth.Result;
//insert a synth provider to take care of the leadout track
//currently, we let mednafen take care of its own leadout track (we'll make that controllable later)
if (IN_DiscInterface != DiscInterface.MednaDisc)
{
var ss_leadout = new SS_Leadout()
{
SessionNumber = 1,
Policy = IN_DiscMountPolicy
};
Func<int, bool> condition = (int lba) => lba >= OUT_Disc.Session1.LeadoutLBA;
new ConditionalSectorSynthProvider().Install(OUT_Disc, condition, ss_leadout);
}
}
FinishLog();
@ -168,6 +181,14 @@ namespace BizHawk.Emulation.DiscSystem
}
DONE: ;
//setup the lowest level synth provider
var sssp = new ArraySectorSynthProvider()
{
Sectors = OUT_Disc._Sectors,
FirstLBA = -150
};
OUT_Disc.SynthProvider = sssp;
}
}

14
BizHawk.Emulation.DiscSystem/DiscSectorReader.cs
View File

@ -85,7 +85,7 @@ namespace BizHawk.Emulation.DiscSystem
/// </summary>
public int ReadLBA_2352(int lba, byte[] buffer, int offset)
{
var sector = disc.Sectors[lba + 150];
var sector = disc.SynthProvider.Get(lba);
PrepareBuffer(buffer, offset, 2352);
PrepareJob(lba);
@ -109,7 +109,7 @@ namespace BizHawk.Emulation.DiscSystem
/// </summary>
public int ReadLBA_2448(int lba, byte[] buffer, int offset)
{
var sector = disc.Sectors[lba + 150];
var sector = disc.SynthProvider.Get(lba);
PrepareBuffer(buffer, offset, 2352);
PrepareJob(lba);
@ -128,7 +128,7 @@ namespace BizHawk.Emulation.DiscSystem
int ReadLBA_2048_Mode1(int lba, byte[] buffer, int offset)
{
//we can read the 2048 bytes directly
var sector = disc.Sectors[lba + 150];
var sector = disc.SynthProvider.Get(lba);
PrepareBuffer(buffer, offset, 2352);
PrepareJob(lba);
@ -145,7 +145,7 @@ namespace BizHawk.Emulation.DiscSystem
int ReadLBA_2048_Mode2_Form1(int lba, byte[] buffer, int offset)
{
//we can read the 2048 bytes directly but we have to get them from the mode 2 data
var sector = disc.Sectors[lba + 150];
var sector = disc.SynthProvider.Get(lba);
PrepareBuffer(buffer, offset, 2352);
PrepareJob(lba);
@ -165,7 +165,7 @@ namespace BizHawk.Emulation.DiscSystem
/// </summary>
public int ReadLBA_SubQ(int lba, byte[] buffer, int offset)
{
var sector = disc.Sectors[lba + 150];
var sector = disc.SynthProvider.Get(lba);
PrepareBuffer(buffer, offset, 12);
PrepareJob(lba);
@ -196,7 +196,7 @@ namespace BizHawk.Emulation.DiscSystem
{
//we need to determine the type of the sector.
//in no case do we need the ECC so build special flags here
var sector = disc.Sectors[lba + 150];
var sector = disc.SynthProvider.Get(lba);
PrepareBuffer(buffer, offset, 2048);
PrepareJob(lba);
@ -271,7 +271,7 @@ namespace BizHawk.Emulation.DiscSystem
/// </summary>
public int ReadLBA_Mode(int lba)
{
var sector = disc.Sectors[lba + 150];
var sector = disc.SynthProvider.Get(lba);
PrepareJob(lba);
job.DestBuffer2448 = buf2442;

11
BizHawk.Emulation.DiscSystem/DiscStructure.cs
View File

@ -12,9 +12,8 @@ namespace BizHawk.Emulation.DiscSystem
public class DiscStructure
{
/// <summary>
/// This is a 0-indexed list of sessions (session 1 is at [0])
/// This is a 1-indexed list of sessions (session 1 is at [1])
/// Support for multiple sessions is thoroughly not working yet
/// TODO - make re-index me with a null session 0
/// </summary>
public List<Session> Sessions = new List<Session>();
@ -50,11 +49,13 @@ namespace BizHawk.Emulation.DiscSystem
/// <summary>
/// A reference to the first information track (Track 1)
/// The raw TOC may have specified something different; it's not clear how this discrepancy is handled.
/// </summary>
public Track FirstInformationTrack { get { return Tracks[1]; } }
/// <summary>
/// A reference to the first information track (Track 1)
/// A reference to the last information track on the disc.
/// The raw TOC may have specified something different; it's not clear how this discrepancy is handled.
/// </summary>
public Track LastInformationTrack { get { return Tracks[InformationTrackCount]; } }
@ -147,8 +148,8 @@ namespace BizHawk.Emulation.DiscSystem
public bool IsAudio { get { return Mode == 0; } }
/// <summary>
/// The 'control' properties of the track indicated by the subchannel Q.
/// This is as indicated by the disc TOC.
/// The 'control' properties of the track expected to be found in the track's subQ.
/// However, this is what's indicated by the disc TOC.
/// Actual sector contents may vary.
/// </summary>
public EControlQ Control;

1
BizHawk.Emulation.DiscSystem/DiscSubQ.cs
View File

@ -99,6 +99,7 @@ namespace BizHawk.Emulation.DiscSystem
/// <summary>
/// Retrieves the second set of timestamps (ap_min, ap_sec, ap_frac) as a convenient Timestamp.
/// TODO - rename everything AP here, it's nonsense. (the P is)
/// </summary>
public Timestamp AP_Timestamp {
get { return new Timestamp(ap_min.DecimalValue, ap_sec.DecimalValue, ap_frame.DecimalValue); }

4
BizHawk.Emulation.DiscSystem/Internal/Jobs/ApplySBIJob.cs
View File

@ -29,14 +29,14 @@ namespace BizHawk.Emulation.DiscSystem
int lba = sbi.ABAs[i] - 150;
//create a synthesizer which can return the patched data
var ss_patchq = new SS_PatchQ() { Original = disc.Sectors[lba + 150] };
var ss_patchq = new SS_PatchQ() { Original = disc._Sectors[lba + 150] };
byte[] subQbuf = ss_patchq.Buffer_SubQ;
//read the old subcode
dsr.ReadLBA_SubQ(lba, subQbuf, 0);
//insert patch
disc.Sectors[lba + 150] = ss_patchq;
disc._Sectors[lba + 150] = ss_patchq;
//apply SBI patch
for (int j = 0; j < 12; j++)

128
BizHawk.Emulation.DiscSystem/Internal/SectorSynth.cs
View File

@ -98,8 +98,14 @@ namespace BizHawk.Emulation.DiscSystem
Complete2448 = SubcodeComplete | User2352,
}
/// <summary>
/// Basic unit of sector synthesis
/// </summary>
interface ISectorSynthJob2448
{
/// <summary>
/// Synthesizes a sctor with the given job parameters
/// </summary>
void Synth(SectorSynthJob job);
}
@ -116,6 +122,65 @@ namespace BizHawk.Emulation.DiscSystem
public Disc Disc;
}
/// <summary>
/// an ISectorSynthProvider that just returns a value from an array of pre-made sectors
/// </summary>
class ArraySectorSynthProvider : ISectorSynthProvider
{
public List<ISectorSynthJob2448> Sectors = new List<ISectorSynthJob2448>();
public int FirstLBA;
public ISectorSynthJob2448 Get(int lba)
{
int index = lba - FirstLBA;
return Sectors[index];
}
}
/// <summary>
/// an ISectorSynthProvider that just returns a fixed synthesizer
/// </summary>
class SimpleSectorSynthProvider : ISectorSynthProvider
{
public ISectorSynthJob2448 SS;
public ISectorSynthJob2448 Get(int lba) { return SS; }
}
/// <summary>
/// Returns 'Patch' synth if the provided condition is met
/// </summary>
class ConditionalSectorSynthProvider : ISectorSynthProvider
{
Func<int,bool> Condition;
ISectorSynthJob2448 Patch;
ISectorSynthProvider Parent;
public void Install(Disc disc, Func<int, bool> condition, ISectorSynthJob2448 patch)
{
Parent = disc.SynthProvider;
disc.SynthProvider = this;
Condition = condition;
Patch = patch;
}
public ISectorSynthJob2448 Get(int lba)
{
if (Condition(lba))
return Patch;
else return Parent.Get(lba);
}
}
/// <summary>
/// When creating a disc, this is set with a callback that can deliver an ISectorSynthJob2448 for the given LBA
/// </summary>
interface ISectorSynthProvider
{
/// <summary>
/// Retrieves an ISectorSynthJob2448 for the given LBA
/// </summary>
ISectorSynthJob2448 Get(int lba);
}
/// <summary>
/// Generic parameters for sector synthesis.
/// To cut down on resource utilization, these can be stored in a disc and are tightly coupled to
@ -123,7 +188,7 @@ namespace BizHawk.Emulation.DiscSystem
/// </summary>
struct SectorSynthParams
{
public long[] BlobOffsets;
//public long[] BlobOffsets;
public MednaDisc MednaDisc;
}
@ -145,5 +210,66 @@ namespace BizHawk.Emulation.DiscSystem
}
}
class SS_Leadout : ISectorSynthJob2448
{
public int SessionNumber;
public DiscMountPolicy Policy;
public void Synth(SectorSynthJob job)
{
//be lazy, just generate the whole sector unconditionally
//this is mostly based on mednafen's approach, which was probably finely tailored for PSX
//heres the comments on the subject:
// I'm not trusting that the "control" field for the TOC leadout entry will always be set properly, so | the control fields for the last track entry
// and the leadout entry together before extracting the D2 bit. Audio track->data leadout is fairly benign though maybe noisy(especially if we ever implement
// data scrambling properly), but data track->audio leadout could break things in an insidious manner for the more accurate drive emulation code).
var ses = job.Disc.Structure.Sessions[SessionNumber];
int lba_relative = job.LBA - ses.LeadoutTrack.LBA;
//data is zero
Timestamp ts = new Timestamp(lba_relative);
Timestamp ats = new Timestamp(job.LBA);
const int ADR = 0x1; // Q channel data encodes position
EControlQ control = ses.LeadoutTrack.Control;
//ehhh? CDI?
//if(toc.tracks[toc.last_track].valid)
// control |= toc.tracks[toc.last_track].control & 0x4;
//else if(toc.disc_type == DISC_TYPE_CD_I)
// control |= 0x4;
control |= (EControlQ)(((int)ses.LastInformationTrack.Control) & 4);
SubchannelQ sq = new SubchannelQ();
sq.SetStatus(ADR, control);
sq.q_tno.BCDValue = 0xAA;
sq.q_index.BCDValue = 0x01;
sq.Timestamp = ts;
sq.AP_Timestamp = ats;
sq.zero = 0;
//finally, rely on a gap sector to do the heavy lifting to synthesize this
CUE.CueTrackType TrackType = CUE.CueTrackType.Audio;
if (ses.LeadoutTrack.IsData)
{
if (job.Disc.TOC.Session1Format == SessionFormat.Type20_CDXA || job.Disc.TOC.Session1Format == SessionFormat.Type10_CDI)
TrackType = CUE.CueTrackType.Mode2_2352;
else
TrackType = CUE.CueTrackType.Mode1_2352;
}
CUE.SS_Gap ss_gap = new CUE.SS_Gap()
{
Policy = Policy,
sq = sq,
TrackType = TrackType,
Pause = true //?
};
ss_gap.Synth(job);
}
}
}

27
Dist/BuildAndPackage.bat
View File

@ -1,11 +1,13 @@
set PATH=%PATH%;C:\Program Files (x86)\git\bin
if "%1"=="" (
SET NAME=BizHawk.zip
) else (
SET NAME=%1
)
svn --version > NUL
@if errorlevel 1 goto MISSINGSVN
git --version > NUL
@if errorlevel 1 goto MISSINGGIT
reg query "HKLM\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0" /v MSBuildToolsPath > nul 2>&1
if ERRORLEVEL 1 goto MISSINGMSBUILD
@ -37,10 +39,23 @@ cd ..\Dist
del %NAME%
rmdir /s /q temp\lua
svn export ..\output\lua temp\Lua
svn export ..\output\firmware temp\Firmware
rmdir /s /q temp\firmware
rmdir /s /q gitsucks
git --git-dir ../.git archive --format zip --output lua.zip master output/Lua
git --git-dir ../.git archive --format zip --output firmware.zip master output/Firmware
unzip lua.zip -d gitsucks
rem del lua.zip
move gitsucks\output\Lua temp
unzip Firmware.zip -d gitsucks
rem del firmware.zip
move gitsucks\output\Firmware temp
rmdir /s /q gitsucks
cd temp
rem remove UPX from any files we have checked in, because people's lousy security software hates it
upx -d dll\*.dll
upx -d dll\*.exe
upx -d *.exe
@ -53,6 +68,6 @@ goto END
:MISSINGMSBUILD
@echo Missing msbuild.exe. can't make distro without that.
goto END
:MISSINGSVN
@echo missing svn.exe. can't make distro without that.
:MISSINGGIT
@echo missing git.exe. can't make distro without that.
:END