--- a/ObjectFileLoader.st Thu Nov 03 15:28:59 2016 +0100
+++ b/ObjectFileLoader.st Fri Nov 04 16:14:07 2016 +0100
@@ -3964,13 +3964,13 @@
install all of its classes) or for a single incrementally compiled methdod
(it should then NOT install it, but return the method object instead).
- DANGER: Internal & highly specialized. Dont use in your programs.
- This interface may change without notice."
+ DANGER: Internal & highly specialized. Don't use in your programs.
+ This interface may change without notice."
|moduleID retVal oldSpaceReserve|
handle notNil ifTrue:[
- moduleID := handle moduleID
+ moduleID := handle moduleID
].
"/
"/ for various reasons, classes, methods, literals, methodDicts etc.
@@ -3989,58 +3989,58 @@
int wasBlocked = 1;
if (__isInteger(address)) {
- if (_isSmallInteger(argument)) {
- arg = __intVal(argument);
-
- addr = (OBJFUNC)(__longIntVal(address));
-
- /*
- * allow function to be interrupted
- */
- if (interruptable != true) {
- wasBlocked = (__BLOCKINTERRUPTS() == true);
- }
-
- force = (forceOld == true);
- if (force) {
- int reserve = __intVal(oldSpaceReserve);
- if ((__oldSpaceSize() - __oldSpaceUsed()) < reserve) {
- __moreOldSpace(__thisContext, reserve);
- }
- prevSpace = __allocForceSpace(OLDSPACE);
- }
-
- if (@global(Verbose) == true) {
- console_printf("calling initfunc %lx(%lx) ...\n", (long)addr, (long)arg);
- }
-
- if (special == true) {
- if (__isSmallInteger(moduleID)) {
- __SET_MODULE_ID(__intVal(moduleID));
- }
- retVal = (*addr)(arg, __pRT__);
- __SET_MODULE_ID(0);
- if (returnsObject != true) {
- retVal = nil;
- }
- } else {
- if (returnsObject == true) {
- retVal = (*addr)(arg);
- } else {
- ret = (INT) ((*addr)(arg));
- retVal = __mkSmallInteger(ret);
- }
- }
-
- if (force) {
- __allocForceSpace(prevSpace);
- }
-
- if (! wasBlocked) {
- __UNBLOCKINTERRUPTS();
- }
- RETURN (retVal);
- }
+ if (_isSmallInteger(argument)) {
+ arg = __intVal(argument);
+
+ addr = (OBJFUNC)(__longIntVal(address));
+
+ /*
+ * allow function to be interrupted
+ */
+ if (interruptable != true) {
+ wasBlocked = (__BLOCKINTERRUPTS() == true);
+ }
+
+ force = (forceOld == true);
+ if (force) {
+ int reserve = __intVal(oldSpaceReserve);
+ if ((__oldSpaceSize() - __oldSpaceUsed()) < reserve) {
+ __moreOldSpace(__thisContext, reserve);
+ }
+ prevSpace = __allocForceSpace(OLDSPACE);
+ }
+
+ if (@global(Verbose) == true) {
+ console_printf("calling initfunc %lx(%lx) ...\n", (long)addr, (long)arg);
+ }
+
+ if (special == true) {
+ if (__isSmallInteger(moduleID)) {
+ __SET_MODULE_ID(__intVal(moduleID));
+ }
+ retVal = (*addr)(arg, __pRT__);
+ __SET_MODULE_ID(0);
+ if (returnsObject != true) {
+ retVal = nil;
+ }
+ } else {
+ if (returnsObject == true) {
+ retVal = (*addr)(arg);
+ } else {
+ ret = (INT) ((*addr)(arg));
+ retVal = __mkSmallInteger(ret);
+ }
+ }
+
+ if (force) {
+ __allocForceSpace(prevSpace);
+ }
+
+ if (! wasBlocked) {
+ __UNBLOCKINTERRUPTS();
+ }
+ RETURN (retVal);
+ }
}
%}.
self primitiveFailed