valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

cs:ip now restored from int22 vector in psp on termination

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@286
This commit is contained in:
Ulf Wohlers 2002-09-16 16:05:23 +00:00
parent 0277679a17
commit 2f16cccfee
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/dos/dos_execute.cpp
View file

@ -96,7 +96,7 @@ bool DOS_Terminate(bool tsr) {
/* Free Files owned by process */
if (!tsr) curpsp.CloseFiles();
/* Get the termination address */
RealPt old22 = RealGetVec(0x22);
RealPt old22 = curpsp.GetInt22();
/* Restore vector 22,23,24 */
curpsp.RestoreVectors();
/* Set the parent PSP */
@ -106,8 +106,8 @@ bool DOS_Terminate(bool tsr) {
dos.dta = parentpsp.GetDTA();
/* Restore the SS:SP to the previous one */
SegSet16(ss,RealSeg(parentpsp.GetStack()));
reg_sp = RealOff(parentpsp.GetStack());
/* Restore the stored registers */
reg_sp = RealOff(parentpsp.GetStack());
/* Restore the old CS:IP from int 22h */
RestoreRegisters();
/* Set the CS:IP stored in int 0x22 back on the stack */
mem_writew(SegPhys(ss)+reg_sp+0,RealOff(old22));
@ -303,6 +303,8 @@ bool DOS_Execute(char * name,ParamBlock * block,Bit8u flags) {
dos.psp=pspseg;
DOS_PSP newpsp(dos.psp);
dos.dta=newpsp.GetDTA();
/* save vectors */
newpsp.SaveVectors();
/* copy fcbs */
newpsp.SetFCB1(block->exec.fcb1);
newpsp.SetFCB2(block->exec.fcb2);