Re: [hatari-devel] Resetting the machine crashes Hatari

[Eero Tamminen <oak@xxxxxxxxxxxxxx>]

Hi,

Thanks, I pushed the fix.


	- Eero

(As to the MiNT/SCC emulation issue, I'll leave Thomas & Nicolas
to decide that.)

On 07/20/2017 09:03 AM, Uwe Seimet wrote:
> The patch appears to resolve the problem. At least I can reset now
> several times and the result is fine.
>
> > Hi,
> >
> > On 07/16/2017 12:23 AM, Eero Tamminen wrote:
> > > On 07/14/2017 09:16 AM, Christian Zietz wrote:
> > > > Eero Tamminen schrieb:
> > > >
> > > > > Resulting INF file TOS resolution: 0x03 -> 0x03.
> > > > > GEMDOS: NEWDESK.INF -> host: /home/us/TT/C/NEWDESK.INF
> > > > > Going to modify '/home/us/TT/C/NEWDESK.INF'.
> > > > > Virtual 'NEWDESK.INF' TOS resolution override file created.
> > > >
> > > > > Resulting INF file TOS resolution: 0x03 -> 0x03.
> > > > > GEMDOS didn't find filename /home/us/TT/C/THING/NEWDESK.INF
> > > > > Using builtin 'NEWDESK.INF'.
> > > > > Virtual 'NEWDESK.INF' TOS resolution override file created.
> > > >
> > > > > Do you still see this issue if you disable all ACSI &
> > > > > IDE drives and just use GEMDOS HD emulation?
> > > >
> > > > Shouldn't the question rather be: Why does Hatari look for NEWDESK.INF
> > > > in C:\THING at all?
> > >
> > > Yes, absolutely!  I don't know how I missed that, thanks!
> > >
> > >
> > >  It seems to me that the current GEMDOS directory is
> > > > preserved during a reset. Maybe you should either look for
> > > > "\NEWDESK.INF" in get_inf_file or reset the GEMDOS current path upon
> > > > reset?
> > >
> > > I'll try to look at that tomorrow.
> > >
> > > (Need to write test-case.)
> >
> > I didn't have time to write a test-case yet, but I think the problem
> > is subsystem reset order.  INF file is re-created at TOS loading, but
> > GEMDOS is reseted only after that.
> >
> > I'm pretty sure the attached patch )that moves the virtual INF file
> > creation later) should fix it.
> >
> > Uwe, could you try it?
> >
> >
> > 	- Eero
>
> > diff -r 5cfcf542f273 src/gemdos.c
> > --- a/src/gemdos.c	Mon Jul 17 11:41:33 2017 +0200
> > +++ b/src/gemdos.c	Thu Jul 20 00:02:17 2017 +0300
> > @@ -551,6 +551,7 @@
> >  	act_pd = 0;
> >  	CurrentDrive = nBootDrive;
> >  	Symbols_RemoveCurrentProgram();
> > +	INF_CreateOverride();
> >  }
> >
> >  /*-----------------------------------------------------------------------*/
> > diff -r 5cfcf542f273 src/tos.c
> > --- a/src/tos.c	Mon Jul 17 11:41:33 2017 +0200
> > +++ b/src/tos.c	Thu Jul 20 00:02:17 2017 +0300
> > @@ -25,7 +25,6 @@
> >  #include "file.h"
> >  #include "gemdos.h"
> >  #include "hdc.h"
> > -#include "inffile.h"
> >  #include "ioMem.h"
> >  #include "log.h"
> >  #include "m68000.h"
> > @@ -703,8 +702,6 @@
> >  	free(pTosFile);
> >
> >  	bTosImageLoaded = true;
> > -
> > -	INF_CreateOverride();
> >  	return 0;
> >  }