simx86: keep exec-only base internal to codebuf.c, use uintptr_t

This eliminates struct cbptr and makes sure that all asm stub
functions that are passed the executable rip get a uintptr_t rip that is
then converted to an r/w pointer using GetGenCodeBuf.

Author: bartoldeman

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

@@ -33,11 +33,12 @@
 #define CODEBUF_SZ (128 * 1024 * 1024)
 static mspace cspace;
 static unsigned char *wbase;
-static unsigned char *xbase;
+static uintptr_t xoffset;
 
 void InitGenCodeBuf(void)
 {
     void *addr;
+    unsigned char *xbase;
 
 #if HAVE_DECL_MREMAP_MAYMOVE
     int err;
@@ -58,32 +59,32 @@ void InitGenCodeBuf(void)
     xbase = addr;
 #endif
     wbase = addr;
+    xoffset = xbase - wbase;
     cspace = create_mspace_with_base(addr, CODEBUF_SZ, 0);
     assert(cspace);
 }
 
 void EndGenCodeBuf(void)
 {
     destroy_mspace(cspace);
-    if (xbase != wbase)
-        munmap(xbase, CODEBUF_SZ);
+    if (xoffset)
+        munmap(wbase + xoffset, CODEBUF_SZ);
     munmap(wbase, CODEBUF_SZ);
 }
 
-struct cbptr AllocGenCodeBuf(size_t size)
+void *AllocGenCodeBuf(size_t size)
 {
-    struct cbptr ret;
+    void *ret;
 
-    ret.ptr = mspace_malloc(cspace, size);
-    assert(ret.ptr);
-    ret.xptr = xbase + (ret.ptr - wbase);
+    ret = mspace_malloc(cspace, size);
+    assert(ret);
     return ret;
 }
 
-void ShrinkGenCodeBuf(struct cbptr ptr, size_t size)
+void ShrinkGenCodeBuf(void *ptr, size_t size)
 {
-    void *ptr2 = mspace_realloc(cspace, ptr.ptr, size);
-    assert(ptr2 == ptr.ptr);
+    void *ptr2 = mspace_realloc(cspace, ptr, size);
+    assert(ptr2 == ptr);
 }
 
 void FreeGenCodeBuf(void *ptr)
@@ -93,14 +94,15 @@ void FreeGenCodeBuf(void *ptr)
     mspace_free(cspace, ptr);
 }
 
-unsigned char *GetGenCodeBuf(const unsigned char *eip)
+unsigned char *GetGenCodeBuf(uintptr_t eip)
 {
-    assert(eip >= xbase && eip < xbase + CODEBUF_SZ);
-    return wbase + (eip - xbase);
+    unsigned char *p = (unsigned char *)eip - xoffset;
+    assert(p >= wbase && p < wbase + CODEBUF_SZ);
+    return p;
 }
 
-unsigned char *GetExecCodeBuf(const unsigned char *ptr)
+uintptr_t GetExecCodeBuf(const unsigned char *ptr)
 {
     assert(ptr >= wbase && ptr < wbase + CODEBUF_SZ);
-    return xbase + (ptr - wbase);
+    return (uintptr_t)ptr + xoffset;
 }

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

@@ -77,6 +77,10 @@ static unsigned Exec_sim(unsigned *mem_ref, unsigned long *flg,
 			 unsigned char *ecpu, void *SeqStart,
 			 unsigned short seqflg, unsigned *seqbase);
 
+static unsigned int _Sim_helper(unsigned int mem_ref, unsigned int data, int mode,
+			uint32_t *flags, unsigned int opc, unsigned int arg,
+			unsigned char *eip);
+
 static unsigned char *currentIG = NULL;
 
 /////////////////////////////////////////////////////////////////////////////
