Attachment #137616 for bug #196984

Lines 178-184 Link Here

(-)Squeak-3.9-9/platforms/unix/src/vm/intplugins/SocketPlugin/SocketPlugin.c.orig (-2 / +2 lines)
178	static sqInt netAddressToInt(unsigned char * ptrToByteArray) {	178	static sqInt netAddressToInt(unsigned char * ptrToByteArray) {
179	sqInt sz;	179	sqInt sz;
180		180
181	sz = interpreterProxy->byteSizeOf(((sqInt)(long)(ptrToByteArray) - 4));	181	sz = interpreterProxy->byteSizeOf(((usqInt)(long)((char *)ptrToByteArray - sqMemoryBase) - 4));
182	if (!(sz == 4)) {	182	if (!(sz == 4)) {
183	return interpreterProxy->primitiveFail();	183	return interpreterProxy->primitiveFail();
184	}	184	}
Lines 315-321 Link Here
315	return null;	315	return null;
316	}	316	}
317	if (!(interpreterProxy->failed())) {	317	if (!(interpreterProxy->failed())) {
318	sz = interpreterProxy->byteSizeOf(((sqInt)(long)(name) - 4));	318	sz = interpreterProxy->byteSizeOf(((usqInt)(long)((char *)name - sqMemoryBase) - 4));
319	sqResolverStartNameLookup(name, sz);	319	sqResolverStartNameLookup(name, sz);
320	}	320	}
321	if (interpreterProxy->failed()) {	321	if (interpreterProxy->failed()) {

Return to bug 196984

Lines 82-88 Link Here

(-)Squeak-3.9-9/platforms/Cross/vm/sqMemoryAccess.h.orig (-3 / +3 lines)
82	static inline sqInt longAtPointerput(char ptr, sqInt val) { return (sqInt)(((sqInt *)ptr)= (sqInt)val); }	82	static inline sqInt longAtPointerput(char ptr, sqInt val) { return (sqInt)(((sqInt *)ptr)= (sqInt)val); }
83	static inline sqInt oopAtPointer(char ptr) { return (sqInt)(((sqInt *)ptr)); }	83	static inline sqInt oopAtPointer(char ptr) { return (sqInt)(((sqInt *)ptr)); }
84	static inline sqInt oopAtPointerput(char ptr, sqInt val) { return (sqInt)(((sqInt *)ptr)= (sqInt)val); }	84	static inline sqInt oopAtPointerput(char ptr, sqInt val) { return (sqInt)(((sqInt *)ptr)= (sqInt)val); }
85	static inline char *pointerForOop(sqInt oop) { return sqMemoryBase + oop; }	85	static inline char *pointerForOop(usqInt oop) { return sqMemoryBase + oop; }
86	static inline sqInt oopForPointer(char *ptr) { return (sqInt)(ptr - sqMemoryBase); }	86	static inline sqInt oopForPointer(char *ptr) { return (sqInt)(ptr - sqMemoryBase); }
87	static inline sqInt byteAt(sqInt oop) { return byteAtPointer(pointerForOop(oop)); }	87	static inline sqInt byteAt(sqInt oop) { return byteAtPointer(pointerForOop(oop)); }
88	static inline sqInt byteAtput(sqInt oop, int val) { return byteAtPointerput(pointerForOop(oop), val); }	88	static inline sqInt byteAtput(sqInt oop, int val) { return byteAtPointerput(pointerForOop(oop), val); }
Lines 106-113 Link Here
106	# define longAtPointerput(ptr, val) ((sqInt)(((sqInt )(ptr))= (sqInt)(val)))	106	# define longAtPointerput(ptr, val) ((sqInt)(((sqInt )(ptr))= (sqInt)(val)))
107	# define oopAtPointer(ptr) (sqInt)(((sqInt )ptr))	107	# define oopAtPointer(ptr) (sqInt)(((sqInt )ptr))
108	# define oopAtPointerput(ptr, val) (sqInt)(((sqInt )ptr)= (sqInt)val)	108	# define oopAtPointerput(ptr, val) (sqInt)(((sqInt )ptr)= (sqInt)val)
109	# define pointerForOop(oop) ((char *)(sqMemoryBase + (oop)))	109	# define pointerForOop(oop) ((char *)(sqMemoryBase + ((usqInt)(oop))))
110	# define oopForPointer(ptr) ((sqInt)(ptr))	110	# define oopForPointer(ptr) ((sqInt)(((char *)(ptr)) - (sqMemoryBase)))
111	# define byteAt(oop) byteAtPointer(pointerForOop(oop))	111	# define byteAt(oop) byteAtPointer(pointerForOop(oop))
112	# define byteAtput(oop, val) byteAtPointerput(pointerForOop(oop), (val))	112	# define byteAtput(oop, val) byteAtPointerput(pointerForOop(oop), (val))
113	# define shortAt(oop) shortAtPointer(pointerForOop(oop))	113	# define shortAt(oop) shortAtPointer(pointerForOop(oop))