Merge pull request dosemu2#2704 from bartoldeman/simx86-delete-nodes-asap

simx86: delete nodes as soon as possible

Author: stsp

src/base/emu-i386/simx86/codegen-sim.c

@@ -2618,7 +2618,8 @@ static unsigned int Gen_sim(IGen *IG, unsigned int *pmem_ref)
 
 	case JMP_TAILCODE: {	// retaddr
 		P0 = (unsigned int)IG->p0;
-		TheCPU.key = P0;
+		if (!(mode & MPATCH))
+			TheCPU.key = P0;
 		if (debug_level('e')>2) {
 			dbug_printf("** Tail code: return from %08x\n",P0);
 		} }
@@ -2784,7 +2785,7 @@ static unsigned Exec_sim(void *SeqStart)
 	P0 = Gen_sim(SeqStart, &TheCPU.mem_ref);
 	currentIG = NULL;
 	EFLAGS = (EFLAGS & ~EFLAGS_CC) | FlagSync_All();
-	if (TheCPU.err) TheCPU.key = P0;
+	if (TheCPU.err && TheCPU.err != EXCP_BREAKNODE) TheCPU.key = P0;
 
 	return P0;
 }

src/base/emu-i386/simx86/codegen-x86.c

@@ -1863,10 +1863,15 @@ arith0:		{
 		}
 		break;
 
-	case JMP_TAILCODE:
+	case JMP_TAILCODE: {
 		/* copy tail instructions to the end of the code block */
+		unsigned char *p = Cp;
 		GNX(Cp, TailCode, TAILSIZE);
-		*((unsigned int *)(Cp - TAILSIZE + TAILFIX)) = IG->p0;
+		/* Keep TheCPU.eip for BreakNode */
+		if (mode & MPATCH)
+			p[5] = p[6] = p[7] = NOP;
+		*((unsigned int *)(p + TAILFIX)) = IG->p0;
+		}
 		break;
 
 	case JMP_INDIRECT: {	// input: %%{e}ax = %%{e}ip

src/base/emu-i386/simx86/codegen.c

@@ -587,6 +587,14 @@ static unsigned ExecOne(TNode *G)
 #endif
 		prefetch(CPUOFFS(0));
 	ePC = Exec(G->addr);
+	if (TheCPU.err == EXCP_BREAKNODE) {
+		if (debug_level('e')>2)
+			e_printf("Delete broken node %08x\n",TheCPU.key);
+		G = FindTree(TheCPU.key);
+		assert(G);
+		RemoveNode(G);
+		TheCPU.err = 0;
+	}
 #ifdef SKIP_EMU_VBIOS
 	if ((TheCPU.cs&0xf000)==config.vbios_seg && !TheCPU.err)
 		TheCPU.err = EXCP_GOBACK;
@@ -686,8 +694,8 @@ unsigned int DoExec(TNode *G)
 	}
 
 #if defined(SINGLESTEP)
-	InvalidateNodeRange(key, 1, NULL);
-	avltr_delete(key);
+	G = FindTree(key);
+	if (G) RemoveNode(G);
 #endif
 
 	return ePC;

src/base/emu-i386/simx86/emu86.h

@@ -680,6 +680,7 @@ extern int SpecPrejits;
 #define EXCP_STISIGNAL	67
 #define EXCP_MODESWITCH	68
 #define EXCP_EMULEAVE	69
+#define EXCP_BREAKNODE	70
 
 #define exit_SIGPEND	0x01	/* signal pending mask */
 #define exit_RPIC	0x02	/* pic asks for interruption */

src/base/emu-i386/simx86/interp.c

@@ -461,7 +461,7 @@ static unsigned int FindExecCode(unsigned int PC)
 		G = FindTree(PC);
 		if (G) {
 			if (!GoodNode(G)) {
-				InvalidateNodeRange(G->key, G->seqlen, NULL);
+				RemoveNode(G);
 				G = NULL;
 			}
 			else if (debug_level('e')>2)