--- a/ObjFLoader.st Fri Mar 29 04:25:01 1996 +0100
+++ b/ObjFLoader.st Tue Apr 02 23:30:48 1996 +0200
@@ -1316,8 +1316,8 @@
for (index = 0; index < count; index++) {
OBJ s;
- s = _MKSTRING(*nm);
- _ArrayInstPtr(list)->a_element[index] = s;
+ s = __MKSTRING(*nm);
+ __ArrayInstPtr(list)->a_element[index] = s;
__STORE(list, s);
nm++;
}
@@ -1388,8 +1388,8 @@
if (ObjectFileLoader_Verbose == true)
printf("addr of %s = %x\n", name, (INT)func);
if (dld_function_executable_p(name)) {
- lowAddr = _MKSMALLINT( (INT)func & 0xFFFF );
- hiAddr = _MKSMALLINT( ((INT)func >> 16) & 0xFFFF );
+ lowAddr = __MKSMALLINT( (INT)func & 0xFFFF );
+ hiAddr = __MKSMALLINT( ((INT)func >> 16) & 0xFFFF );
} else {
char **undefNames;
char **nm;
@@ -1438,8 +1438,8 @@
if (ObjectFileLoader_Verbose == true) {
printf("GetProcAddr %s ok; addr = %x\n", __stringVal(aString), addr);
}
- lowAddr = _MKSMALLINT( (int)addr & 0xFFFF );
- hiAddr = _MKSMALLINT( ((int)addr >> 16) & 0xFFFF );
+ lowAddr = __MKSMALLINT( (int)addr & 0xFFFF );
+ hiAddr = __MKSMALLINT( ((int)addr >> 16) & 0xFFFF );
} else {
if (ObjectFileLoader_Verbose == true) {
printf("GetProcAddr %s error: %x\n", __stringVal(aString), GetLastError());
@@ -1465,8 +1465,8 @@
if (addr) {
if (ObjectFileLoader_Verbose == true)
printf("addr = %x\n", addr);
- lowAddr = _MKSMALLINT( (int)addr & 0xFFFF );
- hiAddr = _MKSMALLINT( ((int)addr >> 16) & 0xFFFF );
+ lowAddr = __MKSMALLINT( (int)addr & 0xFFFF );
+ hiAddr = __MKSMALLINT( ((int)addr >> 16) & 0xFFFF );
} else {
if (ObjectFileLoader_Verbose == true)
printf("dl_getsymbol %s failed\n", __stringVal(aString));
@@ -1494,8 +1494,8 @@
if (ObjectFileLoader_Verbose == true) {
printf("dlsym %s ok; addr = %x\n", __stringVal(aString), addr);
}
- lowAddr = _MKSMALLINT( (int)addr & 0xFFFF );
- hiAddr = _MKSMALLINT( ((int)addr >> 16) & 0xFFFF );
+ 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());
@@ -1539,8 +1539,8 @@
printf("addr = %x\n", addr);
}
- lowAddr = _MKSMALLINT( (int)addr & 0xFFFF );
- hiAddr = _MKSMALLINT( ((int)addr >> 16) & 0xFFFF );
+ lowAddr = __MKSMALLINT( (int)addr & 0xFFFF );
+ hiAddr = __MKSMALLINT( ((int)addr >> 16) & 0xFFFF );
}
}
}
@@ -1564,8 +1564,8 @@
if (addr) {
if (ObjectFileLoader_Verbose == true)
printf("addr = %x\n", addr);
- lowAddr = _MKSMALLINT( (int)addr & 0xFFFF );
- hiAddr = _MKSMALLINT( ((int)addr >> 16) & 0xFFFF );
+ 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());
@@ -1592,8 +1592,8 @@
if (result) {
if (ObjectFileLoader_Verbose == true)
printf("addr = %x\n", addr);
- lowAddr = _MKSMALLINT( (int)addr & 0xFFFF );
- hiAddr = _MKSMALLINT( ((int)addr >> 16) & 0xFFFF );
+ lowAddr = __MKSMALLINT( (int)addr & 0xFFFF );
+ hiAddr = __MKSMALLINT( ((int)addr >> 16) & 0xFFFF );
}
}
}
@@ -2020,7 +2020,7 @@
ObjectFileLoader_LastError = @symbol(linkError);
RETURN ( nil );
}
- _ArrayInstPtr(anInfoBuffer)->a_element[0] = pathName;
+ __ArrayInstPtr(anInfoBuffer)->a_element[0] = pathName;
__STORE(anInfoBuffer, pathName);
RETURN ( anInfoBuffer );
}
@@ -2043,8 +2043,8 @@
ObjectFileLoader_LastError = __MKINT(err);
RETURN ( nil );
}
- _ArrayInstPtr(anInfoBuffer)->a_element[0] = _MKSMALLINT( (int)handle & 0xFFFF );
- _ArrayInstPtr(anInfoBuffer)->a_element[1] = _MKSMALLINT( ((int)handle >> 16) & 0xFFFF );
+ __ArrayInstPtr(anInfoBuffer)->a_element[0] = __MKSMALLINT( (int)handle & 0xFFFF );
+ __ArrayInstPtr(anInfoBuffer)->a_element[1] = __MKSMALLINT( ((int)handle >> 16) & 0xFFFF );
RETURN ( anInfoBuffer );
}
RETURN ( nil );
@@ -2068,8 +2068,8 @@
* returns the name of the temporary ld-file
* use that as handle ...
*/
- tmpName = _MKSTRING(ldname);
- _ArrayInstPtr(anInfoBuffer)->a_element[0] = tmpName;
+ tmpName = __MKSTRING(ldname);
+ __ArrayInstPtr(anInfoBuffer)->a_element[0] = tmpName;
__STORE(anInfoBuffer, tmpName);
RETURN ( anInfoBuffer );
}
@@ -2108,8 +2108,8 @@
printf("load %s handle = %x\n", __stringVal(pathName), handle);
}
- _ArrayInstPtr(anInfoBuffer)->a_element[0] = _MKSMALLINT( (int)handle & 0xFFFF );
- _ArrayInstPtr(anInfoBuffer)->a_element[1] = _MKSMALLINT( ((int)handle >> 16) & 0xFFFF );
+ __ArrayInstPtr(anInfoBuffer)->a_element[0] = __MKSMALLINT( (int)handle & 0xFFFF );
+ __ArrayInstPtr(anInfoBuffer)->a_element[1] = __MKSMALLINT( ((int)handle >> 16) & 0xFFFF );
RETURN (anInfoBuffer);
}
RETURN ( nil );
@@ -2130,7 +2130,7 @@
fprintf(stderr, "dlopen %s error:\n", __stringVal(pathName));
fprintf(stderr, " <%s>\n", errMsg);
ObjectFileLoader_LastError = @symbol(linkError);
- ObjectFileLoader_LinkErrorMessage = _MKSTRING(errMsg);
+ ObjectFileLoader_LinkErrorMessage = __MKSTRING(errMsg);
RETURN (nil);
}
@@ -2138,8 +2138,8 @@
printf("open %s handle = %x\n", __stringVal(pathName), handle);
}
- _ArrayInstPtr(anInfoBuffer)->a_element[0] = _MKSMALLINT( (int)handle & 0xFFFF );
- _ArrayInstPtr(anInfoBuffer)->a_element[1] = _MKSMALLINT( ((int)handle >> 16) & 0xFFFF );
+ __ArrayInstPtr(anInfoBuffer)->a_element[0] = __MKSMALLINT( (int)handle & 0xFFFF );
+ __ArrayInstPtr(anInfoBuffer)->a_element[1] = __MKSMALLINT( ((int)handle >> 16) & 0xFFFF );
RETURN (anInfoBuffer);
}
}
@@ -2166,8 +2166,8 @@
printf("open %s handle = %x\n", __stringVal(pathName), handle);
}
- _ArrayInstPtr(anInfoBuffer)->a_element[0] = _MKSMALLINT( (int)handle & 0xFFFF );
- _ArrayInstPtr(anInfoBuffer)->a_element[1] = _MKSMALLINT( ((int)handle >> 16) & 0xFFFF );
+ __ArrayInstPtr(anInfoBuffer)->a_element[0] = __MKSMALLINT( (int)handle & 0xFFFF );
+ __ArrayInstPtr(anInfoBuffer)->a_element[1] = __MKSMALLINT( ((int)handle >> 16) & 0xFFFF );
RETURN (anInfoBuffer);
}
}
@@ -2197,7 +2197,7 @@
if (ObjectFileLoader_Verbose == true)
printf("rld_load %s ok\n", __stringVal(pathName));
- _ArrayInstPtr(anInfoBuffer)->a_element[0] = pathName;
+ __ArrayInstPtr(anInfoBuffer)->a_element[0] = pathName;
__STORE(anInfoBuffer, pathName);
RETURN ( anInfoBuffer );
}
@@ -2850,7 +2850,7 @@
# if defined(sinix) && defined(BSD)
size += header.a_bss;
# endif
- RETURN ( _MKSMALLINT(size) );
+ RETURN ( __MKSMALLINT(size) );
}
# endif
# endif
@@ -3054,7 +3054,7 @@
OMAGIC, OMAGIC);
RETURN ( nil );
}
- RETURN ( _MKSMALLINT(header.a_text) );
+ RETURN ( __MKSMALLINT(header.a_text) );
}
# endif
# endif
@@ -3159,6 +3159,6 @@
!ObjectFileLoader class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libcomp/Attic/ObjFLoader.st,v 1.87 1996-03-18 14:33:15 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libcomp/Attic/ObjFLoader.st,v 1.88 1996-04-02 21:30:48 cg Exp $'
! !
ObjectFileLoader initialize!
--- a/ObjectFileLoader.st Fri Mar 29 04:25:01 1996 +0100
+++ b/ObjectFileLoader.st Tue Apr 02 23:30:48 1996 +0200
@@ -1316,8 +1316,8 @@
for (index = 0; index < count; index++) {
OBJ s;
- s = _MKSTRING(*nm);
- _ArrayInstPtr(list)->a_element[index] = s;
+ s = __MKSTRING(*nm);
+ __ArrayInstPtr(list)->a_element[index] = s;
__STORE(list, s);
nm++;
}
@@ -1388,8 +1388,8 @@
if (ObjectFileLoader_Verbose == true)
printf("addr of %s = %x\n", name, (INT)func);
if (dld_function_executable_p(name)) {
- lowAddr = _MKSMALLINT( (INT)func & 0xFFFF );
- hiAddr = _MKSMALLINT( ((INT)func >> 16) & 0xFFFF );
+ lowAddr = __MKSMALLINT( (INT)func & 0xFFFF );
+ hiAddr = __MKSMALLINT( ((INT)func >> 16) & 0xFFFF );
} else {
char **undefNames;
char **nm;
@@ -1438,8 +1438,8 @@
if (ObjectFileLoader_Verbose == true) {
printf("GetProcAddr %s ok; addr = %x\n", __stringVal(aString), addr);
}
- lowAddr = _MKSMALLINT( (int)addr & 0xFFFF );
- hiAddr = _MKSMALLINT( ((int)addr >> 16) & 0xFFFF );
+ lowAddr = __MKSMALLINT( (int)addr & 0xFFFF );
+ hiAddr = __MKSMALLINT( ((int)addr >> 16) & 0xFFFF );
} else {
if (ObjectFileLoader_Verbose == true) {
printf("GetProcAddr %s error: %x\n", __stringVal(aString), GetLastError());
@@ -1465,8 +1465,8 @@
if (addr) {
if (ObjectFileLoader_Verbose == true)
printf("addr = %x\n", addr);
- lowAddr = _MKSMALLINT( (int)addr & 0xFFFF );
- hiAddr = _MKSMALLINT( ((int)addr >> 16) & 0xFFFF );
+ lowAddr = __MKSMALLINT( (int)addr & 0xFFFF );
+ hiAddr = __MKSMALLINT( ((int)addr >> 16) & 0xFFFF );
} else {
if (ObjectFileLoader_Verbose == true)
printf("dl_getsymbol %s failed\n", __stringVal(aString));
@@ -1494,8 +1494,8 @@
if (ObjectFileLoader_Verbose == true) {
printf("dlsym %s ok; addr = %x\n", __stringVal(aString), addr);
}
- lowAddr = _MKSMALLINT( (int)addr & 0xFFFF );
- hiAddr = _MKSMALLINT( ((int)addr >> 16) & 0xFFFF );
+ 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());
@@ -1539,8 +1539,8 @@
printf("addr = %x\n", addr);
}
- lowAddr = _MKSMALLINT( (int)addr & 0xFFFF );
- hiAddr = _MKSMALLINT( ((int)addr >> 16) & 0xFFFF );
+ lowAddr = __MKSMALLINT( (int)addr & 0xFFFF );
+ hiAddr = __MKSMALLINT( ((int)addr >> 16) & 0xFFFF );
}
}
}
@@ -1564,8 +1564,8 @@
if (addr) {
if (ObjectFileLoader_Verbose == true)
printf("addr = %x\n", addr);
- lowAddr = _MKSMALLINT( (int)addr & 0xFFFF );
- hiAddr = _MKSMALLINT( ((int)addr >> 16) & 0xFFFF );
+ 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());
@@ -1592,8 +1592,8 @@
if (result) {
if (ObjectFileLoader_Verbose == true)
printf("addr = %x\n", addr);
- lowAddr = _MKSMALLINT( (int)addr & 0xFFFF );
- hiAddr = _MKSMALLINT( ((int)addr >> 16) & 0xFFFF );
+ lowAddr = __MKSMALLINT( (int)addr & 0xFFFF );
+ hiAddr = __MKSMALLINT( ((int)addr >> 16) & 0xFFFF );
}
}
}
@@ -2020,7 +2020,7 @@
ObjectFileLoader_LastError = @symbol(linkError);
RETURN ( nil );
}
- _ArrayInstPtr(anInfoBuffer)->a_element[0] = pathName;
+ __ArrayInstPtr(anInfoBuffer)->a_element[0] = pathName;
__STORE(anInfoBuffer, pathName);
RETURN ( anInfoBuffer );
}
@@ -2043,8 +2043,8 @@
ObjectFileLoader_LastError = __MKINT(err);
RETURN ( nil );
}
- _ArrayInstPtr(anInfoBuffer)->a_element[0] = _MKSMALLINT( (int)handle & 0xFFFF );
- _ArrayInstPtr(anInfoBuffer)->a_element[1] = _MKSMALLINT( ((int)handle >> 16) & 0xFFFF );
+ __ArrayInstPtr(anInfoBuffer)->a_element[0] = __MKSMALLINT( (int)handle & 0xFFFF );
+ __ArrayInstPtr(anInfoBuffer)->a_element[1] = __MKSMALLINT( ((int)handle >> 16) & 0xFFFF );
RETURN ( anInfoBuffer );
}
RETURN ( nil );
@@ -2068,8 +2068,8 @@
* returns the name of the temporary ld-file
* use that as handle ...
*/
- tmpName = _MKSTRING(ldname);
- _ArrayInstPtr(anInfoBuffer)->a_element[0] = tmpName;
+ tmpName = __MKSTRING(ldname);
+ __ArrayInstPtr(anInfoBuffer)->a_element[0] = tmpName;
__STORE(anInfoBuffer, tmpName);
RETURN ( anInfoBuffer );
}
@@ -2108,8 +2108,8 @@
printf("load %s handle = %x\n", __stringVal(pathName), handle);
}
- _ArrayInstPtr(anInfoBuffer)->a_element[0] = _MKSMALLINT( (int)handle & 0xFFFF );
- _ArrayInstPtr(anInfoBuffer)->a_element[1] = _MKSMALLINT( ((int)handle >> 16) & 0xFFFF );
+ __ArrayInstPtr(anInfoBuffer)->a_element[0] = __MKSMALLINT( (int)handle & 0xFFFF );
+ __ArrayInstPtr(anInfoBuffer)->a_element[1] = __MKSMALLINT( ((int)handle >> 16) & 0xFFFF );
RETURN (anInfoBuffer);
}
RETURN ( nil );
@@ -2130,7 +2130,7 @@
fprintf(stderr, "dlopen %s error:\n", __stringVal(pathName));
fprintf(stderr, " <%s>\n", errMsg);
ObjectFileLoader_LastError = @symbol(linkError);
- ObjectFileLoader_LinkErrorMessage = _MKSTRING(errMsg);
+ ObjectFileLoader_LinkErrorMessage = __MKSTRING(errMsg);
RETURN (nil);
}
@@ -2138,8 +2138,8 @@
printf("open %s handle = %x\n", __stringVal(pathName), handle);
}
- _ArrayInstPtr(anInfoBuffer)->a_element[0] = _MKSMALLINT( (int)handle & 0xFFFF );
- _ArrayInstPtr(anInfoBuffer)->a_element[1] = _MKSMALLINT( ((int)handle >> 16) & 0xFFFF );
+ __ArrayInstPtr(anInfoBuffer)->a_element[0] = __MKSMALLINT( (int)handle & 0xFFFF );
+ __ArrayInstPtr(anInfoBuffer)->a_element[1] = __MKSMALLINT( ((int)handle >> 16) & 0xFFFF );
RETURN (anInfoBuffer);
}
}
@@ -2166,8 +2166,8 @@
printf("open %s handle = %x\n", __stringVal(pathName), handle);
}
- _ArrayInstPtr(anInfoBuffer)->a_element[0] = _MKSMALLINT( (int)handle & 0xFFFF );
- _ArrayInstPtr(anInfoBuffer)->a_element[1] = _MKSMALLINT( ((int)handle >> 16) & 0xFFFF );
+ __ArrayInstPtr(anInfoBuffer)->a_element[0] = __MKSMALLINT( (int)handle & 0xFFFF );
+ __ArrayInstPtr(anInfoBuffer)->a_element[1] = __MKSMALLINT( ((int)handle >> 16) & 0xFFFF );
RETURN (anInfoBuffer);
}
}
@@ -2197,7 +2197,7 @@
if (ObjectFileLoader_Verbose == true)
printf("rld_load %s ok\n", __stringVal(pathName));
- _ArrayInstPtr(anInfoBuffer)->a_element[0] = pathName;
+ __ArrayInstPtr(anInfoBuffer)->a_element[0] = pathName;
__STORE(anInfoBuffer, pathName);
RETURN ( anInfoBuffer );
}
@@ -2850,7 +2850,7 @@
# if defined(sinix) && defined(BSD)
size += header.a_bss;
# endif
- RETURN ( _MKSMALLINT(size) );
+ RETURN ( __MKSMALLINT(size) );
}
# endif
# endif
@@ -3054,7 +3054,7 @@
OMAGIC, OMAGIC);
RETURN ( nil );
}
- RETURN ( _MKSMALLINT(header.a_text) );
+ RETURN ( __MKSMALLINT(header.a_text) );
}
# endif
# endif
@@ -3159,6 +3159,6 @@
!ObjectFileLoader class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libcomp/ObjectFileLoader.st,v 1.87 1996-03-18 14:33:15 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libcomp/ObjectFileLoader.st,v 1.88 1996-04-02 21:30:48 cg Exp $'
! !
ObjectFileLoader initialize!