@@ -2130,7 +2134,7 @@ static unsigned int Gen_sim(IGen *IG, unsigned int *pmem_ref,
 
 	case O_SIM: {
 		uint32_t flags = FlagSync_All();
-		DR1.d = Sim_helper(mem_ref, DR1.d, mode,
+		DR1.d = _Sim_helper(mem_ref, DR1.d, mode,
 				   &flags, IG->p0, IG->p1, currentIG);
 		FlagSync_RFL(flags);
 		if (TheCPU.err > 0)
@@ -3518,9 +3522,10 @@ static unsigned int _Sim_helper(unsigned int mem_ref, unsigned int data, int mod
 
 unsigned int Sim_helper(unsigned int mem_ref, unsigned int data, int mode,
 			uint32_t *flags, unsigned int opc, unsigned int arg,
-			unsigned char *eip)
+			uintptr_t rip)
 {
 	unsigned int ret;
+	unsigned char *eip = GetGenCodeBuf(rip);
 
 	InCompiledCode--;
 	ret = _Sim_helper(mem_ref, data, mode, flags, opc, arg, eip);

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

@@ -391,12 +391,11 @@ void Gen(int op, int mode, ...)
 /////////////////////////////////////////////////////////////////////////////
 
 
-static struct cbptr ProduceCode(unsigned int PC, IMeta *I0)
+static unsigned char *ProduceCode(unsigned int PC, IMeta *I0)
 {
 	int i,j,mall_req;
 	unsigned char *cp, *cp1, *BaseGenBuf, *CodePtr;
 	size_t GenBufSize;
-	struct cbptr cbp;
 
 	if (debug_level('e')>1) {
 	    e_printf("---------------------------------------------\n");
@@ -414,8 +413,7 @@ static struct cbptr ProduceCode(unsigned int PC, IMeta *I0)
 	for (i=0; i<=CurrIMeta; i++)
 	    GenBufSize += I0[i].ngen * MAX_GEND_BYTES_PER_OP;
 	mall_req = GenBufSize + 32;// 32 for tail
-	cbp = AllocGenCodeBuf(mall_req);
-	BaseGenBuf = cbp.ptr;
+	BaseGenBuf = AllocGenCodeBuf(mall_req);
 	/* actual code buffer starts from here */
 	CodePtr = BaseGenBuf;
 	I0->daddr = 0;
@@ -467,11 +465,11 @@ static struct cbptr ProduceCode(unsigned int PC, IMeta *I0)
 
 	/* shrink buffer to what is actually needed */
 	mall_req = I0->totlen;
-	ShrinkGenCodeBuf(cbp, mall_req);
+	ShrinkGenCodeBuf(BaseGenBuf, mall_req);
 	if (debug_level('e')>3)
 		e_printf("Seq len %#x:%#x\n",I0->seqlen,I0->totlen);
 
-	return cbp;
+	return BaseGenBuf;
 }
 
 
@@ -503,7 +501,7 @@ TNode *Close(unsigned int PC, unsigned int Interp_LONG_CS, int mode,
 {
 	IMeta *I0;
 	TNode *G;
-	struct cbptr GenCodeBuf;
+	unsigned char *GenCodeBuf;
 
 	assert (CurrIMeta >= 0);
 

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

@@ -70,7 +70,7 @@ void m_munprotect(unsigned int addr, unsigned int len, unsigned char *eip)
 		return;
 	// no need to invalidate the whole page here,
 	// as the page does not need to be unprotected
-	InvalidateNodeRange_X(addr, len, eip);
+	InvalidateNodeRange(addr, len, eip);
 #if PROFILE
 	CpatchInvalidates++;
 #endif
@@ -91,7 +91,7 @@ void m_munprotect(unsigned int addr, unsigned int len, unsigned char *eip)
 struct rep_stack {
 	unsigned char *esi, *edi;
 	unsigned long ecx, eflags, edx, eax;
-	unsigned char *eip;
+	uintptr_t rip;
 	unsigned long cpatch_op;
 } __attribute__((packed));
 
@@ -118,7 +118,7 @@ void rep_movs_stos(struct rep_stack *stack)
 {
 	unsigned char *paddr = stack->edi;
 	unsigned int ecx = stack->ecx;
-	unsigned char *eip = stack->eip;
+	unsigned char *eip = GetGenCodeBuf(stack->rip);
 	dosaddr_t addr;
 	unsigned int len = ecx;
 	unsigned char *edi;
@@ -260,7 +260,7 @@ void stk_32(dosaddr_t addr, Bit32u value)
 static void wri8_slow(dosaddr_t addr, Bit8u value, unsigned char *eip)
 {
 	if (e_querymark(addr, 1)) {
-		InvalidateNodeRange_X(addr, 1, eip);
+		InvalidateNodeRange(addr, 1, eip);
 #if PROFILE
 		CpatchInvalidates++;
 #endif
@@ -271,7 +271,7 @@ static void wri8_slow(dosaddr_t addr, Bit8u value, unsigned char *eip)
 static void wri16_slow(dosaddr_t addr, Bit16u value, unsigned char *eip)
 {
 	if (e_querymark(addr, 2)) {
-		InvalidateNodeRange_X(addr, 2, eip);
+		InvalidateNodeRange(addr, 2, eip);
 #if PROFILE
 		CpatchInvalidates++;
 #endif
@@ -282,7 +282,7 @@ static void wri16_slow(dosaddr_t addr, Bit16u value, unsigned char *eip)
 static void wri32_slow(dosaddr_t addr, Bit32u value, unsigned char *eip)
 {
 	if (e_querymark(addr, 4)) {
-		InvalidateNodeRange_X(addr, 4, eip);
+		InvalidateNodeRange(addr, 4, eip);
 #if PROFILE
 		CpatchInvalidates++;
 #endif
@@ -319,8 +319,9 @@ static void UnCpatch_wri32(unsigned char *eip)
 }
 #endif
 
-void wri_8(dosaddr_t addr, Bit8u value, unsigned char *eip)
+void wri_8(dosaddr_t addr, Bit8u value, uintptr_t rip)
 {
+	unsigned char *eip = GetGenCodeBuf(rip);
 #if PROFILE
 	CpatchWrites++;
 #endif
@@ -347,8 +348,9 @@ void wri_8(dosaddr_t addr, Bit8u value, unsigned char *eip)
 	InCompiledCode++;
 }
 
-void wri_16(dosaddr_t addr, Bit16u value, unsigned char *eip)
+void wri_16(dosaddr_t addr, Bit16u value, uintptr_t rip)
 {
+	unsigned char *eip = GetGenCodeBuf(rip);
 #if PROFILE
 	CpatchWrites++;
 #endif
@@ -375,8 +377,9 @@ void wri_16(dosaddr_t addr, Bit16u value, unsigned char *eip)
 	InCompiledCode++;
 }
 
-void wri_32(dosaddr_t addr, Bit32u value, unsigned char *eip)
+void wri_32(dosaddr_t addr, Bit32u value, uintptr_t rip)
 {
+	unsigned char *eip = GetGenCodeBuf(rip);
 #if PROFILE
 	CpatchWrites++;
 #endif
@@ -601,7 +604,7 @@ int Cpatch(sigcontext_t *scp)
     unsigned char *p;
     int w16;
     unsigned int v;
-    unsigned char *eip = (unsigned char *)_scp_rip;
+    uintptr_t eip = _scp_rip;
 
 #if PROFILE
     CpatchTotal++;
@@ -697,10 +700,10 @@ int Cpatch(sigcontext_t *scp)
     return 0;
 }
 
-int UnCpatch(unsigned char *eip)
+int UnCpatch(uintptr_t rip)
 {
     unsigned char *p;
-    p = GetGenCodeBuf(eip);
+    p = GetGenCodeBuf(rip);
 
     if (*p != 0xff) return 1;
     if (debug_level('e')) {

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

@@ -14,15 +14,15 @@ struct rep_stack;
 ASMLINKAGE(void,rep_movs_stos,(struct rep_stack *stack));
 ASMLINKAGE(void,stk_16,(dosaddr_t addr, Bit16u value));
 ASMLINKAGE(void,stk_32,(dosaddr_t addr, Bit32u value));
-ASMLINKAGE(void,wri_8,(dosaddr_t addr, Bit8u value, unsigned char *eip));
-ASMLINKAGE(void,wri_16,(dosaddr_t addr, Bit16u value, unsigned char *eip));
-ASMLINKAGE(void,wri_32,(dosaddr_t addr, Bit32u value, unsigned char *eip));
+ASMLINKAGE(void,wri_8,(dosaddr_t addr, Bit8u value, uintptr_t rip));
+ASMLINKAGE(void,wri_16,(dosaddr_t addr, Bit16u value, uintptr_t rip));
+ASMLINKAGE(void,wri_32,(dosaddr_t addr, Bit32u value, uintptr_t rip));
 ASMLINKAGE(Bit8u,read_8,(dosaddr_t addr));
 ASMLINKAGE(Bit16u,read_16,(dosaddr_t addr));
 ASMLINKAGE(Bit32u,read_32,(dosaddr_t addr));
 
 int Cpatch(sigcontext_t *scp);
-int UnCpatch(unsigned char *eip);
+int UnCpatch(uintptr_t rip);
 void Cpatch_init(void);
 int Ofs_SetSegProt(void);
 int Ofs_SimHelper(void);

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

@@ -750,17 +750,13 @@ int e_markpage(unsigned int addr, size_t len);
 int e_unmarkpage(unsigned int addr, size_t len);
 void m_munprotect(unsigned int addr, unsigned int len, unsigned char *eip);
 
-struct cbptr {
-    unsigned char *ptr;
-    unsigned char *xptr;
-};
 void InitGenCodeBuf(void);
 void EndGenCodeBuf(void);
-struct cbptr AllocGenCodeBuf(size_t size);
-void ShrinkGenCodeBuf(struct cbptr ptr, size_t size);
+void *AllocGenCodeBuf(size_t size);
+void ShrinkGenCodeBuf(void *ptr, size_t size);
 void FreeGenCodeBuf(void *ptr);
-unsigned char *GetGenCodeBuf(const unsigned char *eip);
-unsigned char *GetExecCodeBuf(const unsigned char *ptr);
+unsigned char *GetGenCodeBuf(uintptr_t eip);
+uintptr_t GetExecCodeBuf(const unsigned char *ptr);
 //
 void CollectStat(void);
 //
@@ -781,7 +777,7 @@ void init_emu_npu(void);
 
 unsigned int Sim_helper(unsigned int mem_ref, unsigned int data, int mode,
 			uint32_t *flags, unsigned int opc, unsigned int arg,
-			unsigned char *eip);
+			uintptr_t rip);
 
 void e_VgaMovs(dosaddr_t edi, dosaddr_t esi, unsigned int rep,
 	       int dp, unsigned int access);

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

@@ -248,7 +248,7 @@ static int e_vgaemu_fault(sigcontext_t *scp, dosaddr_t cr2)
 /* save eip, eflags, and do a "ret" out of compiled code */
 static int e_return_from_jit(sigcontext_t *scp, int pop_flags)
 {
-	_scp_eax = FindPC_X((unsigned char *)_scp_rip);
+	_scp_eax = FindPC_X(_scp_rip);
 	e_printf("FindPC: found %x\n",_scp_eax);
 	if (pop_flags) {
 		_scp_edx = *(long *)_scp_rsp; // flags
@@ -364,7 +364,7 @@ int e_handle_pagefault(dosaddr_t addr, unsigned err, sigcontext_t *scp)
 	else if (DPMIValidSelector(_scp_cs))
 		p = (unsigned char *)EMU_BASE32(GetSegmentBase(_scp_cs) + _scp_rip);
 	else
-		p = (unsigned char *) _scp_rip;
+		p = GetGenCodeBuf(_scp_rip);
 	if (debug_level('e')>1 || in_dosemu) {
 		v = *((int *)p);
 		__asm__("bswap %0" : "=r" (v) : "0" (v));
@@ -397,7 +397,7 @@ int e_handle_pagefault(dosaddr_t addr, unsigned err, sigcontext_t *scp)
 	/* We HAVE to invalidate all the code in the page
 	 * if the page is going to be unprotected */
 	addr &= _PAGE_MASK;
-	return InvalidateNodeRange_X(addr, PAGE_SIZE, p);
+	return InvalidateNodeRange(addr, PAGE_SIZE, p);
 }
 
 int e_handle_fault(sigcontext_t *scp)

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

@@ -1147,7 +1147,7 @@ static int TraverseAndClean(void)
  * code addresses. At the end, we reset both CodeBuf and InstrMeta to prepare
  * for a new sequence.
  */
-TNode *Move2Tree(IMeta *I0, struct cbptr GenCodeBuf)
+TNode *Move2Tree(IMeta *I0, unsigned char *GenCodeBuf)
 {
   TNode *nG = NULL;
 #if PROFILE >= 2
@@ -1212,7 +1212,7 @@ TNode *Move2Tree(IMeta *I0, struct cbptr GenCodeBuf)
   __atomic_store_n(&findtree_cache[key&FINDTREE_CACHE_HASH_MASK], nG,
 		   __ATOMIC_RELAXED);
 
-  nG->addr = GenCodeBuf.ptr;
+  nG->addr = GenCodeBuf;
 
   /* setup structures for inter-node linking */
   nG->unlinked_jmp_targets = 0;

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

@@ -153,21 +153,17 @@ typedef struct avltr_tree
 #define MINUS -1
 
 TNode *FindTree(int key);
-TNode *Move2Tree(IMeta *I0, struct cbptr GenCodeBuf);
+TNode *Move2Tree(IMeta *I0, unsigned char *GenCodeBuf);
 void tree_gc(void);
 
 void InitTrees(void);
 
 unsigned int FindPC(const unsigned char *addr);
-static inline unsigned int FindPC_X(const unsigned char *addr)
+static inline unsigned int FindPC_X(uintptr_t addr)
 {
     return FindPC(GetGenCodeBuf(addr));
 }
 int InvalidateNodeRange(int addr, int len, unsigned char *eip);
-static inline int InvalidateNodeRange_X(int addr, int len, unsigned char *eip)
-{
-    return InvalidateNodeRange(addr, len, GetGenCodeBuf(eip));
-}
 void avltr_delete(const int key);
 void NodeLinker(TNode *LG, TNode *G);