simx86: _LONG_CS->LONG_CS and LONG_CS->static Interp_LONG_CS

To avoid confusion between these two. SPEC_PREJIT can only
use Interp_LONG_CS.

Author: bartoldeman

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

@@ -1478,7 +1478,7 @@ static unsigned int Gen_sim(const IGen *IG, dosaddr_t mem_ref)
 			}
 		}
 		if (TheCPU.err2 == EXCP00_DIVZ)
-			P0 = _LONG_CS + (dosaddr_t)IG->p0;
+			P0 = LONG_CS + (dosaddr_t)IG->p0;
 		break;
 	case O_IDIV:		// no flags
 		GTRACE0("O_IDIV");
@@ -1537,7 +1537,7 @@ static unsigned int Gen_sim(const IGen *IG, dosaddr_t mem_ref)
 			}
 		}
 		if (TheCPU.err2 == EXCP00_DIVZ)
-			P0 = _LONG_CS + (dosaddr_t)IG->p0;
+			P0 = LONG_CS + (dosaddr_t)IG->p0;
 		break;
 	case O_CBWD:
 		GTRACE0("O_CBWD");
@@ -2728,7 +2728,7 @@ static unsigned int Gen_sim(const IGen *IG, dosaddr_t mem_ref)
 		break;
 
 	case JMP_INDIRECT:
-		P0 = _LONG_CS + ((mode & DATA16) ? DR1.w.l : DR1.d);
+		P0 = LONG_CS + ((mode & DATA16) ? DR1.w.l : DR1.d);
 		if (debug_level('e')>2)
 			dbug_printf("** Jump taken to %08x\n",P0);
 		break;
@@ -2900,14 +2900,13 @@ static void emu_pagefault_handler(dosaddr_t addr, int err, uint32_t op, int len)
 		return;
 	}
 	/* trigger an exception in DPMI */
-	/* Need to shutdown prejitter to touch LONG_CS and TheCPU.err
+	/* Need to shutdown prejitter to touch TheCPU.err
 	   to return to _Interp86() */
 	prejit_sync();
 	TheCPU.err = EXCP0E_PAGE;
 	TheCPU.scp_err = err;
 	TheCPU.cr[2] = addr;
 	if (currentIG) {
-		LONG_CS = _LONG_CS;
 		unsigned int P0 = FindPC(currentIG);
 		TheCPU.eip = P0 - LONG_CS;
 		EFLAGS = (EFLAGS & ~EFLAGS_CC) | FlagSync_All();

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

@@ -518,7 +518,7 @@ static CodeBuf *ProduceCode(unsigned int PC, IMeta *I0)
  *
  */
 
-TNode *Close(unsigned int PC, int mode)
+TNode *Close(unsigned int PC, unsigned int Interp_LONG_CS, int mode)
 {
 	IMeta *I0;
 	TNode *G;
@@ -551,7 +551,7 @@ TNode *Close(unsigned int PC, int mode)
 	 * if some other code tries to write over the page including
 	 * this node */
 	e_markpage(G->seqbase, G->seqlen);
-	G->cs = LONG_CS;
+	G->cs = Interp_LONG_CS;
 	G->mode = mode;
 	/* check links INSIDE current node */
 	if (0 == (EFLAGS & EFLAGS_TF) ) {

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

@@ -270,7 +270,7 @@ extern int CurrIMeta;
 extern void Gen(int op, int mode, ...);
 extern void AddrGen(int op, int mode, ...);
 extern int  (*Fp87_op)(int exop, int reg, unsigned mem_ref);
-TNode *Close(unsigned int PC, int mode);
+TNode *Close(unsigned int PC, unsigned int Interp_LONGCS, int mode);
 extern unsigned char * (*CodeGen)(unsigned char *CodePtr,
 				  unsigned char *BaseGenBuf, const IGen *IG);
 extern unsigned (*Exec)(unsigned *mem_ref, unsigned long *flg,

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

@@ -235,7 +235,7 @@ static inline void exprintb(unsigned char val,char *bf,unsigned int pos)
 	while (v) { *p-- = ehextab[v&15]; v>>=4; }
 }
 
-char *e_print_regs(void)
+char *e_print_regs(unsigned int Interp_LONG_CS)
 {
 	static char buf[sizeof(eregbuf) + 300];
 	char *p = buf;
@@ -261,7 +261,7 @@ char *e_print_regs(void)
 	exprintl(TheCPU.eip,buf,(ERB_L4+ERB_LEFTM)+39);
 	{
 		int i;
-		dosaddr_t csp = LONG_CS+TheCPU.eip;
+		dosaddr_t csp = Interp_LONG_CS+TheCPU.eip;
 		dosaddr_t st = LONG_SS+TheCPU.esp;
 		if (csp < 0xa0000 - 256 || dpmi_is_valid_range(csp, 256)) {
 			unsigned char *op = EMU_BASE32(csp);
@@ -548,11 +548,10 @@ static void Reg2Cpu(struct vm86_struct *info)
 
   /* FPU state is loaded later on demand for JIT, not used for simulator */
   TheCPU.fpstate = &vm86_fpu_state;
-  LONG_CS = _LONG_CS;
   if (debug_level('e')>1) {
 	if (debug_level('e')==9) e_printf("Reg2Cpu< vm86=%08x dpm=%08x emu=%08x\n%s\n",
 		regs->eflags,get_FLAGS(TheCPU.eflags),TheCPU.eflags,
-		e_print_regs());
+		e_print_regs(LONG_CS));
 	else e_printf("Reg2Cpu< vm86=%08x dpm=%08x emu=%08x\n",
 		regs->eflags,get_FLAGS(TheCPU.eflags),TheCPU.eflags);
   }
@@ -725,10 +724,9 @@ static void Scp2CpuD(cpuctx_t *scp)
 	e_printf("Scp2CpuD%s: CS:IP=%08x:%08x\n%s\n",
 			(TheCPU.err? " ERR":""),
 			LONG_CS, _eip,
-			e_print_regs());
+			e_print_regs(LONG_CS));
   }
   TheCPU.mode = mode;
-  LONG_CS = _LONG_CS;
 }
 
 
@@ -1131,7 +1129,7 @@ static int e_dpmi_tail(cpuctx_t *scp)
       /* 0 if ok, else exception code+1 or negative if dosemu err */
       if (xval < 0) {
         error("DPM86: error %d\n", -xval);
-        error("@\n%s",e_print_regs());
+        error("@\n%s",e_print_regs(LONG_CS));
         leavedos_main(0);
         return -1;
       }

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

@@ -743,7 +743,7 @@ int _ModRMSim(unsigned int PC, int mode, signed char overr_ds, signed char overr
 int ModGetReg1(unsigned int PC, int mode);
 //
 char *e_emu_disasm(unsigned char *org, int is32, unsigned int refseg);
-char *e_print_regs(void);
+char *e_print_regs(unsigned int Interp_LONGCS);
 char *e_print_scp_regs(cpuctx_t *scp, int pmode);
 const char *e_trace_fp(void);
 void GCPrint(unsigned char *cp, unsigned char *cbase, int len);