hg/stx-libcomp: comparison ObjFLoader.st

equal deleted inserted replaced

-:3b0d380771e9
+:ccc7f9389a8e
 ObjectFileLoader comment:'
 COPYRIGHT (c) 1993 by Claus Gittinger
 	     All Rights Reserved
-$Header: /cvs/stx/stx/libcomp/Attic/ObjFLoader.st,v 1.27 1995-07-03 02:38:34 claus Exp $
+$Header: /cvs/stx/stx/libcomp/Attic/ObjFLoader.st,v 1.28 1995-07-23 02:23:48 claus Exp $
 '!
 !ObjectFileLoader class methodsFor:'documentation'!
 copyright
 "
 !
 version
 "
-$Header: /cvs/stx/stx/libcomp/Attic/ObjFLoader.st,v 1.27 1995-07-03 02:38:34 claus Exp $
+$Header: /cvs/stx/stx/libcomp/Attic/ObjFLoader.st,v 1.28 1995-07-23 02:23:48 claus Exp $
 "
 !
 documentation
 "
 #ifdef DL1_6    /* dl1.6 COFF loader */
 # define HAS_DL
 #endif
-#ifdef aix
+#ifdef _AIX
 # define AIX_DL
 # define HAS_DL
 #endif
 /*
 	firstCall = 0;
 	(void) dld_init (__myName__);
 }
 if (__isString(pathName)) {
-	if (dld_link(_stringVal(pathName))) {
+	if (dld_link(__stringVal(pathName))) {
 	    if (ObjectFileLoader_Verbose == true) {
-		printf ("link file %s failed\n", _stringVal(pathName));
+		printf ("link file %s failed\n", __stringVal(pathName));
 		dld_perror("cant link");
 	    }
 	    ObjectFileLoader_LastError = @symbol(linkError);
 	    RETURN ( nil );
 	}
 #ifdef DL1_6
 extern char *__myName__;
 char *ldname;
 if (__isString(pathName)) {
-	if ( dl_loadmod_only(__myName__, _stringVal(pathName), &ldname) == 0 ) {
+	if ( dl_loadmod_only(__myName__, __stringVal(pathName), &ldname) == 0 ) {
 	    if (ObjectFileLoader_Verbose == true) {
-		printf ("link file %s failed\n", _stringVal(pathName));
+		printf ("link file %s failed\n", __stringVal(pathName));
 	    }
 	    RETURN ( nil );
 	}
 	/*
 	 * returns the name of the temporary ld-file
 int *handle;
 if (__isString(pathName)) {
 	if (__isArray(aBuffer)
 	 && (_arraySize(aBuffer) == 2)) {;
-	    if ( (handle = load(_stringVal(pathName), 0, 0)) == 0 ) {
+	    if ( (handle = load(__stringVal(pathName), 0, 0)) == 0 ) {
 		if (ObjectFileLoader_Verbose == true) {
-		    printf ("link file %s failed\n", _stringVal(pathName));
+		    printf ("load file %s failed\n", __stringVal(pathName));
 		}
 		RETURN ( nil );
 	    }
 	    if (ObjectFileLoader_Verbose == true)
-		printf("load %s handle = %x\n", _stringVal(pathName), handle);
+		printf("load %s handle = %x\n", __stringVal(pathName), handle);
 	    _ArrayInstPtr(aBuffer)->a_element[0] =
 				       _MKSMALLINT( (int)handle & 0xFFFF );
 	    _ArrayInstPtr(aBuffer)->a_element[1] =
 				       _MKSMALLINT( ((int)handle >> 16) & 0xFFFF );
 RETURN ( nil );
 #endif
 #ifdef SYSV4_DL
 void *handle;
+char *nm;
 if ((pathName == nil) || __isString(pathName)) {
 	if (__isArray(aBuffer)
 	 && (_arraySize(aBuffer) == 2)) {;
-	    if (pathName == nil)
+	    handle = dlopen(pathName == nil ?
-		handle = dlopen((char *)0, RTLD_NOW);
+				(char *)0 :
-	    else
+				__stringVal(pathName),
-		handle = dlopen(_stringVal(pathName), RTLD_NOW);
+			    RTLD_NOW);
 	    if (! handle) {
 		fprintf(stderr, "dlopen %s error: <%s>\n",
-				_stringVal(pathName), dlerror());
+				__stringVal(pathName), dlerror());
 		ObjectFileLoader_LastError = @symbol(linkError);
 		RETURN (nil);
 	    }
 	    if (ObjectFileLoader_Verbose == true)
-		printf("open %s handle = %x\n", _stringVal(pathName), handle);
+		printf("open %s handle = %x\n", __stringVal(pathName), handle);
 	    _ArrayInstPtr(aBuffer)->a_element[0] =
 				       _MKSMALLINT( (int)handle & 0xFFFF );
 	    _ArrayInstPtr(aBuffer)->a_element[1] =
 				       _MKSMALLINT( ((int)handle >> 16) & 0xFFFF );
 	if (__isArray(aBuffer)
 	 && (_arraySize(aBuffer) == 2)) {;
 	    if (pathName == nil)
 		handle = dlopen((char *)0, 1);
 	    else
-		handle = dlopen(_stringVal(pathName), 1);
+		handle = dlopen(__stringVal(pathName), 1);
 	    if (! handle) {
 		fprintf(stderr, "dlopen %s error: <%s>\n",
-				_stringVal(pathName), dlerror());
+				__stringVal(pathName), dlerror());
 		ObjectFileLoader_LastError = @symbol(linkError);
 		RETURN (nil);
 	    }
 	    if (ObjectFileLoader_Verbose == true)
-		printf("open %s handle = %x\n", _stringVal(pathName), handle);
+		printf("open %s handle = %x\n", __stringVal(pathName), handle);
 	    _ArrayInstPtr(aBuffer)->a_element[0] =
 				       _MKSMALLINT( (int)handle & 0xFFFF );
 	    _ArrayInstPtr(aBuffer)->a_element[1] =
 				       _MKSMALLINT( ((int)handle >> 16) & 0xFFFF );
 long result;
 char *files[2];
 NXStream *errOut;
 if (__isString(pathName)) {
-	files[0] = (char *) _stringVal(pathName);
+	files[0] = (char *) __stringVal(pathName);
 	files[1] = (char *) 0;
 	errOut = NXOpenFile(2, 2);
 	result = rld_load(errOut,
 			  (struct mach_header **)0,
 			  files,
 			  (char *)0);
 	NXClose(errOut);
 	if (! result) {
 	    ObjectFileLoader_LastError = @symbol(linkError);
-	    fprintf(stderr, "rld_load %s failed\n", _stringVal(pathName));
+	    fprintf(stderr, "rld_load %s failed\n", __stringVal(pathName));
 	    RETURN (nil);
 	}
 	if (ObjectFileLoader_Verbose == true)
-	    printf("rld_load %s ok\n", _stringVal(pathName));
+	    printf("rld_load %s ok\n", __stringVal(pathName));
 	RETURN (pathName);
 }
 #endif
 %}.
 |low hi|
 %{
 #ifdef GNU_DL
 if (__isString(handle)) {
-	if (dld_unlink_by_file(_stringVal(handle), 1)) {
+	if (dld_unlink_by_file(__stringVal(handle), 1)) {
 	    if (ObjectFileLoader_Verbose == true) {
-		printf ("unlink file %s failed\n", _stringVal(handle));
+		printf ("unlink file %s failed\n", __stringVal(handle));
 		dld_perror("cant unlink");
 	    }
 	    RETURN (false);
 	}
 	RETURN (true);
 void (*func)();
 unsigned long addr;
 char *name;
 if (__isString(aString)) {
-	name = (char *) _stringVal(aString);
+	name = (char *) __stringVal(aString);
 	if (isFunction == false) {
 	    addr = dld_get_symbol(name);
 	} else {
 	    func = (void (*) ()) dld_get_func(name);
 	    if (func) {
 if (__isString(aString)) {
 	if (__isString(handle)) {
 	    if (ObjectFileLoader_Verbose == true)
 		printf("get sym <%s> handle = %x\n",
-			_stringVal(aString), _stringVal(handle));
+			__stringVal(aString), __stringVal(handle));
-	    addr = dl_getsymbol(_stringVal(handle), _stringVal(aString));
+	    addr = dl_getsymbol(__stringVal(handle), __stringVal(aString));
 	    if (addr) {
 		if (ObjectFileLoader_Verbose == true)
 		    printf("addr = %x\n", addr);
 		lowAddr = _MKSMALLINT( (int)addr & 0xFFFF );
 		hiAddr = _MKSMALLINT( ((int)addr >> 16) & 0xFFFF );
 	    } else {
 		if (ObjectFileLoader_Verbose == true)
-		    printf("dl_getsymbol %s failed\n", _stringVal(aString));
+		    printf("dl_getsymbol %s failed\n", __stringVal(aString));
 	    }
 	}
 }
 #endif
 if (__bothSmallInteger(low, hi)) {
 	val = (_intVal(hi) << 16) + _intVal(low);
 	h = (void *)(val);
 	if (__isString(aString)) {
 	    if (ObjectFileLoader_Verbose == true)
-		printf("get sym <%s> handle = %x\n", _stringVal(aString), h);
+		printf("get sym <%s> handle = %x\n", __stringVal(aString), h);
-	    addr = dlsym(h, (char *) _stringVal(aString));
+	    addr = dlsym(h, (char *) __stringVal(aString));
 	    if (addr) {
 		if (ObjectFileLoader_Verbose == true)
 		    printf("addr = %x\n", addr);
 		lowAddr = _MKSMALLINT( (int)addr & 0xFFFF );
 		hiAddr = _MKSMALLINT( ((int)addr >> 16) & 0xFFFF );
 	    } else {
 		if (ObjectFileLoader_Verbose == true)
-		    printf("dlsym %s error: %s\n", _stringVal(aString), dlerror());
+		    printf("dlsym %s error: %s\n", __stringVal(aString), dlerror());
 	    }
 	}
 }
 #endif
 	val = (_intVal(hi) << 16) + _intVal(low);
 	h = (void *)(val);
 	if (__isString(aString)) {
 	    if (ObjectFileLoader_Verbose == true)
 		printf("get sym <%s> handle = %x file = %s\n",
-			_stringVal(aString), h, _stringVal(fileName));
+			__stringVal(aString), h, __stringVal(fileName));
-	    nl[0].n_name = _stringVal(aString);
+	    nl[0].n_name = __stringVal(aString);
 	    nl[1].n_name = "";
-	    if (nlist(_stringVal(fileName), &nl) == -1) {
+	    if (nlist(__stringVal(fileName), &nl) == -1) {
 		if (ObjectFileLoader_Verbose == true)
 		    printf("nlist error\n");
 	    } else {
 		printf("value=%x section=%d type=%x sclass=%d\n",
 			nl[0].n_value, nl[0].n_scnum, nl[0].n_type, nl[0].n_sclass);
 if (__bothSmallInteger(low, hi)) {
 	val = (_intVal(hi) << 16) + _intVal(low);
 	h = (void *)(val);
 	if (__isString(aString)) {
 	    if (ObjectFileLoader_Verbose == true)
-		printf("get sym <%s> handle = %x\n", _stringVal(aString), h);
+		printf("get sym <%s> handle = %x\n", __stringVal(aString), h);
-	    addr = dlsym(h, _stringVal(aString));
+	    addr = dlsym(h, __stringVal(aString));
 	    if (addr) {
 		if (ObjectFileLoader_Verbose == true)
 		    printf("addr = %x\n", addr);
 		lowAddr = _MKSMALLINT( (int)addr & 0xFFFF );
 		hiAddr = _MKSMALLINT( ((int)addr >> 16) & 0xFFFF );
 	    } else {
 		if (ObjectFileLoader_Verbose == true)
-		    printf("dlsym %s error: %s\n", _stringVal(aString), dlerror());
+		    printf("dlsym %s error: %s\n", __stringVal(aString), dlerror());
 	    }
 	}
 }
 #endif
 long result;
 NXStream *errOut;
 if (__isString(aString)) {
 	if (ObjectFileLoader_Verbose == true)
-	    printf("get sym <%s>\n", _stringVal(aString));
+	    printf("get sym <%s>\n", __stringVal(aString));
 	errOut = NXOpenFile(2, 2);
 	result = rld_lookup(errOut,
-			    (char *) _stringVal(aString),
+			    (char *) __stringVal(aString),
 			    &addr);
 	NXClose(errOut);
 	if (result) {
 	    if (ObjectFileLoader_Verbose == true)
 		printf("addr = %x\n", addr);
 %{
 void (*addr)();
 unsigned val;
 typedef void (*VOIDFUNC)();
 int savInt;
-extern int __immediateInterrupt__;
 int prevSpace, force;
 int arg = 0;
 int wasBlocked = 1;
 extern OBJ __BLOCKINTERRUPTS();
 	    addr = (VOIDFUNC) val;
 	    /*
 	     * allow function to be interrupted
 	     */
-#ifdef OLD
-	    savInt = __immediateInterrupt__;
-	    __immediateInterrupt__ = 1;
-#endif
 	    if (interruptable != true) {
 		wasBlocked = (__BLOCKINTERRUPTS() == true);
 	    }
 	    force = (forceOld == true);
 	    }
 	    if (! wasBlocked) {
 		__UNBLOCKINTERRUPTS();
 	    }
-#ifdef OLD
-	    __immediateInterrupt__ = savInt;
-#endif
 	    RETURN (self);
 	}
 }
 %}.
 self primitiveFailed
 "initialization phases after registration.
 DANGER: Pure magic; internal only -> dont use in your programs."
 %{
 int savInt;
-extern int __immediateInterrupt__;
 int prevSpace, force;
 int arg = 0;
 int wasBlocked = 1;
 extern OBJ __BLOCKINTERRUPTS();
 if (_isSmallInteger(phase)) {
-	/*
-	 * allow function to be interrupted
-	 */
-#ifdef OLD
-	savInt = __immediateInterrupt__;
-	__immediateInterrupt__ = 1;
-#endif
 	if (interruptable != true) {
 	    wasBlocked = (__BLOCKINTERRUPTS() == true);
 	}
 	force = (forceOld == true);
 	}
 	if (! wasBlocked) {
 	    __UNBLOCKINTERRUPTS();
 	}
-#ifdef OLD
-	__immediateInterrupt__ = savInt;
-#endif
 	RETURN (self);
 }
 %}.
 self primitiveFailed
 ! !
 if (! __isString(aFileName)) {
 	RETURN (nil);
 }
-fname = (char *) _stringVal(aFileName);
+fname = (char *) __stringVal(aFileName);
 # if defined(A_DOT_OUT) && !defined(ELF)
 #  if !defined(sco) && !defined(isc)
 {
 	struct exec header;
 if (! __isString(aFileName)) {
 	RETURN ( nil );
 }
-fname = (char *) _stringVal(aFileName);
+fname = (char *) __stringVal(aFileName);
 # if defined(A_DOT_OUT) && !defined(ELF)
 #  if !defined(sco) && !defined(isc)
 {
 	struct exec header;
 }
 # if defined(A_DOT_OUT) && !defined(ELF)
 #  if !defined(sco) && !defined(isc)
 {
-	char *fname = (char *) _stringVal(aFileName);
+	char *fname = (char *) __stringVal(aFileName);
 	unsigned taddr, daddr;
 	unsigned tsize, dsize;
 	unsigned toffset = 0;
 	unsigned doffset = 0;
 	int fd;

changeset 98	ccc7f9389a8e
parent 97	3b0d380771e9
child 100	6df9644528bd