at http://www.mirandabanda.org/files/Cog/VM/VM.r3024/.
I had *forgotten* to implement following forwarders on primitive failure in
machine code primitives, hence Cog Spur was badly broken. It's now a
little bit better, but I still need to implement this for named primitives.
Real soon now I hope...
CogVM source as per VMMaker.oscog-eem.791/r3024
Implement following forwarders on primitive failure in machine code
interpreter
primitives (still have to implement this in sideways calls of named
primitives).
Allow the JIT to not compile primitiveDoNamedPrimitiveWithArgs
to avoid any potential complications.
Rewrite all the semaphore installing primitives to fail if the semaphore
arg is
neither a semaphore or nil instead of assuming if its not a semaphore it
must be
nil, so as to fail and retry when semaphores are forwarded (as they are when
Semaphore is redefined).
Implement isSemaphoreOop:/Obj: in the object memories to abstract away the
code.
Base Spur's on the class index of splObj: ClassSemaphore, avoiding the table
lookup to derive the class. Make checkForEventsMayContextSwitch: treat all
its
semaphores consistently.
Have spur's fetchClassOfNonImm: answer nilObj for
forwarders to avoid assert fails.
On Spur add read barriers to primitiveSuspend and synchronousSignal:'s
myList
access, because the process list manipulation routines do no checking. Add
assert checks for forwarders in the process list manipulation routines.
Fix slip in
StackInterpreter>>actuallyFollowNecessaryForwardingInMethod:literalCount:
that corrupts the methodClassAssociation.
Abstract out the call machinery from
compileTrampolineFor:numArgs:arg:arg:arg:-
arg:saveRegs:pushLinkReg:resultReg: so it can be used by
maybeCompileRetry:onPrimitiveFail: in implementing following forwarders on
primitive failure in machine code, and the Open PIC miss call.
Have bytecodePCFor:cogMethod:startBcpc: map any pc before the
stackCheckOffset
to the initialPC, which applies to primitives in progress.
Fix assert fails in updateStateOfSpouseContextForFrame:WithSP:
and elsewhere with forwarders.
LargeIntegers Plugin:
Fix a latent signed shift bug in cDigitSub:len:with:len:into:
caused by VMMaker.oscog-eem.785's eliminating the
divide-via-shift optimization.
These changes allow Cog Spur to redefine Process and/or Semaphore and not
hang.
--
best,
Eliot
1
0
01 Jul '14
Revision: 3024
Author: eliot
Date: 2014-07-01 08:39:10 -0700 (Tue, 01 Jul 2014)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.791
Rescue non-Spur builds by making accessorDepthForPrimitiveIndex: a Spur option.
Factor out the type machinery in generateShiftRight:on:indent: and use it to
ensure generateSignedBitShift:on:indent: will not cast 64-bit vars to ints.
Modified Paths:
--------------
branches/Cog/nscogsrc/vm/cointerp.c
branches/Cog/nscogsrc/vm/cointerp.h
branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
branches/Cog/nscogsrc/vm/interp.h
branches/Cog/nscogsrc/vm/vmCallback.h
branches/Cog/nsspursrc/vm/cointerp.c
branches/Cog/nsspursrc/vm/cointerp.h
branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
branches/Cog/nsspursrc/vm/interp.h
branches/Cog/nsspursrc/vm/vmCallback.h
branches/Cog/sistasrc/vm/cointerp.c
branches/Cog/sistasrc/vm/cointerp.h
branches/Cog/sistasrc/vm/gcc3x-cointerp.c
branches/Cog/sistasrc/vm/interp.h
branches/Cog/sistasrc/vm/vmCallback.h
branches/Cog/spursistasrc/vm/cointerp.c
branches/Cog/spursistasrc/vm/cointerp.h
branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
branches/Cog/spursistasrc/vm/interp.h
branches/Cog/spursistasrc/vm/vmCallback.h
branches/Cog/spursrc/vm/cointerp.c
branches/Cog/spursrc/vm/cointerp.h
branches/Cog/spursrc/vm/gcc3x-cointerp.c
branches/Cog/spursrc/vm/interp.h
branches/Cog/spursrc/vm/vmCallback.h
branches/Cog/src/vm/cointerp.c
branches/Cog/src/vm/cointerp.h
branches/Cog/src/vm/cointerpmt.c
branches/Cog/src/vm/cointerpmt.h
branches/Cog/src/vm/gcc3x-cointerp.c
branches/Cog/src/vm/gcc3x-cointerpmt.c
branches/Cog/src/vm/interp.h
branches/Cog/src/vm/vmCallback.h
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nscogsrc/vm/cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.c 2014-07-01 03:09:58 UTC (rev 3023)
+++ branches/Cog/nscogsrc/vm/cointerp.c 2014-07-01 15:39:10 UTC (rev 3024)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
from
- CoInterpreter VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CoInterpreter VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -364,7 +364,6 @@
#endif
sqInt interpret(void);
-sqInt accessorDepthForPrimitiveIndex(sqInt primIndex);
static void activateCoggedNewMethod(sqInt inInterpreter) NoDbgRegParms;
static void activateNewMethod(void);
sqInt activeProcess(void);
@@ -1176,7 +1175,7 @@
static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)) NoDbgRegParms;
static sqInt roomToPushNArgs(sqInt n) NoDbgRegParms;
static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms;
-static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms;
+static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms;
static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms;
usqInt scavengeThresholdAddress(void);
EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext);
@@ -2065,7 +2064,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.790";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.791";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -13075,13 +13074,7 @@
return null;
}
-sqInt
-accessorDepthForPrimitiveIndex(sqInt primIndex)
-{
- return primitiveAccessorDepthTable[primIndex];
-}
-
/* Activate newMethod when newMethod has been cogged, i.e. create a
machine-code frame and (re)enter machine-code.
*/
@@ -23994,15 +23987,17 @@
sqInt header1;
sqInt header2;
sqInt header3;
+ sqInt header4;
usqInt lastWord;
sqInt newFreeChunk;
sqInt newOop;
- usqInt next;
+ sqInt next;
sqInt oop;
sqInt realHeader;
sqInt sz;
sqInt sz1;
sqInt sz2;
+ sqInt sz3;
sqInt target;
usqInt w;
@@ -24013,7 +24008,21 @@
/* begin objectAfterWhileForwarding: */
header2 = longAt(oop);
if ((header2 & MarkBit) == 0) {
- next = ((sqInt) (objectAfter(oop)));
+ /* begin objectAfter: */
+ if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) {
+ error("no objects after the end of memory");
+ }
+ if (((longAt(oop)) & TypeMask) == HeaderTypeFree) {
+ sz2 = (longAt(oop)) & AllButTypeMask;
+ }
+ else {
+ /* begin sizeBitsOf: */
+ header3 = longAt(oop);
+ sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass
+ ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask
+ : header3 & SizeMask);
+ }
+ next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]);
goto l1;
}
fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1;
@@ -24028,7 +24037,7 @@
else {
sz1 = realHeader & SizeMask;
}
- next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask])));
+ next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]);
l1: /* end objectAfterWhileForwarding: */;
if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) {
@@ -24082,18 +24091,18 @@
}
/* begin safeObjectAfter: */
if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) {
- sz2 = (longAt(newFreeChunk)) & AllButTypeMask;
+ sz3 = (longAt(newFreeChunk)) & AllButTypeMask;
}
else {
/* begin sizeBitsOf: */
- header3 = longAt(newFreeChunk);
- sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass
+ header4 = longAt(newFreeChunk);
+ sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass
? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask
- : header3 & SizeMask);
+ : header4 & SizeMask);
}
- next = ((newFreeChunk + sz2) >= GIV(freeStart)
+ next = ((newFreeChunk + sz3) >= GIV(freeStart)
? GIV(freeStart)
- : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask]));
+ : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask]));
assert((next == GIV(freeStart))
|| (next == (oopFromChunk(GIV(compEnd)))));
if (next == GIV(freeStart)) {
@@ -50896,7 +50905,7 @@
given object or free chunk in memory. Return freeStart when
enumeration is complete. This is for assertion checking only. */
-static usqInt
+static sqInt
safeObjectAfter(sqInt oop)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt header;
Modified: branches/Cog/nscogsrc/vm/cointerp.h
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.h 2014-07-01 03:09:58 UTC (rev 3023)
+++ branches/Cog/nscogsrc/vm/cointerp.h 2014-07-01 15:39:10 UTC (rev 3024)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
*/
@@ -14,7 +14,6 @@
# define NoDbgRegParms /*empty*/
#endif
-sqInt accessorDepthForPrimitiveIndex(sqInt primIndex);
sqInt activeProcess(void);
sqInt addressCouldBeObj(sqInt address);
sqInt addressCouldBeOop(sqInt address);
Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-07-01 03:09:58 UTC (rev 3023)
+++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-07-01 15:39:10 UTC (rev 3024)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
from
- CoInterpreter VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CoInterpreter VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -367,7 +367,6 @@
#endif
sqInt interpret(void);
-sqInt accessorDepthForPrimitiveIndex(sqInt primIndex);
static void activateCoggedNewMethod(sqInt inInterpreter) NoDbgRegParms;
static void activateNewMethod(void);
sqInt activeProcess(void);
@@ -1179,7 +1178,7 @@
static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)) NoDbgRegParms;
static sqInt roomToPushNArgs(sqInt n) NoDbgRegParms;
static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms;
-static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms;
+static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms;
static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms;
usqInt scavengeThresholdAddress(void);
EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext);
@@ -2068,7 +2067,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.790";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.791";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -13084,13 +13083,7 @@
return null;
}
-sqInt
-accessorDepthForPrimitiveIndex(sqInt primIndex)
-{
- return primitiveAccessorDepthTable[primIndex];
-}
-
/* Activate newMethod when newMethod has been cogged, i.e. create a
machine-code frame and (re)enter machine-code.
*/
@@ -24003,15 +23996,17 @@
sqInt header1;
sqInt header2;
sqInt header3;
+ sqInt header4;
usqInt lastWord;
sqInt newFreeChunk;
sqInt newOop;
- usqInt next;
+ sqInt next;
sqInt oop;
sqInt realHeader;
sqInt sz;
sqInt sz1;
sqInt sz2;
+ sqInt sz3;
sqInt target;
usqInt w;
@@ -24022,7 +24017,21 @@
/* begin objectAfterWhileForwarding: */
header2 = longAt(oop);
if ((header2 & MarkBit) == 0) {
- next = ((sqInt) (objectAfter(oop)));
+ /* begin objectAfter: */
+ if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) {
+ error("no objects after the end of memory");
+ }
+ if (((longAt(oop)) & TypeMask) == HeaderTypeFree) {
+ sz2 = (longAt(oop)) & AllButTypeMask;
+ }
+ else {
+ /* begin sizeBitsOf: */
+ header3 = longAt(oop);
+ sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass
+ ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask
+ : header3 & SizeMask);
+ }
+ next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]);
goto l1;
}
fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1;
@@ -24037,7 +24046,7 @@
else {
sz1 = realHeader & SizeMask;
}
- next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask])));
+ next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]);
l1: /* end objectAfterWhileForwarding: */;
if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) {
@@ -24091,18 +24100,18 @@
}
/* begin safeObjectAfter: */
if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) {
- sz2 = (longAt(newFreeChunk)) & AllButTypeMask;
+ sz3 = (longAt(newFreeChunk)) & AllButTypeMask;
}
else {
/* begin sizeBitsOf: */
- header3 = longAt(newFreeChunk);
- sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass
+ header4 = longAt(newFreeChunk);
+ sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass
? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask
- : header3 & SizeMask);
+ : header4 & SizeMask);
}
- next = ((newFreeChunk + sz2) >= GIV(freeStart)
+ next = ((newFreeChunk + sz3) >= GIV(freeStart)
? GIV(freeStart)
- : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask]));
+ : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask]));
assert((next == GIV(freeStart))
|| (next == (oopFromChunk(GIV(compEnd)))));
if (next == GIV(freeStart)) {
@@ -50905,7 +50914,7 @@
given object or free chunk in memory. Return freeStart when
enumeration is complete. This is for assertion checking only. */
-static usqInt
+static sqInt
safeObjectAfter(sqInt oop)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt header;
Modified: branches/Cog/nscogsrc/vm/interp.h
===================================================================
--- branches/Cog/nscogsrc/vm/interp.h 2014-07-01 03:09:58 UTC (rev 3023)
+++ branches/Cog/nscogsrc/vm/interp.h 2014-07-01 15:39:10 UTC (rev 3024)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/nscogsrc/vm/vmCallback.h
===================================================================
--- branches/Cog/nscogsrc/vm/vmCallback.h 2014-07-01 03:09:58 UTC (rev 3023)
+++ branches/Cog/nscogsrc/vm/vmCallback.h 2014-07-01 15:39:10 UTC (rev 3024)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
*/
#define VM_CALLBACK_INC 1
Modified: branches/Cog/nsspursrc/vm/cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.c 2014-07-01 03:09:58 UTC (rev 3023)
+++ branches/Cog/nsspursrc/vm/cointerp.c 2014-07-01 15:39:10 UTC (rev 3024)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
from
- CoInterpreter VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CoInterpreter VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2283,7 +2283,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.790";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.791";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -5577,6 +5577,7 @@
GIV(framePointer) = localFP;
ceEnterCogCodePopReceiverReg();
+ null;
goto l290;
}
localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -5594,7 +5595,7 @@
/* begin fetchNextBytecode */
currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector);
- /* return self */
+ null;
l290: /* end baseFrameReturn */;
goto l287;
}
Modified: branches/Cog/nsspursrc/vm/cointerp.h
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.h 2014-07-01 03:09:58 UTC (rev 3023)
+++ branches/Cog/nsspursrc/vm/cointerp.h 2014-07-01 15:39:10 UTC (rev 3024)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
*/
Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-07-01 03:09:58 UTC (rev 3023)
+++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-07-01 15:39:10 UTC (rev 3024)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
from
- CoInterpreter VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CoInterpreter VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2286,7 +2286,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.790";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.791";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -5586,6 +5586,7 @@
GIV(framePointer) = localFP;
ceEnterCogCodePopReceiverReg();
+ null;
goto l290;
}
localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -5603,7 +5604,7 @@
/* begin fetchNextBytecode */
currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector);
- /* return self */
+ null;
l290: /* end baseFrameReturn */;
goto l287;
}
Modified: branches/Cog/nsspursrc/vm/interp.h
===================================================================
--- branches/Cog/nsspursrc/vm/interp.h 2014-07-01 03:09:58 UTC (rev 3023)
+++ branches/Cog/nsspursrc/vm/interp.h 2014-07-01 15:39:10 UTC (rev 3024)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/nsspursrc/vm/vmCallback.h
===================================================================
--- branches/Cog/nsspursrc/vm/vmCallback.h 2014-07-01 03:09:58 UTC (rev 3023)
+++ branches/Cog/nsspursrc/vm/vmCallback.h 2014-07-01 15:39:10 UTC (rev 3024)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
*/
#define VM_CALLBACK_INC 1
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Mon Jun 30 20:09:33 PDT 2014
+ Tue Jul 1 08:38:13 PDT 2014
Modified: branches/Cog/sistasrc/vm/cointerp.c
===================================================================
--- branches/Cog/sistasrc/vm/cointerp.c 2014-07-01 03:09:58 UTC (rev 3023)
+++ branches/Cog/sistasrc/vm/cointerp.c 2014-07-01 15:39:10 UTC (rev 3024)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
from
- CoInterpreter VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CoInterpreter VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -362,7 +362,6 @@
#endif
sqInt interpret(void);
-sqInt accessorDepthForPrimitiveIndex(sqInt primIndex);
static void activateCoggedNewMethod(sqInt inInterpreter) NoDbgRegParms;
static void activateNewMethod(void);
sqInt activeProcess(void);
@@ -1171,7 +1170,7 @@
static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)) NoDbgRegParms;
static sqInt roomToPushNArgs(sqInt n) NoDbgRegParms;
static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms;
-static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms;
+static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms;
static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms;
usqInt scavengeThresholdAddress(void);
EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext);
@@ -2059,7 +2058,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.790]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.791]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -4751,7 +4750,6 @@
GIV(framePointer) = localFP;
ceEnterCogCodePopReceiverReg();
- null;
goto l159;
}
localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -4766,7 +4764,7 @@
/* begin fetchNextBytecode */
currentBytecode = byteAtPointer(++localIP);
- null;
+ /* return self */
l159: /* end baseFrameReturn */;
goto l156;
}
@@ -9086,13 +9084,7 @@
return null;
}
-sqInt
-accessorDepthForPrimitiveIndex(sqInt primIndex)
-{
- return primitiveAccessorDepthTable[primIndex];
-}
-
/* Activate newMethod when newMethod has been cogged, i.e. create a
machine-code frame and (re)enter machine-code.
*/
@@ -19570,17 +19562,15 @@
sqInt header1;
sqInt header2;
sqInt header3;
- sqInt header4;
usqInt lastWord;
sqInt newFreeChunk;
sqInt newOop;
- sqInt next;
+ usqInt next;
sqInt oop;
sqInt realHeader;
sqInt sz;
sqInt sz1;
sqInt sz2;
- sqInt sz3;
sqInt target;
usqInt w;
@@ -19591,21 +19581,7 @@
/* begin objectAfterWhileForwarding: */
header2 = longAt(oop);
if ((header2 & MarkBit) == 0) {
- /* begin objectAfter: */
- if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) {
- error("no objects after the end of memory");
- }
- if (((longAt(oop)) & TypeMask) == HeaderTypeFree) {
- sz2 = (longAt(oop)) & AllButTypeMask;
- }
- else {
- /* begin sizeBitsOf: */
- header3 = longAt(oop);
- sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass
- ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask
- : header3 & SizeMask);
- }
- next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]);
+ next = ((sqInt) (objectAfter(oop)));
goto l1;
}
fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1;
@@ -19620,7 +19596,7 @@
else {
sz1 = realHeader & SizeMask;
}
- next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]);
+ next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask])));
l1: /* end objectAfterWhileForwarding: */;
if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) {
@@ -19674,18 +19650,18 @@
}
/* begin safeObjectAfter: */
if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) {
- sz3 = (longAt(newFreeChunk)) & AllButTypeMask;
+ sz2 = (longAt(newFreeChunk)) & AllButTypeMask;
}
else {
/* begin sizeBitsOf: */
- header4 = longAt(newFreeChunk);
- sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass
+ header3 = longAt(newFreeChunk);
+ sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass
? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask
- : header4 & SizeMask);
+ : header3 & SizeMask);
}
- next = ((newFreeChunk + sz3) >= GIV(freeStart)
+ next = ((newFreeChunk + sz2) >= GIV(freeStart)
? GIV(freeStart)
- : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask]));
+ : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask]));
assert((next == GIV(freeStart))
|| (next == (oopFromChunk(GIV(compEnd)))));
if (next == GIV(freeStart)) {
@@ -46392,7 +46368,7 @@
given object or free chunk in memory. Return freeStart when
enumeration is complete. This is for assertion checking only. */
-static sqInt
+static usqInt
safeObjectAfter(sqInt oop)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt header;
Modified: branches/Cog/sistasrc/vm/cointerp.h
===================================================================
--- branches/Cog/sistasrc/vm/cointerp.h 2014-07-01 03:09:58 UTC (rev 3023)
+++ branches/Cog/sistasrc/vm/cointerp.h 2014-07-01 15:39:10 UTC (rev 3024)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
*/
@@ -14,7 +14,6 @@
# define NoDbgRegParms /*empty*/
#endif
-sqInt accessorDepthForPrimitiveIndex(sqInt primIndex);
sqInt activeProcess(void);
sqInt addressCouldBeObj(sqInt address);
sqInt addressCouldBeOop(sqInt address);
Modified: branches/Cog/sistasrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-07-01 03:09:58 UTC (rev 3023)
+++ branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-07-01 15:39:10 UTC (rev 3024)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
from
- CoInterpreter VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CoInterpreter VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -365,7 +365,6 @@
#endif
sqInt interpret(void);
-sqInt accessorDepthForPrimitiveIndex(sqInt primIndex);
static void activateCoggedNewMethod(sqInt inInterpreter) NoDbgRegParms;
static void activateNewMethod(void);
sqInt activeProcess(void);
@@ -1174,7 +1173,7 @@
static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)) NoDbgRegParms;
static sqInt roomToPushNArgs(sqInt n) NoDbgRegParms;
static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms;
-static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms;
+static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms;
static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms;
usqInt scavengeThresholdAddress(void);
EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext);
@@ -2062,7 +2061,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.790]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.791]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -4760,7 +4759,6 @@
GIV(framePointer) = localFP;
ceEnterCogCodePopReceiverReg();
- null;
goto l159;
}
localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -4775,7 +4773,7 @@
/* begin fetchNextBytecode */
currentBytecode = byteAtPointer(++localIP);
- null;
+ /* return self */
l159: /* end baseFrameReturn */;
goto l156;
}
@@ -9095,13 +9093,7 @@
return null;
}
-sqInt
-accessorDepthForPrimitiveIndex(sqInt primIndex)
-{
- return primitiveAccessorDepthTable[primIndex];
-}
-
/* Activate newMethod when newMethod has been cogged, i.e. create a
machine-code frame and (re)enter machine-code.
*/
@@ -19579,17 +19571,15 @@
sqInt header1;
sqInt header2;
sqInt header3;
- sqInt header4;
usqInt lastWord;
sqInt newFreeChunk;
sqInt newOop;
- sqInt next;
+ usqInt next;
sqInt oop;
sqInt realHeader;
sqInt sz;
sqInt sz1;
sqInt sz2;
- sqInt sz3;
sqInt target;
usqInt w;
@@ -19600,21 +19590,7 @@
/* begin objectAfterWhileForwarding: */
header2 = longAt(oop);
if ((header2 & MarkBit) == 0) {
- /* begin objectAfter: */
- if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) {
- error("no objects after the end of memory");
- }
- if (((longAt(oop)) & TypeMask) == HeaderTypeFree) {
- sz2 = (longAt(oop)) & AllButTypeMask;
- }
- else {
- /* begin sizeBitsOf: */
- header3 = longAt(oop);
- sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass
- ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask
- : header3 & SizeMask);
- }
- next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]);
+ next = ((sqInt) (objectAfter(oop)));
goto l1;
}
fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1;
@@ -19629,7 +19605,7 @@
else {
sz1 = realHeader & SizeMask;
}
- next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]);
+ next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask])));
l1: /* end objectAfterWhileForwarding: */;
if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) {
@@ -19683,18 +19659,18 @@
}
/* begin safeObjectAfter: */
if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) {
- sz3 = (longAt(newFreeChunk)) & AllButTypeMask;
+ sz2 = (longAt(newFreeChunk)) & AllButTypeMask;
}
else {
/* begin sizeBitsOf: */
- header4 = longAt(newFreeChunk);
- sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass
+ header3 = longAt(newFreeChunk);
+ sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass
? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask
- : header4 & SizeMask);
+ : header3 & SizeMask);
}
- next = ((newFreeChunk + sz3) >= GIV(freeStart)
+ next = ((newFreeChunk + sz2) >= GIV(freeStart)
? GIV(freeStart)
- : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask]));
+ : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask]));
assert((next == GIV(freeStart))
|| (next == (oopFromChunk(GIV(compEnd)))));
if (next == GIV(freeStart)) {
@@ -46401,7 +46377,7 @@
given object or free chunk in memory. Return freeStart when
enumeration is complete. This is for assertion checking only. */
-static sqInt
+static usqInt
safeObjectAfter(sqInt oop)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt header;
Modified: branches/Cog/sistasrc/vm/interp.h
===================================================================
--- branches/Cog/sistasrc/vm/interp.h 2014-07-01 03:09:58 UTC (rev 3023)
+++ branches/Cog/sistasrc/vm/interp.h 2014-07-01 15:39:10 UTC (rev 3024)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/sistasrc/vm/vmCallback.h
===================================================================
--- branches/Cog/sistasrc/vm/vmCallback.h 2014-07-01 03:09:58 UTC (rev 3023)
+++ branches/Cog/sistasrc/vm/vmCallback.h 2014-07-01 15:39:10 UTC (rev 3024)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
*/
#define VM_CALLBACK_INC 1
Modified: branches/Cog/spursistasrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.c 2014-07-01 03:09:58 UTC (rev 3023)
+++ branches/Cog/spursistasrc/vm/cointerp.c 2014-07-01 15:39:10 UTC (rev 3024)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
from
- CoInterpreter VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CoInterpreter VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2278,7 +2278,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.790]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.791]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -5470,7 +5470,6 @@
GIV(framePointer) = localFP;
ceEnterCogCodePopReceiverReg();
- null;
goto l148;
}
localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -5485,7 +5484,7 @@
/* begin fetchNextBytecode */
currentBytecode = byteAtPointer(++localIP);
- null;
+ /* return self */
l148: /* end baseFrameReturn */;
goto l145;
}
Modified: branches/Cog/spursistasrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.h 2014-07-01 03:09:58 UTC (rev 3023)
+++ branches/Cog/spursistasrc/vm/cointerp.h 2014-07-01 15:39:10 UTC (rev 3024)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
*/
Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-07-01 03:09:58 UTC (rev 3023)
+++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-07-01 15:39:10 UTC (rev 3024)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
from
- CoInterpreter VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CoInterpreter VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2281,7 +2281,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.790]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.791]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -5479,7 +5479,6 @@
GIV(framePointer) = localFP;
ceEnterCogCodePopReceiverReg();
- null;
goto l148;
}
localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -5494,7 +5493,7 @@
/* begin fetchNextBytecode */
currentBytecode = byteAtPointer(++localIP);
- null;
+ /* return self */
l148: /* end baseFrameReturn */;
goto l145;
}
Modified: branches/Cog/spursistasrc/vm/interp.h
===================================================================
--- branches/Cog/spursistasrc/vm/interp.h 2014-07-01 03:09:58 UTC (rev 3023)
+++ branches/Cog/spursistasrc/vm/interp.h 2014-07-01 15:39:10 UTC (rev 3024)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/spursistasrc/vm/vmCallback.h
===================================================================
--- branches/Cog/spursistasrc/vm/vmCallback.h 2014-07-01 03:09:58 UTC (rev 3023)
+++ branches/Cog/spursistasrc/vm/vmCallback.h 2014-07-01 15:39:10 UTC (rev 3024)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
*/
#define VM_CALLBACK_INC 1
Modified: branches/Cog/spursrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/cointerp.c 2014-07-01 03:09:58 UTC (rev 3023)
+++ branches/Cog/spursrc/vm/cointerp.c 2014-07-01 15:39:10 UTC (rev 3024)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
from
- CoInterpreter VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CoInterpreter VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2273,7 +2273,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.790]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.791]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
Modified: branches/Cog/spursrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursrc/vm/cointerp.h 2014-07-01 03:09:58 UTC (rev 3023)
+++ branches/Cog/spursrc/vm/cointerp.h 2014-07-01 15:39:10 UTC (rev 3024)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
*/
Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-07-01 03:09:58 UTC (rev 3023)
+++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-07-01 15:39:10 UTC (rev 3024)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
from
- CoInterpreter VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CoInterpreter VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2276,7 +2276,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.790]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.791]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
Modified: branches/Cog/spursrc/vm/interp.h
===================================================================
--- branches/Cog/spursrc/vm/interp.h 2014-07-01 03:09:58 UTC (rev 3023)
+++ branches/Cog/spursrc/vm/interp.h 2014-07-01 15:39:10 UTC (rev 3024)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/spursrc/vm/vmCallback.h
===================================================================
--- branches/Cog/spursrc/vm/vmCallback.h 2014-07-01 03:09:58 UTC (rev 3023)
+++ branches/Cog/spursrc/vm/vmCallback.h 2014-07-01 15:39:10 UTC (rev 3024)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
*/
#define VM_CALLBACK_INC 1
Modified: branches/Cog/src/vm/cointerp.c
===================================================================
--- branches/Cog/src/vm/cointerp.c 2014-07-01 03:09:58 UTC (rev 3023)
+++ branches/Cog/src/vm/cointerp.c 2014-07-01 15:39:10 UTC (rev 3024)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
from
- CoInterpreter VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CoInterpreter VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -361,7 +361,6 @@
#endif
sqInt interpret(void);
-sqInt accessorDepthForPrimitiveIndex(sqInt primIndex);
static void activateCoggedNewMethod(sqInt inInterpreter) NoDbgRegParms;
static void activateNewMethod(void);
sqInt activeProcess(void);
@@ -1167,7 +1166,7 @@
static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)) NoDbgRegParms;
static sqInt roomToPushNArgs(sqInt n) NoDbgRegParms;
static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms;
-static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms;
+static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms;
static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms;
usqInt scavengeThresholdAddress(void);
EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext);
@@ -2055,7 +2054,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.790]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.791]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -9081,13 +9080,7 @@
return null;
}
-sqInt
-accessorDepthForPrimitiveIndex(sqInt primIndex)
-{
- return primitiveAccessorDepthTable[primIndex];
-}
-
/* Activate newMethod when newMethod has been cogged, i.e. create a
machine-code frame and (re)enter machine-code.
*/
@@ -19446,17 +19439,15 @@
sqInt header1;
sqInt header2;
sqInt header3;
- sqInt header4;
usqInt lastWord;
sqInt newFreeChunk;
sqInt newOop;
- sqInt next;
+ usqInt next;
sqInt oop;
sqInt realHeader;
sqInt sz;
sqInt sz1;
sqInt sz2;
- sqInt sz3;
sqInt target;
usqInt w;
@@ -19467,21 +19458,7 @@
/* begin objectAfterWhileForwarding: */
header2 = longAt(oop);
if ((header2 & MarkBit) == 0) {
- /* begin objectAfter: */
- if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) {
- error("no objects after the end of memory");
- }
- if (((longAt(oop)) & TypeMask) == HeaderTypeFree) {
- sz2 = (longAt(oop)) & AllButTypeMask;
- }
- else {
- /* begin sizeBitsOf: */
- header3 = longAt(oop);
- sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass
- ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask
- : header3 & SizeMask);
- }
- next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]);
+ next = ((sqInt) (objectAfter(oop)));
goto l1;
}
fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1;
@@ -19496,7 +19473,7 @@
else {
sz1 = realHeader & SizeMask;
}
- next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]);
+ next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask])));
l1: /* end objectAfterWhileForwarding: */;
if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) {
@@ -19550,18 +19527,18 @@
}
/* begin safeObjectAfter: */
if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) {
- sz3 = (longAt(newFreeChunk)) & AllButTypeMask;
+ sz2 = (longAt(newFreeChunk)) & AllButTypeMask;
}
else {
/* begin sizeBitsOf: */
- header4 = longAt(newFreeChunk);
- sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass
+ header3 = longAt(newFreeChunk);
+ sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass
? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask
- : header4 & SizeMask);
+ : header3 & SizeMask);
}
- next = ((newFreeChunk + sz3) >= GIV(freeStart)
+ next = ((newFreeChunk + sz2) >= GIV(freeStart)
? GIV(freeStart)
- : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask]));
+ : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask]));
assert((next == GIV(freeStart))
|| (next == (oopFromChunk(GIV(compEnd)))));
if (next == GIV(freeStart)) {
@@ -46204,7 +46181,7 @@
given object or free chunk in memory. Return freeStart when
enumeration is complete. This is for assertion checking only. */
-static sqInt
+static usqInt
safeObjectAfter(sqInt oop)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt header;
Modified: branches/Cog/src/vm/cointerp.h
===================================================================
--- branches/Cog/src/vm/cointerp.h 2014-07-01 03:09:58 UTC (rev 3023)
+++ branches/Cog/src/vm/cointerp.h 2014-07-01 15:39:10 UTC (rev 3024)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
*/
@@ -14,7 +14,6 @@
# define NoDbgRegParms /*empty*/
#endif
-sqInt accessorDepthForPrimitiveIndex(sqInt primIndex);
sqInt activeProcess(void);
sqInt addressCouldBeObj(sqInt address);
sqInt addressCouldBeOop(sqInt address);
Modified: branches/Cog/src/vm/cointerpmt.c
===================================================================
--- branches/Cog/src/vm/cointerpmt.c 2014-07-01 03:09:58 UTC (rev 3023)
+++ branches/Cog/src/vm/cointerpmt.c 2014-07-01 15:39:10 UTC (rev 3024)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
from
- CoInterpreterMT VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CoInterpreterMT VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
*/
-static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -404,7 +404,6 @@
#endif
sqInt interpret(void);
-sqInt accessorDepthForPrimitiveIndex(sqInt primIndex);
static void activateCoggedNewMethod(sqInt inInterpreter) NoDbgRegParms;
static void activateNewMethod(void);
sqInt activeProcess(void);
@@ -2152,7 +2151,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.790]";
+const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.791]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
sqInt willNotThreadWarnCount;
@@ -9180,13 +9179,7 @@
return null;
}
-sqInt
-accessorDepthForPrimitiveIndex(sqInt primIndex)
-{
- return primitiveAccessorDepthTable[primIndex];
-}
-
/* Activate newMethod when newMethod has been cogged, i.e. create a
machine-code frame and (re)enter machine-code.
*/
Modified: branches/Cog/src/vm/cointerpmt.h
===================================================================
--- branches/Cog/src/vm/cointerpmt.h 2014-07-01 03:09:58 UTC (rev 3023)
+++ branches/Cog/src/vm/cointerpmt.h 2014-07-01 15:39:10 UTC (rev 3024)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
*/
@@ -14,7 +14,6 @@
# define NoDbgRegParms /*empty*/
#endif
-sqInt accessorDepthForPrimitiveIndex(sqInt primIndex);
sqInt activeProcess(void);
sqInt addressCouldBeObj(sqInt address);
sqInt addressCouldBeOop(sqInt address);
Modified: branches/Cog/src/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/src/vm/gcc3x-cointerp.c 2014-07-01 03:09:58 UTC (rev 3023)
+++ branches/Cog/src/vm/gcc3x-cointerp.c 2014-07-01 15:39:10 UTC (rev 3024)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
from
- CoInterpreter VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
+ CoInterpreter VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.791 uuid: 7d762755-99b7-46ae-8435-31b17f4f0e0c " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -364,7 +364,6 @@
#endif
sqInt interpret(void);
-sqInt accessorDepthForPrimitiveIndex(sqInt primIndex);
static void activateCoggedNewMethod(sqInt inInterpreter) NoDbgRegParms;
static void activateNewMethod(void);
sqInt activeProcess(void);
@@ -1170,7 +1169,7 @@
static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)) NoDbgRegParms;
static sqInt roomToPushNArgs(sqInt n) NoDbgRegParms;
static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms;
-static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms;
+static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms;
static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms;
usqInt scavengeThresholdAddress(void);
EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext);
@@ -2058,7 +2057,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.790]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.791]";
@@ Diff output truncated at 50000 characters. @@
1
0
Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-eem.791.mcz
==================== Summary ====================
Name: VMMaker.oscog-eem.791
Author: eem
Time: 1 July 2014, 8:30:55.624 am
UUID: 7d762755-99b7-46ae-8435-31b17f4f0e0c
Ancestors: VMMaker.oscog-eem.790
Rescue the non-Spur builds by making
accessorDepthForPrimitiveIndex: a Spur option.
Factor out the type machinery in generateShiftRight:on:indent:
and use it to ensure generateSignedBitShift:on:indent: will not
cast 64-bit vars to ints.
=============== Diff against VMMaker.oscog-eem.790 ===============
Item was changed:
----- Method: CCodeGenerator>>generateShiftRight:on:indent: (in category 'C translation') -----
generateShiftRight: msgNode on: aStream indent: level
"Generate the C code for this message onto the given stream."
+ | type |
- | decl |
"If the variable is a 64-bit type then don't cast it to usqInt (typically a 32-bit type)"
+ (self is64BitIntegralVariable: msgNode receiver typeInto: [:t| type := t])
- (msgNode receiver isVariable
- and: [(decl := self typeOfVariable: msgNode receiver name) notNil
- and: [#('usqLong' 'sqLong' 'unsigned long long' 'long long' 'unsigned __int64' '__int64')
- anySatisfy: [:type| decl beginsWith: type]]])
ifTrue:
["If not unsigned cast it to unsigned."
+ type first ~= $u ifTrue:
+ [aStream nextPutAll: '((unsigned '; nextPutAll: type; nextPut: $)].
- (decl first = $u) ifFalse:
- [aStream
- nextPutAll: '((unsigned ';
- nextPutAll: ((decl endsWith: msgNode receiver name)
- ifTrue: [decl allButLast: msgNode receiver name size]
- ifFalse: [decl]);
- nextPut: $)].
self emitCExpression: msgNode receiver on: aStream.
+ type first ~= $u ifTrue:
- (decl first = $u) ifFalse:
[aStream nextPut: $)]]
ifFalse:
[aStream nextPutAll: '((usqInt) '.
self emitCExpression: msgNode receiver on: aStream.
aStream nextPut: $)].
aStream nextPutAll: ' >> '.
self emitCExpression: msgNode args first on: aStream!
Item was changed:
----- Method: CCodeGenerator>>generateSignedBitShift:on:indent: (in category 'C translation') -----
generateSignedBitShift: msgNode on: aStream indent: level
"Generate the C code for this message onto the given stream."
+ | cast type arg |
+ "since ``signed'' is a synonym for ``signed int'' do not cast 64-bit values to signed if at all possible."
+ cast := (self is64BitIntegralVariable: msgNode receiver typeInto: [:t| type := t])
+ ifTrue: ['(', (type first = $u ifTrue: [type allButFirst: (type second = $n ifTrue: [2] ifFalse: [1])] ifFalse: [type]), ')']
+ ifFalse: ['(signed)'].
- | arg |
(arg := msgNode args first) isConstant
ifTrue: "bit shift amount is a constant"
+ [aStream nextPut: $(; nextPutAll: cast.
- [aStream nextPut: $(; nextPutAll: '(signed)'.
self emitCExpression: msgNode receiver on: aStream.
arg value < 0
+ ifTrue: [aStream nextPutAll: ' >> '; print: arg value negated]
+ ifFalse: [aStream nextPutAll: ' << '; print: arg value].
- ifTrue: [aStream nextPutAll: ' >> ', arg value negated printString]
- ifFalse: [aStream nextPutAll: ' << ', arg value printString].
aStream nextPut: $)]
ifFalse: "bit shift amount is an expression"
[aStream nextPutAll: '(('.
self emitCExpression: arg on: aStream.
+ aStream nextPutAll: ' < 0) ? ('; nextPutAll: cast.
- aStream nextPutAll: ' < 0) ? ('; nextPutAll: '(signed)'.
self emitCExpression: msgNode receiver on: aStream.
aStream nextPutAll: ' >> -'.
self emitCExpression: arg on: aStream.
+ aStream nextPutAll: ') : ('; nextPutAll: cast.
- aStream nextPutAll: ') : ('; nextPutAll: '(signed)'.
self emitCExpression: msgNode receiver on: aStream.
aStream nextPutAll: ' << '.
self emitCExpression: arg on: aStream.
aStream nextPutAll: '))']!
Item was added:
+ ----- Method: CCodeGenerator>>is64BitIntegralVariable:typeInto: (in category 'C translation') -----
+ is64BitIntegralVariable: node typeInto: aBlock
+ | decl |
+ ^node isVariable
+ and: [(decl := self typeOfVariable: node name) notNil
+ and: [(#('usqLong' 'sqLong' 'unsigned long long' 'long long' 'unsigned __int64' '__int64')
+ anySatisfy: [:type| decl beginsWith: type])
+ and: [aBlock value: ((decl endsWith: node name)
+ ifTrue: [decl allButLast: node name size + 1]
+ ifFalse: [decl]).
+ true]]]!
Item was changed:
----- Method: CoInterpreter>>accessorDepthForPrimitiveIndex: (in category 'cog jit support') -----
accessorDepthForPrimitiveIndex: primIndex
<api>
+ <option: #SpurObjectMemory>
^primitiveAccessorDepthTable at: primIndex!
1
0
Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker:
http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.80.mcz
==================== Summary ====================
Name: CMakeVMMakerSqueak-tty.80
Author: tty
Time: 1 July 2014, 9:54:21.074 am
UUID: 791765ad-9061-4651-a0cd-1cdd877a017e
Ancestors: CMakeVMMakerSqueak-tty.79
save stage while I revert and debug
=============== Diff against CMakeVMMakerSqueak-tty.79 ===============
Item was changed:
----- Method: CMakeVMGeneratorForSqueak>>generate (in category 'code generation') -----
generate
| intPlugins extPlugins |
-
output := String new writeStream.
config setGlobalOptions: self.
+
-
self
printHeader;
project: config executableName.
config setGlobalOptionsAfterDetermineSystem: self.
config setupDirectories: self.
+
-
self message: '${CMAKE_MODULE_PATH}'.
self set: 'CMAKE_CONFIGURATION_TYPES' to: 'Release'.
+ config preferredIncludes do: [ :each | self includeDirectories: each ].
- config preferredIncludes
- do: [ :each | self includeDirectories: each ].
self includeDirectories: self includeDirs.
+ config standardIncludes do: [:each | self includeDirectories: each ].
- config standardIncludes
- do: [:each | self includeDirectories: each ].
self addDefinitions: config compilerFlags.
config extraVMSettings: self.
+
-
self puts: 'add_executable(' , config executableName, ' ', config executableType, ' ' , self sources , ')'.
+
-
intPlugins := self generatePluginConfigs: config internalPlugins internal: true.
extPlugins := self generatePluginConfigs: config externalPlugins internal: false.
self processThirdpartyLibraries.
+
-
self processPlugins: intPlugins, extPlugins.
config setExtraTargetProperties: self.
+
-
self cmd: 'target_link_libraries'
params: self moduleName , ' ${LINKLIBS}'.
config postBuildActions: self.
+
-
self saveFile.
self generateBuildScript.!
Item was removed:
- ----- Method: CMakeVMMakerSqueakRedirectMethodsWithArgTest>>testAddVMDrivers (in category 'as yet unclassified') -----
- testAddVMDrivers
- self flag:'tty'. "Is the self shouldnt sufficient?"
- #(#SqueakMacintoshConfig #SqueakUnixConfig #SqueakWindowsConfig )
- do:[:each |
- (Smalltalk at:each)
- allSubclassesDo:[:configuration | | o buildTypes vmGenerator|
- o:= configuration new.
- (o excludeFromBuild not) & (configuration isAbstractBaseClass not)
- ifTrue:[
- buildTypes:=o availableBuildTypes copyWithoutAll:#(#buildNone).
- buildTypes do:[:buildType |
- o configureForBuildType: buildType.
- vmGenerator:=CMakeVMGeneratorForSqueak new.
- vmGenerator config: o.
- vmGenerator output:(String new writeStream).
- self shouldnt: [o addVMDrivers: vmGenerator] raise: Error]]]].
- !
Item was added:
+ ----- Method: CMakeVMMakerSqueakUnixConfigTest>>testAddVMDrivers (in category 'as yet unclassified') -----
+ testAddVMDrivers
+ self flag:'tty'. "Is the self shouldnt sufficient?"
+ #( #SqueakUnixConfig )
+ do:[:each |
+ (Smalltalk at:each)
+ allSubclassesDo:[:configuration | | o buildTypes vmGenerator|
+ o:= configuration new.
+ (o excludeFromBuild not) & (configuration isAbstractBaseClass not)
+ ifTrue:[
+ buildTypes:=o availableBuildTypes copyWithoutAll:#(#buildNone).
+ buildTypes do:[:buildType |
+ o configureForBuildType: buildType.
+ vmGenerator:=CMakeVMGeneratorForSqueak new.
+ vmGenerator config: o.
+ vmGenerator output:(String new writeStream).
+ self shouldnt: [o addVMDrivers: vmGenerator] raise: Error]]]].
+ !
Item was changed:
----- Method: CPlatformConfigForSqueak>>linkFlags (in category 'cmake buildType redirects') -----
linkFlags
" '-lSM -lICE -ldl -lGL -lpthread -lm -lnsl -lX11' -L/usr/lib32 etc..."
+ |d flags|
- |d |
d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy.
d
at: #build put: [self linkFlagsBuild];
at: #buildAssert put: [self linkFlagsBuildAssert];
at: #buildAssertITimerHeartbeat put: [self linkFlagsBuildAssertITimerHeartbeat];
at:#buildDebug put: [self linkFlagsBuildDebug];
at: #buildDebugITimerHeartbeat put: [self linkFlagsBuildDebugITimerHeartbeat ];
at: #buildITimerHeartbeat put: [self linkFlagsBuildITimerHeartbeat];
at: #buildMultiThreaded put: [self linkFlagsBuildMultiThreaded ];
at: #buildMultiThreadedAssert put: [self linkFlagsBuildMultiThreadedAssert];
at: #buildMultiThreadedDebug put: [self linkFlagsBuildMultiThreadedDebug ];
at: #buildNone put:[self linkFlagsNoBuildType].
+ flags := String
+ streamContents: [:stream | ((d at: buildType) value collect: #withBlanksTrimmed as: Set)
+ asStringOn: stream
+ delimiter: ' '].
+ ^flags.
+
+
- ^(d at: buildType) value
!
Item was changed:
----- Method: CPlatformConfigForSqueak>>setGlobalOptionsBuild: (in category 'cmake buildType redirects') -----
setGlobalOptionsBuild: aMaker
"convenience method to customize for this build type.
SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions'
usually do nothing"
-
self subclassResponsibility!
Item was added:
+ ----- Method: Linux32x86Config>>addVMDriversBuild: (in category 'cmake buildType redirects') -----
+ addVMDriversBuild: aMaker
+ aMaker message: 'addVMDrivers: aMaker'.
+ self
+ addDriver: 'vm-display-null'
+ sources: #(
+ '${targetPlatform}/vm-display-null/sqUnixDisplayNull' )
+ generator: aMaker
+ externalLibs: #();
+
+ addDriver: 'vm-display-X11'
+ sources: #(
+ '${targetPlatform}/vm-display-X11/sqUnixX11'
+ '${targetPlatform}/vm-display-X11/sqUnixMozilla' )
+ generator: aMaker
+ externalLibs: (self linkFlags);
+
+ addDriver: 'vm-sound-ALSA'
+ sources: #(
+ '${targetPlatform}/vm-sound-ALSA/sqUnixSoundALSA' )
+ generator: aMaker
+ externalLibs: #();
+
+ addDriver: 'vm-sound-null'
+ sources: #(
+ '${targetPlatform}/vm-sound-null/sqUnixSoundNull' )
+ generator: aMaker
+ externalLibs: #().
+ !
Item was added:
+ ----- Method: Linux32x86Config>>addVMDriversBuildAssert: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildAssert: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: Linux32x86Config>>addVMDriversBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildAssertITimerHeartbeat: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: Linux32x86Config>>addVMDriversBuildDebug: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildDebug: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: Linux32x86Config>>addVMDriversBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildDebugITimerHeartbeat: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: Linux32x86Config>>addVMDriversBuildITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildITimerHeartbeat: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: Linux32x86Config>>addVMDriversBuildMultiThreaded: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildMultiThreaded: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: Linux32x86Config>>addVMDriversBuildMultiThreadedAssert: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildMultiThreadedAssert: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: Linux32x86Config>>addVMDriversBuildMultiThreadedDebug: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildMultiThreadedDebug: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was changed:
+ ----- Method: Linux32x86Config>>coreSourcesBuild (in category 'sources') -----
- ----- Method: Linux32x86Config>>coreSourcesBuild (in category 'cmake buildType redirects') -----
coreSourcesBuild
"files to include from src/vm dir"
^ #(
'cogit.c'
+ 'gcc3x-cointerp.c'
- 'cointerp.c'
)!
Item was changed:
----- Method: Linux32x86Config>>defaultExternalPlugins (in category 'plugins') -----
defaultExternalPlugins
" tty 2014.06.10 cut-n-paste from Cog/build.linux32x86/newspeak.cog.spur/build/plugins.ext"
^ #(B3DAcceleratorPlugin
BochsIA32Plugin
ThreadedFFIPlugin "moduleName->SqueakFFIPrims "
"FFIPlugin" "moduleName->SqueakFFIPrims "
SqueakSSLPlugin "moduleName->SqueakSSL"
LocalePlugin
UnixOSProcessPlugin
UUIDPlugin)
"N.B. Regarding ThreadedFFIPlugin and FFIPlugin from eem:
Use ThreadedFFIPlugin. The FFIPlugin is obsolete (it requires assembler support files, and is non-reentrant). This should generate in src/plugins/SqueakFFIPrims/{SqueakFFIPrims.c,ARM32FFIPlugin.c,IA32FFIPlugin.c} and you should compile only src/plugins/SqueakFFIPrims/SqueakFFIPrims.c. src/plugins/SqueakFFIPrims/SqueakFFIPrims.c is a simple wrapper that includes ARM32FFIPlugin.c or IA32FFIPlugin.c as appropriate (and others can be added as they are developed).
"!
Item was changed:
----- Method: Linux32x86Config>>linkFlagsBuild (in category 'cmake buildType redirects') -----
linkFlagsBuild
+ "Answer array of libraries to link to
+ SystemNavigation default browseMethodsWhoseNamesContain: 'libsBuild'"
- "Answer array of flags like the LIBS=''-lpthread -luuid'' line in the GNU system's mvm file
- cat Cog/build.linux32x86/squeak.cog.v3/build/mvm SystemNavigation default browseMethodsWhoseNamesContain: 'libsBuild'"
^ {
'-lpthread'
. '-luuid'
}!
Item was changed:
----- Method: Linux32x86SqueakCogV3Config>>compilerFlagsBuild (in category 'cmake buildType redirects') -----
compilerFlagsBuild
"Some gcc versions (3.4*) create a broken VM using -O2, so try -O1 if you have problems"
^{
+ '-g3' "more debugging"
+ .'-O1' "low optiomization level"
- '-g0'
- .'-O2'
.'-m32'
.'-msse2'
.'-D_GNU_SOURCE'
.'-D_FILE_OFFSET_BITS=64'
+ .'-DNDEBUG' "disable assertions"
+ .'-DLSB_FIRST=1' ""
- .'-DNDEBUG'
- .'-DLSB_FIRST=1'
.'-DUSE_GLOBAL_STRUCT=0'
.'-DDEBUGVM=0'
.'-DCOGMTVM=0'
.'-fno-tree-pre '
+ .'-fno-caller-saves'
+ }
- .'-fno-caller-saves'}
!
Item was changed:
----- Method: Linux32x86SqueakCogV3Config>>configureFlagsBuild (in category 'cmake buildType redirects') -----
configureFlagsBuild
+ ^{'-without-npsqueak' . ''}!
- ^{'-without-npsqueak' }!
Item was removed:
- Linux32x86SqueakCogV3Config subclass: #Linux32x86SqueakCogV3NoGLConfig
- instanceVariableNames: ''
- classVariableNames: ''
- poolDictionaries: ''
- category: 'CMakeVMMakerSqueak-Linux32x86'!
Item was removed:
- ----- Method: Linux32x86SqueakCogV3NoGLConfig>>configHBuild (in category 'as yet unclassified') -----
- configHBuild
- " right now its like that "
- ^'/* config.h. Generated by configure. */
- /* config.h.in -- template for config.h -*- C -*-
- *
- * Copyright (C) 1996-2007 by Ian Piumarta and other authors/contributors
- * listed elsewhere in this file.
- * All rights reserved.
- *
- * This file is part of Unix Squeak.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
- /* Author: Ian.Piumarta(a)squeakland.org
- *
- * Last edited: 2006-04-23 12:34:41 by piumarta on emilia.local
- */
-
- #ifndef __sq_config_h
- #define __sq_config_h
-
- /* explicit image width */
-
- #define HAVE_INTERP_H 1
-
- /* package options */
-
- #define USE_X11 1
- #define USE_X11_GLX 0
- /* #undef USE_QUARTZ */
- /* #undef USE_QUARTZ_CGL */
- /* #undef USE_RFB */
-
- /* libraries */
-
- /* #undef HAVE_LIBX11 */
- #define HAVE_LIBXEXT 1
- #define HAVE_LIBDL 1
- /* #undef HAVE_DYLD */
- /* #undef HAVE_LIBFFI */
- /* #undef HAVE_ICONV */
-
- /* #undef USE_AUDIO_NONE */
- /* #undef USE_AUDIO_SUN */
- /* #undef USE_AUDIO_NAS */
- /* #undef USE_AUDIO_OSS */
- /* #undef USE_AUDIO_MACOSX */
- /* #undef OSS_DEVICE */
-
- /* header files */
-
- #define HAVE_UNISTD_H 1
- /* #undef NEED_GETHOSTNAME_P */
-
- #define HAVE_DIRENT_H 1
- /* #undef HAVE_SYS_NDIR_H */
- /* #undef HAVE_SYS_DIR_H */
- /* #undef HAVE_NDIR_H */
- #define HAVE_DLFCN_H 1
- #define HAVE_ICONV_H 1
-
- #define HAVE_SYS_TIME_H 1
- #define TIME_WITH_SYS_TIME 1
-
- /* #undef HAVE_SYS_FILIO_H */
-
- /* #undef HAVE_SYS_AUDIOIO_H */
- /* #undef HAVE_SUN_AUDIOIO_H */
-
- #define HAVE_PTY_H 1
- /* #undef HAVE_UTIL_H */
- /* #undef HAVE_LIBUTIL_H */
- #define HAVE_STROPTS_H 1
-
- /* #undef HAVE_GL_GL_H */
- /* #undef HAVE_OPENGL_GL_H */
-
- /* #undef NEED_SUNOS_H */
-
- /* system calls/library functions */
-
- #define AT_EXIT atexit
-
- #define HAVE_TZSET 1
-
- #define HAVE_OPENPTY 1
- /* #undef HAVE_UNIX98_PTYS */
-
- #define HAVE_SNPRINTF 1
- /* #undef HAVE___SNPRINTF */
-
- #define HAVE_MMAP 1
-
- /* #undef HAVE_DYLD */
-
- #define HAVE_LANGINFO_CODESET 1
-
- #define HAVE_ALLOCA 1
- #define HAVE_ALLOCA_H 1
-
- #define HAVE_UNSETENV 1
-
- #define HAVE_NANOSLEEP 1
-
- /* widths of primitive types */
-
- #define SIZEOF_INT 4
- #define SIZEOF_LONG 4
- #define SIZEOF_LONG_LONG 8
- #define SIZEOF_VOID_P 4
-
- /* structures */
-
- #define HAVE_TM_GMTOFF 1
- #define HAVE_TIMEZONE 1
-
- /* typedefs */
-
- /* #undef size_t */
- /* #undef socklen_t */
-
- #define squeakInt64 long long
-
- /* architecture */
-
- #define OS_TYPE "unix"
-
- #define VM_HOST "x86_64-linux-gnu"
- #define VM_HOST_CPU "x86_64"
- /* #undef VM_HOST_VENDOR */
- #define VM_HOST_OS "linux-gnu"
- #define VM_BUILD_STRING "Unix built on "__DATE__ " "__TIME__" Compiler: "__VERSION__
-
- /* #undef WORDS_BIGENDIAN */
- /* #undef DOUBLE_WORD_ALIGNMENT */
-
- /* damage containment */
-
- /* #undef DARWIN */
-
- #ifdef NEED_SUNOS_H
- # include "sunos.h"
- #endif
-
- /* other configured variables */
-
- #define SQ_VERSION "4.2-0"
- #define VM_VERSION "4.0-3020"
- #define VM_MODULE_PREFIX ""
- /* #undef VM_DLSYM_PREFIX */
- #define VM_X11DIR "/usr/lib"
-
- /* avoid dependencies on glibc2.3 */
-
- #define HAVE_FEATURES_H 1
-
- #if defined(HAVE_FEATURES_H)
- # include "glibc.h"
- #endif
-
- #endif /* __sq_config_h */
- '!
Item was removed:
- ----- Method: Linux32x86SqueakCogV3NoGLConfig>>defaultExternalPlugins (in category 'as yet unclassified') -----
- defaultExternalPlugins
- "Removed the B3DAcceleratorPlugin since we don't have OpenGL bindings here"
- ^ (super defaultExternalPlugins copyWithoutAll: #(#B3DAcceleratorPlugin #ThreadedIA32FFIPlugin #InternetConfigPlugin #FT2Plugin #UUIDPlugin))!
Item was removed:
- ----- Method: Linux32x86SqueakCogV3NoGLConfig>>defaultInternalPlugins (in category 'as yet unclassified') -----
- defaultInternalPlugins
- "Removed the B3DAcceleratorPlugin since we don't have OpenGL bindings here"
- ^ (super defaultInternalPlugins copyWithoutAll: #(#IA32ABIPlugin #BitBltSimulation #JoystickTabletPlugin #StarSqueakPlugin #SurfacePlugin #SqueakFFIPrims #ThreadedIA32FFIPlugin ))!
Item was removed:
- ----- Method: Linux32x86SqueakCogV3NoGLConfig>>linkFlagsBuild (in category 'as yet unclassified') -----
- linkFlagsBuild
- ^ {'-lSM'
- . '-lICE '
- . '-ldl'
- . '-lpthread'
- . '-lm'
- . '-lnsl'
- . '-lX11'
- . '-luuid'}!
Item was added:
+ ----- Method: Linux64Config>>addVMDriversBuild: (in category 'cmake buildType redirects') -----
+ addVMDriversBuild: aMaker
+ aMaker message: 'addVMDrivers: aMaker'.
+ self
+ addDriver: 'vm-display-null'
+ sources: #(
+ '${targetPlatform}/vm-display-null/sqUnixDisplayNull' )
+ generator: aMaker
+ externalLibs: #();
+
+ addDriver: 'vm-display-X11'
+ sources: #(
+ '${targetPlatform}/vm-display-X11/sqUnixX11'
+ '${targetPlatform}/vm-display-X11/sqUnixMozilla' )
+ generator: aMaker
+ externalLibs: (self linkFlags);
+
+ addDriver: 'vm-sound-ALSA'
+ sources: #(
+ '${targetPlatform}/vm-sound-ALSA/sqUnixSoundALSA' )
+ generator: aMaker
+ externalLibs: #();
+
+ addDriver: 'vm-sound-null'
+ sources: #(
+ '${targetPlatform}/vm-sound-null/sqUnixSoundNull' )
+ generator: aMaker
+ externalLibs: #().
+ !
Item was added:
+ ----- Method: Linux64Config>>addVMDriversBuildAssert: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildAssert: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: Linux64Config>>addVMDriversBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildAssertITimerHeartbeat: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: Linux64Config>>addVMDriversBuildDebug: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildDebug: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: Linux64Config>>addVMDriversBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildDebugITimerHeartbeat: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: Linux64Config>>addVMDriversBuildITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildITimerHeartbeat: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: Linux64Config>>addVMDriversBuildMultiThreaded: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildMultiThreaded: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: Linux64Config>>addVMDriversBuildMultiThreadedAssert: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildMultiThreadedAssert: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: Linux64Config>>addVMDriversBuildMultiThreadedDebug: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildMultiThreadedDebug: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: Linux64x86w32BitConfig>>addVMDrivers: (in category 'cmake buildType redirects') -----
+ addVMDrivers: maker
+ "
+ libICE
+ ICE is the Inter Client Exchange protocol, part of X11
+
+ libSM
+ session management library for X11
+
+ "
+ self
+ addDriver: 'vm-display-null'
+ sources: #(
+ '${targetPlatform}/vm-display-null/sqUnixDisplayNull' )
+ generator: maker
+ externalLibs: #();
+
+
+ addDriver: 'vm-display-X11'
+ sources: #(
+ '${targetPlatform}/vm-display-X11/sqUnixX11'
+ '${targetPlatform}/vm-display-X11/sqUnixMozilla' )
+ generator: maker
+
+ "-lSM -lICE -ldl -lGL -lpthread -lm -lnsl -lX11'"
+ externalLibs: #( SM ICE GL X11 nsl dl);
+
+
+ addDriver: 'vm-sound-ALSA'
+ sources: #(
+ '${targetPlatform}/vm-sound-ALSA/sqUnixSoundALSA' )
+ generator: maker
+ externalLibs: #();
+
+ addDriver: 'vm-sound-null'
+ sources: #(
+ '${targetPlatform}/vm-sound-null/sqUnixSoundNull' )
+ generator: maker
+ externalLibs: #().
+
+ "
+ vm-display-null
+ vm-display-X11
+ vm-sound-ALSA
+ vm-sound-null"!
Item was added:
+ ----- Method: Linux64x86w32BitConfig>>addVMDriversBuild: (in category 'cmake buildType redirects') -----
+ addVMDriversBuild: aMaker
+ aMaker message: 'addVMDrivers: aMaker'.
+ self
+ addDriver: 'vm-display-null'
+ sources: #(
+ '${targetPlatform}/vm-display-null/sqUnixDisplayNull' )
+ generator: aMaker
+ externalLibs: #();
+
+ addDriver: 'vm-display-X11'
+ sources: #(
+ '${targetPlatform}/vm-display-X11/sqUnixX11'
+ '${targetPlatform}/vm-display-X11/sqUnixMozilla' )
+ generator: aMaker
+ externalLibs: #( SM ICE GL X11 nsl dl); "(self linkFlags);"
+
+ addDriver: 'vm-sound-ALSA'
+ sources: #(
+ '${targetPlatform}/vm-sound-ALSA/sqUnixSoundALSA' )
+ generator: aMaker
+ externalLibs: #();
+
+ addDriver: 'vm-sound-null'
+ sources: #(
+ '${targetPlatform}/vm-sound-null/sqUnixSoundNull' )
+ generator: aMaker
+ externalLibs: #().
+ !
Item was added:
+ ----- Method: Linux64x86w32BitConfig>>addVMDriversBuildAssert: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildAssert: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: Linux64x86w32BitConfig>>addVMDriversBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildAssertITimerHeartbeat: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: Linux64x86w32BitConfig>>addVMDriversBuildDebug: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildDebug: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: Linux64x86w32BitConfig>>addVMDriversBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildDebugITimerHeartbeat: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: Linux64x86w32BitConfig>>addVMDriversBuildITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildITimerHeartbeat: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: Linux64x86w32BitConfig>>addVMDriversBuildMultiThreaded: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildMultiThreaded: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: Linux64x86w32BitConfig>>addVMDriversBuildMultiThreadedAssert: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildMultiThreadedAssert: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: Linux64x86w32BitConfig>>addVMDriversBuildMultiThreadedDebug: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildMultiThreadedDebug: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was removed:
- ----- Method: Linux64x86w32BitConfig>>commonCompilerFlags (in category 'compiler flags') -----
- commonCompilerFlags
- "avoid premature optimization. push this decision down lower if it is needed at all"
- ^{'-m32'}
- !
Item was changed:
----- Method: Linux64x86w32BitConfig>>configHBuild (in category 'cmake buildType redirects') -----
configHBuild
self flag:'tty'. "This needs to be customized"
^ '
#ifndef __sq_config_h
#define __sq_config_h
/* explicit image width */
#define HAVE_INTERP_H 1
/* package options */
#define USE_X11 1
#define USE_X11_GLX 1
/* #undef USE_QUARTZ */
/* #undef USE_QUARTZ_CGL */
/* #undef USE_RFB */
/* libraries */
/* #undef HAVE_LIBX11 */
/* #undef HAVE_LIBXEXT */
#define HAVE_LIBDL 1
/* #undef HAVE_DYLD */
/* #undef HAVE_LIBFFI */
/* #undef HAVE_ICONV */
/* #undef USE_AUDIO_NONE */
/* #undef USE_AUDIO_SUN */
/* #undef USE_AUDIO_NAS */
/* #undef USE_AUDIO_OSS */
/* #undef USE_AUDIO_MACOSX */
/* #undef OSS_DEVICE */
/* header files */
#define HAVE_UNISTD_H 1
/* #undef NEED_GETHOSTNAME_P */
#define HAVE_DIRENT_H 1
/* #undef HAVE_SYS_NDIR_H */
/* #undef HAVE_SYS_DIR_H */
/* #undef HAVE_NDIR_H */
#define HAVE_DLFCN_H 1
#define HAVE_ICONV_H 1
#define HAVE_SYS_TIME_H 1
#define TIME_WITH_SYS_TIME 1
/* #undef HAVE_SYS_FILIO_H */
/* #undef HAVE_SYS_AUDIOIO_H */
/* #undef HAVE_SUN_AUDIOIO_H */
#define HAVE_PTY_H 1
/* #undef HAVE_UTIL_H */
/* #undef HAVE_LIBUTIL_H */
#define HAVE_STROPTS_H 1
#define HAVE_GL_GL_H 1
/* #undef HAVE_OPENGL_GL_H */
/* #undef NEED_SUNOS_H */
/* system calls/library functions */
#define AT_EXIT atexit
#define HAVE_TZSET 1
#define HAVE_OPENPTY 1
/* #undef HAVE_UNIX98_PTYS */
#define HAVE_SNPRINTF 1
/* #undef HAVE___SNPRINTF */
#define HAVE_MMAP 1
/* #undef HAVE_DYLD */
#define HAVE_LANGINFO_CODESET 1
#define HAVE_ALLOCA 1
#define HAVE_ALLOCA_H 1
#define HAVE_UNSETENV 1
#define HAVE_NANOSLEEP 1
/* widths of primitive types */
#define SIZEOF_INT 4
#define SIZEOF_LONG 4
#define SIZEOF_LONG_LONG 8
#define SIZEOF_VOID_P 4
/* structures */
#define HAVE_TM_GMTOFF 1
#define HAVE_TIMEZONE 1
/* typedefs */
/* #undef size_t */
/* #undef socklen_t */
#define ENABLE_FAST_BLT 1
#define squeakInt64 long long
/* architecture */
#define OS_TYPE "unix"
#define __arm__ 1
#define __ARM_ARCH_6__ 1
#define VM_HOST "arm-pc-linux-gnu"
#define VM_HOST_CPU "arm"
/* #undef VM_HOST_VENDOR */
#define VM_HOST_OS "linux-gnu"
#define VM_BUILD_STRING "Unix built on "__DATE__ " "__TIME__" Compiler: "__VERSION__
/* #undef WORDS_BIGENDIAN */
/* #undef DOUBLE_WORD_ALIGNMENT */
/* damage containment */
/* #undef DARWIN */
#ifdef NEED_SUNOS_H
# include "sunos.h"
#endif
/* other configured variables */
#define SQ_VERSION "3.9a-7024"
#define VM_VERSION "3.9-7"
#define VM_MODULE_PREFIX ""
/* #undef VM_DLSYM_PREFIX */
#define VM_X11DIR ""
/* avoid dependencies on glibc2.3 */
#define HAVE_FEATURES_H 1
#if defined(HAVE_FEATURES_H)
# include "glibc.h"
#endif
/* used by UUID plugin: */
#define HAVE_UUID_H 1
#endif /* __sq_config_h */
'!
Item was removed:
- ----- Method: Linux64x86w32BitConfig>>extraPluginSettings: (in category 'plugin extra rules') -----
- extraPluginSettings: maker
- super extraPluginSettings: maker.
- maker set: #linkFlags toString: '${linkFlags} -m32'!
Item was changed:
----- Method: Linux64x86w32BitConfig>>extraVMSettingsBuild: (in category 'cmake buildType redirects') -----
extraVMSettingsBuild: aMaker
"SystemNavigation default browseMethodsWhoseNamesContain: 'extraVMSettingsBuild:'"
| versionC |
+ aMaker message: 'extraVMSettingsBuild: aMaker'.
self generateConfigH.
"add a generated version.c"
versionC := 'version.c'.
aMaker cmd: 'add_custom_command' params: 'OUTPUT ',
versionC , '
COMMAND ${platformsDir}/unix/config/verstamp ',versionC,' gcc
COMMENT "Generating version.c"
'.
!
Item was removed:
- ----- Method: Linux64x86w32BitConfig>>linkFlags (in category 'accessing') -----
- linkFlags
- " ^ super linkFlags , ' -luuid -lSM -lICE -ldl -lGL -lpthread -lm -lnsl -lX11'"
- ^ super linkFlags , ' -luuid -lSM -lICE -ldl -lpthread -lm -lnsl -lX11'
-
- !
Item was changed:
----- Method: Linux64x86w32BitConfig>>postBuildActionsBuild: (in category 'cmake buildType redirects') -----
+ postBuildActionsBuild: aMaker
+ "SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActionsBuild:'"
+ aMaker message: 'postBuildActionsBuild: aMaker'.!
- postBuildActionsBuild: gen
- "SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActionsBuild:'"!
Item was added:
+ ----- Method: Linux64x86w32BitConfig>>postBuildActionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') -----
+ postBuildActionsBuildMultiThreadedAssert: aMaker
+ ^self postBuildActionsBuild: aMaker!
Item was changed:
----- Method: Linux64x86w32BitConfig>>setExtraTargetPropertiesBuild: (in category 'cmake buildType redirects') -----
setExtraTargetPropertiesBuild: aMaker
self flag:'tty'. "I am nervous about this method up here in this class, but pharo has it in CogUnixConfig, so using as is for now"
+
+ aMaker message: 'setExtraTargetPropertiesBuild: aMaker'.
+
- aMaker setTargetProperties: 'LINK_FLAGS "-m32"'.
-
aMaker puts: 'set_source_files_properties( ${srcVMDir}/cogit.c PROPERTIES
+ COMPILE_FLAGS "' , self compilerFlags , '")'.
- COMPILE_FLAGS "-O1 -fno-omit-frame-pointer -momit-leaf-frame-pointer -mno-rtd -mno-accumulate-outgoing-args")'.
aMaker
cmd: 'set_source_files_properties'
params: ' ${targetPlatform}/vm/sqUnixHeartbeat.c PROPERTIES
+ COMPILE_FLAGS "' , self compilerFlags , '"'.
+ "
- COMPILE_FLAGS "-O1 -fno-omit-frame-pointer -mno-rtd -mno-accumulate-outgoing-args"'.
-
aMaker addExternalLibraries:
#(
'uuid' ""
'ssl' ""
'crypto' ""
+ 'm'
+ 'dl'
+ 'pthread'
).
+
+ "
+ aMaker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName.
+ self addVMDrivers: aMaker.!
-
- !
Item was changed:
----- Method: Linux64x86w32BitConfig>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'cmake buildType redirects') -----
setGlobalOptionsAfterDetermineSystemBuild: aMaker
"
SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystemBuild:'"
+ aMaker message: 'setGlobalOptionsAfterDetermineSystemBuild: aMaker'. !
- !
Item was changed:
----- Method: Linux64x86w32BitConfig>>setGlobalOptionsBuild: (in category 'cmake buildType redirects') -----
setGlobalOptionsBuild: aMaker
+ aMaker message: 'setGlobalOptionsBuild: aMaker'.
- aMaker set: 'CMAKE_C_COMPILER' to: '/usr/bin/gcc'.
- aMaker set: 'CMAKE_CXX_COMPILER' to: '/usr/bin/g++'.
" maker set: 'CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH}' to: ' /usr/lib/gcc/x86_64-slackware-linux/4.8.2/'.
set any CMake global options, before declaring a project in cmake file
set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /opt/local/lib)
SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions:'
"!
Item was added:
+ Linux64x86w32BitConfig subclass: #Linux64x86w32BitSqueakCogV3Config
+ instanceVariableNames: ''
+ classVariableNames: ''
+ poolDictionaries: ''
+ category: 'CMakeVMMakerSqueak-Linux64X86-32BitCompatibility'!
+
+ !Linux64x86w32BitSqueakCogV3Config commentStamp: 'tty 6/15/2014 18:26' prior: 0!
+ A slightly modified configuration, which avoids linking with openGL libraries.
+
+ SqueakLinux64x86w32CompatBuilder
+ configureABuildFor: #Linux32x86SqueakCogV3NoGLConfig withBuildType: #build;
+ generateSources;
+ generate.
+
+ HelpBrowser openOn: CMakeVMMakerSqueakEndUserHelp
+ HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp
+
+
+ Getting the UUIDPlugin to compile (not work, unfortunately, but compile) required modifying oscogvm/platforms/unix/plugins/acinclude.m4.
+ to read: (my Slackware system has <uuid> and uuidgen. then setting the
+
+ # -*- sh -*-
+
+ AC_MSG_CHECKING([for UUID support])
+ AC_TRY_COMPILE([#include <sys/uuid.h>],[uuid_generatorxyz;],[
+ AC_MSG_RESULT(yes)
+ AC_CHECK_LIB(uuid, uuid_generator_xyz,LIB_UUID="-luuid" )
+ ],[
+ AC_MSG_RESULT(no)
+ AC_MSG_CHECKING([for UUID support uuid/uuid.h] and uuid_generate)
+ AC_TRY_COMPILE([#include <uuid/uuid.h>],[uuid_generate;],[
+ AC_MSG_RESULT(yes)
+ AC_CHECK_LIB(uuid, uuid_generate, LIB_UUID="-luuid")],[
+ AC_MSG_RESULT(no)
+ AC_MSG_CHECKING([for UUID support uuid and uuidgen] )
+ AC_TRY_COMPILE([#include <uuid.h>],[uuidgen;],[
+ AC_MSG_RESULT(yes)
+ AC_CHECK_LIB(uuid, uuidgen, LIB_UUID="-luuid" )],[
+ AC_MSG_RESULT(no)
+ AC_PLUGIN_DISABLE
+ ])
+ ])
+ ])
+
+
+
+
+ #define HAVE_UUID_H 1
+ #define HAVE_UUIDGEN 1
+
+ fl;ags in my configH method
+
+ !
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>cogitClass (in category 'source generation') -----
+ cogitClass
+ ^ StackToRegisterMappingCogit
+ !
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>compilerFlagsBuild (in category 'cmake buildType redirects') -----
+ compilerFlagsBuild
+ "Some gcc versions (3.4*) create a broken VM using -O2, so try -O1 if you have problems"
+ ^{
+ '-g3' "more debugging"
+ .'-O1' "low optimization level"
+ .'-m32'
+ .'-msse2'
+ .'-D_GNU_SOURCE'
+ .'-D_FILE_OFFSET_BITS=64'
+ .'-DNDEBUG' "disable assertions"
+ .'-DLSB_FIRST=1' ""
+ .'-DUSE_GLOBAL_STRUCT=0'
+ .'-DDEBUGVM=0'
+ .'-DCOGMTVM=0'
+ .'-fno-tree-pre '
+ .'-fno-caller-saves'
+ }
+
+ !
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>compilerFlagsBuildAssert (in category 'cmake buildType redirects') -----
+ compilerFlagsBuildAssert
+ ^self compilerFlagsBuild
+ !
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>compilerFlagsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') -----
+ compilerFlagsBuildAssertITimerHeartbeat
+ ^self compilerFlagsBuild
+ !
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>compilerFlagsBuildDebug (in category 'cmake buildType redirects') -----
+ compilerFlagsBuildDebug
+ ^self compilerFlagsBuild
+ !
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>compilerFlagsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') -----
+ compilerFlagsBuildDebugITimerHeartbeat
+ ^self compilerFlagsBuild
+ !
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>compilerFlagsBuildITimerHeartbeat (in category 'cmake buildType redirects') -----
+ compilerFlagsBuildITimerHeartbeat
+ ^self compilerFlagsBuild
+ !
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>compilerFlagsBuildMultiThreaded (in category 'cmake buildType redirects') -----
+ compilerFlagsBuildMultiThreaded
+ ^self compilerFlagsBuild
+ !
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>compilerFlagsBuildMultiThreadedAssert (in category 'cmake buildType redirects') -----
+ compilerFlagsBuildMultiThreadedAssert
+ ^self compilerFlagsBuild
+ !
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>compilerFlagsBuildMultiThreadedDebug (in category 'cmake buildType redirects') -----
+ compilerFlagsBuildMultiThreadedDebug
+ ^self compilerFlagsBuild
+ !
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>configHBuild (in category 'headers generation') -----
+ configHBuild
+ ^ '
+
+ #define HAVE_UUID_H 1
+ #define HAVE_UUIDGEN 1
+
+ #ifndef __sq_config_h
+ #define __sq_config_h
+
+ /* explicit image width */
+
+ #define HAVE_INTERP_H 1
+
+ /* package options */
+
+ #define USE_X11 1
+
+ #undef USE_X11_GLX
+ /* #undef USE_QUARTZ */
+ /* #undef USE_QUARTZ_CGL */
+ /* #undef USE_RFB */
+
+ /* libraries */
+
+ /* #undef HAVE_LIBX11 */
+ /* #undef HAVE_LIBXEXT */
+ #define HAVE_LIBDL 1
+ /* #undef HAVE_DYLD */
+ /* #undef HAVE_LIBFFI */
+ /* #undef HAVE_ICONV */
+
+ /* #undef USE_AUDIO_NONE */
+ /* #undef USE_AUDIO_SUN */
+ /* #undef USE_AUDIO_NAS */
+ /* #undef USE_AUDIO_OSS */
+ /* #undef USE_AUDIO_MACOSX */
+ /* #undef OSS_DEVICE */
+
+ /* header files */
+
+ #define HAVE_UNISTD_H 1
+ /* #undef NEED_GETHOSTNAME_P */
+
+ #define HAVE_DIRENT_H 1
+ /* #undef HAVE_SYS_NDIR_H */
+ /* #undef HAVE_SYS_DIR_H */
+ /* #undef HAVE_NDIR_H */
+ #define HAVE_DLFCN_H 1
+ #define HAVE_ICONV_H 1
+
+ #define HAVE_SYS_TIME_H 1
+ #define TIME_WITH_SYS_TIME 1
+
+ /* #undef HAVE_SYS_FILIO_H */
+
+ /* #undef HAVE_SYS_AUDIOIO_H */
+ /* #undef HAVE_SUN_AUDIOIO_H */
+
+ #define HAVE_PTY_H 1
+ /* #undef HAVE_UTIL_H */
+ /* #undef HAVE_LIBUTIL_H */
+ #define HAVE_STROPTS_H 1
+
+ #undef HAVE_GL_GL_H
+ #undef HAVE_OPENGL_GL_H
+
+ /* #undef NEED_SUNOS_H */
+
+ /* system calls/library functions */
+
+ #define AT_EXIT atexit
+
+ #define HAVE_TZSET 1
+
+ #define HAVE_OPENPTY 1
+ /* #undef HAVE_UNIX98_PTYS */
+
+ #define HAVE_SNPRINTF 1
+ /* #undef HAVE___SNPRINTF */
+
+ #define HAVE_MMAP 1
+
+ /* #undef HAVE_DYLD */
+
+ #define HAVE_LANGINFO_CODESET 1
+
+ #define HAVE_ALLOCA 1
+ #define HAVE_ALLOCA_H 1
+
+ #define HAVE_UNSETENV 1
+
+ #define HAVE_NANOSLEEP 1
+
+ /* widths of primitive types */
+
+ #define SIZEOF_INT 4
+ #define SIZEOF_LONG 4
+ #define SIZEOF_LONG_LONG 8
+ #define SIZEOF_VOID_P 4
+
+ /* structures */
+
+ #define HAVE_TM_GMTOFF 1
+ #define HAVE_TIMEZONE 1
+
+ /* typedefs */
+
+ /* #undef size_t */
+ /* #undef socklen_t */
+
+ #define squeakInt64 long long
+
+ /* architecture */
+
+ #define OS_TYPE "unix"
+
+ #define VM_HOST "i686-pc-linux-gnu"
+ #define VM_HOST_CPU "i686"
+ /* #undef VM_HOST_VENDOR */
+ #define VM_HOST_OS "linux-gnu"
+ #define VM_BUILD_STRING "Unix built on "__DATE__ " "__TIME__" Compiler: "__VERSION__
+
+ /* #undef WORDS_BIGENDIAN */
+ /* #undef DOUBLE_WORD_ALIGNMENT */
+
+ /* damage containment */
+
+ /* #undef DARWIN */
+
+ #ifdef NEED_SUNOS_H
+ # include "sunos.h"
+ #endif
+
+ /* other configured variables */
+
+ #define SQ_VERSION "3.9a-7024"
+ #define VM_VERSION "3.9-7"
+ #define VM_MODULE_PREFIX ""
+ /* #undef VM_DLSYM_PREFIX */
+ #define VM_X11DIR ""
+
+ /* avoid dependencies on glibc2.3 */
+
+ #define HAVE_FEATURES_H 1
+
+ #if defined(HAVE_FEATURES_H)
+ # include "glibc.h"
+ #endif
+
+ #endif /* __sq_config_h */
+
+ '!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>configureFlagsBuild (in category 'cmake buildType redirects') -----
+ configureFlagsBuild
+ ^{'-without-npsqueak' . '--without-vm-display-fbdev' . '--x-libraries=/usr/lib' } !
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>configureFlagsBuildAssert (in category 'cmake buildType redirects') -----
+ configureFlagsBuildAssert
+ ^self configureFlagsBuild!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>configureFlagsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') -----
+ configureFlagsBuildAssertITimerHeartbeat
+ ^self configureFlagsBuild!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>configureFlagsBuildDebug (in category 'cmake buildType redirects') -----
+ configureFlagsBuildDebug
+ ^self configureFlagsBuild!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>configureFlagsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') -----
+ configureFlagsBuildDebugITimerHeartbeat
+ ^self configureFlagsBuild!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>configureFlagsBuildITimerHeartbeat (in category 'cmake buildType redirects') -----
+ configureFlagsBuildITimerHeartbeat
+ ^self configureFlagsBuild!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>configureFlagsBuildMultiThreaded (in category 'cmake buildType redirects') -----
+ configureFlagsBuildMultiThreaded
+ ^self configureFlagsBuild!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>configureFlagsBuildMultiThreadedAssert (in category 'cmake buildType redirects') -----
+ configureFlagsBuildMultiThreadedAssert
+ ^self configureFlagsBuild!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>configureFlagsBuildMultiThreadedDebug (in category 'cmake buildType redirects') -----
+ configureFlagsBuildMultiThreadedDebug
+ ^self configureFlagsBuild!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>defaultExternalPlugins (in category 'plugins') -----
+ defaultExternalPlugins
+ ""
+ ^ (super defaultExternalPlugins copyWithoutAll: #(BochsIA32Plugin #UUIDPlugin))!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>dirBuildLanguageVMMM (in category 'cmake directory ') -----
+ dirBuildLanguageVMMM
+ ^self squeakCogV3!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>dirInstall (in category 'cmake') -----
+ dirInstall
+ "the directory of the finished product.. the place where 'make install' puts stuff.
+ SystemNavigation default browseMethodsWhoseNamesContain: 'outputDir'
+ "
+ ^self squeakCogV3 , '.noGL'!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>excludeFromBuild (in category 'cmake') -----
+ excludeFromBuild
+ ^false "build this configuration"
+ " ^true"
+
+ !
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>executableName (in category 'cmake') -----
+ executableName
+ ^ self vmCogExecutableName!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>interpreterClass (in category 'source generation') -----
+ interpreterClass
+ ^ CoInterpreter!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>lDFlagsBuild (in category 'cmake buildType redirects') -----
+ lDFlagsBuild
+ "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file cat Cog/build.linux32x86/squeak.cog.v3/build/mvm"
+ ^ {
+ '-Wl'
+ . '-z'
+ . 'now'
+
+ }
+ !
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>lDFlagsBuildAssert (in category 'cmake buildType redirects') -----
+ lDFlagsBuildAssert
+ "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file cat Cog/build.linux32x86/squeak.cog.v3/build/mvm"
+ ^self lDFlagsBuild!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>lDFlagsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') -----
+ lDFlagsBuildAssertITimerHeartbeat
+ "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file cat Cog/build.linux32x86/squeak.cog.v3/build/mvm"
+ ^self lDFlagsBuild!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>lDFlagsBuildDebug (in category 'cmake buildType redirects') -----
+ lDFlagsBuildDebug
+ "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file cat Cog/build.linux32x86/squeak.cog.v3/build/mvm"
+ ^self lDFlagsBuild!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>lDFlagsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') -----
+ lDFlagsBuildDebugITimerHeartbeat
+ "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file cat Cog/build.linux32x86/squeak.cog.v3/build/mvm"
+ ^self lDFlagsBuild!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>lDFlagsBuildITimerHeartbeat (in category 'cmake buildType redirects') -----
+ lDFlagsBuildITimerHeartbeat
+ "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file cat Cog/build.linux32x86/squeak.cog.v3/build/mvm"
+ ^self lDFlagsBuild!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>lDFlagsBuildMultiThreaded (in category 'cmake buildType redirects') -----
+ lDFlagsBuildMultiThreaded
+ "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file cat Cog/build.linux32x86/squeak.cog.v3/build/mvm"
+ ^self lDFlagsBuild!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>lDFlagsBuildMultiThreadedAssert (in category 'cmake buildType redirects') -----
+ lDFlagsBuildMultiThreadedAssert
+ "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file cat Cog/build.linux32x86/squeak.cog.v3/build/mvm"
+ ^self lDFlagsBuild!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>lDFlagsBuildMultiThreadedDebug (in category 'cmake buildType redirects') -----
+ lDFlagsBuildMultiThreadedDebug
+ "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file cat Cog/build.linux32x86/squeak.cog.v3/build/mvm"
+ ^self lDFlagsBuild!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>linkFlagsBuild (in category 'cmake buildType redirects') -----
+ linkFlagsBuild
+ "Answer array of libraries to link to"
+ ^ {
+ '-luuid'
+ . 'lSM'
+ . '-lICE'
+ . '-ldl'
+ . '-lGL'
+ . '-lpthread'
+ . '-lm'
+ . '-lnsl'
+ . '-lX11'
+ }
+ !
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>linkFlagsBuildAssert (in category 'cmake buildType redirects') -----
+ linkFlagsBuildAssert
+ ^self linkFlagsBuild!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>linkFlagsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') -----
+ linkFlagsBuildAssertITimerHeartbeat
+ ^self linkFlagsBuild!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>linkFlagsBuildDebug (in category 'cmake buildType redirects') -----
+ linkFlagsBuildDebug
+ ^self linkFlagsBuild!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>linkFlagsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') -----
+ linkFlagsBuildDebugITimerHeartbeat
+ ^self linkFlagsBuild!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>linkFlagsBuildITimerHeartbeat (in category 'cmake buildType redirects') -----
+ linkFlagsBuildITimerHeartbeat
+ ^self linkFlagsBuild!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>linkFlagsBuildMultiThreaded (in category 'cmake buildType redirects') -----
+ linkFlagsBuildMultiThreaded
+ ^self linkFlagsBuild!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>linkFlagsBuildMultiThreadedAssert (in category 'cmake buildType redirects') -----
+ linkFlagsBuildMultiThreadedAssert
+ ^self linkFlagsBuild!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>linkFlagsBuildMultiThreadedDebug (in category 'cmake buildType redirects') -----
+ linkFlagsBuildMultiThreadedDebug
+ ^self linkFlagsBuild!
Item was removed:
- Linux64x86w32BitConfig subclass: #Linux64x86w32BitSqueakCogV3SlackwareConfig
- instanceVariableNames: ''
- classVariableNames: ''
- poolDictionaries: ''
- category: 'CMakeVMMakerSqueak-Linux64X86-32BitCompatibility'!
-
- !Linux64x86w32BitSqueakCogV3SlackwareConfig commentStamp: 'tty 6/15/2014 18:26' prior: 0!
- A slightly modified configuration, which avoids linking with openGL libraries.
-
- SqueakLinux64x86w32CompatBuilder
- configureABuildFor: #Linux32x86SqueakCogV3NoGLConfig withBuildType: #build;
- generateSources;
- generate.
-
- HelpBrowser openOn: CMakeVMMakerSqueakEndUserHelp
- HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp
-
-
- Getting the UUIDPlugin to compile (not work, unfortunately, but compile) required modifying oscogvm/platforms/unix/plugins/acinclude.m4.
- to read: (my Slackware system has <uuid> and uuidgen. then setting the
-
- # -*- sh -*-
-
- AC_MSG_CHECKING([for UUID support])
- AC_TRY_COMPILE([#include <sys/uuid.h>],[uuid_generatorxyz;],[
- AC_MSG_RESULT(yes)
- AC_CHECK_LIB(uuid, uuid_generator_xyz,LIB_UUID="-luuid" )
- ],[
- AC_MSG_RESULT(no)
- AC_MSG_CHECKING([for UUID support uuid/uuid.h] and uuid_generate)
- AC_TRY_COMPILE([#include <uuid/uuid.h>],[uuid_generate;],[
- AC_MSG_RESULT(yes)
- AC_CHECK_LIB(uuid, uuid_generate, LIB_UUID="-luuid")],[
- AC_MSG_RESULT(no)
- AC_MSG_CHECKING([for UUID support uuid and uuidgen] )
- AC_TRY_COMPILE([#include <uuid.h>],[uuidgen;],[
- AC_MSG_RESULT(yes)
- AC_CHECK_LIB(uuid, uuidgen, LIB_UUID="-luuid" )],[
- AC_MSG_RESULT(no)
- AC_PLUGIN_DISABLE
- ])
- ])
- ])
-
-
-
-
- #define HAVE_UUID_H 1
- #define HAVE_UUIDGEN 1
-
- fl;ags in my configH method
-
- !
Item was removed:
- ----- Method: Linux64x86w32BitSqueakCogV3SlackwareConfig>>addDriver:sources:generator: (in category 'utils') -----
- addDriver: name sources: aSources generator: cmakeGen
-
- | cfg srcs |
-
- srcs := aSources inject: '' into: [:res :each | res , ' "', each, '"' ].
- cfg := cmakeGen
- captureOutputDuring: [
- cmakeGen printHeader;
- project: name;
- include: '../directories.cmake';
-
- message: 'Adding module: ', name;
-
- addDefinitions: self compilerFlags;
- addDefinitions: '-fPIC -DPIC';
- set: #sources to: srcs;
- cmd: 'add_library' params: name, ' SHARED ${sources}';
- includeDirectories: '${crossDir}/plugins/FilePlugin';
- set: 'LIBRARY_OUTPUT_PATH' toString: self outputDir;
- cmd: 'set_target_properties' params: name , ' PROPERTIES PREFIX "" SUFFIX ""
- LINK_FLAGS "-lSM -lICE -ldl -lpthread -lm -lnsl -lX11"'
- ].
-
-
- self write: cfg toFile: ((self buildDir / name) assureExistence / cmakeGen outputFileName) fullName.
- cmakeGen addSubdirectory: name.
- !
Item was removed:
- ----- Method: Linux64x86w32BitSqueakCogV3SlackwareConfig>>cogitClass (in category 'source generation') -----
- cogitClass
- ^ StackToRegisterMappingCogit
- !
Item was removed:
- ----- Method: Linux64x86w32BitSqueakCogV3SlackwareConfig>>compilerFlagsBuild (in category 'cmake buildType redirects') -----
- compilerFlagsBuild
- ^ {
- '-g0'.
- '-O2'.
- '-fno-tree-pre'.
- '-fno-caller-saves'.
- '-msse2'.
- '-D_GNU_SOURCE'.
- '-DNDEBUG'.
- '-DITIMER_HEARTBEAT=1'.
- '-DNO_VM_PROFILE=1'.
- '-DDEBUGVM=0' }!
Item was removed:
- ----- Method: Linux64x86w32BitSqueakCogV3SlackwareConfig>>compilerFlagsBuildAssert (in category 'cmake buildType redirects') -----
- compilerFlagsBuildAssert
- ^self compilerFlagsBuild
- !
Item was removed:
- ----- Method: Linux64x86w32BitSqueakCogV3SlackwareConfig>>compilerFlagsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') -----
- compilerFlagsBuildAssertITimerHeartbeat
- ^self compilerFlagsBuild
- !
Item was removed:
- ----- Method: Linux64x86w32BitSqueakCogV3SlackwareConfig>>compilerFlagsBuildDebug (in category 'cmake buildType redirects') -----
- compilerFlagsBuildDebug
- ^self compilerFlagsBuild
- !
Item was removed:
- ----- Method: Linux64x86w32BitSqueakCogV3SlackwareConfig>>compilerFlagsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') -----
- compilerFlagsBuildDebugITimerHeartbeat
- ^self compilerFlagsBuild
- !
Item was removed:
- ----- Method: Linux64x86w32BitSqueakCogV3SlackwareConfig>>compilerFlagsBuildITimerHeartbeat (in category 'cmake buildType redirects') -----
- compilerFlagsBuildITimerHeartbeat
- ^self compilerFlagsBuild
- !
Item was removed:
- ----- Method: Linux64x86w32BitSqueakCogV3SlackwareConfig>>compilerFlagsBuildMultiThreaded (in category 'cmake buildType redirects') -----
- compilerFlagsBuildMultiThreaded
- ^self compilerFlagsBuild
- !
Item was removed:
- ----- Method: Linux64x86w32BitSqueakCogV3SlackwareConfig>>compilerFlagsBuildMultiThreadedAssert (in category 'cmake buildType redirects') -----
- compilerFlagsBuildMultiThreadedAssert
- ^self compilerFlagsBuild
- !
Item was removed:
- ----- Method: Linux64x86w32BitSqueakCogV3SlackwareConfig>>compilerFlagsBuildMultiThreadedDebug (in category 'cmake buildType redirects') -----
- compilerFlagsBuildMultiThreadedDebug
- ^self compilerFlagsBuild
- !
Item was removed:
- ----- Method: Linux64x86w32BitSqueakCogV3SlackwareConfig>>configHBuild (in category 'headers generation') -----
- configHBuild
- ^ '
-
- #define HAVE_UUID_H 1
- #define HAVE_UUIDGEN 1
-
- #ifndef __sq_config_h
- #define __sq_config_h
-
- /* explicit image width */
-
- #define HAVE_INTERP_H 1
-
- /* package options */
-
- #define USE_X11 1
-
- #undef USE_X11_GLX
- /* #undef USE_QUARTZ */
- /* #undef USE_QUARTZ_CGL */
- /* #undef USE_RFB */
-
- /* libraries */
-
- /* #undef HAVE_LIBX11 */
- /* #undef HAVE_LIBXEXT */
- #define HAVE_LIBDL 1
- /* #undef HAVE_DYLD */
- /* #undef HAVE_LIBFFI */
- /* #undef HAVE_ICONV */
-
- /* #undef USE_AUDIO_NONE */
- /* #undef USE_AUDIO_SUN */
- /* #undef USE_AUDIO_NAS */
- /* #undef USE_AUDIO_OSS */
- /* #undef USE_AUDIO_MACOSX */
- /* #undef OSS_DEVICE */
-
- /* header files */
-
- #define HAVE_UNISTD_H 1
- /* #undef NEED_GETHOSTNAME_P */
-
- #define HAVE_DIRENT_H 1
- /* #undef HAVE_SYS_NDIR_H */
- /* #undef HAVE_SYS_DIR_H */
- /* #undef HAVE_NDIR_H */
- #define HAVE_DLFCN_H 1
- #define HAVE_ICONV_H 1
-
- #define HAVE_SYS_TIME_H 1
- #define TIME_WITH_SYS_TIME 1
-
- /* #undef HAVE_SYS_FILIO_H */
-
- /* #undef HAVE_SYS_AUDIOIO_H */
- /* #undef HAVE_SUN_AUDIOIO_H */
-
- #define HAVE_PTY_H 1
- /* #undef HAVE_UTIL_H */
- /* #undef HAVE_LIBUTIL_H */
- #define HAVE_STROPTS_H 1
-
- #undef HAVE_GL_GL_H
- #undef HAVE_OPENGL_GL_H
-
- /* #undef NEED_SUNOS_H */
-
- /* system calls/library functions */
-
- #define AT_EXIT atexit
-
- #define HAVE_TZSET 1
-
- #define HAVE_OPENPTY 1
- /* #undef HAVE_UNIX98_PTYS */
-
- #define HAVE_SNPRINTF 1
- /* #undef HAVE___SNPRINTF */
-
- #define HAVE_MMAP 1
-
- /* #undef HAVE_DYLD */
-
- #define HAVE_LANGINFO_CODESET 1
-
- #define HAVE_ALLOCA 1
- #define HAVE_ALLOCA_H 1
-
- #define HAVE_UNSETENV 1
-
- #define HAVE_NANOSLEEP 1
-
- /* widths of primitive types */
-
- #define SIZEOF_INT 4
- #define SIZEOF_LONG 4
- #define SIZEOF_LONG_LONG 8
- #define SIZEOF_VOID_P 4
-
- /* structures */
-
- #define HAVE_TM_GMTOFF 1
- #define HAVE_TIMEZONE 1
-
- /* typedefs */
-
- /* #undef size_t */
- /* #undef socklen_t */
-
- #define squeakInt64 long long
-
- /* architecture */
-
- #define OS_TYPE "unix"
-
- #define VM_HOST "i686-pc-linux-gnu"
- #define VM_HOST_CPU "i686"
- /* #undef VM_HOST_VENDOR */
- #define VM_HOST_OS "linux-gnu"
- #define VM_BUILD_STRING "Unix built on "__DATE__ " "__TIME__" Compiler: "__VERSION__
-
- /* #undef WORDS_BIGENDIAN */
- /* #undef DOUBLE_WORD_ALIGNMENT */
-
- /* damage containment */
-
- /* #undef DARWIN */
-
- #ifdef NEED_SUNOS_H
- # include "sunos.h"
- #endif
-
- /* other configured variables */
-
- #define SQ_VERSION "3.9a-7024"
- #define VM_VERSION "3.9-7"
- #define VM_MODULE_PREFIX ""
- /* #undef VM_DLSYM_PREFIX */
- #define VM_X11DIR ""
-
- /* avoid dependencies on glibc2.3 */
-
- #define HAVE_FEATURES_H 1
-
- #if defined(HAVE_FEATURES_H)
- # include "glibc.h"
- #endif
-
- #endif /* __sq_config_h */
-
- '!
Item was removed:
- ----- Method: Linux64x86w32BitSqueakCogV3SlackwareConfig>>defaultExternalPlugins (in category 'plugins') -----
- defaultExternalPlugins
- "Removed the B3DAcceleratorPlugin since we don't have OpenGL bindings here"
- ^ (super defaultExternalPlugins copyWithoutAll: #(#B3DAcceleratorPlugin #ThreadedIA32FFIPlugin #InternetConfigPlugin #FT2Plugin))!
Item was removed:
- ----- Method: Linux64x86w32BitSqueakCogV3SlackwareConfig>>defaultInternalPlugins (in category 'plugins') -----
- defaultInternalPlugins
- "Removed the B3DAcceleratorPlugin since we don't have OpenGL bindings here"
- ^ (super defaultInternalPlugins copyWithoutAll: #(#IA32ABIPlugin #JoystickTabletPlugin #StarSqueakPlugin #SurfacePlugin #SqueakFFIPrims #ThreadedIA32FFIPlugin))!
Item was removed:
- ----- Method: Linux64x86w32BitSqueakCogV3SlackwareConfig>>dirBuildLanguageVMMM (in category 'cmake directory ') -----
- dirBuildLanguageVMMM
- ^self squeakCogV3!
Item was removed:
- ----- Method: Linux64x86w32BitSqueakCogV3SlackwareConfig>>dirInstall (in category 'cmake') -----
- dirInstall
- "the directory of the finished product.. the place where 'make install' puts stuff.
- SystemNavigation default browseMethodsWhoseNamesContain: 'outputDir'
- "
- ^self squeakCogV3 , '.noGL'!
Item was removed:
- ----- Method: Linux64x86w32BitSqueakCogV3SlackwareConfig>>excludeFromBuild (in category 'cmake') -----
- excludeFromBuild
- ^true "build this configuration"
- " ^true"
-
- !
Item was removed:
- ----- Method: Linux64x86w32BitSqueakCogV3SlackwareConfig>>executableName (in category 'cmake') -----
- executableName
- ^ self vmCogExecutableName!
Item was removed:
- ----- Method: Linux64x86w32BitSqueakCogV3SlackwareConfig>>interpreterClass (in category 'source generation') -----
- interpreterClass
- ^ CoInterpreter!
Item was removed:
- ----- Method: Linux64x86w32BitSqueakCogV3SlackwareConfig>>linkFlagsBuild (in category 'compiler flags') -----
- linkFlagsBuild
- ^ '-lSM -lICE -ldl -lpthread -lm -lnsl -lX11'!
Item was removed:
- Linux64x86w32BitSqueakCogV3SlackwareConfig subclass: #Linux64x86w32BitSqueakCogV3SlackwareNoGLConfig
- instanceVariableNames: ''
- classVariableNames: ''
- poolDictionaries: ''
- category: 'CMakeVMMakerSqueak-Linux64X86-32BitCompatibility'!
-
- !Linux64x86w32BitSqueakCogV3SlackwareNoGLConfig commentStamp: 'tty 6/15/2014 18:26' prior: 0!
- A slightly modified configuration, which avoids linking with openGL libraries.
-
- SqueakLinux64x86w32CompatBuilder
- configureABuildFor: #Linux32x86SqueakCogV3NoGLConfig withBuildType: #build;
- generateSources;
- generate.
-
- HelpBrowser openOn: CMakeVMMakerSqueakEndUserHelp
- HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp
-
-
- Getting the UUIDPlugin to compile (not work, unfortunately, but compile) required modifying oscogvm/platforms/unix/plugins/acinclude.m4.
- to read: (my Slackware system has <uuid> and uuidgen. then setting the
-
- # -*- sh -*-
-
- AC_MSG_CHECKING([for UUID support])
- AC_TRY_COMPILE([#include <sys/uuid.h>],[uuid_generatorxyz;],[
- AC_MSG_RESULT(yes)
- AC_CHECK_LIB(uuid, uuid_generator_xyz,LIB_UUID="-luuid" )
- ],[
- AC_MSG_RESULT(no)
- AC_MSG_CHECKING([for UUID support uuid/uuid.h] and uuid_generate)
- AC_TRY_COMPILE([#include <uuid/uuid.h>],[uuid_generate;],[
- AC_MSG_RESULT(yes)
- AC_CHECK_LIB(uuid, uuid_generate, LIB_UUID="-luuid")],[
- AC_MSG_RESULT(no)
- AC_MSG_CHECKING([for UUID support uuid and uuidgen] )
- AC_TRY_COMPILE([#include <uuid.h>],[uuidgen;],[
- AC_MSG_RESULT(yes)
- AC_CHECK_LIB(uuid, uuidgen, LIB_UUID="-luuid" )],[
- AC_MSG_RESULT(no)
- AC_PLUGIN_DISABLE
- ])
- ])
- ])
-
-
-
-
- #define HAVE_UUID_H 1
- #define HAVE_UUIDGEN 1
-
- fl;ags in my configH method
-
- !
Item was removed:
- ----- Method: Linux64x86w32BitSqueakCogV3SlackwareNoGLConfig>>excludeFromBuild (in category 'as yet unclassified') -----
- excludeFromBuild
- "over-ride to exclude yourself from a build or not"
- ^true!
Item was added:
+ ----- Method: SqueakBSDConfig>>addVMDriversBuild: (in category 'cmake buildType redirects') -----
+ addVMDriversBuild: aMaker
+ aMaker message: 'addVMDrivers: aMaker'.
+ self
+ addDriver: 'vm-display-null'
+ sources: #(
+ '${targetPlatform}/vm-display-null/sqUnixDisplayNull' )
+ generator: aMaker
+ externalLibs: #();
+
+ addDriver: 'vm-display-X11'
+ sources: #(
+ '${targetPlatform}/vm-display-X11/sqUnixX11'
+ '${targetPlatform}/vm-display-X11/sqUnixMozilla' )
+ generator: aMaker
+ externalLibs: (self linkFlags);
+
+ addDriver: 'vm-sound-ALSA'
+ sources: #(
+ '${targetPlatform}/vm-sound-ALSA/sqUnixSoundALSA' )
+ generator: aMaker
+ externalLibs: #();
+
+ addDriver: 'vm-sound-null'
+ sources: #(
+ '${targetPlatform}/vm-sound-null/sqUnixSoundNull' )
+ generator: aMaker
+ externalLibs: #().
+ !
Item was added:
+ ----- Method: SqueakBSDConfig>>addVMDriversBuildAssert: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildAssert: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: SqueakBSDConfig>>addVMDriversBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildAssertITimerHeartbeat: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: SqueakBSDConfig>>addVMDriversBuildDebug: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildDebug: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: SqueakBSDConfig>>addVMDriversBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildDebugITimerHeartbeat: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: SqueakBSDConfig>>addVMDriversBuildITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildITimerHeartbeat: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: SqueakBSDConfig>>addVMDriversBuildMultiThreaded: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildMultiThreaded: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: SqueakBSDConfig>>addVMDriversBuildMultiThreadedAssert: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildMultiThreadedAssert: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: SqueakBSDConfig>>addVMDriversBuildMultiThreadedDebug: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildMultiThreadedDebug: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: SqueakSunOS32x86Config>>addVMDriversBuild: (in category 'cmake buildType redirects') -----
+ addVMDriversBuild: aMaker
+ aMaker message: 'addVMDrivers: aMaker'.
+ self
+ addDriver: 'vm-display-null'
+ sources: #(
+ '${targetPlatform}/vm-display-null/sqUnixDisplayNull' )
+ generator: aMaker
+ externalLibs: #();
+
+ addDriver: 'vm-display-X11'
+ sources: #(
+ '${targetPlatform}/vm-display-X11/sqUnixX11'
+ '${targetPlatform}/vm-display-X11/sqUnixMozilla' )
+ generator: aMaker
+ externalLibs: (self linkFlags);
+
+ addDriver: 'vm-sound-ALSA'
+ sources: #(
+ '${targetPlatform}/vm-sound-ALSA/sqUnixSoundALSA' )
+ generator: aMaker
+ externalLibs: #();
+
+ addDriver: 'vm-sound-null'
+ sources: #(
+ '${targetPlatform}/vm-sound-null/sqUnixSoundNull' )
+ generator: aMaker
+ externalLibs: #().
+ !
Item was added:
+ ----- Method: SqueakSunOS32x86Config>>addVMDriversBuildAssert: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildAssert: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: SqueakSunOS32x86Config>>addVMDriversBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildAssertITimerHeartbeat: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: SqueakSunOS32x86Config>>addVMDriversBuildDebug: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildDebug: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: SqueakSunOS32x86Config>>addVMDriversBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildDebugITimerHeartbeat: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: SqueakSunOS32x86Config>>addVMDriversBuildITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildITimerHeartbeat: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: SqueakSunOS32x86Config>>addVMDriversBuildMultiThreaded: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildMultiThreaded: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: SqueakSunOS32x86Config>>addVMDriversBuildMultiThreadedAssert: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildMultiThreadedAssert: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was added:
+ ----- Method: SqueakSunOS32x86Config>>addVMDriversBuildMultiThreadedDebug: (in category 'cmake buildType redirects') -----
+ addVMDriversBuildMultiThreadedDebug: aMaker
+ ^self addVMDriversBuild: aMaker!
Item was removed:
- ----- Method: SqueakUnixConfig>>addVMDriversBuild: (in category 'cmake buildType redirects') -----
- addVMDriversBuild: aMaker
- "
- libICE
- ICE is the Inter Client Exchange protocol, part of X11
-
- libSM
- session management library for X11
-
- "
- self
- addDriver: 'vm-display-null'
- sources: #(
- '${targetPlatform}/vm-display-null/sqUnixDisplayNull' )
- generator: aMaker
- externalLibs: #();
-
-
- addDriver: 'vm-display-X11'
- sources: #(
- '${targetPlatform}/vm-display-X11/sqUnixX11'
- '${targetPlatform}/vm-display-X11/sqUnixMozilla' )
- generator: aMaker
-
- "-lSM -lICE -ldl -lGL -lpthread -lm -lnsl -lX11'"
- externalLibs: #( SM ICE GL X11 nsl dl);
-
-
- addDriver: 'vm-sound-ALSA'
- sources: #(
- '${targetPlatform}/vm-sound-ALSA/sqUnixSoundALSA' )
- generator: aMaker
- externalLibs: #();
-
- addDriver: 'vm-sound-null'
- sources: #(
- '${targetPlatform}/vm-sound-null/sqUnixSoundNull' )
- generator: aMaker
- externalLibs: #().
-
- "
- vm-display-null
- vm-display-X11
- vm-sound-ALSA
- vm-sound-null"!
Item was removed:
- ----- Method: SqueakUnixConfig>>addVMDriversBuildAssert: (in category 'cmake buildType redirects') -----
- addVMDriversBuildAssert: aMaker
- ^self addVMDriversBuild: aMaker!
Item was removed:
- ----- Method: SqueakUnixConfig>>addVMDriversBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') -----
- addVMDriversBuildAssertITimerHeartbeat: aMaker
- ^self addVMDriversBuild: aMaker!
Item was removed:
- ----- Method: SqueakUnixConfig>>addVMDriversBuildDebug: (in category 'cmake buildType redirects') -----
- addVMDriversBuildDebug: aMaker
- ^self addVMDriversBuild: aMaker!
Item was removed:
- ----- Method: SqueakUnixConfig>>addVMDriversBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') -----
- addVMDriversBuildDebugITimerHeartbeat: aMaker
- ^self addVMDriversBuild: aMaker!
Item was removed:
- ----- Method: SqueakUnixConfig>>addVMDriversBuildITimerHeartbeat: (in category 'cmake buildType redirects') -----
- addVMDriversBuildITimerHeartbeat: aMaker
- ^self addVMDriversBuild: aMaker!
Item was removed:
- ----- Method: SqueakUnixConfig>>addVMDriversBuildMultiThreaded: (in category 'utils') -----
- addVMDriversBuildMultiThreaded: aMaker
- ^self addVMDriversBuild: aMaker!
Item was removed:
- ----- Method: SqueakUnixConfig>>addVMDriversBuildMultiThreadedAssert: (in category 'cmake buildType redirects') -----
- addVMDriversBuildMultiThreadedAssert: aMaker
- ^self addVMDriversBuild: aMaker!
Item was removed:
- ----- Method: SqueakUnixConfig>>addVMDriversBuildMultiThreadedDebug: (in category 'cmake buildType redirects') -----
- addVMDriversBuildMultiThreadedDebug: aMaker
- ^self addVMDriversBuild: aMaker!
Item was changed:
----- Method: SqueakUnixConfig>>commonCompilerFlags (in category 'compiler flags') -----
commonCompilerFlags
"avoid premature optimization. push this decision down lower if it is needed at all"
+ self deprecated: ' its much easier to have all the flags in your configuration class. '.
^{}
!
1
0
Hi All,
I recently eliminated the optimization in Slang that replaces a
division by a power of two with a shift, because the code cast the argument
to signed, and hence broke unsigned division. That's what used to be
controlled by the UseRightShiftForDivide class var of CCodeGenerator.
Yesterday I found out that that optimization is the only thing that's
keeping the LargeIntegers plugin afloat. To whit:
LargeIntegersPlugin>>cDigitSub: pByteSmall
len: smallLen
with: pByteLarge
len: largeLen
into: pByteRes
| z limit |
<var: #pByteSmall type: 'unsigned char * '>
<var: #pByteLarge type: 'unsigned char * '>
<var: #pByteRes type: 'unsigned char * '>
z := 0.
"Loop invariant is -1<=z<=1"
limit := smallLen - 1.
0 to: limit do:
[:i |
z := z + (pByteLarge at: i) - (pByteSmall at: i).
pByteRes at: i put: z - (z // 256 * 256).
"sign-tolerant form of (z bitAnd: 255)"
z := z // 256].
limit := largeLen - 1.
smallLen to: limit do:
[:i |
z := z + (pByteLarge at: i) .
pByteRes at: i put: z - (z // 256 * 256).
"sign-tolerant form of (z bitAnd: 255)"
z := z // 256].
The "z := z // 256"'s at the end of the loops were being generated as
z = ((sqInt) z) >> 8;
which is essential for the signed arithmetic implicit in "z := z +
(pByteLarge at: i) - (pByteSmall at: i)" to work.
So what's the right thing to do?
In C -1 // 256 = 0, but in Smalltalk -1 // 256 = -1 (// rounds towards -
infinity), whereas (-1 quo: 256) = 0 (quo: rounds towards 0).
I could modify the code generator to generate Smalltalk semantics for //,
but its not pretty (one has to check signedness, check if there's a
remainder, etc).
What I'd like is to have a signed bitShift:. Wait you say, bitShift: is
signed. Ah, but the code generator generates unsigned shifts for all
bitShift:'s !!!!.
So some ideas:
1. change bitShift: to obey the type of the receiver (Slang allows one to
type variables, defaulting to a singed long). This is my preference, but it
risks breaking a good handful of negative bitShift: uses in plugins (which
is where I'm worried about regressions).
2. change bitShift: to obey explicit casts, generating a signed shift for
foo asInteger bitShift: expr
(self cCoerceSimple: #foo to: #sqInt) bitShift: expr
Seriously?!?! this stinks.
3. write
z := self cCode: [z >>= 8] inSmalltalk: [z // 256]
Seriously?!?! this stinks too.
Anything else that makes any sense?
--
best,
Eliot
4
10
01 Jul '14
Revision: 3023
Author: eliot
Date: 2014-06-30 20:09:58 -0700 (Mon, 30 Jun 2014)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.790
Implement following forwarders on primitive failure in machine code interpreter
primitives (still have to implement this in sideways calls of named primitives).
Allow the JIT to not compile primitiveDoNamedPrimitiveWithArgs
to avoid any potential complications.
Rewrite all the semaphore installing primitives to fail if the semaphore arg is
neither a semaphore or nil instead of assuming if its not a semaphore it must be
nil, so as to fail and retry when semaphores are forwarded (as they are when
Semaphore is redefined).
Implement isSemaphoreOop:/Obj: in the object memories to abstract away the code.
Base Spur's on the class index of splObj: ClassSemaphore, avoiding the table
lookup to derive the class. Make checkForEventsMayContextSwitch: treat all its
semaphores consistently.
Have spur's fetchClassOfNonImm: answer nilObj for
forwarders to avoid assert fails.
On Spur add read barriers to primitiveSuspend and synchronousSignal:'s myList
access, because the process list manipulation routines do no checking. Add
assert checks for forwarders in the process list manipulation routines.
Fix slip in StackInterpreter>>actuallyFollowNecessaryForwardingInMethod:literalCount:
that corrupts the methodClassAssociation.
Abstract out the call machinery from compileTrampolineFor:numArgs:arg:arg:arg:-
arg:saveRegs:pushLinkReg:resultReg: so it can be used by
maybeCompileRetry:onPrimitiveFail: in implementing following forwarders on
primitive failure in machine code, and the Open PIC miss call.
Have bytecodePCFor:cogMethod:startBcpc: map any pc before the stackCheckOffset
to the initialPC, which applies to primitives in progress.
Fix assert fails in updateStateOfSpouseContextForFrame:WithSP:
and elsewhere with forwarders.
LargeIntegers Plugin:
Fix a latent signed shift bug in cDigitSub:len:with:len:into:
caused by VMMaker.oscog-eem.785's eliminating the
divide-via-shift optimization.
These changes allow Cog Spur to redefine Process and/or Semaphore and not hang.
Modified Paths:
--------------
branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c
branches/Cog/nscogsrc/vm/cogit.c
branches/Cog/nscogsrc/vm/cogit.h
branches/Cog/nscogsrc/vm/cogmethod.h
branches/Cog/nscogsrc/vm/cointerp.c
branches/Cog/nscogsrc/vm/cointerp.h
branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
branches/Cog/nscogsrc/vm/interp.h
branches/Cog/nscogsrc/vm/vmCallback.h
branches/Cog/nsspursrc/vm/cogit.c
branches/Cog/nsspursrc/vm/cogit.h
branches/Cog/nsspursrc/vm/cogmethod.h
branches/Cog/nsspursrc/vm/cointerp.c
branches/Cog/nsspursrc/vm/cointerp.h
branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
branches/Cog/nsspursrc/vm/interp.h
branches/Cog/nsspursrc/vm/vmCallback.h
branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
branches/Cog/nsspurstacksrc/vm/interp.c
branches/Cog/nsspurstacksrc/vm/interp.h
branches/Cog/nsspurstacksrc/vm/vmCallback.h
branches/Cog/scripts/uploadvms
branches/Cog/sistasrc/vm/cogit.c
branches/Cog/sistasrc/vm/cogit.h
branches/Cog/sistasrc/vm/cogmethod.h
branches/Cog/sistasrc/vm/cointerp.c
branches/Cog/sistasrc/vm/cointerp.h
branches/Cog/sistasrc/vm/gcc3x-cointerp.c
branches/Cog/sistasrc/vm/interp.h
branches/Cog/sistasrc/vm/vmCallback.h
branches/Cog/spursistasrc/vm/cogit.c
branches/Cog/spursistasrc/vm/cogit.h
branches/Cog/spursistasrc/vm/cogmethod.h
branches/Cog/spursistasrc/vm/cointerp.c
branches/Cog/spursistasrc/vm/cointerp.h
branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
branches/Cog/spursistasrc/vm/interp.h
branches/Cog/spursistasrc/vm/vmCallback.h
branches/Cog/spursrc/vm/cogit.c
branches/Cog/spursrc/vm/cogit.h
branches/Cog/spursrc/vm/cogmethod.h
branches/Cog/spursrc/vm/cointerp.c
branches/Cog/spursrc/vm/cointerp.h
branches/Cog/spursrc/vm/gcc3x-cointerp.c
branches/Cog/spursrc/vm/interp.h
branches/Cog/spursrc/vm/vmCallback.h
branches/Cog/spurstacksrc/vm/gcc3x-interp.c
branches/Cog/spurstacksrc/vm/interp.c
branches/Cog/spurstacksrc/vm/interp.h
branches/Cog/spurstacksrc/vm/vmCallback.h
branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c
branches/Cog/src/vm/cogit.c
branches/Cog/src/vm/cogit.h
branches/Cog/src/vm/cogmethod.h
branches/Cog/src/vm/cointerp.c
branches/Cog/src/vm/cointerp.h
branches/Cog/src/vm/cointerpmt.c
branches/Cog/src/vm/cointerpmt.h
branches/Cog/src/vm/gcc3x-cointerp.c
branches/Cog/src/vm/gcc3x-cointerpmt.c
branches/Cog/src/vm/interp.h
branches/Cog/src/vm/vmCallback.h
branches/Cog/stacksrc/vm/gcc3x-interp.c
branches/Cog/stacksrc/vm/interp.c
branches/Cog/stacksrc/vm/interp.h
branches/Cog/stacksrc/vm/vmCallback.h
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c
===================================================================
--- branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c 2014-06-29 06:02:05 UTC (rev 3022)
+++ branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c 2014-07-01 03:09:58 UTC (rev 3023)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
from
- LargeIntegersPlugin VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211
+ LargeIntegersPlugin VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
*/
-static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 " __DATE__ ;
+static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 " __DATE__ ;
@@ -172,9 +172,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "LargeIntegers v1.5 VMMaker.oscog-eem.787 (i)"
+ "LargeIntegers v1.5 VMMaker.oscog-eem.790 (i)"
#else
- "LargeIntegers v1.5 VMMaker.oscog-eem.787 (e)"
+ "LargeIntegers v1.5 VMMaker.oscog-eem.790 (e)"
#endif
;
static const int orOpIndex = 1;
@@ -950,24 +950,21 @@
cDigitSublenwithleninto(unsigned char * pByteSmall, sqInt smallLen, unsigned char * pByteLarge, sqInt largeLen, unsigned char * pByteRes)
{
sqInt i;
- sqInt limit;
sqInt z;
/* Loop invariant is -1<=z<=1 */
z = 0;
- limit = smallLen - 1;
- for (i = 0; i <= limit; i += 1) {
+ for (i = 0; i < smallLen; i += 1) {
z = (z + (pByteLarge[i])) - (pByteSmall[i]);
pByteRes[i] = (z - ((z / 256) * 256));
- z = z / 256;
+ z = ((signed)z >> 8);
}
- limit = largeLen - 1;
- for (i = smallLen; i <= limit; i += 1) {
+ for (i = smallLen; i < largeLen; i += 1) {
z += pByteLarge[i];
pByteRes[i] = (z - ((z / 256) * 256));
- z = z / 256;
+ z = ((signed)z >> 8);
}
}
@@ -1856,7 +1853,6 @@
sqInt i;
sqInt larger;
sqInt largerLen;
- sqInt limit;
sqInt neg;
unsigned char * pByteLarge;
unsigned char * pByteRes;
@@ -1910,17 +1906,15 @@
/* Loop invariant is -1<=z<=1 */
z = 0;
- limit = smallerLen - 1;
- for (i = 0; i <= limit; i += 1) {
+ for (i = 0; i < smallerLen; i += 1) {
z = (z + (pByteLarge[i])) - (pByteSmall[i]);
pByteRes[i] = (z - ((z / 256) * 256));
- z = z / 256;
+ z = ((signed)z >> 8);
}
- limit = largerLen - 1;
- for (i = smallerLen; i <= limit; i += 1) {
+ for (i = smallerLen; i < largerLen; i += 1) {
z += pByteLarge[i];
pByteRes[i] = (z - ((z / 256) * 256));
- z = z / 256;
+ z = ((signed)z >> 8);
}
return (neg
? normalizeNegative(res)
Modified: branches/Cog/nscogsrc/vm/cogit.c
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.c 2014-06-29 06:02:05 UTC (rev 3022)
+++ branches/Cog/nscogsrc/vm/cogit.c 2014-07-01 03:09:58 UTC (rev 3023)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.786 uuid: 425c25e8-f3f6-4f06-b2eb-392c5da0ed44
+ CCodeGenerator VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.786 uuid: 425c25e8-f3f6-4f06-b2eb-392c5da0ed44
+ StackToRegisterMappingCogit VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.786 uuid: 425c25e8-f3f6-4f06-b2eb-392c5da0ed44 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -252,7 +252,7 @@
#define MapEnd 0
#define MaxCompiledPrimitiveIndex 222
#define MaxMethodSize 65535
-#define MaxNegativeErrorCode -7
+#define MaxNegativeErrorCode -8
#define MaxNumArgs 15
#define MaxStackAllocSize 1572864
#define MaxStackCheckOffset 0xFFF
@@ -304,6 +304,7 @@
#define PopR 69
#define PrefetchAw 72
#define PrimCallCollectsProfileSamples 8
+#define PrimCallDoNotJIT 32
#define PrimCallMayCallBack 4
#define PrimCallNeedsNewMethod 1
#define PrimCallNeedsPrimitiveFunction 2
@@ -321,6 +322,7 @@
#define SendNumArgsReg -6
#define SFENCE 116
#define ShiftForWord 2
+#define ShouldNotJIT -8
#define SIB1 0
#define SIB4 2
#define Size4Bit 0
@@ -450,6 +452,7 @@
static void compileBlockEntry(BlockStart *blockStart) NoDbgRegParms;
static void compileBlockFrameBuild(BlockStart *blockStart) NoDbgRegParms;
static void compileBlockFramelessEntry(BlockStart *blockStart) NoDbgRegParms;
+static void compileCallFornumArgsargargargargresultRegsaveRegs(void *aRoutine, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt resultRegOrNil, sqInt saveRegs) NoDbgRegParms;
static sqInt compileClosedPICPrototype(void);
static CogMethod * compileCogMethod(sqInt selector) NoDbgRegParms;
static AbstractInstruction * compileCPICEntry(void);
@@ -953,6 +956,7 @@
static void marshallSendArguments(sqInt numArgs) NoDbgRegParms;
usqInt maxCogMethodAddress(void);
static void maybeCompileAllocFillerCheck(void);
+static void maybeCompileRetryonPrimitiveFail(sqInt retryInst, sqInt primIndex) NoDbgRegParms;
static sqInt maybeFreeCogMethodDoesntLookKosher(CogMethod *cogMethod) NoDbgRegParms;
static sqInt maybeGenerateCheckFeatures(void);
static sqInt maybeGenerateICacheFlush(void);
@@ -1193,7 +1197,6 @@
static sqInt compilationTrace;
static sqInt cPICCaseSize;
static sqInt cPICEndSize;
-static const int cStackAlignment = STACK_ALIGN_BYTES;
static sqInt deadCode;
static sqInt debugFixupBreaks;
unsigned long debugPrimCallStackOffset;
@@ -4490,6 +4493,73 @@
}
+/* Generate a call to aRoutine with up to 4 arguments. If resultRegOrNil is
+ non-zero assign the C result to resultRegOrNil. If saveRegs, save all
+ registers. Hack: a negative arg value indicates an abstract register, a
+ non-negative value
+ indicates a constant. */
+
+static void
+compileCallFornumArgsargargargargresultRegsaveRegs(void *aRoutine, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt resultRegOrNil, sqInt saveRegs)
+{
+ const int cStackAlignment = STACK_ALIGN_BYTES;
+
+ if (cStackAlignment > BytesPerWord) {
+ genAlignCStackSavingRegistersnumArgswordAlignment(backEnd, saveRegs, numArgs, cStackAlignment / BytesPerWord);
+ }
+ if (saveRegs) {
+ genSaveRegisters(backEnd);
+ }
+ if (numArgs > 0) {
+ if (numArgs > 1) {
+ if (numArgs > 2) {
+ if (numArgs > 3) {
+ if (regOrConst3 < 0) {
+ genPassRegasArgument(backEnd, regOrConst3, 3);
+ }
+ else {
+ genPassConstasArgument(backEnd, regOrConst3, 3);
+ }
+ }
+ if (regOrConst2 < 0) {
+ genPassRegasArgument(backEnd, regOrConst2, 2);
+ }
+ else {
+ genPassConstasArgument(backEnd, regOrConst2, 2);
+ }
+ }
+ if (regOrConst1 < 0) {
+ genPassRegasArgument(backEnd, regOrConst1, 1);
+ }
+ else {
+ genPassConstasArgument(backEnd, regOrConst1, 1);
+ }
+ }
+ if (regOrConst0 < 0) {
+ genPassRegasArgument(backEnd, regOrConst0, 0);
+ }
+ else {
+ genPassConstasArgument(backEnd, regOrConst0, 0);
+ }
+ }
+ CallRT(((usqInt)aRoutine));
+ if (!(resultRegOrNil == null)) {
+ genWriteCResultIntoReg(backEnd, resultRegOrNil);
+ }
+ if (saveRegs) {
+ if (numArgs > 0) {
+ genRemoveNArgsFromStack(backEnd, numArgs);
+ }
+ if (resultRegOrNil == null) {
+ genRestoreRegs(backEnd);
+ }
+ else {
+ genRestoreRegsExcept(backEnd, resultRegOrNil);
+ }
+ }
+}
+
+
/* Compile the abstract instructions for a full closed PIC used to initialize
closedPICSize. The loads into SendNumArgsReg are those for optional method
objects which may be
@@ -4886,6 +4956,7 @@
sqInt offset1;
sqInt reg;
sqInt retpc;
+ AbstractInstruction *retry;
/* Save processor fp, sp and return pc in the interpreter's frame stack and instruction pointers */
@@ -4893,7 +4964,10 @@
genExternalizePointersForPrimitiveCall();
genLoadCStackPointersForPrimCall();
flags = primitivePropertyFlags(primitiveIndex);
- if ((flags & PrimCallCollectsProfileSamples) != 0) {
+ if (flags & PrimCallDoNotJIT) {
+ return ShouldNotJIT;
+ }
+ if (flags & PrimCallCollectsProfileSamples) {
/* Test nextProfileTick for being non-zero and call checkProfileTick if so */
@@ -4911,8 +4985,11 @@
/* begin Label */
continuePostSampleNonPrim = genoperandoperand(Label, (labelCounter += 1), bytecodePC);
}
+ if (recordPrimTrace()) {
+ genFastPrimTraceUsingand(ClassReg, SendNumArgsReg);
+ }
/* begin MoveCq:R: */
- genoperandoperand(MoveCqR, 0, TempReg);
+ retry = genoperandoperand(MoveCqR, 0, TempReg);
/* begin MoveR:Aw: */
address11 = primFailCodeAddress();
genoperandoperand(MoveRAw, TempReg, address11);
@@ -4923,21 +5000,18 @@
/* begin MoveR:Aw: */
address12 = argumentCountAddress();
genoperandoperand(MoveRAw, TempReg, address12);
- if ((flags & PrimCallNeedsPrimitiveFunction) != 0) {
+ if (flags & PrimCallNeedsPrimitiveFunction) {
/* begin MoveCw:R: */
genoperandoperand(MoveCwR, ((sqInt)primitiveRoutine), TempReg);
/* begin MoveR:Aw: */
address3 = primitiveFunctionPointerAddress();
genoperandoperand(MoveRAw, TempReg, address3);
}
- if (recordPrimTrace()) {
- genFastPrimTraceUsingand(ClassReg, SendNumArgsReg);
- }
- if ((flags & (PrimCallNeedsNewMethod + PrimCallMayCallBack)) != 0) {
+ if (flags & (PrimCallNeedsNewMethod + PrimCallMayCallBack)) {
/* The ceActivateFailingPrimitiveMethod: machinery can't handle framelessness. */
- if ((flags & PrimCallMayCallBack) != 0) {
+ if (flags & PrimCallMayCallBack) {
needsFrame = 1;
}
addDependent(methodLabel, annotateAbsolutePCRef(gMoveCwR(((sqInt)methodLabel), ClassReg)));
@@ -4951,12 +5025,12 @@
/* begin PrefetchAw: */
address13 = primFailCodeAddress();
genoperand(PrefetchAw, address13);
- if ((flags & PrimCallMayCallBack) != 0) {
+ if (flags & PrimCallMayCallBack) {
/* Sideways call the C primitive routine so that we return through cePrimReturnEnterCogCode. */
/* begin genSubstituteReturnAddress: */
- retpc = ((flags & PrimCallCollectsProfileSamples) != 0
+ retpc = (flags & PrimCallCollectsProfileSamples
? cePrimReturnEnterCogCodeProfiling
: cePrimReturnEnterCogCode);
/* begin PushCw: */
@@ -4973,8 +5047,8 @@
CallRT(((sqInt)primitiveRoutine));
/* begin Label */
primInvokeLabel = genoperandoperand(Label, (labelCounter += 1), bytecodePC);
- if ((flags & PrimCallCollectsProfileSamples) != 0) {
- assert((flags & PrimCallNeedsNewMethod) != 0);
+ if (flags & PrimCallCollectsProfileSamples) {
+ assert(flags & PrimCallNeedsNewMethod);
/* begin MoveAw:R: */
address5 = nextProfileTickAddress();
genoperandoperand(MoveAwR, address5, TempReg);
@@ -4989,6 +5063,7 @@
/* begin Label */
continuePostSamplePrim = genoperandoperand(Label, (labelCounter += 1), bytecodePC);
}
+ maybeCompileRetryonPrimitiveFail(retry, primitiveIndex);
maybeCompileAllocFillerCheck();
/* begin MoveAw:R: */
address8 = instructionPointerAddress();
@@ -5012,7 +5087,7 @@
/* begin RetN: */
genoperand(RetN, BytesPerWord);
}
- if ((flags & PrimCallCollectsProfileSamples) != 0) {
+ if (flags & PrimCallCollectsProfileSamples) {
/* The sample is collected by cePrimReturnEnterCogCode for external calls */
@@ -5021,8 +5096,8 @@
/* Call ceCheckProfileTick: to record sample and then continue. */
jmpTarget(jmpSamplePrim, gLabel());
- assert((flags & PrimCallNeedsNewMethod) != 0);
- CallRT((unsigned long)ceCheckProfileTick);
+ assert(flags & PrimCallNeedsNewMethod);
+ CallRT(((unsigned long)ceCheckProfileTick));
/* begin Jump: */
genoperand(Jump, ((sqInt)continuePostSamplePrim));
}
@@ -5032,7 +5107,7 @@
/* begin MoveR:Aw: */
address10 = newMethodAddress();
genoperandoperand(MoveRAw, TempReg, address10);
- CallRT((unsigned long)ceCheckProfileTick);
+ CallRT(((unsigned long)ceCheckProfileTick));
/* begin Jump: */
genoperand(Jump, ((sqInt)continuePostSampleNonPrim));
}
@@ -5094,7 +5169,6 @@
static void
compileOpenPICnumArgs(sqInt selector, sqInt numArgs)
{
- AbstractInstruction *abstractInstruction;
AbstractInstruction *itsAHit;
AbstractInstruction *jumpBCMethod;
AbstractInstruction *jumpClassMiss;
@@ -5106,7 +5180,6 @@
sqInt offset4;
sqInt offset5;
sqInt offset6;
- sqInt routine;
compilePICProlog(numArgs);
/* begin Nop */
@@ -5198,15 +5271,7 @@
genPushRegisterArgsForNumArgs(backEnd, numArgs);
genSmalltalkToCStackSwitch();
addDependent(methodLabel, annotateAbsolutePCRef(gMoveCwR(((sqInt)methodLabel), SendNumArgsReg)));
- if (cStackAlignment > BytesPerWord) {
- genAlignCStackSavingRegistersnumArgswordAlignment(backEnd, 0, 1, cStackAlignment / BytesPerWord);
- }
- genPassRegasArgument(backEnd, SendNumArgsReg, 0);
- routine = (sqInt)ceSendFromInLineCacheMiss;
- /* begin annotateCall: */
- /* begin Call: */
- abstractInstruction = genoperand(Call, routine);
- annotatewith(abstractInstruction, IsRelativeCall);
+ compileCallFornumArgsargargargargresultRegsaveRegs(ceSendFromInLineCacheMiss, 1, SendNumArgsReg, null, null, null, null, 0);
}
@@ -5287,60 +5352,7 @@
genoperand(PushR, LinkReg);
}
genSmalltalkToCStackSwitch();
- if (cStackAlignment > BytesPerWord) {
- genAlignCStackSavingRegistersnumArgswordAlignment(backEnd, saveRegs, numArgs, cStackAlignment / BytesPerWord);
- }
- if (saveRegs) {
- genSaveRegisters(backEnd);
- }
- if (numArgs > 0) {
- if (numArgs > 1) {
- if (numArgs > 2) {
- if (numArgs > 3) {
- if (regOrConst3 < 0) {
- genPassRegasArgument(backEnd, regOrConst3, 3);
- }
- else {
- genPassConstasArgument(backEnd, regOrConst3, 3);
- }
- }
- if (regOrConst2 < 0) {
- genPassRegasArgument(backEnd, regOrConst2, 2);
- }
- else {
- genPassConstasArgument(backEnd, regOrConst2, 2);
- }
- }
- if (regOrConst1 < 0) {
- genPassRegasArgument(backEnd, regOrConst1, 1);
- }
- else {
- genPassConstasArgument(backEnd, regOrConst1, 1);
- }
- }
- if (regOrConst0 < 0) {
- genPassRegasArgument(backEnd, regOrConst0, 0);
- }
- else {
- genPassConstasArgument(backEnd, regOrConst0, 0);
- }
- }
- /* begin Call: */
- genoperand(Call, ((usqInt)aRoutine));
- if (!(resultRegOrNil == null)) {
- genWriteCResultIntoReg(backEnd, resultRegOrNil);
- }
- if (saveRegs) {
- if (numArgs > 0) {
- genRemoveNArgsFromStack(backEnd, numArgs);
- }
- if (resultRegOrNil == null) {
- genRestoreRegs(backEnd);
- }
- else {
- genRestoreRegsExcept(backEnd, resultRegOrNil);
- }
- }
+ compileCallFornumArgsargargargargresultRegsaveRegs(aRoutine, numArgs, regOrConst0, regOrConst1, regOrConst2, regOrConst3, resultRegOrNil, saveRegs);
genLoadStackPointers(backEnd);
/* begin RetN: */
@@ -12238,7 +12250,6 @@
for (numArgs = 0, numArgsLimiT = (1 + 1); numArgs <= numArgsLimiT; numArgs += 1) {
picMissTrampolines[numArgs] = (genPICMissTrampolineFor(numArgs));
}
-
}
static void
@@ -12425,9 +12436,7 @@
static void
generateTrampolines(void)
{
- sqInt addr;
sqInt methodZoneStart;
- sqInt selector;
methodZoneStart = methodZoneBase;
allocateOpcodesbytecodes(80, 0);
@@ -12444,7 +12453,6 @@
generateTracingTrampolines();
recordGeneratedRunTimeaddress("methodZoneBase", methodZoneBase);
flushICacheFromto(processor, methodZoneStart, methodZoneBase);
-
}
static void
@@ -14816,11 +14824,7 @@
/* begin MoveAw:R: */
address6 = cStackPointerAddress();
genoperandoperand(MoveAwR, address6, SPReg);
- if (cStackAlignment > BytesPerWord) {
- genAlignCStackSavingRegistersnumArgswordAlignment(backEnd, 0, 1, cStackAlignment / BytesPerWord);
- }
- genPassRegasArgument(backEnd, SendNumArgsReg, 0);
- CallRT((unsigned long)ceActivateFailingPrimitiveMethod);
+ compileCallFornumArgsargargargargresultRegsaveRegs(ceActivateFailingPrimitiveMethod, 1, SendNumArgsReg, null, null, null, null, 0);
if (profiling) {
/* Call ceCheckProfileTick: to record sample and then continue. newMethod
@@ -18988,6 +18992,16 @@
}
+/* Object representations with lazy forwarding will want to check for
+ forwarding pointers on primitive failure and retry the primitive if found.
+ By default do nothing. */
+
+static void
+maybeCompileRetryonPrimitiveFail(sqInt retryInst, sqInt primIndex)
+{
+}
+
+
/* Check that the header fields are consistent with the type.
Answer 0 if it is ok, otherwise answer a code for the error. */
Modified: branches/Cog/nscogsrc/vm/cogit.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.h 2014-06-29 06:02:05 UTC (rev 3022)
+++ branches/Cog/nscogsrc/vm/cogit.h 2014-07-01 03:09:58 UTC (rev 3023)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.786 uuid: 425c25e8-f3f6-4f06-b2eb-392c5da0ed44
+ CCodeGenerator VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
*/
Modified: branches/Cog/nscogsrc/vm/cogmethod.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogmethod.h 2014-06-29 06:02:05 UTC (rev 3022)
+++ branches/Cog/nscogsrc/vm/cogmethod.h 2014-07-01 03:09:58 UTC (rev 3023)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.786 uuid: 425c25e8-f3f6-4f06-b2eb-392c5da0ed44
+ CCodeGenerator VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
*/
typedef struct {
Modified: branches/Cog/nscogsrc/vm/cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.c 2014-06-29 06:02:05 UTC (rev 3022)
+++ branches/Cog/nscogsrc/vm/cointerp.c 2014-07-01 03:09:58 UTC (rev 3023)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
from
- CoInterpreter VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211
+ CoInterpreter VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -267,6 +267,7 @@
#define NextLinkIndex 0
#define NilObject 0
#define PrimCallCollectsProfileSamples 8
+#define PrimCallDoNotJIT 32
#define PrimCallMayCallBack 4
#define PrimCallNeedsNewMethod 1
#define PrimCallNeedsPrimitiveFunction 2
@@ -363,6 +364,7 @@
#endif
sqInt interpret(void);
+sqInt accessorDepthForPrimitiveIndex(sqInt primIndex);
static void activateCoggedNewMethod(sqInt inInterpreter) NoDbgRegParms;
static void activateNewMethod(void);
sqInt activeProcess(void);
@@ -553,7 +555,6 @@
sqInt falseObject(void);
void * fetchArrayofObject(sqInt fieldIndex, sqInt objectPointer);
sqInt fetchByteofObject(sqInt byteIndex, sqInt oop);
-static sqInt fetchClassOfNonImm(sqInt oop) NoDbgRegParms;
sqInt fetchClassOf(sqInt oop);
double fetchFloatofObject(sqInt fieldIndex, sqInt objectPointer);
sqInt fetchIntegerofObject(sqInt fieldIndex, sqInt objectPointer);
@@ -587,6 +588,7 @@
sqInt floatObjectOf(double aFloat);
double floatValueOf(sqInt oop);
sqInt flushExternalPrimitiveOf(sqInt methodObj);
+static void followForwardedObjectFieldstoDepth(sqInt objOop, sqInt depth) NoDbgRegParms;
static sqInt followForwarded(sqInt objOop) NoDbgRegParms;
static void followForwardingPointersInStackZone(sqInt theBecomeEffectsFlags) NoDbgRegParms;
static void followNecessaryForwardingInMethod(sqInt methodObj) NoDbgRegParms;
@@ -673,13 +675,13 @@
sqInt isBytes(sqInt oop);
sqInt isCharacterObject(sqInt oop);
sqInt isCharacterValue(sqInt anInteger);
-static sqInt isClassOfNonImmequalTo(sqInt oop, sqInt classOop) NoDbgRegParms;
sqInt isCogMethodReference(sqInt methodHeader);
static sqInt isCompiledMethodHeader(sqInt objHeader) NoDbgRegParms;
sqInt isCompiledMethod(sqInt oop);
static sqInt isContextHeader(sqInt aHeader) NoDbgRegParms;
static sqInt isContextNonImm(sqInt oop) NoDbgRegParms;
static sqInt isContext(sqInt oop) NoDbgRegParms;
+static sqInt isEmptyList(sqInt aLinkedList) NoDbgRegParms;
sqInt isFloatObject(sqInt oop);
static sqInt isFrameonPage(char *aFrame, StackPage *aPage) NoDbgRegParms;
static sqInt isFree(StackPage * self_in_isFree) NoDbgRegParms;
@@ -706,6 +708,7 @@
sqInt isQuickPrimitiveIndex(sqInt anInteger);
sqInt isReadMediatedContextInstVarIndex(sqInt index);
sqInt isReallyYoungObject(sqInt obj);
+static sqInt isSemaphoreOop(sqInt anOop) NoDbgRegParms;
static sqInt isSingleContext(sqInt aContext) NoDbgRegParms;
static sqInt isStillMarriedContext(sqInt aContext) NoDbgRegParms;
static sqInt isWeakNonImm(sqInt oop) NoDbgRegParms;
@@ -1325,21 +1328,21 @@
_iss StackPage * mostRecentlyUsedPage;
_iss sqInt numStackPages;
_iss sqInt needGCFlag;
+_iss sqInt profileProcess;
_iss sqInt jmpDepth;
_iss sqLong nextProfileTick;
-_iss usqInt fwdTableNext;
_iss sqInt longRunningPrimitiveCheckSemaphore;
-_iss sqInt tempOop;
_iss sqInt profileSemaphore;
+_iss sqInt profileMethod;
+_iss usqInt fwdTableNext;
+_iss sqInt tempOop;
+_iss sqInt longRunningPrimitiveCheckMethod;
_iss usqInt compStart;
_iss sqInt extraRootCount;
-_iss sqInt profileProcess;
_iss sqInt classNameIndex;
_iss sqInt statGrowMemory;
_iss sqInt weakRootCount;
_iss sqInt growHeadroom;
-_iss sqInt longRunningPrimitiveCheckMethod;
-_iss sqInt profileMethod;
_iss sqInt backwardJumpCount;
_iss sqInt lastMethodCacheProbeWrite;
_iss sqInt lkupClass;
@@ -2062,7 +2065,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.787";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.790";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -13072,7 +13075,13 @@
return null;
}
+sqInt
+accessorDepthForPrimitiveIndex(sqInt primIndex)
+{
+ return primitiveAccessorDepthTable[primIndex];
+}
+
/* Activate newMethod when newMethod has been cogged, i.e. create a
machine-code frame and (re)enter machine-code.
*/
@@ -13350,8 +13359,9 @@
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt lastLink;
+ assert(!(isForwarded(aList)));
assert((fetchPointerofObject(NextLinkIndex, proc)) == (nilObject()));
- if ((longAt((aList + BaseHeaderSize) + (FirstLinkIndex << ShiftForWord))) == GIV(nilObj)) {
+ if (isEmptyList(aList)) {
/* begin storePointer:ofObject:withValue: */
if ((((usqInt) aList)) < (((usqInt) GIV(youngStart)))) {
possibleRootStoreIntovalue(aList, proc);
@@ -14380,13 +14390,20 @@
sqInt headerPointer;
sqInt i;
sqInt i1;
+ sqInt i2;
sqInt iLimiT;
+ sqInt iLimiT1;
sqInt last;
sqInt list;
sqInt m;
sqInt methodHeader;
sqInt next;
sqInt numLiterals;
+ sqInt obj;
+ sqInt obj1;
+ sqInt obj2;
+ sqInt obj3;
+ sqInt obj4;
sqInt objHeader;
sqInt objHeader1;
sqInt objHeader11;
@@ -14404,6 +14421,7 @@
sqInt schedAssoc;
sqInt sp;
usqInt start;
+ sqInt xArray;
if ((checkForLeaks & 4) != 0) {
runLeakCheckerForFullGC(1);
@@ -16782,6 +16800,7 @@
must be done before any of the synchronousSignals below or else we will
attribute a pause in ioRelinquishProcessor to the newly activated process. */
+ GIV(nextProfileTick) = 0;
if (GIV(profileProcess) == GIV(nilObj)) {
GIV(profileProcess) = longAt(((longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SchedulerAssociation << ShiftForWord))) + BaseHeaderSize) + (ValueIndex << ShiftForWord))) + BaseHeaderSize) + (ActiveProcessIndex << ShiftForWord));
GIV(profileMethod) = GIV(nilObj);
@@ -16790,7 +16809,6 @@
&& (synchronousSignal(GIV(profileSemaphore)))) {
switched = 1;
}
- GIV(nextProfileTick) = 0;
}
if (checkDeliveryOfLongRunningPrimitiveSignal()) {
switched = 1;
@@ -16839,12 +16857,12 @@
}
}
if (GIV(pendingFinalizationSignals) > 0) {
+ GIV(pendingFinalizationSignals) = 0;
sema = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (TheFinalizationSemaphore << ShiftForWord));
- if ((isClassOfNonImmequalTo(sema, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSemaphore << ShiftForWord))))
+ if ((sema != GIV(nilObj))
&& (synchronousSignal(sema))) {
switched = 1;
}
- GIV(pendingFinalizationSignals) = 0;
}
if (signalExternalSemaphores()) {
switched = 1;
@@ -19315,20 +19333,19 @@
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt ccIndex;
sqInt sema;
- sqInt semaphoreClass;
sqInt xArray;
xArray = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ExternalObjectsArray << ShiftForWord));
- semaphoreClass = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSemaphore << ShiftForWord));
/* Note: semaphore indices are 1-based */
sema = longAt((xArray + BaseHeaderSize) + ((index - 1) << ShiftForWord));
- return ((sema & 1) == 0)
- && ((((((ccIndex = (((usqInt) (longAt(sema))) >> 12) & 0x1F)) == 0
+ assert(!(isOopForwarded(sema)));
+ return (((sema & 1) == 0)
+ && (((((ccIndex = (((usqInt) (longAt(sema))) >> 12) & 0x1F)) == 0
? (longAt(sema - BaseHeaderSize)) & AllButTypeMask
- : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)))) == semaphoreClass)
- && (synchronousSignal(sema)));
+ : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)))) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSemaphore << ShiftForWord)))))
+ && (synchronousSignal(sema));
}
static void
@@ -21179,16 +21196,6 @@
return byteAt((oop + BaseHeaderSize) + byteIndex);
}
-static sqInt
-fetchClassOfNonImm(sqInt oop)
-{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt ccIndex;
-
- return (((ccIndex = (((usqInt) (longAt(oop))) >> 12) & 0x1F)) == 0
- ? (longAt(oop - BaseHeaderSize)) & AllButTypeMask
- : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)));
-}
-
sqInt
fetchClassOf(sqInt oop)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
@@ -22351,6 +22358,12 @@
}
}
+static void
+followForwardedObjectFieldstoDepth(sqInt objOop, sqInt depth)
+{
+ error("shouldNotImplement");
+}
+
static sqInt
followForwarded(sqInt objOop)
{
@@ -24987,26 +25000,6 @@
return ((anInteger >= 0) && (anInteger <= 0xFF));
}
-
-/* Answer if the given (non-immediate) object is an instance of the given
- class.
- */
-
-static sqInt
-isClassOfNonImmequalTo(sqInt oop, sqInt classOop)
-{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt ccIndex;
- sqInt cl;
-
- if ((oop & 1)) {
- return 0;
- }
- cl = (((ccIndex = (((usqInt) (longAt(oop))) >> 12) & 0x1F)) == 0
- ? (longAt(oop - BaseHeaderSize)) & AllButTypeMask
- : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)));
- return cl == classOop;
-}
-
sqInt
isCogMethodReference(sqInt methodHeader)
{
@@ -25058,6 +25051,13 @@
&& (((((usqInt) (longAt(oop))) >> 12) & 0x1F) == ClassMethodContextCompactIndex);
}
+static sqInt
+isEmptyList(sqInt aLinkedList)
+{ DECL_MAYBE_SQ_GLOBAL_STRUCT
+ assert(!(isForwarded(aLinkedList)));
+ return (longAt((aLinkedList + BaseHeaderSize) + (FirstLinkIndex << ShiftForWord))) == GIV(nilObj);
+}
+
sqInt
isFloatObject(sqInt oop)
{
@@ -25358,6 +25358,17 @@
}
static sqInt
+isSemaphoreOop(sqInt anOop)
+{ DECL_MAYBE_SQ_GLOBAL_STRUCT
+ sqInt ccIndex;
+
+ return ((anOop & 1) == 0)
+ && (((((ccIndex = (((usqInt) (longAt(anOop))) >> 12) & 0x1F)) == 0
+ ? (longAt(anOop - BaseHeaderSize)) & AllButTypeMask
+ : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)))) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSemaphore << ShiftForWord))));
+}
+
+static sqInt
isSingleContext(sqInt aContext)
{
return ((longAt((aContext + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1) == 0;
@@ -27809,15 +27820,18 @@
markAndTrace(GIV(newMethod));
}
/* begin traceProfileState */
+ ;
markAndTrace(GIV(profileProcess));
markAndTrace(GIV(profileMethod));
markAndTrace(GIV(profileSemaphore));
sqLowLevelMFence();
if ((GIV(longRunningPrimitiveCheckMethod) != null)
&& (GIV(longRunningPrimitiveCheckSequenceNumber) != GIV(statCheckForEvents))) {
+ ;
markAndTrace(GIV(longRunningPrimitiveCheckMethod));
}
if (GIV(longRunningPrimitiveCheckSemaphore) != null) {
+ ;
markAndTrace(GIV(longRunningPrimitiveCheckSemaphore));
}
if (!(GIV(tempOop) == 0)) {
@@ -29424,10 +29438,18 @@
else {
cogMethodForIP = ((CogBlockMethod *) cogMethod);
assert(((cogMethodForIP->cmType)) == CMMethod);
+
+ /* map any pcs in primitive code (i.e. return addresses for interpreter primitive calls) to the initial pc */
+
mcpc = (((sqInt)cogMethod)) - theIP;
+ if ((((usqInt)mcpc)) < ((cogMethod->stackCheckOffset))) {
+ bcpc = startBcpc;
+ goto l2;
+ }
}
assert(((mcpc >= (((sqInt)cogMethod))) && (mcpc <= ((((sqInt)cogMethod)) + ((cogMethod->blockSize))))));
bcpc = bytecodePCForstartBcpcin(mcpc, startBcpc, cogMethodForIP);
+l2: /* end bytecodePCFor:cogMethod:startBcpc: */;
assert(bcpc >= (startPCOfMethod(methodObj)));
/* If there's a CallPrimitive we need to skip it. */
@@ -35563,7 +35585,7 @@
/* CriticalSections are laid out like Semaphores */
owningProcessIndex = ExcessSignalsIndex;
- if ((longAt((criticalSection + BaseHeaderSize) + (FirstLinkIndex << ShiftForWord))) == GIV(nilObj)) {
+ if (isEmptyList(criticalSection)) {
longAtput((criticalSection + BaseHeaderSize) + (owningProcessIndex << ShiftForWord), GIV(nilObj));
}
else {
@@ -38377,7 +38399,6 @@
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt arg;
sqInt ccIndex;
- sqInt top;
arg = longAt(GIV(stackPointer));
if ((arg & 1)) {
@@ -38401,23 +38422,24 @@
}
return;
}
- /* begin popStack */
- top = longAt(GIV(stackPointer));
- GIV(stackPointer) += BytesPerWord;
- arg = top;
- if (!((((arg & 1)
- ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassInteger << ShiftForWord))
- : (((ccIndex = (((usqInt) (longAt(arg))) >> 12) & 0x1F)) == 0
- ? (longAt(arg - BaseHeaderSize)) & AllButTypeMask
- : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))))) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSemaphore << ShiftForWord))))) {
- arg = GIV(nilObj);
+ if ((arg == GIV(nilObj))
+ || (((arg & 1) == 0)
+ && (((((ccIndex = (((usqInt) (longAt(arg))) >> 12) & 0x1F)) == 0
+ ? (longAt(arg - BaseHeaderSize)) & AllButTypeMask
+ : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)))) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSemaphore << ShiftForWord)))))) {
+ /* begin splObj:put: */
+ /* begin storePointer:ofObject:withValue: */
+ if ((((usqInt) GIV(specialObjectsOop))) < (((usqInt) GIV(youngStart)))) {
+ possibleRootStoreIntovalue(GIV(specialObjectsOop), arg);
+ }
+ longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheInputSemaphore << ShiftForWord), arg);
+ /* begin pop: */
+ GIV(stackPointer) += 1 * BytesPerWord;
+ null;
}
- /* begin splObj:put: */
- /* begin storePointer:ofObject:withValue: */
- if ((((usqInt) GIV(specialObjectsOop))) < (((usqInt) GIV(youngStart)))) {
- possibleRootStoreIntovalue(GIV(specialObjectsOop), arg);
+ else {
+ GIV(primFailCode) = PrimErrBadArgument;
}
- longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheInputSemaphore << ShiftForWord), arg);
}
@@ -38871,35 +38893,27 @@
static void
primitiveInterruptSemaphore(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt anObject;
sqInt arg;
sqInt ccIndex;
- sqInt top;
- /* begin popStack */
- top = longAt(GIV(stackPointer));
- GIV(stackPointer) += BytesPerWord;
- arg = top;
- if ((((arg & 1)
- ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassInteger << ShiftForWord))
- : (((ccIndex = (((usqInt) (longAt(arg))) >> 12) & 0x1F)) == 0
- ? (longAt(arg - BaseHeaderSize)) & AllButTypeMask
- : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))))) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSemaphore << ShiftForWord)))) {
+ arg = longAt(GIV(stackPointer));
+ if ((arg == GIV(nilObj))
+ || (((arg & 1) == 0)
+ && (((((ccIndex = (((usqInt) (longAt(arg))) >> 12) & 0x1F)) == 0
+ ? (longAt(arg - BaseHeaderSize)) & AllButTypeMask
+ : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)))) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSemaphore << ShiftForWord)))))) {
/* begin splObj:put: */
/* begin storePointer:ofObject:withValue: */
if ((((usqInt) GIV(specialObjectsOop))) < (((usqInt) GIV(youngStart)))) {
possibleRootStoreIntovalue(GIV(specialObjectsOop), arg);
}
longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheInterruptSemaphore << ShiftForWord), arg);
+ /* begin pop: */
+ GIV(stackPointer) += 1 * BytesPerWord;
+ null;
}
else {
- /* begin splObj:put: */
- anObject = GIV(nilObj);
- /* begin storePointer:ofObject:withValue: */
- if ((((usqInt) GIV(specialObjectsOop))) < (((usqInt) GIV(youngStart)))) {
- possibleRootStoreIntovalue(GIV(specialObjectsOop), anObject);
- }
- longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheInterruptSemaphore << ShiftForWord), anObject);
+ GIV(primFailCode) = PrimErrBadArgument;
}
}
@@ -39658,29 +39672,21 @@
sqInt sema;
char *sp;
- sema = longAt(GIV(stackPointer) + (0 * BytesPerWord));
- if (((sema & 1))
- || (GIV(argumentCount) != 1)) {
- /* begin primitiveFail */
- if (!GIV(primFailCode)) {
- GIV(primFailCode) = 1;
- }
- return null;
+ if (GIV(argumentCount) != 1) {
+ return (GIV(primFailCode) = PrimErrBadNumArgs);
}
+ sema = longAt(GIV(stackPointer) + (0 * BytesPerWord));
if (sema == GIV(nilObj)) {
flushState = GIV(longRunningPrimitiveCheckSemaphore) != null;
GIV(longRunningPrimitiveCheckSemaphore) = null;
}
else {
flushState = GIV(longRunningPrimitiveCheckSemaphore) == null;
- if (!(((((ccIndex = (((usqInt) (longAt(sema))) >> 12) & 0x1F)) == 0
+ if (!(((sema & 1) == 0)
+ && (((((ccIndex = (((usqInt) (longAt(sema))) >> 12) & 0x1F)) == 0
? (longAt(sema - BaseHeaderSize)) & AllButTypeMask
- : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)))) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSemaphore << ShiftForWord))))) {
- /* begin primitiveFail */
- if (!GIV(primFailCode)) {
- GIV(primFailCode) = 1;
- }
- return null;
+ : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)))) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSemaphore << ShiftForWord)))))) {
+ return (GIV(primFailCode) = PrimErrBadArgument);
}
GIV(longRunningPrimitiveCheckSemaphore) = sema;
}
@@ -39693,7 +39699,7 @@
assert((((stackValue(0)) == (nilObject()))
&& (GIV(longRunningPrimitiveCheckSemaphore) == null))
|| (((stackValue(0)) == GIV(longRunningPrimitiveCheckSemaphore))
- && ((fetchClassOfNonImm(sema)) == (splObj(ClassSemaphore)))));
+ && (isSemaphoreOop(sema))));
}
voidLongRunningPrimitive("install");
/* begin pop: */
@@ -39711,35 +39717,27 @@
static void
primitiveLowSpaceSemaphore(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt anObject;
sqInt arg;
sqInt ccIndex;
- sqInt top;
- /* begin popStack */
- top = longAt(GIV(stackPointer));
- GIV(stackPointer) += BytesPerWord;
- arg = top;
- if ((((arg & 1)
- ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassInteger << ShiftForWord))
- : (((ccIndex = (((usqInt) (longAt(arg))) >> 12) & 0x1F)) == 0
- ? (longAt(arg - BaseHeaderSize)) & AllButTypeMask
- : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))))) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSemaphore << ShiftForWord)))) {
+ arg = longAt(GIV(stackPointer));
+ if ((arg == GIV(nilObj))
+ || (((arg & 1) == 0)
+ && (((((ccIndex = (((usqInt) (longAt(arg))) >> 12) & 0x1F)) == 0
+ ? (longAt(arg - BaseHeaderSize)) & AllButTypeMask
+ : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)))) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSemaphore << ShiftForWord)))))) {
/* begin splObj:put: */
/* begin storePointer:ofObject:withValue: */
if ((((usqInt) GIV(specialObjectsOop))) < (((usqInt) GIV(youngStart)))) {
possibleRootStoreIntovalue(GIV(specialObjectsOop), arg);
}
longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheLowSpaceSemaphore << ShiftForWord), arg);
+ /* begin pop: */
+ GIV(stackPointer) += 1 * BytesPerWord;
+ null;
}
else {
- /* begin splObj:put: */
- anObject = GIV(nilObj);
- /* begin storePointer:ofObject:withValue: */
- if ((((usqInt) GIV(specialObjectsOop))) < (((usqInt) GIV(youngStart)))) {
- possibleRootStoreIntovalue(GIV(specialObjectsOop), anObject);
- }
- longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheLowSpaceSemaphore << ShiftForWord), anObject);
+ GIV(primFailCode) = PrimErrBadArgument;
}
}
@@ -41532,28 +41530,20 @@
sqInt sema;
char *sp;
- sema = longAt(GIV(stackPointer) + (0 * BytesPerWord));
- if (((sema & 1))
- || (GIV(argumentCount) != 1)) {
- /* begin primitiveFail */
- if (!GIV(primFailCode)) {
- GIV(primFailCode) = 1;
- }
- return null;
+ if (GIV(argumentCount) != 1) {
+ return (GIV(primFailCode) = PrimErrBadNumArgs);
}
+ sema = longAt(GIV(stackPointer) + (0 * BytesPerWord));
if (sema == GIV(nilObj)) {
flushState = GIV(profileSemaphore) != GIV(nilObj);
}
else {
flushState = GIV(profileSemaphore) == GIV(nilObj);
- if (!(((((ccIndex = (((usqInt) (longAt(sema))) >> 12) & 0x1F)) == 0
+ if (!(((sema & 1) == 0)
+ && (((((ccIndex = (((usqInt) (longAt(sema))) >> 12) & 0x1F)) == 0
? (longAt(sema - BaseHeaderSize)) & AllButTypeMask
- : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)))) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSemaphore << ShiftForWord))))) {
- /* begin primitiveFail */
- if (!GIV(primFailCode)) {
- GIV(primFailCode) = 1;
- }
- return null;
+ : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)))) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSemaphore << ShiftForWord)))))) {
+ return (GIV(primFailCode) = PrimErrBadArgument);
}
}
@@ -41572,7 +41562,7 @@
assert((((stackValue(0)) == (nilObject()))
&& (GIV(profileSemaphore) == (nilObject())))
|| (((stackValue(0)) == GIV(profileSemaphore))
- && ((fetchClassOfNonImm(sema)) == (splObj(ClassSemaphore)))));
+ && (isSemaphoreOop(sema))));
}
GIV(profileProcess) = (GIV(profileMethod) = GIV(nilObj));
/* begin pop: */
@@ -41650,6 +41640,7 @@
functionPointer = ((void (*)(void)) ((primIndex > MaxPrimitiveIndex
? 0
: primitiveTable[primIndex])));
+
baseFlags = (GIV(profileSemaphore) != GIV(nilObj)
? PrimCallNeedsNewMethod + PrimCallCollectsProfileSamples
: 0);
@@ -43155,40 +43146,39 @@
msecsObj = longAt(GIV(stackPointer));
sema = longAt(GIV(stackPointer) + (1 * BytesPerWord));
msecs = positive32BitValueOf(msecsObj);
- if (GIV(primFailCode)
- || ((sema & 1))) {
- /* begin primitiveFail */
- if (!GIV(primFailCode)) {
- GIV(primFailCode) = 1;
- }
- return;
- }
- if (((((ccIndex = (((usqInt) (longAt(sema))) >> 12) & 0x1F)) == 0
+ if (!GIV(primFailCode)) {
+ if (((sema & 1) == 0)
+ && (((((ccIndex = (((usqInt) (longAt(sema))) >> 12) & 0x1F)) == 0
? (longAt(sema - BaseHeaderSize)) & AllButTypeMask
- : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)))) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSemaphore << ShiftForWord)))) {
- /* begin splObj:put: */
- /* begin storePointer:ofObject:withValue: */
- if ((((usqInt) GIV(specialObjectsOop))) < (((usqInt) GIV(youngStart)))) {
- possibleRootStoreIntovalue(GIV(specialObjectsOop), sema);
+ : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)))) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSemaphore << ShiftForWord))))) {
+ /* begin splObj:put: */
+ /* begin storePointer:ofObject:withValue: */
+ if ((((usqInt) GIV(specialObjectsOop))) < (((usqInt) GIV(youngStart)))) {
+ possibleRootStoreIntovalue(GIV(specialObjectsOop), sema);
+ }
+ longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheTimerSemaphore << ShiftForWord), sema);
+ deltaMsecs = msecs - ((ioMSecs()) & MillisecondClockMask);
+ if (deltaMsecs < 0) {
+ deltaMsecs = (deltaMsecs + MillisecondClockMask) + 1;
+ }
+ GIV(nextWakeupUsecs) = (ioUTCMicroseconds()) + (deltaMsecs * 1000);
+ /* begin pop: */
+ GIV(stackPointer) += 2 * BytesPerWord;
+ return;
}
- longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheTimerSemaphore << ShiftForWord), sema);
- deltaMsecs = msecs - ((ioMSecs()) & MillisecondClockMask);
- if (deltaMsecs < 0) {
- deltaMsecs = (deltaMsecs + MillisecondClockMask) + 1;
+ if (sema == GIV(nilObj)) {
+ /* begin storePointer:ofObject:withValue: */
+ if ((((usqInt) GIV(specialObjectsOop))) < (((usqInt) GIV(youngStart)))) {
+ possibleRootStoreIntovalue(GIV(specialObjectsOop), GIV(nilObj));
+ }
+ longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheTimerSemaphore << ShiftForWord), GIV(nilObj));
+ GIV(nextWakeupUsecs) = 0;
+ /* begin pop: */
+ GIV(stackPointer) += 2 * BytesPerWord;
+ return;
}
- GIV(nextWakeupUsecs) = (ioUTCMicroseconds()) + (deltaMsecs * 1000);
}
- else {
- /* begin storePointer:ofObject:withValue: */
- if ((((usqInt) GIV(specialObjectsOop))) < (((usqInt) GIV(youngStart)))) {
- possibleRootStoreIntovalue(GIV(specialObjectsOop), GIV(nilObj));
- }
- longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheTimerSemaphore << ShiftForWord), GIV(nilObj));
- GIV(nextWakeupUsecs) = 0;
- }
- /* begin pop: */
- GIV(stackPointer) += 2 * BytesPerWord;
- null;
+ GIV(primFailCode) = PrimErrBadArgument;
}
@@ -43207,36 +43197,35 @@
usecsObj = longAt(GIV(stackPointer));
sema = longAt(GIV(stackPointer) + (1 * BytesPerWord));
usecs = positive64BitValueOf(usecsObj);
- if (GIV(primFailCode)
- || ((sema & 1))) {
- /* begin primitiveFail */
- if (!GIV(primFailCode)) {
- GIV(primFailCode) = 1;
- }
- return;
- }
- if (((((ccIndex = (((usqInt) (longAt(sema))) >> 12) & 0x1F)) == 0
+ if (!GIV(primFailCode)) {
+ if (((sema & 1) == 0)
+ && (((((ccIndex = (((usqInt) (longAt(sema))) >> 12) & 0x1F)) == 0
? (longAt(sema - BaseHeaderSize)) & AllButTypeMask
- : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)))) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSemaphore << ShiftForWord)))) {
- /* begin splObj:put: */
- /* begin storePointer:ofObject:withValue: */
- if ((((usqInt) GIV(specialObjectsOop))) < (((usqInt) GIV(youngStart)))) {
- possibleRootStoreIntovalue(GIV(specialObjectsOop), sema);
+ : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)))) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSemaphore << ShiftForWord))))) {
+ /* begin splObj:put: */
+ /* begin storePointer:ofObject:withValue: */
+ if ((((usqInt) GIV(specialObjectsOop))) < (((usqInt) GIV(youngStart)))) {
+ possibleRootStoreIntovalue(GIV(specialObjectsOop), sema);
+ }
+ longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheTimerSemaphore << ShiftForWord), sema);
+ GIV(nextWakeupUsecs) = usecs;
+ /* begin pop: */
+ GIV(stackPointer) += 2 * BytesPerWord;
+ return;
}
- longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheTimerSemaphore << ShiftForWord), sema);
- GIV(nextWakeupUsecs) = usecs;
- }
- else {
- /* begin storePointer:ofObject:withValue: */
- if ((((usqInt) GIV(specialObjectsOop))) < (((usqInt) GIV(youngStart)))) {
- possibleRootStoreIntovalue(GIV(specialObjectsOop), GIV(nilObj));
+ if (sema == GIV(nilObj)) {
+ /* begin storePointer:ofObject:withValue: */
+ if ((((usqInt) GIV(specialObjectsOop))) < (((usqInt) GIV(youngStart)))) {
+ possibleRootStoreIntovalue(GIV(specialObjectsOop), GIV(nilObj));
+ }
+ longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheTimerSemaphore << ShiftForWord), GIV(nilObj));
+ GIV(nextWakeupUsecs) = 0;
+ /* begin pop: */
+ GIV(stackPointer) += 2 * BytesPerWord;
+ return;
}
- longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheTimerSemaphore << ShiftForWord), GIV(nilObj));
- GIV(nextWakeupUsecs) = 0;
}
- /* begin pop: */
- GIV(stackPointer) += 2 * BytesPerWord;
- null;
+ GIV(primFailCode) = PrimErrBadArgument;
}
static void
@@ -44519,13 +44508,12 @@
myList = longAt((process + BaseHeaderSize) + (MyListIndex << ShiftForWord));
if (myList == GIV(nilObj)) {
- /* begin primitiveFail */
- if (!GIV(primFailCode)) {
- GIV(primFailCode) = 1;
- }
+ (GIV(primFailCode) = PrimErrBadReceiver);
return;
}
+
/* begin removeProcess:fromList: */
+ assert(!(isForwarded(myList)));
firstLink = longAt((myList + BaseHeaderSize) + (FirstLinkIndex << ShiftForWord));
lastLink = longAt((myList + BaseHeaderSize) + (LastLinkIndex << ShiftForWord));
if (process == firstLink) {
@@ -46470,7 +46458,7 @@
priority = (oop >> 1);
processLists = longAt(((longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SchedulerAssociation << ShiftForWord))) + BaseHeaderSize) + (ValueIndex << ShiftForWord))) + BaseHeaderSize) + (ProcessListsIndex << ShiftForWord));
processList = longAt((processLists + BaseHeaderSize) + ((priority - 1) << ShiftForWord));
- if ((longAt((processList + BaseHeaderSize) + (FirstLinkIndex << ShiftForWord))) == GIV(nilObj)) {
+ if (isEmptyList(processList)) {
return;
}
inInterpreter = GIV(instructionPointer) >= (startOfMemory());
@@ -46747,7 +46735,7 @@
: GIV(highestRunnableProcessPriority));
for (pri = (p - 1); pri >= 0; pri += -1) {
processList = longAt((schedLists + BaseHeaderSize) + (pri << ShiftForWord));
- if (!((longAt((processList + BaseHeaderSize) + (FirstLinkIndex << ShiftForWord))) == GIV(nilObj))) {
+ if (!(isEmptyList(processList))) {
/* begin cr */
printf("\n");
print("processes at priority ");
@@ -49714,6 +49702,7 @@
}
else {
/* begin addFirstLink:toList: */
+ assert(!(isForwarded(processList)));
assert((fetchPointerofObject(NextLinkIndex, aProcess)) == (nilObject()));
firstLink = longAt((processList + BaseHeaderSize) + (FirstLinkIndex << ShiftForWord));
assert(firstLink != aProcess);
@@ -50362,6 +50351,7 @@
sqInt last;
sqInt next;
+ assert(!(isForwarded(aList)));
first = longAt((aList + BaseHeaderSize) + (FirstLinkIndex << ShiftForWord));
last = longAt((aList + BaseHeaderSize) + (LastLinkIndex << ShiftForWord));
if (first == last) {
@@ -51998,7 +51988,7 @@
sqInt xArray;
xArray = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ExternalObjectsArray << ShiftForWord));
- return doSignalExternalSemaphores(stSizeOf(xArray));
+ return doSignalExternalSemaphores(numSlotsOf(xArray));
}
@@ -52011,6 +52001,8 @@
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt empty;
+ /* begin isEmptyList: */
+ assert(!(isForwarded(aSemaphore)));
empty = (longAt((aSemaphore + BaseHeaderSize) + (FirstLinkIndex << ShiftForWord))) == GIV(nilObj);
if (!empty) {
putToSleepyieldingIf(removeFirstLinkOfList(aSemaphore), 1);
@@ -54431,8 +54423,9 @@
synchronousSignal(sqInt aSemaphore)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt excessSignals;
+ sqInt firstLink;
- if ((longAt((aSemaphore + BaseHeaderSize) + (FirstLinkIndex << ShiftForWord))) == GIV(nilObj)) {
+ if (isEmptyList(aSemaphore)) {
/* no process is waiting on this semaphore */
@@ -54450,6 +54443,7 @@
null;
return 0;
}
+
return resumepreemptedYieldingIffrom(removeFirstLinkOfList(aSemaphore), GIV(preemptionYields), CSSignal);
}
@@ -55169,6 +55163,7 @@
theContext = longAt(theFP + FoxThisContext);
assert(isContext(theContext));
assert((frameReceiver(theFP)) == (fetchPointerofObject(ReceiverIndex, theContext)));
+
if ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())) {
tempIndex = ((mframeCogMethod(theFP))->cmNumArgs);
pointer = (theFP + FoxMFReceiver) - BytesPerWord;
@@ -55532,7 +55527,7 @@
: GIV(highestRunnableProcessPriority));
while (((p -= 1)) >= 0) {
processList = longAt((schedLists + BaseHeaderSize) + (p << ShiftForWord));
- while (!((longAt((processList + BaseHeaderSize) + (FirstLinkIndex << ShiftForWord))) == GIV(nilObj))) {
+ while (!(isEmptyList(processList))) {
/* Only answer processes with a runnable suspendedContext.
Discard those that aren't; the VM would crash otherwise. */
Modified: branches/Cog/nscogsrc/vm/cointerp.h
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.h 2014-06-29 06:02:05 UTC (rev 3022)
+++ branches/Cog/nscogsrc/vm/cointerp.h 2014-07-01 03:09:58 UTC (rev 3023)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
*/
@@ -14,6 +14,7 @@
# define NoDbgRegParms /*empty*/
#endif
+sqInt accessorDepthForPrimitiveIndex(sqInt primIndex);
sqInt activeProcess(void);
sqInt addressCouldBeObj(sqInt address);
sqInt addressCouldBeOop(sqInt address);
Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
===================================================================
@@ Diff output truncated at 50000 characters. @@
1
0
Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-eem.790.mcz
==================== Summary ====================
Name: VMMaker.oscog-eem.790
Author: eem
Time: 30 June 2014, 7:21:25.447 pm
UUID: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59
Ancestors: VMMaker.oscog-eem.789
Implement following forwarders on primitive failure in
machine code interpreter primitives (still have to implement
this for sideways calls of named primitives).
Allow the JIT to not compile primitiveDoNamedPrimitiveWithArgs
to avoid any potential complications.
Rewrite all the semaphore installing primitives to fail if the
semaphore arg is neither a semaphore or nil instead of
assuming if its not a semaphore it must be nil, so as to
fail and retry when semaphores are forwarded (as they are
when Semaphore is redefined).
Implement isSemaphoreOop:/Obj: in trhe object memories
to abstract away the code. Base Spur's on the class index
of splObj: ClassSemaphore, avoiding the table lookup to
derive the class. Make checkForEventsMayContextSwitch:
treat all its semaphores consistently.
Have spur's fetchClassOfNonImm: answer nilObj for
forwarders to avoid assert fails.
On Spur read barriers to primitiveSuspend and
synchronousSignal:'s myList access, because the process
list manipulation routines do no checking.
Add assert checks for forwarders in the process list
manipulation routines.
Abstract out the call machinery from compileTrampolineFor:-
numArgs:arg:arg:arg:arg:saveRegs:pushLinkReg:resultReg:
so it can be used by maybeCompileRetry:onPrimitiveFail:
in implementing following forwarders on primitive failure in
machine code, and the Open PIC miss call.
Have bytecodePCFor:cogMethod:startBcpc: map any pc
before the stackCheckOffset to the initialPC, which applies
to primitives in progress.
Nuke duplicated code in CoInterpreter class>>
initializeWithOptions:
Fix assert fails in updateStateOfSpouseContextForFrame:WithSP:
and elsewhere with forwarders.
Slang:
Add FooInterpreter class>>primitiveClass so that accessor
depths are checked for the right primitive implementation,
CoInterpreterPrimitives in CoInterpreter, etc, not just
InterpreterPrimitives.
LargeIntegers Plugin:
Fix a latent signed shift bug in cDigitSub:len:with:len:into:
caused by VMMaker.oscog-eem.785's eliminating the
divide-via-shift optimization.
Simulator:
Create the MessageSends for simulatedTrampolines in
simulatedTrampolineFor: and hence eliminate the hack setup
in generateTrampolines.
Add a print rump C stack entry to the Cog utilities menu.
All these changes allow Cog Spur to redefine Process and/or
Semaphore.
=============== Diff against VMMaker.oscog-eem.789 ===============
Item was changed:
----- Method: CoInterpreter class>>initializeMiscConstants (in category 'initialization') -----
initializeMiscConstants
super initializeMiscConstants.
COGVM := true.
MinBackwardJumpCountForCompile := 10.
MaxNumArgs := 15.
PrimCallNeedsNewMethod := 1.
PrimCallNeedsPrimitiveFunction := 2.
PrimCallMayCallBack := 4.
PrimCallCollectsProfileSamples := 8.
CheckAllocationFillerAfterPrimCall := 16.
+ PrimCallDoNotJIT := 32.
ReturnToInterpreter := 1. "setjmp/longjmp code."
PrimTraceLogSize := 256. "Room for 256 selectors. Must be 256 because we use a byte to hold the index"
TraceBufferSize := 256 * 3. "Room for 256 events"
TraceContextSwitch := self objectMemoryClass basicNew integerObjectOf: 1.
TraceBlockActivation := self objectMemoryClass basicNew integerObjectOf: 2.
TraceBlockCreation := self objectMemoryClass basicNew integerObjectOf: 3.
TraceIncrementalGC := self objectMemoryClass basicNew integerObjectOf: 4.
TraceFullGC := self objectMemoryClass basicNew integerObjectOf: 5.
TraceCodeCompaction := self objectMemoryClass basicNew integerObjectOf: 6.
TraceOwnVM := self objectMemoryClass basicNew integerObjectOf: 7.
TraceDisownVM := self objectMemoryClass basicNew integerObjectOf: 8.
TraceThreadSwitch := self objectMemoryClass basicNew integerObjectOf: 9.
TracePreemptDisowningThread := self objectMemoryClass basicNew integerObjectOf: 10.
TraceVMCallback := self objectMemoryClass basicNew integerObjectOf: 11.
TraceVMCallbackReturn := self objectMemoryClass basicNew integerObjectOf: 12.
TraceStackOverflow := self objectMemoryClass basicNew integerObjectOf: 13.
TraceIsFromMachineCode := 1.
TraceIsFromInterpreter := 2.
CSCallbackEnter := 3.
CSCallbackLeave := 4.
CSEnterCriticalSection := 5.
CSExitCriticalSection := 6.
CSResume := 7.
CSSignal := 8.
CSSuspend := 9.
CSWait := 10.
CSYield := 11.
CSCheckEvents := 12.
CSThreadSchedulingLoop := 13.
CSOwnVM := 14.
CSThreadBind := 15.
CSSwitchIfNeccessary := 16.
TraceSources := CArrayAccessor on: #('?' 'm' 'i' 'callbackEnter' 'callbackLeave' 'enterCritical' 'exitCritical' 'resume' 'signal' 'suspend' 'wait' 'yield' 'eventcheck' 'threadsched' 'ownVM' 'bindToThread' 'switchIfNecessary').
"this is simulation only"
RumpCStackSize := 4096!
Item was removed:
- ----- Method: CoInterpreter class>>initializeWithOptions: (in category 'initialization') -----
- initializeWithOptions: optionsDictionary
-
- super initializeWithOptions: optionsDictionary.
- COGVM := true.
-
- MinBackwardJumpCountForCompile := 10.
-
- MaxNumArgs := 15.
- PrimCallNeedsNewMethod := 1.
- PrimCallNeedsPrimitiveFunction := 2.
- PrimCallMayCallBack := 4.
- PrimCallCollectsProfileSamples := 8.
-
- ReturnToInterpreter := 1. "setjmp/longjmp code."
-
- PrimTraceLogSize := 256. "Room for 256 selectors. Must be 256 because we use a byte to hold the index"
- TraceBufferSize := 256 * 3. "Room for 256 events"
- TraceContextSwitch := self objectMemoryClass basicNew integerObjectOf: 1.
- TraceBlockActivation := self objectMemoryClass basicNew integerObjectOf: 2.
- TraceBlockCreation := self objectMemoryClass basicNew integerObjectOf: 3.
- TraceIncrementalGC := self objectMemoryClass basicNew integerObjectOf: 4.
- TraceFullGC := self objectMemoryClass basicNew integerObjectOf: 5.
- TraceCodeCompaction := self objectMemoryClass basicNew integerObjectOf: 6.
- TraceOwnVM := self objectMemoryClass basicNew integerObjectOf: 7.
- TraceDisownVM := self objectMemoryClass basicNew integerObjectOf: 8.
- TraceThreadSwitch := self objectMemoryClass basicNew integerObjectOf: 9.
- TracePreemptDisowningThread := self objectMemoryClass basicNew integerObjectOf: 10.
- TraceVMCallback := self objectMemoryClass basicNew integerObjectOf: 11.
- TraceVMCallbackReturn := self objectMemoryClass basicNew integerObjectOf: 12.
-
- TraceIsFromMachineCode := 1.
- TraceIsFromInterpreter := 2.
- CSCallbackEnter := 3.
- CSCallbackLeave := 4.
- CSEnterCriticalSection := 5.
- CSExitCriticalSection := 6.
- CSResume := 7.
- CSSignal := 8.
- CSSuspend := 9.
- CSWait := 10.
- CSYield := 11.
- CSCheckEvents := 12.
- CSThreadSchedulingLoop := 13.
- CSOwnVM := 14.
- CSThreadBind := 15.
- CSSwitchIfNeccessary := 16.
-
- TraceSources := CArrayAccessor on: #('?' 'm' 'i' 'callbackEnter' 'callbackLeave' 'enterCritical' 'exitCritical' 'resume' 'signal' 'suspend' 'wait' 'yield' 'eventcheck' 'threadsched' 'ownVM' 'bindToThread' 'switchIfNecessary').
-
- "this is simulation only"
- RumpCStackSize := 4096!
Item was added:
+ ----- Method: CoInterpreter class>>primitivesClass (in category 'translation') -----
+ primitivesClass
+ ^CoInterpreterPrimitives!
Item was added:
+ ----- Method: CoInterpreter>>accessorDepthForPrimitiveIndex: (in category 'cog jit support') -----
+ accessorDepthForPrimitiveIndex: primIndex
+ <api>
+ ^primitiveAccessorDepthTable at: primIndex!
Item was changed:
----- Method: CoInterpreter>>bytecodePCFor:cogMethod:startBcpc: (in category 'frame access') -----
bytecodePCFor: theIP cogMethod: cogMethod startBcpc: startBcpc
"Answer the mapping of the native pc theIP to a zero-relative bytecode pc.
See contextInstructionPointer:frame: for the explanation."
<var: #cogMethod type: #'CogMethod *'>
| cogMethodForIP mcpc |
<inline: true>
<var: #cogMethodForIP type: #'CogBlockMethod *'>
self assert: theIP < 0.
(theIP signedBitShift: -16) < -1 "See contextInstructionPointer:frame:"
ifTrue:
[cogMethodForIP := self cCoerceSimple: cogMethod asInteger - ((theIP signedBitShift: -16) * cogit blockAlignment)
to: #'CogBlockMethod *'.
self assert: cogMethodForIP cmType = CMBlock.
self assert: cogMethodForIP cmHomeMethod = cogMethod.
mcpc := cogMethodForIP asInteger - theIP signedIntFromShort]
ifFalse:
[cogMethodForIP := self cCoerceSimple: cogMethod to: #'CogBlockMethod *'.
self assert: cogMethodForIP cmType = CMMethod.
+ mcpc := cogMethod asInteger - theIP.
+ "map any pcs in primitive code (i.e. return addresses for interpreter primitive calls) to the initial pc"
+ mcpc asUnsignedInteger < cogMethod stackCheckOffset ifTrue:
+ [^startBcpc]].
- mcpc := cogMethod asInteger - theIP].
self assert: (mcpc between: cogMethod asInteger and: cogMethod asInteger + cogMethod blockSize).
^cogit bytecodePCFor: mcpc startBcpc: startBcpc in: cogMethodForIP!
Item was added:
+ ----- Method: CoInterpreter>>ceCheckForAndFollowForwardedPrimitiveStateFor: (in category 'cog jit support') -----
+ ceCheckForAndFollowForwardedPrimitiveStateFor: primIndex
+ "In Spur a primitive may fail due to encountering a forwarder.
+ On failure check the accessorDepth for the primitive and
+ if non-negative scan the args to the depth, following any
+ forwarders. Answer if any are found so the prim can be retried."
+ <api>
+ <option: #SpurObjectMemory>
+ ^self cCode: [self checkForAndFollowForwardedPrimitiveStateFor: primIndex]
+ inSmalltalk: [(self checkForAndFollowForwardedPrimitiveStateFor: primIndex)
+ ifTrue: [1]
+ ifFalse: [0]]!
Item was changed:
----- Method: CoInterpreter>>primitivePropertyFlags: (in category 'cog jit support') -----
primitivePropertyFlags: primIndex
<api>
"Answer any special requirements of the given primitive"
| baseFlags functionPointer |
<var: #functionPointer declareC: 'void (*functionPointer)(void)'>
functionPointer := self functionPointerFor: primIndex inClass: nil.
+ "The complications of following forwarding pointers in machine code on failures
+ of primitives called indirectly through primitiveDoNamedPrimitiveWithArgs are not
+ worth dealing with, as primitiveDoNamedPrimitiveWithArgs is used only in debugging."
+ (objectMemory hasSpurMemoryManagerAPI
+ and: [functionPointer = #primitiveDoNamedPrimitiveWithArgs]) ifTrue:
+ [^PrimCallDoNotJIT].
+
baseFlags := profileSemaphore ~= objectMemory nilObject
ifTrue: [PrimCallNeedsNewMethod + PrimCallCollectsProfileSamples]
ifFalse: [0].
longRunningPrimitiveCheckSemaphore ~= nil ifTrue:
[baseFlags := baseFlags bitOr: PrimCallNeedsNewMethod].
(functionPointer == #primitiveExternalCall
or: [functionPointer == #primitiveCalloutToFFI]) ifTrue: "For callbacks"
[baseFlags := baseFlags bitOr: PrimCallNeedsNewMethod + PrimCallNeedsPrimitiveFunction + PrimCallMayCallBack.
checkAllocFiller ifTrue:
[baseFlags := baseFlags bitOr: CheckAllocationFillerAfterPrimCall]].
^baseFlags!
Item was changed:
----- Method: CoInterpreter>>synchronousSignal: (in category 'process primitive support') -----
synchronousSignal: aSemaphore
"Signal the given semaphore from within the interpreter.
Answer if the current process was preempted.
Override to add tracing info."
| excessSignals |
<inline: false>
(self isEmptyList: aSemaphore) ifTrue:
["no process is waiting on this semaphore"
excessSignals := self fetchInteger: ExcessSignalsIndex ofObject: aSemaphore.
self storeInteger: ExcessSignalsIndex
ofObject: aSemaphore
withValue: excessSignals + 1.
^false].
+
+ objectMemory hasSpurMemoryManagerAPI ifTrue:
+ [| firstLink |
+ firstLink := objectMemory fetchPointer: FirstLinkIndex ofObject: aSemaphore.
+ (objectMemory isForwarded: firstLink) ifTrue:
+ ["0 = aSemaphore, 1 = aProcess. Hence reference to suspendedContext will /not/ be forwarded."
+ objectMemory followForwardedObjectFields: aSemaphore toDepth: 1].
+ self assert: (objectMemory isForwarded: (objectMemory fetchPointer: SuspendedContextIndex ofObject: firstLink)) not].
+
^self resume: (self removeFirstLinkOfList: aSemaphore)
preemptedYieldingIf: preemptionYields
from: CSSignal!
Item was changed:
----- Method: CoInterpreter>>updateStateOfSpouseContextForFrame:WithSP: (in category 'frame access') -----
updateStateOfSpouseContextForFrame: theFP WithSP: theSP
"Update the frame's spouse context with the frame's current state except for the
sender and instruction pointer, which are used to mark the context as married."
| theContext tempIndex pointer argsPointer |
<inline: false>
<var: #theFP type: #'char *'>
<var: #theSP type: #'char *'>
<var: #pointer type: #'char *'>
<var: #argsPointer type: #'char *'>
self assert: (self frameHasContext: theFP).
theContext := self frameContext: theFP.
self assert: (objectMemory isContext: theContext).
+ objectMemory hasSpurMemoryManagerAPI
+ ifTrue:
+ ["We do not need to follow forwarding pointer to the receiver; makeBaseFrameFor: does that.
+ In any case the assignments below updating the non-argument stack contents will do so."
+ self assert: ((self frameReceiver: theFP)
+ = (objectMemory fetchPointer: ReceiverIndex ofObject: theContext)
+ or: [(objectMemory isOopForwarded: (objectMemory fetchPointer: ReceiverIndex ofObject: theContext))
+ and: [(objectMemory followForwarded: (objectMemory fetchPointer: ReceiverIndex ofObject: theContext))
+ = (self frameReceiver: theFP)]])]
+ ifFalse:
+ [self assert: (self frameReceiver: theFP)
+ = (objectMemory fetchPointer: ReceiverIndex ofObject: theContext)].
- self assert: (self frameReceiver: theFP)
- = (objectMemory fetchPointer: ReceiverIndex ofObject: theContext).
(self isMachineCodeFrame: theFP)
ifTrue:
[tempIndex := self mframeNumArgs: theFP.
pointer := theFP + FoxMFReceiver - BytesPerWord]
ifFalse:
[tempIndex := self iframeNumArgs: theFP.
pointer := theFP + FoxIFReceiver - BytesPerWord].
"update the arguments. this would appear not to be strictly necessary, but is for two reasons.
First, the fact that arguments are read-only is only as convention in the Smalltalk compiler;
other languages may choose to modify arguments.
Second, the Squeak runUntilErrorOrReturnFrom: nightmare pops the stack top, which may, in
certain circumstances, be the last argument, and hence the last argument may not have been
stored into the context."
argsPointer := theFP + (self frameStackedReceiverOffsetNumArgs: tempIndex).
1 to: tempIndex do:
[:i|
argsPointer := argsPointer - BytesPerWord.
self assert: (objectMemory addressCouldBeOop: (stackPages longAt: argsPointer)).
objectMemory storePointer: ReceiverIndex + i
ofObject: theContext
withValue: (stackPages longAt: argsPointer)].
"now update the non-argument stack contents."
[pointer >= theSP] whileTrue:
[self assert: (objectMemory addressCouldBeOop: (stackPages longAt: pointer)).
tempIndex := tempIndex + 1.
objectMemory storePointer: ReceiverIndex + tempIndex
ofObject: theContext
withValue: (stackPages longAt: pointer).
pointer := pointer - BytesPerWord].
self assert: ReceiverIndex + tempIndex < (objectMemory lengthOf: theContext).
objectMemory storePointerUnchecked: StackPointerIndex
ofObject: theContext
withValue: (objectMemory integerObjectOf: tempIndex)!
Item was changed:
----- Method: CoInterpreterMT>>checkForEventsMayContextSwitch: (in category 'process primitive support') -----
checkForEventsMayContextSwitch: mayContextSwitch
"Check for possible interrupts and handle one if necessary.
Answer if a context switch has occurred."
| switched sema now |
<inline: false>
<var: #now type: #usqLong>
self assertSaneThreadAndProcess.
cogit assertCStackWellAligned.
statCheckForEvents := statCheckForEvents + 1.
"restore the stackLimit if it has been smashed."
self restoreStackLimit.
self externalWriteBackHeadFramePointers.
self assert: stackPage = stackPages mostRecentlyUsedPage.
"Allow the platform to do anything it needs to do synchronously."
self ioSynchronousCheckForEvents.
self checkCogCompiledCodeCompactionCalledFor.
objectMemory needGCFlag ifTrue:
["sufficientSpaceAfterGC: runs the incremental GC and
then, if not enough space is available, the fullGC."
(objectMemory sufficientSpaceAfterGC: 0) ifFalse:
[self setSignalLowSpaceFlagAndSaveProcess]].
mayContextSwitch ifFalse: [^false].
switched := false.
self assert: deferThreadSwitch not.
deferThreadSwitch := true.
(profileProcess ~= objectMemory nilObject
or: [nextProfileTick > 0 and:[self ioHighResClock >= nextProfileTick]]) ifTrue:
+ [nextProfileTick := 0.
+ "Take a sample (if not already done so) for the profiler if it is active. This
- ["Take a sample (if not already done so) for the profiler if it is active. This
must be done before any of the synchronousSignals below or else we will
attribute a pause in ioRelinquishProcessor to the newly activated process."
+ profileProcess = objectMemory nilObject ifTrue:
- profileProcess = objectMemory nilObject ifTrue:
[profileProcess := self activeProcess.
profileMethod := objectMemory nilObject].
+ "and signal the profiler semaphore if it is present"
+ (profileSemaphore ~= objectMemory nilObject
+ and: [self synchronousSignal: profileSemaphore]) ifTrue:
+ [switched := true]].
- "and signal the profiler semaphore if it is present"
- (profileSemaphore ~= objectMemory nilObject
- and: [self synchronousSignal: profileSemaphore]) ifTrue:
- [switched := true].
- nextProfileTick := 0].
self checkDeliveryOfLongRunningPrimitiveSignal ifTrue:
[switched := true].
objectMemory signalLowSpace ifTrue:
[objectMemory signalLowSpace: false. "reset flag"
sema := objectMemory splObj: TheLowSpaceSemaphore.
+ (sema ~= objectMemory nilObject
- (sema ~= objectMemory nilObject
and: [self synchronousSignal: sema]) ifTrue:
[switched := true]].
"inIOProcessEvents prevents reentrancy into ioProcessEvents and allows disabling
ioProcessEvents e.g. for native GUIs. We would like to manage that here but can't
since the platform code may choose to call ioProcessEvents itself in various places."
false
ifTrue:
[((now := self ioUTCMicroseconds) >= nextPollUsecs
and: [inIOProcessEvents = 0]) ifTrue:
[statIOProcessEvents := statIOProcessEvents + 1.
inIOProcessEvents := inIOProcessEvents + 1.
self ioProcessEvents. "sets interruptPending if interrupt key pressed; may callback"
inIOProcessEvents > 0 ifTrue:
[inIOProcessEvents := inIOProcessEvents - 1].
nextPollUsecs := now + 20000
"msecs to wait before next call to ioProcessEvents. Note that strictly
speaking we might need to update 'now' at this point since
ioProcessEvents could take a very long time on some platforms"]]
ifFalse:
[(now := self ioUTCMicroseconds) >= nextPollUsecs ifTrue:
[statIOProcessEvents := statIOProcessEvents + 1.
self ioProcessEvents. "sets interruptPending if interrupt key pressed; may callback"
nextPollUsecs := now + 20000
"msecs to wait before next call to ioProcessEvents. Note that strictly
speaking we might need to update 'now' at this point since
ioProcessEvents could take a very long time on some platforms"]].
interruptPending ifTrue:
[interruptPending := false.
"reset interrupt flag"
sema := objectMemory splObj: TheInterruptSemaphore.
+ (sema ~= objectMemory nilObject
- (sema ~= objectMemory nilObject
and: [self synchronousSignal: sema]) ifTrue:
[switched := true]].
nextWakeupUsecs ~= 0 ifTrue:
[now >= nextWakeupUsecs ifTrue:
[nextWakeupUsecs := 0.
"set timer interrupt to 0 for 'no timer'"
sema := objectMemory splObj: TheTimerSemaphore.
+ (sema ~= objectMemory nilObject
- (sema ~= objectMemory nilObject
and: [self synchronousSignal: sema]) ifTrue:
[switched := true]]].
"signal any pending finalizations"
pendingFinalizationSignals > 0 ifTrue:
+ [pendingFinalizationSignals := 0.
+ sema := objectMemory splObj: TheFinalizationSemaphore.
+ (sema ~= objectMemory nilObject
- [sema := objectMemory splObj: TheFinalizationSemaphore.
- ((objectMemory isClassOfNonImm: sema equalTo: (objectMemory splObj: ClassSemaphore))
and: [self synchronousSignal: sema]) ifTrue:
+ [switched := true]].
- [switched := true].
- pendingFinalizationSignals := 0].
"signal all semaphores in semaphoresToSignal"
self signalExternalSemaphores ifTrue:
[switched := true].
deferThreadSwitch := false.
checkThreadActivation ifTrue:
[checkThreadActivation := false.
self cedeToHigherPriorityThreads]. "N.B. This may not return if we do switch."
self threadSwitchIfNecessary: self activeProcess from: CSCheckEvents.
^switched!
Item was changed:
----- Method: CoInterpreterPrimitives>>primitiveLongRunningPrimitiveSemaphore (in category 'process primitives') -----
primitiveLongRunningPrimitiveSemaphore
"Primitive. Install the semaphore to be used for collecting long-running primitives,
or nil if no semaphore should be used."
| sema flushState activeContext |
<export: true>
+ self methodArgumentCount ~= 1 ifTrue:
+ [^self primitiveFailFor: PrimErrBadNumArgs].
sema := self stackValue: 0.
- ((objectMemory isIntegerObject: sema)
- or: [self methodArgumentCount ~= 1]) ifTrue:
- [^self primitiveFail].
sema = objectMemory nilObject
ifTrue:
[flushState := longRunningPrimitiveCheckSemaphore notNil.
longRunningPrimitiveCheckSemaphore := nil]
ifFalse:
[flushState := longRunningPrimitiveCheckSemaphore isNil.
+ (objectMemory isSemaphoreOop: sema) ifFalse:
+ [^self primitiveFailFor: PrimErrBadArgument].
- (objectMemory fetchClassOfNonImm: sema) = (objectMemory splObj: ClassSemaphore) ifFalse:
- [^self primitiveFail].
longRunningPrimitiveCheckSemaphore := sema].
"If we've switched checking on or off we must void machine code
(and machine code pcs in contexts) since we will start or stop setting
newMethod in machine code primitive invocations, and so generate
slightly different code from here on in."
flushState ifTrue:
[self push: instructionPointer.
activeContext := self voidVMStateForSnapshotFlushingExternalPrimitivesIf: false.
self marryContextInNewStackPageAndInitializeInterpreterRegisters: activeContext.
self assert: (((self stackValue: 0) = objectMemory nilObject and: [longRunningPrimitiveCheckSemaphore isNil])
or: [(self stackValue: 0) = longRunningPrimitiveCheckSemaphore
+ and: [objectMemory isSemaphoreOop: sema]])].
- and: [(objectMemory fetchClassOfNonImm: sema) = (objectMemory splObj: ClassSemaphore)]])].
self voidLongRunningPrimitive: 'install'.
self pop: 1.
flushState ifTrue:
[self siglong: reenterInterpreter jmp: ReturnToInterpreter]!
Item was changed:
----- Method: CoInterpreterPrimitives>>primitiveProfileSemaphore (in category 'process primitives') -----
primitiveProfileSemaphore
"Primitive. Install the semaphore to be used for profiling,
or nil if no semaphore should be used.
See also primitiveProfileStart."
| sema flushState activeContext |
<export: true>
+ self methodArgumentCount ~= 1 ifTrue:
+ [^self primitiveFailFor: PrimErrBadNumArgs].
sema := self stackValue: 0.
- ((objectMemory isIntegerObject: sema)
- or: [self methodArgumentCount ~= 1]) ifTrue:
- [^self primitiveFail].
sema = objectMemory nilObject
ifTrue:
[flushState := profileSemaphore ~= objectMemory nilObject]
ifFalse:
[flushState := profileSemaphore = objectMemory nilObject.
+ (objectMemory isSemaphoreOop: sema) ifFalse:
+ [^self primitiveFailFor: PrimErrBadArgument]].
- (objectMemory fetchClassOfNonImm: sema) = (objectMemory splObj: ClassSemaphore) ifFalse:
- [^self primitiveFail]].
profileSemaphore := sema.
"If we've switched profiling on or off we must void machine code
(and machine code pcs in contexts) since we will start or stop
testing the profile clock in machine code primitive invocations,
and so generate slightly different code from here on in."
flushState ifTrue:
[self push: instructionPointer.
activeContext := self voidVMStateForSnapshotFlushingExternalPrimitivesIf: false.
self marryContextInNewStackPageAndInitializeInterpreterRegisters: activeContext.
self assert: (((self stackValue: 0) = objectMemory nilObject and: [profileSemaphore = objectMemory nilObject])
or: [(self stackValue: 0) = profileSemaphore
+ and: [objectMemory isSemaphoreOop: sema]])].
- and: [(objectMemory fetchClassOfNonImm: sema) = (objectMemory splObj: ClassSemaphore)]])].
profileProcess := profileMethod := objectMemory nilObject.
self pop: 1.
flushState ifTrue:
[self siglong: reenterInterpreter jmp: ReturnToInterpreter]!
Item was changed:
----- Method: CoInterpreterPrimitives>>primitiveSuspend (in category 'process primitives') -----
primitiveSuspend
"Primitive. Suspend the receiver, aProcess such that it can be executed again
by sending #resume. If the given process is not currently running, take it off
its corresponding list. The primitive returns the list the receiver was previously on."
| process myList |
process := self stackTop.
process = self activeProcess ifTrue:
[| inInterpreter |
"We're going to switch process, either to an interpreted frame or a machine
code frame. To know whether to return or enter machine code we have to
know from whence we came. We could have come from the interpreter,
either directly or via a machine code primitive. We could have come from
machine code. The instructionPointer tells us where from:"
self pop: 1 thenPush: objectMemory nilObject.
inInterpreter := instructionPointer >= objectMemory startOfMemory.
self transferTo: self wakeHighestPriority from: CSSuspend.
^self forProcessPrimitiveReturnToExecutivePostContextSwitch: inInterpreter].
myList := objectMemory fetchPointer: MyListIndex ofObject: process.
"XXXX Fixme. We should really check whether myList is a kind of LinkedList or not
but we can't easily so just do a quick check for nil which is the most common case."
+ myList = objectMemory nilObject ifTrue:
+ [^self primitiveFailFor: PrimErrBadReceiver].
+ "Alas in Spur we need a read barrier"
+ (objectMemory isForwarded: myList) ifTrue:
+ [myList := objectMemory followForwarded: myList.
+ objectMemory storePointer: MyListIndex ofObject: process withValue: myList].
- myList = objectMemory nilObject ifTrue:[^self primitiveFail].
self removeProcess: process fromList: myList.
self successful ifTrue:
[objectMemory storePointer: MyListIndex ofObject: process withValue: objectMemory nilObject.
self pop: 1 thenPush: myList]!
Item was changed:
SharedPool subclass: #CogMethodConstants
instanceVariableNames: ''
+ classVariableNames: 'CMBlock CMClosedPIC CMFree CMMaxUsageCount CMMethod CMOpenPIC CheckAllocationFillerAfterPrimCall MaxLiteralCountForCompile MaxMethodSize MaxNumArgs MaxStackCheckOffset PrimCallCollectsProfileSamples PrimCallDoNotJIT PrimCallMayCallBack PrimCallNeedsNewMethod PrimCallNeedsPrimitiveFunction'
- classVariableNames: 'CMBlock CMClosedPIC CMFree CMMaxUsageCount CMMethod CMOpenPIC CheckAllocationFillerAfterPrimCall MaxLiteralCountForCompile MaxMethodSize MaxNumArgs MaxStackCheckOffset PrimCallCollectsProfileSamples PrimCallMayCallBack PrimCallNeedsNewMethod PrimCallNeedsPrimitiveFunction'
poolDictionaries: ''
category: 'VMMaker-JIT'!
Item was changed:
CogClass subclass: #CogObjectRepresentation
+ instanceVariableNames: 'cogit methodZone objectMemory coInterpreter ceStoreCheckTrampoline'
- instanceVariableNames: 'cogit methodZone objectMemory ceStoreCheckTrampoline'
classVariableNames: ''
poolDictionaries: 'CogMethodConstants CogRTLOpcodes VMBasicConstants VMObjectIndices VMStackFrameOffsets'
category: 'VMMaker-JIT'!
!CogObjectRepresentation commentStamp: '<historical>' prior: 0!
I am an abstract superclass for object representations whose job it is to generate abstract instructions for accessing objects. It is hoped that this level of indirection between the Cogit code generator and object access makes it easier to adapt the code generator to different garbage collectors, object representations and languages.!
Item was added:
+ ----- Method: CogObjectRepresentation>>maybeCompileRetry:onPrimitiveFail: (in category 'primitive generators') -----
+ maybeCompileRetry: retryInst onPrimitiveFail: primIndex
+ <var: #retry type: #'AbstractInstruction *'>
+ "Object representations with lazy forwarding will want to check for
+ forwarding pointers on primitive failure and retry the primitive if found.
+ By default do nothing."!
Item was changed:
----- Method: CogObjectRepresentation>>setCogit:methodZone: (in category 'initialization') -----
setCogit: aCogit methodZone: aMethodZone
<doNotGenerate>
cogit := aCogit.
methodZone := aMethodZone.
+ coInterpreter := aCogit coInterpreter.
+ objectMemory := (coInterpreter isKindOf: StackInterpreter)
+ ifTrue: [coInterpreter objectMemory]
+ ifFalse: [coInterpreter]!
- objectMemory := (aCogit coInterpreter isKindOf: StackInterpreter)
- ifTrue: [aCogit coInterpreter objectMemory]
- ifFalse: [aCogit coInterpreter]!
Item was added:
+ ----- Method: CogObjectRepresentationForSpur>>maybeCompileRetry:onPrimitiveFail: (in category 'primitive generators') -----
+ maybeCompileRetry: retryInst onPrimitiveFail: primIndex
+ <var: #retry type: #'AbstractInstruction *'>
+ "If primIndex has an accessorDepth, check for primitive failure and call
+ ceCheckForAndFollowForwardedPrimitiveStateFor:. If ceCheck.... answers
+ true, retry the primitive."
+ | accessorDepth jmp |
+ <var: #jmp type: #'AbstractInstruction *'>
+ accessorDepth := coInterpreter accessorDepthForPrimitiveIndex: primIndex.
+ accessorDepth < 0 ifTrue:
+ [^0].
+ cogit MoveAw: coInterpreter primFailCodeAddress R: TempReg.
+ cogit CmpCq: 0 R: TempReg.
+ jmp := cogit JumpZero: 0.
+ cogit
+ compileCallFor: #ceCheckForAndFollowForwardedPrimitiveStateFor:
+ numArgs: 1
+ arg: primIndex
+ arg: nil
+ arg: nil
+ arg: nil
+ resultReg: TempReg
+ saveRegs: false.
+ cogit CmpCq: 0 R: TempReg.
+ cogit JumpNonZero: retryInst.
+ jmp jmpTarget: cogit Label.
+ ^0!
Item was changed:
----- Method: CogVMSimulator>>utilitiesMenu: (in category 'UI') -----
utilitiesMenu: aMenuMorph
aMenuMorph
add: 'toggle transcript' action: #toggleTranscript;
add: 'clone VM' action: #cloneSimulationWindow;
addLine;
add: 'print ext head frame' action: #printExternalHeadFrame;
add: 'print int head frame' action: #printHeadFrame;
add: 'print mc/cog frame' action: [self printFrame: cogit processor fp WithSP: cogit processor sp];
add: 'short print ext frame & callers' action: [self shortPrintFrameAndCallers: framePointer];
add: 'short print int frame & callers' action: [self shortPrintFrameAndCallers: localFP];
add: 'short print mc/cog frame & callers' action: [self shortPrintFrameAndCallers: cogit processor fp];
add: 'long print ext frame & callers' action: [self printFrameAndCallers: framePointer SP: stackPointer];
add: 'long print int frame & callers' action: [self printFrameAndCallers: localFP SP: localSP];
add: 'long print mc/cog frame & callers' action: [self printFrameAndCallers: cogit processor fp SP: cogit processor sp];
add: 'print frame...' action: [(self promptHex: 'print frame') ifNotNil: [:fp| self printFrame: fp]];
add: 'print call stack' action: #printCallStack;
add: 'print stack call stack' action: #printStackCallStack;
add: 'print stack call stack of...' action: [(self promptHex: 'frame') ifNotNil: [:fp| self printStackCallStackOf: fp]];
add: 'print call stack of...' action: [(self promptHex: 'context or process oop') ifNotNil: [:obj| self printCallStackOf: obj]];
add: 'print call stack of frame...' action: [(self promptHex: 'frame') ifNotNil: [:fp| self printCallStackFP: fp]];
add: 'print all stacks' action: #printAllStacks;
add: 'write back local ptrs' action: [stackPointer := localSP. framePointer := localFP. instructionPointer := localIP.
self writeBackHeadFramePointers];
add: 'write back mc ptrs' action: [stackPointer := cogit processor sp. framePointer := cogit processor fp. instructionPointer := cogit processor eip.
self writeBackHeadFramePointers];
addLine;
+ add: 'print rump C stack' action: [objectMemory printMemoryFrom: cogit processor sp to: self CStackPointer];
add: 'print registers' action: [cogit processor printRegistersOn: transcript];
add: 'print register map' action: [cogit printRegisterMapOn: transcript];
add: 'disassemble method/trampoline...' action: [(self promptHex: 'pc') ifNotNil: [:pc| cogit disassembleCodeAt: pc]];
add: 'disassemble method/trampoline at pc' action: [cogit disassembleCodeAt: cogit processor pc];
add: 'disassemble ext head frame method' action: [cogit disassembleMethod: (self frameMethod: framePointer)];
add: 'print oop...' action: [(self promptHex: 'print oop') ifNotNil: [:oop| self printOop: oop]];
add: 'long print oop...' action: [(self promptHex: 'print oop') ifNotNil: [:oop| self longPrintOop: oop]];
add: 'print context...' action: [(self promptHex: 'print context') ifNotNil: [:oop| self printContext: oop]];
addLine;
add: 'inspect object memory' target: objectMemory action: #inspect;
add: 'inspect cointerpreter' action: #inspect;
add: 'inspect cogit' target: cogit action: #inspect;
add: 'inspect method zone' target: cogit methodZone action: #inspect.
self isThreadedVM ifTrue:
[aMenuMorph add: 'inspect thread manager' target: self threadManager action: #inspect].
aMenuMorph
addLine;
add: 'print cog methods' target: cogMethodZone action: #printCogMethods;
add: 'print cog methods with prim...' action: [(self promptNum: 'prim index') ifNotNil: [:pix| cogMethodZone printCogMethodsWithPrimitive: pix]];
add: 'print trampoline table' target: cogit action: #printTrampolineTable;
add: 'print prim trace log' action: #dumpPrimTraceLog;
add: 'report recent instructions' target: cogit action: #reportLastNInstructions;
add: 'set break pc (', (cogit breakPC isInteger ifTrue: [cogit breakPC hex] ifFalse: [cogit breakPC printString]), ')...' action: [(self promptHex: 'break pc') ifNotNil: [:bpc| cogit breakPC: bpc]];
add: (cogit singleStep
ifTrue: ['no single step']
ifFalse: ['single step'])
action: [cogit singleStep: cogit singleStep not];
add: (cogit printRegisters
ifTrue: ['no print registers each instruction']
ifFalse: ['print registers each instruction'])
action: [cogit printRegisters: cogit printRegisters not];
add: (cogit printInstructions
ifTrue: ['no print instructions each instruction']
ifFalse: ['print instructions each instruction'])
action: [cogit printInstructions: cogit printInstructions not];
addLine;
add: 'set break count...' action: [|s| s := UIManager default request: 'break count (dec)'.
s notEmpty ifTrue: [breakCount := Integer readFrom: s readStream]];
add: 'set break selector...' action: [|s| s := UIManager default request: 'break selector'.
s notEmpty ifTrue: [self setBreakSelector: s]];
add: 'set break block...' action: [|s| s := UIManager default request: 'break block' initialAnswer: '[:theCogit| false]'.
s notEmpty ifTrue: [self setBreakBlockFromString: s]];
add: 'set cogit break method...' action: [(self promptHex: 'cogit breakMethod') ifNotNil: [:bm| cogit setBreakMethod: bm]];
add: (printBytecodeAtEachStep
ifTrue: ['no print bytecode each bytecode']
ifFalse: ['print bytecode each bytecode'])
action: [self ensureDebugAtEachStepBlock.
printBytecodeAtEachStep := printBytecodeAtEachStep not];
add: (printFrameAtEachStep
ifTrue: ['no print frame each bytecode']
ifFalse: ['print frame each bytecode'])
action: [self ensureDebugAtEachStepBlock.
printFrameAtEachStep := printFrameAtEachStep not].
^aMenuMorph!
Item was changed:
CogClass subclass: #Cogit
instanceVariableNames: 'coInterpreter objectMemory objectRepresentation processor threadManager methodZone methodZoneBase codeBase minValidCallAddress lastNInstructions simulatedAddresses simulatedTrampolines simulatedVariableGetters simulatedVariableSetters printRegisters printInstructions compilationTrace clickConfirm breakPC breakBlock singleStep guardPageSize traceFlags traceStores breakMethod methodObj initialPC endPC methodOrBlockNumArgs inBlock needsFrame hasYoungReferent usesMethodClass primitiveIndex backEnd callerSavedRegMask postCompileHook primInvokeLabel methodLabel stackCheckLabel blockEntryLabel blockEntryNoContextSwitch blockNoContextSwitchOffset stackOverflowCall sendMiss sendMissCall missOffset entryPointMask checkedEntryAlignment uncheckedEntryAlignment cmEntryOffset entry cmNoCheckEntryOffset noCheckEntry dynSuperEntry dynSuperEntryAlignment cmDynSuperEntryOffset mnuCall interpretCall interpretLabel endCPICCase0 endCPICCase1 numPICCases firstCPICCaseOffset cPICCaseSize cPICEndSize closedPICSize openPICSize fixups abstractOpcodes annotations generatorTable primitiveGeneratorTable byte0 byte1 byte2 byte3 bytecodePC bytecodeSetOffset opcodeIndex numAbstractOpcodes annotationIndex blockStarts blockCount labelCounter cStackAlignment expectedSPAlignment expectedFPAlignment codeModified maxMethodBefore maxLitIndex ceMethodAbortTrampoline cePICAbortTrampoline ceCheckForInterruptTrampoline ceCPICMissTrampoline ceReturnToInterpreterTrampoline ceBaseFrameReturnTrampoline ceSendMustBeBooleanAddTrueTrampoline ceSendMustBeBooleanAddFalseTrampoline ceCannotResumeTrampoline ceEnterCogCodePopReceiverReg ceEnterCogCodePopReceiverAndClassRegs cePrimReturnEnterCogCode cePrimReturnEnterCogCodeProfiling ceNonLocalReturnTrampoline ceFetchContextInstVarTrampoline ceStoreContextInstVarTrampoline ceImplicitReceiverTrampoline ceExplicitReceiverTrampoline ceCaptureCStackPointers ceFlushICache ceCheckFeaturesFunction ceTraceLinkedSendTrampoline ceTraceBlockActivationTrampoline ceTraceStoreTrampoline ceGetSP sendTrampolines superSendTrampolines dynamicSuperSendTrampolines firstSend lastSend realCEEnterCogCodePopReceiverReg realCEEnterCogCodePopReceiverAndClassRegs trampolineTableIndex trampolineAddresses objectReferencesInRuntime runtimeObjectRefIndex cFramePointerInUse debugPrimCallStackOffset ceTryLockVMOwner ceUnlockVMOwner cogMethodSurrogateClass cogBlockMethodSurrogateClass extA extB'
+ classVariableNames: 'AltBlockCreationBytecodeSize AltNSSendIsPCAnnotated AnnotationConstantNames AnnotationShift BlockCreationBytecodeSize Debug DisplacementMask DisplacementX2N EagerInstructionDecoration EncounteredUnknownBytecode FirstAnnotation HasBytecodePC InsufficientCodeSpace IsAbsPCReference IsDisplacement IsDisplacementX2N IsNSSendCall IsObjectReference IsRelativeCall IsSendCall MapEnd MaxCompiledPrimitiveIndex MaxNegativeErrorCode MaxStackAllocSize MaxUnitDisplacement MaxX2NDisplacement MethodTooBig NSSendIsPCAnnotated NotFullyInitialized NumObjRefsInRuntime NumSendTrampolines NumTrampolines ProcessorClass ShouldNotJIT UnimplementedPrimitive YoungSelectorInPIC'
- classVariableNames: 'AltBlockCreationBytecodeSize AltNSSendIsPCAnnotated AnnotationConstantNames AnnotationShift BlockCreationBytecodeSize Debug DisplacementMask DisplacementX2N EagerInstructionDecoration EncounteredUnknownBytecode FirstAnnotation HasBytecodePC InsufficientCodeSpace IsAbsPCReference IsDisplacement IsDisplacementX2N IsNSSendCall IsObjectReference IsRelativeCall IsSendCall MapEnd MaxCompiledPrimitiveIndex MaxNegativeErrorCode MaxStackAllocSize MaxUnitDisplacement MaxX2NDisplacement MethodTooBig NSSendIsPCAnnotated NotFullyInitialized NumObjRefsInRuntime NumSendTrampolines NumTrampolines ProcessorClass UnimplementedPrimitive YoungSelectorInPIC'
poolDictionaries: 'CogCompilationConstants CogMethodConstants CogRTLOpcodes VMBasicConstants VMObjectIndices VMStackFrameOffsets'
category: 'VMMaker-JIT'!
Cogit class
instanceVariableNames: 'generatorTable primitiveTable'!
!Cogit commentStamp: 'eem 2/13/2013 15:37' prior: 0!
I am the code generator for the Cog VM. My job is to produce machine code versions of methods for faster execution and to manage inline caches for faster send performance. I can be tested in the current image using my class-side in-image compilation facilities. e.g. try
StackToRegisterMappingCogit genAndDis: (Integer >> #benchFib)
I have concrete subclasses that implement different levels of optimization:
SimpleStackBasedCogit is the simplest code generator.
StackToRegisterMappingCogit is the current production code generator It defers pushing operands
to the stack until necessary and implements a register-based calling convention for low-arity sends.
StackToRegisterMappingCogit is an experimental code generator with support for counting
conditional branches, intended to support adaptive optimization.
coInterpreter <CoInterpreterSimulator>
the VM's interpreter with which I cooperate
methodZoneManager <CogMethodZoneManager>
the manager of the machine code zone
objectRepresentation <CogObjectRepresentation>
the object used to generate object accesses
processor <BochsIA32Alien|?>
the simulator that executes the IA32/x86 machine code I generate when simulating execution in Smalltalk
simulatedTrampolines <Dictionary of Integer -> MessageSend>
the dictionary mapping trap jump addresses to run-time routines used to warp from simulated machine code in to the Smalltalk run-time.
simulatedVariableGetters <Dictionary of Integer -> MessageSend>
the dictionary mapping trap read addresses to variables in run-time objects used to allow simulated machine code to read variables in the Smalltalk run-time.
simulatedVariableSetters <Dictionary of Integer -> MessageSend>
the dictionary mapping trap write addresses to variables in run-time objects used to allow simulated machine code to write variables in the Smalltalk run-time.
printRegisters printInstructions clickConfirm <Boolean>
flags controlling debug printing and code simulation
breakPC <Integer>
machine code pc breakpoint
cFramePointer cStackPointer <Integer>
the variables representing the C stack & frame pointers, which must change on FFI callback and return
selectorOop <sqInt>
the oop of the methodObj being compiled
methodObj <sqInt>
the bytecode method being compiled
initialPC endPC <Integer>
the start and end pcs of the methodObj being compiled
methodOrBlockNumArgs <Integer>
argument count of current method or block being compiled
needsFrame <Boolean>
whether methodObj or block needs a frame to execute
primitiveIndex <Integer>
primitive index of current method being compiled
methodLabel <CogAbstractOpcode>
label for the method header
blockEntryLabel <CogAbstractOpcode>
label for the start of the block dispatch code
stackOverflowCall <CogAbstractOpcode>
label for the call of ceStackOverflow in the method prolog
sendMissCall <CogAbstractOpcode>
label for the call of ceSICMiss in the method prolog
entryOffset <Integer>
offset of method entry code from start (header) of method
entry <CogAbstractOpcode>
label for the first instruction of the method entry code
noCheckEntryOffset <Integer>
offset of the start of a method proper (after the method entry code) from start (header) of method
noCheckEntry <CogAbstractOpcode>
label for the first instruction of start of a method proper
fixups <Array of <AbstractOpcode Label | nil>>
the labels for forward jumps that will be fixed up when reaching the relevant bytecode. fixup shas one element per byte in methodObj's bytecode
abstractOpcodes <Array of <AbstractOpcode>>
the code generated when compiling methodObj
byte0 byte1 byte2 byte3 <Integer>
individual bytes of current bytecode being compiled in methodObj
bytecodePointer <Integer>
bytecode pc (same as Smalltalk) of the current bytecode being compiled
opcodeIndex <Integer>
the index of the next free entry in abstractOpcodes (this code is translated into C where OrderedCollection et al do not exist)
numAbstractOpcodes <Integer>
the number of elements in abstractOpcocdes
blockStarts <Array of <BlockStart>>
the starts of blocks in the current method
blockCount
the index into blockStarts as they are being noted, and hence eventuakly teh total number of blocks in the current method
labelCounter <Integer>
a nicety for numbering labels not needed in the production system but probably not expensive enough to worry about
ceStackOverflowTrampoline <Integer>
ceSend0ArgsTrampoline <Integer>
ceSend1ArgsTrampoline <Integer>
ceSend2ArgsTrampoline <Integer>
ceSendNArgsTrampoline <Integer>
ceSendSuper0ArgsTrampoline <Integer>
ceSendSuper1ArgsTrampoline <Integer>
ceSendSuper2ArgsTrampoline <Integer>
ceSendSuperNArgsTrampoline <Integer>
ceSICMissTrampoline <Integer>
ceCPICMissTrampoline <Integer>
ceStoreCheckTrampoline <Integer>
ceReturnToInterpreterTrampoline <Integer>
ceBaseFrameReturnTrampoline <Integer>
ceSendMustBeBooleanTrampoline <Integer>
ceClosureCopyTrampoline <Integer>
the various trampolines (system-call-like jumps from machine code to the run-time).
See Cogit>>generateTrampolines for the mapping from trampoline to run-time
routine and then read the run-time routine for a funcitonal description.
ceEnterCogCodePopReceiverReg <Integer>
the enilopmart (jump from run-time to machine-code)
methodZoneBase <Integer>
!
Cogit class
instanceVariableNames: 'generatorTable primitiveTable'!
Item was changed:
----- Method: Cogit class>>initializeErrorCodes (in category 'class initialization') -----
initializeErrorCodes
"External errors, returned to or from cog:selector:"
NotFullyInitialized := -1.
InsufficientCodeSpace := -2.
MethodTooBig := -4.
YoungSelectorInPIC := -5.
EncounteredUnknownBytecode := -6.
UnimplementedPrimitive := -7.
+ ShouldNotJIT := -8.
+ MaxNegativeErrorCode := ShouldNotJIT.
- MaxNegativeErrorCode := UnimplementedPrimitive.
"Internal errors returned by generator routines to other generator routines"
BadRegisterSet := 1!
Item was added:
+ ----- Method: Cogit>>compileCallFor:numArgs:arg:arg:arg:arg:resultReg:saveRegs: (in category 'initialization') -----
+ compileCallFor: aRoutine numArgs: numArgs arg: regOrConst0 arg: regOrConst1 arg: regOrConst2 arg: regOrConst3 resultReg: resultRegOrNil saveRegs: saveRegs
+ "Generate a call to aRoutine with up to 4 arguments. If resultRegOrNil is
+ non-zero assign the C result to resultRegOrNil. If saveRegs, save all registers.
+ Hack: a negative arg value indicates an abstract register, a non-negative value
+ indicates a constant."
+ <var: #aRoutine type: #'void *'>
+ <inline: false>
+ cStackAlignment > BytesPerWord ifTrue:
+ [backEnd
+ genAlignCStackSavingRegisters: saveRegs
+ numArgs: numArgs
+ wordAlignment: cStackAlignment / BytesPerWord].
+ saveRegs ifTrue:
+ [backEnd genSaveRegisters].
+ numArgs > 0 ifTrue:
+ [numArgs > 1 ifTrue:
+ [numArgs > 2 ifTrue:
+ [numArgs > 3 ifTrue:
+ [regOrConst3 < 0
+ ifTrue: [backEnd genPassReg: regOrConst3 asArgument: 3]
+ ifFalse: [backEnd genPassConst: regOrConst3 asArgument: 3]].
+ regOrConst2 < 0
+ ifTrue: [backEnd genPassReg: regOrConst2 asArgument: 2]
+ ifFalse: [backEnd genPassConst: regOrConst2 asArgument: 2]].
+ regOrConst1 < 0
+ ifTrue: [backEnd genPassReg: regOrConst1 asArgument: 1]
+ ifFalse: [backEnd genPassConst: regOrConst1 asArgument: 1]].
+ regOrConst0 < 0
+ ifTrue: [backEnd genPassReg: regOrConst0 asArgument: 0]
+ ifFalse: [backEnd genPassConst: regOrConst0 asArgument: 0]].
+ self CallRT: (self cCode: [aRoutine asUnsignedInteger]
+ inSmalltalk: [self simulatedTrampolineFor: aRoutine]).
+ resultRegOrNil ifNotNil:
+ [backEnd genWriteCResultIntoReg: resultRegOrNil].
+ saveRegs ifTrue:
+ [numArgs > 0 ifTrue:
+ [backEnd genRemoveNArgsFromStack: numArgs].
+ resultRegOrNil
+ ifNotNil: [backEnd genRestoreRegsExcept: resultRegOrNil]
+ ifNil: [backEnd genRestoreRegs]]!
Item was changed:
----- Method: Cogit>>compileTrampolineFor:numArgs:arg:arg:arg:arg:saveRegs:pushLinkReg:resultReg: (in category 'initialization') -----
compileTrampolineFor: aRoutine numArgs: numArgs arg: regOrConst0 arg: regOrConst1 arg: regOrConst2 arg: regOrConst3 saveRegs: saveRegs pushLinkReg: pushLinkReg resultReg: resultRegOrNil
"Generate a trampoline with up to four arguments. Generate either a call or a jump to aRoutine
as requested by callJumpBar. If generating a call and resultRegOrNil is non-zero pass the C result
back in resultRegOrNil.
Hack: a negative value indicates an abstract register, a non-negative value indicates a constant."
<var: #aRoutine type: #'void *'>
<inline: false>
"If on a RISC processor, the return address needs to be pushed to the
stack so that the interpreter sees the same stack layout as on CISC."
(pushLinkReg and: [backEnd hasLinkRegister]) ifTrue:
[self PushR: LinkReg].
self genSmalltalkToCStackSwitch.
+ self
+ compileCallFor: aRoutine
+ numArgs: numArgs
+ arg: regOrConst0
+ arg: regOrConst1
+ arg: regOrConst2
+ arg: regOrConst3
+ resultReg: resultRegOrNil
+ saveRegs: saveRegs.
- cStackAlignment > BytesPerWord ifTrue:
- [backEnd
- genAlignCStackSavingRegisters: saveRegs
- numArgs: numArgs
- wordAlignment: cStackAlignment / BytesPerWord].
- saveRegs ifTrue:
- [backEnd genSaveRegisters].
- numArgs > 0 ifTrue:
- [numArgs > 1 ifTrue:
- [numArgs > 2 ifTrue:
- [numArgs > 3 ifTrue:
- [regOrConst3 < 0
- ifTrue: [backEnd genPassReg: regOrConst3 asArgument: 3]
- ifFalse: [backEnd genPassConst: regOrConst3 asArgument: 3]].
- regOrConst2 < 0
- ifTrue: [backEnd genPassReg: regOrConst2 asArgument: 2]
- ifFalse: [backEnd genPassConst: regOrConst2 asArgument: 2]].
- regOrConst1 < 0
- ifTrue: [backEnd genPassReg: regOrConst1 asArgument: 1]
- ifFalse: [backEnd genPassConst: regOrConst1 asArgument: 1]].
- regOrConst0 < 0
- ifTrue: [backEnd genPassReg: regOrConst0 asArgument: 0]
- ifFalse: [backEnd genPassConst: regOrConst0 asArgument: 0]].
- self Call: (self cCode: [aRoutine asUnsignedInteger]
- inSmalltalk: [self simulatedTrampolineFor: aRoutine]).
- resultRegOrNil ifNotNil:
- [backEnd genWriteCResultIntoReg: resultRegOrNil].
- saveRegs ifTrue:
- [numArgs > 0 ifTrue:
- [backEnd genRemoveNArgsFromStack: numArgs].
- resultRegOrNil
- ifNotNil: [backEnd genRestoreRegsExcept: resultRegOrNil]
- ifNil: [backEnd genRestoreRegs]].
backEnd genLoadStackPointers.
backEnd hasLinkRegister ifTrue:
[self PopR: LinkReg].
self RetN: 0!
Item was changed:
----- Method: Cogit>>generateTrampolines (in category 'initialization') -----
generateTrampolines
"Generate the run-time entries and exits at the base of the native code zone and update the base.
Read the class-side method trampolines for documentation on the various trampolines"
| methodZoneStart |
methodZoneStart := methodZoneBase.
self allocateOpcodes: 80 bytecodes: 0.
initialPC := 0.
endPC := numAbstractOpcodes - 1.
hasYoungReferent := false.
self generateSendTrampolines.
self generateMissAbortTrampolines.
objectRepresentation generateObjectRepresentationTrampolines.
self generateRunTimeTrampolines.
self cppIf: NewspeakVM ifTrue: [self generateNewspeakRuntime].
self generateEnilopmarts.
self generateTracingTrampolines.
"finish up"
self recordGeneratedRunTime: 'methodZoneBase' address: methodZoneBase.
+ processor flushICacheFrom: methodZoneStart to: methodZoneBase!
- processor flushICacheFrom: methodZoneStart to: methodZoneBase.
- self cCode: ''
- inSmalltalk:
- [simulatedTrampolines keysAndValuesDo:
- [:addr :selector|
- simulatedTrampolines
- at: addr
- put: (MessageSend
- receiver: ((self respondsTo: selector)
- ifTrue: [self]
- ifFalse: [(coInterpreter respondsTo: selector)
- ifTrue: [coInterpreter]
- ifFalse: [(objectMemory respondsTo: selector)
- ifTrue: [objectMemory]
- ifFalse: [self notify: 'cannot find receiver for ', selector]]])
- selector: selector
- arguments: (1 to: selector numArgs) asArray)]]!
Item was changed:
----- Method: Cogit>>simulatedTrampolineFor: (in category 'initialization') -----
simulatedTrampolineFor: selectorOrAddress
"Set a simulated trampoline. This is a method in the cogit, coInterpreter
or objectMemory that is called from a machine code trampoline."
<doNotGenerate>
| address |
selectorOrAddress isInteger ifTrue:
[self assert: (simulatedTrampolines includesKey: selectorOrAddress).
^selectorOrAddress].
self assert: selectorOrAddress isSymbol.
address := self simulatedAddressFor: selectorOrAddress.
+ simulatedTrampolines
+ at: address
+ ifAbsentPut:
+ [MessageSend
+ receiver: ((self respondsTo: selectorOrAddress)
+ ifTrue: [self]
+ ifFalse: [(coInterpreter respondsTo: selectorOrAddress)
+ ifTrue: [coInterpreter]
+ ifFalse: [(objectMemory respondsTo: selectorOrAddress)
+ ifTrue: [objectMemory]
+ ifFalse: [self notify: 'cannot find receiver for ', selectorOrAddress]]])
+ selector: selectorOrAddress
+ arguments: (1 to: selectorOrAddress numArgs) asArray].
- simulatedTrampolines at: address ifAbsentPut: [selectorOrAddress].
^address!
Item was changed:
----- Method: InterpreterPrimitives>>primitiveInputSemaphore (in category 'I/O primitives') -----
primitiveInputSemaphore
"Register the input semaphore. If the argument is not a
Semaphore, unregister the current input semaphore."
| arg |
arg := self stackTop.
(objectMemory isIntegerObject: arg) ifTrue:
["If arg is integer, then use it as an index
into the external objects array and install it
as the new event semaphore"
self ioSetInputSemaphore: (objectMemory integerValueOf: arg).
self successful ifTrue:
[self pop: 1].
^nil].
"old code for compatibility"
TheInputSemaphore = nil ifTrue:
[^self primitiveFail].
+ (arg = objectMemory nilObject
+ or: [objectMemory isSemaphoreOop: arg])
+ ifTrue:
+ [objectMemory splObj: TheInputSemaphore put: arg.
+ self pop: 1]
+ ifFalse:
+ [self primitiveFailFor: PrimErrBadArgument]!
- arg := self popStack.
- (objectMemory fetchClassOf: arg) = (objectMemory splObj: ClassSemaphore) ifFalse:
- [arg := objectMemory nilObject].
- objectMemory splObj: TheInputSemaphore put: arg!
Item was changed:
----- Method: InterpreterPrimitives>>primitiveInterruptSemaphore (in category 'I/O primitives') -----
primitiveInterruptSemaphore
"Register the user interrupt semaphore. If the argument is
not a Semaphore, unregister the current interrupt
semaphore. "
| arg |
+ arg := self stackTop.
+ (arg = objectMemory nilObject
+ or: [objectMemory isSemaphoreOop: arg])
+ ifTrue:
+ [objectMemory splObj: TheInterruptSemaphore put: arg.
+ self pop: 1]
+ ifFalse:
+ [self primitiveFailFor: PrimErrBadArgument]!
- arg := self popStack.
- (objectMemory fetchClassOf: arg) = (objectMemory splObj: ClassSemaphore)
- ifTrue: [objectMemory splObj: TheInterruptSemaphore put: arg]
- ifFalse: [objectMemory splObj: TheInterruptSemaphore put: objectMemory nilObject]!
Item was changed:
----- Method: InterpreterPrimitives>>primitiveLowSpaceSemaphore (in category 'memory space primitives') -----
primitiveLowSpaceSemaphore
"Register the low-space semaphore. If the argument is not a
+ Semaphore, unregister the current low-space Semaphore."
- Semaphore, unregister the current low-space Semaphore."
| arg |
+ arg := self stackTop.
+ (arg = objectMemory nilObject
+ or: [objectMemory isSemaphoreOop: arg])
+ ifTrue:
+ [objectMemory splObj: TheLowSpaceSemaphore put: arg.
+ self pop: 1]
+ ifFalse:
+ [self primitiveFailFor: PrimErrBadArgument]!
- arg := self popStack.
- (objectMemory fetchClassOf: arg) = (objectMemory splObj: ClassSemaphore)
- ifTrue: [objectMemory splObj: TheLowSpaceSemaphore put: arg]
- ifFalse: [objectMemory splObj: TheLowSpaceSemaphore put: objectMemory nilObject]!
Item was changed:
----- Method: InterpreterPrimitives>>primitiveProfileSemaphore (in category 'process primitives') -----
primitiveProfileSemaphore
"Primitive. Install the semaphore to be used for profiling,
or nil if no semaphore should be used.
See also primitiveProfileStart."
| sema |
<export: true>
+ self methodArgumentCount = 1 ifFalse:
+ [^self primitiveFailFor: PrimErrBadNumArgs].
- self methodArgumentCount = 1 ifFalse:[^self success: false].
sema := self stackValue: 0.
+ (sema = objectMemory nilObject
+ or: [objectMemory isSemaphoreOop: sema]) ifFalse:
+ [^self primitiveFailFor: PrimErrBadArgument].
- sema = objectMemory nilObject ifFalse:[
- (objectMemory fetchClassOf: sema) = (objectMemory splObj: ClassSemaphore)
- ifFalse:[^self success: false]].
profileSemaphore := sema.
profileProcess := profileMethod := objectMemory nilObject.
+ self pop: 1!
- self pop: 1.!
Item was changed:
----- Method: InterpreterPrimitives>>primitiveSuspend (in category 'process primitives') -----
primitiveSuspend
"Primitive. Suspend the receiver, aProcess such that it can be executed again
by sending #resume. If the given process is not currently running, take it off
its corresponding list. The primitive returns the list the receiver was previously on."
| process myList |
process := self stackTop.
+ process = self activeProcess ifTrue:
+ [self pop: 1 thenPush: objectMemory nilObject.
+ ^self transferTo: self wakeHighestPriority].
+ myList := objectMemory fetchPointer: MyListIndex ofObject: process.
+ "XXXX Fixme. We should really check whether myList is a kind of LinkedList or not
+ but we can't easily so just do a quick check for nil which is the most common case."
+ myList = objectMemory nilObject ifTrue:
+ [^self primitiveFailFor: PrimErrBadReceiver].
+ "Alas in Spur we need a read barrier"
+ (objectMemory isForwarded: myList) ifTrue:
+ [myList := objectMemory followForwarded: myList.
+ objectMemory storePointer: MyListIndex ofObject: process withValue: myList].
+ self removeProcess: process fromList: myList.
+ self successful ifTrue:
+ [objectMemory storePointer: MyListIndex ofObject: process withValue: objectMemory nilObject.
+ self pop: 1 thenPush: myList]!
- process = self activeProcess ifTrue:[
- self pop: 1 thenPush: objectMemory nilObject.
- self transferTo: self wakeHighestPriority.
- ] ifFalse:[
- myList := objectMemory fetchPointer: MyListIndex ofObject: process.
- "XXXX Fixme. We should really check whether myList is a kind of LinkedList or not
- but we can't easily so just do a quick check for nil which is the most common case."
- myList = objectMemory nilObject ifTrue:[^self primitiveFail].
- self removeProcess: process fromList: myList.
- self successful ifTrue:[
- objectMemory storePointer: MyListIndex ofObject: process withValue: objectMemory nilObject.
- self pop: 1 thenPush: myList.
- ].
- ]!
Item was changed:
----- Method: LargeIntegersPlugin>>cDigitSub:len:with:len:into: (in category 'C core') -----
+ cDigitSub: pByteSmall len: smallLen with: pByteLarge len: largeLen into: pByteRes
+ | z |
- cDigitSub: pByteSmall
- len: smallLen
- with: pByteLarge
- len: largeLen
- into: pByteRes
- | z limit |
<var: #pByteSmall type: 'unsigned char * '>
<var: #pByteLarge type: 'unsigned char * '>
<var: #pByteRes type: 'unsigned char * '>
+ z := 0. "Loop invariant is -1<=z<=1"
+ 0 to: smallLen - 1 do:
- z := 0.
- "Loop invariant is -1<=z<=1"
- limit := smallLen - 1.
- 0 to: limit do:
[:i |
z := z + (pByteLarge at: i) - (pByteSmall at: i).
+ pByteRes at: i put: z - (z // 256 * 256). "sign-tolerant form of (z bitAnd: 255)"
+ z := z signedBitShift: -8].
+ smallLen to: largeLen - 1 do:
- pByteRes at: i put: z - (z // 256 * 256).
- "sign-tolerant form of (z bitAnd: 255)"
- z := z // 256].
- limit := largeLen - 1.
- smallLen to: limit do:
[:i |
z := z + (pByteLarge at: i) .
+ pByteRes at: i put: z - (z // 256 * 256). "sign-tolerant form of (z bitAnd: 255)"
+ z := z signedBitShift: -8].
- pByteRes at: i put: z - (z // 256 * 256).
- "sign-tolerant form of (z bitAnd: 255)"
- z := z // 256].
!
Item was added:
+ ----- Method: ObjectMemory>>isSemaphoreObj: (in category 'interpreter access') -----
+ isSemaphoreObj: anObj
+ ^(self fetchClassOfNonImm: anObj) = (self splObj: ClassSemaphore)!
Item was added:
+ ----- Method: ObjectMemory>>isSemaphoreOop: (in category 'interpreter access') -----
+ isSemaphoreOop: anOop
+ ^(self isNonImmediate: anOop)
+ and: [self isSemaphoreObj: anOop]!
Item was changed:
----- Method: SimpleStackBasedCogit>>compileInterpreterPrimitive: (in category 'primitive generators') -----
compileInterpreterPrimitive: primitiveRoutine
"Compile a call to an interpreter primitive. Call the C routine with the
usual stack-switching dance, test the primFailCode and then either
return on success or continue to the method body."
<var: #primitiveRoutine declareC: 'void (*primitiveRoutine)(void)'>
+ | flags jmp jmpSamplePrim retry continuePostSamplePrim jmpSampleNonPrim continuePostSampleNonPrim |
- | flags jmp jmpSamplePrim continuePostSamplePrim jmpSampleNonPrim continuePostSampleNonPrim |
<var: #jmp type: #'AbstractInstruction *'>
+ <var: #retry type: #'AbstractInstruction *'>
<var: #jmpSamplePrim type: #'AbstractInstruction *'>
<var: #continuePostSamplePrim type: #'AbstractInstruction *'>
<var: #jmpSampleNonPrim type: #'AbstractInstruction *'>
<var: #continuePostSampleNonPrim type: #'AbstractInstruction *'>
"Save processor fp, sp and return pc in the interpreter's frame stack and instruction pointers"
self genExternalizePointersForPrimitiveCall.
"Switch to the C stack."
self genLoadCStackPointersForPrimCall.
flags := coInterpreter primitivePropertyFlags: primitiveIndex.
+ (flags anyMask: PrimCallDoNotJIT) ifTrue:
+ [^ShouldNotJIT].
+
+ (flags anyMask: PrimCallCollectsProfileSamples) ifTrue:
- (flags bitAnd: PrimCallCollectsProfileSamples) ~= 0 ifTrue:
["Test nextProfileTick for being non-zero and call checkProfileTick if so"
BytesPerWord = 4
ifTrue:
[self MoveAw: coInterpreter nextProfileTickAddress R: TempReg.
self MoveAw: coInterpreter nextProfileTickAddress + BytesPerWord R: ClassReg.
self OrR: TempReg R: ClassReg]
ifFalse:
[self MoveAw: coInterpreter nextProfileTickAddress R: TempReg.
self CmpCq: 0 R: TempReg].
"If set, jump to record sample call."
jmpSampleNonPrim := self JumpNonZero: 0.
continuePostSampleNonPrim := self Label].
+ "Old full prim trace is in VMMaker-eem.550 and prior"
+ self recordPrimTrace ifTrue:
+ [self genFastPrimTraceUsing: ClassReg and: SendNumArgsReg].
+
"Clear the primFailCode and set argumentCount"
+ retry := self MoveCq: 0 R: TempReg.
- self MoveCq: 0 R: TempReg.
self MoveR: TempReg Aw: coInterpreter primFailCodeAddress.
methodOrBlockNumArgs ~= 0 ifTrue:
[self MoveCq: methodOrBlockNumArgs R: TempReg].
self MoveR: TempReg Aw: coInterpreter argumentCountAddress.
+
+ "If required, set primitiveFunctionPointer and newMethod"
+ (flags anyMask: PrimCallNeedsPrimitiveFunction) ifTrue:
- (flags bitAnd: PrimCallNeedsPrimitiveFunction) ~= 0 ifTrue:
[self MoveCw: primitiveRoutine asInteger R: TempReg.
self MoveR: TempReg Aw: coInterpreter primitiveFunctionPointerAddress].
+ (flags anyMask: PrimCallNeedsNewMethod+PrimCallMayCallBack) ifTrue:
- "Old full prim trace is in VMMaker-eem.550 and prior"
- self recordPrimTrace ifTrue:
- [self genFastPrimTraceUsing: ClassReg and: SendNumArgsReg].
- ((flags bitAnd: PrimCallNeedsNewMethod+PrimCallMayCallBack) ~= 0) ifTrue:
["The ceActivateFailingPrimitiveMethod: machinery can't handle framelessness."
+ (flags anyMask: PrimCallMayCallBack) ifTrue:
- (flags bitAnd: PrimCallMayCallBack) ~= 0 ifTrue:
[needsFrame := true].
methodLabel addDependent:
(self annotateAbsolutePCRef:
(self MoveCw: methodLabel asInteger R: ClassReg)).
self MoveMw: (self offset: CogMethod of: #methodObject) r: ClassReg R: TempReg.
self MoveR: TempReg Aw: coInterpreter newMethodAddress].
+
+ "Invoke the primitive"
self PrefetchAw: coInterpreter primFailCodeAddress.
+ (flags anyMask: PrimCallMayCallBack)
- (flags bitAnd: PrimCallMayCallBack) ~= 0
ifTrue: "Sideways call the C primitive routine so that we return through cePrimReturnEnterCogCode."
[backEnd genSubstituteReturnAddress:
+ ((flags anyMask: PrimCallCollectsProfileSamples)
- ((flags bitAnd: PrimCallCollectsProfileSamples) ~= 0
ifTrue: [cePrimReturnEnterCogCodeProfiling]
ifFalse: [cePrimReturnEnterCogCode]).
self JumpRT: primitiveRoutine asInteger.
primInvokeLabel := self Label.
jmp := jmpSamplePrim := continuePostSamplePrim := nil]
ifFalse:
["Call the C primitive routine."
self CallRT: primitiveRoutine asInteger.
primInvokeLabel := self Label.
+ (flags anyMask: PrimCallCollectsProfileSamples) ifTrue:
+ [self assert: (flags anyMask: PrimCallNeedsNewMethod).
- (flags bitAnd: PrimCallCollectsProfileSamples) ~= 0 ifTrue:
- [self assert: (flags bitAnd: PrimCallNeedsNewMethod) ~= 0.
"Test nextProfileTick for being non-zero and call checkProfileTick if so"
BytesPerWord = 4
ifTrue:
[self MoveAw: coInterpreter nextProfileTickAddress R: TempReg.
self MoveAw: coInterpreter nextProfileTickAddress + BytesPerWord R: ClassReg.
self OrR: TempReg R: ClassReg]
ifFalse:
[self MoveAw: coInterpreter nextProfileTickAddress R: TempReg.
self CmpCq: 0 R: TempReg].
"If set, jump to record sample call."
jmpSamplePrim := self JumpNonZero: 0.
continuePostSamplePrim := self Label].
+ objectRepresentation maybeCompileRetry: retry onPrimitiveFail: primitiveIndex.
self maybeCompileAllocFillerCheck.
"Switch back to the Smalltalk stack. Stack better be in either of these two states:
success: stackPointer -> result (was receiver)
arg1
...
argN
return pc
failure: receiver
arg1
...
stackPointer -> argN
return pc
In either case we can push the instructionPointer or load it into the LinkRegister to reestablish the return pc"
self MoveAw: coInterpreter instructionPointerAddress
R: (backEnd hasLinkRegister ifTrue: [LinkReg] ifFalse: [ClassReg]).
backEnd genLoadStackPointers.
"Test primitive failure"
self MoveAw: coInterpreter primFailCodeAddress R: TempReg.
backEnd hasLinkRegister ifFalse: [self PushR: ClassReg]. "Restore return pc on CISCs"
self flag: 'ask concrete code gen if move sets condition codes?'.
self CmpCq: 0 R: TempReg.
jmp := self JumpNonZero: 0.
"Fetch result from stack"
self MoveMw: BytesPerWord r: SPReg R: ReceiverResultReg.
self flag: 'currently caller pushes result'.
self RetN: BytesPerWord].
+ (flags anyMask: PrimCallCollectsProfileSamples) ifTrue:
- (flags bitAnd: PrimCallCollectsProfileSamples) ~= 0 ifTrue:
["The sample is collected by cePrimReturnEnterCogCode for external calls"
jmpSamplePrim notNil ifTrue:
["Call ceCheckProfileTick: to record sample and then continue."
jmpSamplePrim jmpTarget: self Label.
+ self assert: (flags anyMask: PrimCallNeedsNewMethod).
+ self CallRT: (self cCode: [#ceCheckProfileTick asUnsignedLong]
- self assert: (flags bitAnd: PrimCallNeedsNewMethod) ~= 0.
- self CallRT: (self cCode: '(unsigned long)ceCheckProfileTick'
inSmalltalk: [self simulatedTrampolineFor: #ceCheckProfileTick]).
"reenter the post-primitive call flow"
self Jump: continuePostSamplePrim].
"Null newMethod and call ceCheckProfileTick: to record sample and then continue.
ceCheckProfileTick will map null/0 to coInterpreter nilObject"
jmpSampleNonPrim jmpTarget: self Label.
self MoveCq: 0 R: TempReg.
self MoveR: TempReg Aw: coInterpreter newMethodAddress.
+ self CallRT: (self cCode: [#ceCheckProfileTick asUnsignedLong]
- self CallRT: (self cCode: '(unsigned long)ceCheckProfileTick'
inSmalltalk: [self simulatedTrampolineFor: #ceCheckProfileTick]).
"reenter the post-primitive call flow"
self Jump: continuePostSampleNonPrim].
jmp notNil ifTrue:
["Jump to restore of receiver reg and proceed to frame build for failure."
jmp jmpTarget: self Label.
"Restore receiver reg from stack. If on RISCs ret pc is in LinkReg, if on CISCs ret pc is on stack."
self MoveMw: BytesPerWord * (methodOrBlockNumArgs + (backEnd hasLinkRegister ifTrue: [0] ifFalse: [1]))
r: SPReg
R: ReceiverResultReg].
^0!
Item was changed:
----- Method: SimpleStackBasedCogit>>compileOpenPIC:numArgs: (in category 'in-line cacheing') -----
compileOpenPIC: selector numArgs: numArgs
"Compile the code for an open PIC. Perform a probe of the first-level method
lookup cache followed by a call of ceSendFromInLineCacheMiss: if the probe fails."
+ | jumpSelectorMiss jumpClassMiss itsAHit jumpBCMethod |
- | jumpSelectorMiss jumpClassMiss itsAHit jumpBCMethod routine |
<var: #jumpSelectorMiss type: #'AbstractInstruction *'>
<var: #jumpClassMiss type: #'AbstractInstruction *'>
<var: #itsAHit type: #'AbstractInstruction *'>
<var: #jumpBCMethod type: #'AbstractInstruction *'>
self compilePICProlog: numArgs.
self cppIf: NewspeakVM ifTrue:
[self Nop. "1st nop differentiates dynSuperEntry from no-check entry if using nextMethod"
dynSuperEntry := self Nop].
entry := objectRepresentation genGetClassTagOf: ReceiverResultReg into: ClassReg scratchReg: TempReg.
"Do first of three probes. See CoInterpreter>>lookupInMethodCacheSel:classTag:"
self flag: #lookupInMethodCacheSel:classTag:. "so this method shows up as a sender of lookupInMethodCacheSel:class:"
self MoveR: ClassReg R: SendNumArgsReg.
self annotate: (self XorCw: selector R: ClassReg) objRef: selector.
self LogicalShiftLeftCq: ShiftForWord R: ClassReg.
self AndCq: MethodCacheMask << ShiftForWord R: ClassReg.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << ShiftForWord)
r: ClassReg
R: TempReg.
self annotate: (self CmpCw: selector R: TempReg) objRef: selector.
jumpSelectorMiss := self JumpNonZero: 0.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << ShiftForWord)
r: ClassReg
R: TempReg.
self CmpR: SendNumArgsReg R: TempReg.
jumpClassMiss := self JumpNonZero: 0.
itsAHit := self Label.
"Fetch the method. The interpret trampoline requires the bytecoded method in SendNumArgsReg"
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheMethod << ShiftForWord)
r: ClassReg
R: SendNumArgsReg.
"If the method is compiled jump to its unchecked entry-point, otherwise interpret it."
objectRepresentation
genLoadSlot: HeaderIndex sourceReg: SendNumArgsReg destReg: TempReg.
self MoveR: TempReg R: ClassReg.
jumpBCMethod := objectRepresentation genJumpSmallIntegerInScratchReg: TempReg.
jumpBCMethod jmpTarget: interpretLabel.
self AddCq: cmNoCheckEntryOffset R: ClassReg.
self JumpR: ClassReg.
"First probe missed. Do second of three probes. Shift hash right one and retry."
jumpSelectorMiss jmpTarget: (jumpClassMiss jmpTarget: self Label).
self MoveR: SendNumArgsReg R: ClassReg.
self annotate: (self XorCw: selector R: ClassReg) objRef: selector.
self LogicalShiftLeftCq: ShiftForWord - 1 R: ClassReg.
self AndCq: MethodCacheMask << ShiftForWord R: ClassReg.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << ShiftForWord)
r: ClassReg
R: TempReg.
self annotate: (self CmpCw: selector R: TempReg) objRef: selector.
jumpSelectorMiss := self JumpNonZero: 0.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << ShiftForWord)
r: ClassReg
R: TempReg.
self CmpR: SendNumArgsReg R: TempReg.
self JumpZero: itsAHit.
"Second probe missed. Do last probe. Shift hash right two and retry."
jumpSelectorMiss jmpTarget: self Label.
self MoveR: SendNumArgsReg R: ClassReg.
self annotate: (self XorCw: selector R: ClassReg) objRef: selector.
ShiftForWord > 2 ifTrue:
[self LogicalShiftLeftCq: ShiftForWord - 1 R: ClassReg].
self AndCq: MethodCacheMask << ShiftForWord R: ClassReg.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << ShiftForWord)
r: ClassReg
R: TempReg.
self annotate: (self CmpCw: selector R: TempReg) objRef: selector.
jumpSelectorMiss := self JumpNonZero: 0.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << ShiftForWord)
r: ClassReg
R: TempReg.
self CmpR: SendNumArgsReg R: TempReg.
self JumpZero: itsAHit.
"Last probe missed. Call ceSendFromInLineCacheMiss: to do the full lookup."
jumpSelectorMiss jmpTarget: self Label.
self genSaveStackPointers.
self genLoadCStackPointers.
methodLabel addDependent: (self annotateAbsolutePCRef: (self MoveCw: methodLabel asInteger R: SendNumArgsReg)).
+ self
+ compileCallFor: #ceSendFromInLineCacheMiss:
+ numArgs: 1
+ arg: SendNumArgsReg
+ arg: nil
+ arg: nil
+ arg: nil
+ resultReg: nil
+ saveRegs: false
- cStackAlignment > BytesPerWord ifTrue:
- [backEnd
- genAlignCStackSavingRegisters: false
- numArgs: 1
- wordAlignment: cStackAlignment / BytesPerWord].
- backEnd genPassReg: SendNumArgsReg asArgument: 0.
- routine := self cCode: '(sqInt)ceSendFromInLineCacheMiss'
- inSmalltalk: [self simulatedAddressFor: #ceSendFromInLineCacheMiss:].
- self annotateCall: (self Call: routine)
"Note that this call does not return."!
Item was changed:
----- Method: SimpleStackBasedCogit>>genPrimReturnEnterCogCodeEnilopmart: (in category 'initialization') -----
genPrimReturnEnterCogCodeEnilopmart: profiling
"Generate the substitute return code for an external or FFI primitive call.
On success simply return, extracting numArgs from newMethod.
On primitive failure call ceActivateFailingPrimitiveMethod: newMethod."
| jmpSample continuePostSample jmpFail |
<var: #jmpSample type: #'AbstractInstruction *'>
<var: #continuePostSample type: #'AbstractInstruction *'>
<var: #jmpFail type: #'AbstractInstruction *'>
opcodeIndex := 0.
profiling ifTrue:
["Test nextProfileTick for being non-zero and call checkProfileTick: if so.
N.B. nextProfileTick is 64-bits so 32-bit systems need to test both halves."
BytesPerWord = 4
ifTrue:
[self MoveAw: coInterpreter nextProfileTickAddress R: TempReg.
self MoveAw: coInterpreter nextProfileTickAddress + BytesPerWord R: ClassReg.
self OrR: TempReg R: ClassReg]
ifFalse:
[self MoveAw: coInterpreter nextProfileTickAddress R: TempReg.
self CmpCq: 0 R: TempReg].
"If set, jump to record sample call."
jmpSample := self JumpNonZero: 0.
continuePostSample := self Label].
self maybeCompileAllocFillerCheck.
"Test primitive failure"
self MoveAw: coInterpreter primFailCodeAddress R: TempReg.
self flag: 'ask concrete code gen if move sets condition codes?'.
self CmpCq: 0 R: TempReg.
jmpFail := self JumpNonZero: 0.
"Switch back to the Smalltalk stack. Stack better be in either of these two states:
success: stackPointer -> result (was receiver)
arg1
...
argN
return pc
failure: receiver
arg1
...
stackPointer -> argN
return pc
We push the instructionPointer to reestablish the return pc in the success case,
but leave it to ceActivateFailingPrimitiveMethod: to do so in the failure case."
backEnd hasLinkRegister
ifTrue:
[backEnd genLoadStackPointers. "Switch back to Smalltalk stack."
self MoveMw: 0 r: SPReg R: ReceiverResultReg. "Fetch result from stack"
self MoveAw: coInterpreter instructionPointerAddress R: LinkReg. "Get and restore ret pc"
self RetN: BytesPerWord] "Return, popping result from stack"
ifFalse:
[self MoveAw: coInterpreter instructionPointerAddress R: ClassReg. "Get return pc"
backEnd genLoadStackPointers. "Switch back to Smalltalk stack."
self MoveMw: 0 r: SPReg R: ReceiverResultReg. "Fetch result from stack"
self MoveR: ClassReg Mw: 0 r: SPReg. "Restore return pc"
self RetN: 0]. "Return, popping result from stack"
"Primitive failed. Invoke C code to build the frame and continue."
jmpFail jmpTarget: (self MoveAw: coInterpreter newMethodAddress R: SendNumArgsReg).
"Reload sp with CStackPointer; easier than popping args of checkProfileTick."
self MoveAw: self cStackPointerAddress R: SPReg.
+ self
+ compileCallFor: #ceActivateFailingPrimitiveMethod:
+ numArgs: 1
+ arg: SendNumArgsReg
+ arg: nil
+ arg: nil
+ arg: nil
+ resultReg: nil
+ saveRegs: false.
- cStackAlignment > BytesPerWord ifTrue:
- [backEnd
- genAlignCStackSavingRegisters: false
- numArgs: 1
- wordAlignment: cStackAlignment / BytesPerWord].
- backEnd genPassReg: SendNumArgsReg asArgument: 0.
- self CallRT: (self cCode: '(unsigned long)ceActivateFailingPrimitiveMethod'
- inSmalltalk: [self simulatedTrampolineFor: #ceActivateFailingPrimitiveMethod:]).
profiling ifTrue:
["Call ceCheckProfileTick: to record sample and then continue. newMethod
should be up-to-date. Need to save and restore the link reg around this call."
jmpSample jmpTarget: self Label.
backEnd hasLinkRegister ifTrue: [self PushR: LinkReg].
self CallRT: (self cCode: '(unsigned long)ceCheckProfileTick'
inSmalltalk: [self simulatedTrampolineFor: #ceCheckProfileTick]).
backEnd hasLinkRegister ifTrue: [self PopR: LinkReg].
self Jump: continuePostSample]!
Item was changed:
----- Method: SimpleStackBasedCogit>>generateMissAbortTrampolines (in category 'initialization') -----
generateMissAbortTrampolines
"Generate the run-time entries for the various method and PIC entry misses and aborts..
Read the class-side method trampolines for documentation on the various trampolines"
ceMethodAbortTrampoline := self genMethodAbortTrampoline.
cePICAbortTrampoline := self genPICAbortTrampoline.
ceCPICMissTrampoline := self genTrampolineFor: #ceCPICMiss:receiver:
called: 'ceCPICMissTrampoline'
arg: ClassReg
+ arg: ReceiverResultReg!
- arg: ReceiverResultReg.
- self cCode: '' inSmalltalk:
- [simulatedTrampolines
- at: (self simulatedAddressFor: #ceSendFromInLineCacheMiss:)
- put: #ceSendFromInLineCacheMiss:]!
Item was changed:
----- Method: SpurMemoryManager>>allInstancesOf: (in category 'primitive support') -----
allInstancesOf: aClass
"Attempt to answer an array of all objects, excluding those that may
be garbage collected as a side effect of allocating the result array.
If no memory is available answer the number of instances as a SmallInteger.
Since objects are at least 16 bytes big, and the largest SmallInteger covers
1/4 of the address space, the count can never overflow."
| classIndex freeChunk ptr start limit count bytes |
classIndex := self rawHashBitsOf: aClass.
(classIndex = 0
or: [aClass ~~ (self classOrNilAtIndex: classIndex)]) ifTrue:
[freeChunk := self allocateSlots: 0 format: self arrayFormat classIndex: ClassArrayCompactIndex.
^freeChunk].
MarkObjectsForEnumerationPrimitives ifTrue:
[self markObjects]. "may not want to revive objects unnecessarily; but marking is sloooow."
freeChunk := self allocateLargestFreeChunk.
ptr := start := freeChunk + self baseHeaderSize.
limit := self addressAfter: freeChunk.
count := 0.
self allHeapEntitiesDo:
[:obj| "continue enumerating even if no room so as to unmark all objects."
(MarkObjectsForEnumerationPrimitives
ifTrue: [self isMarked: obj]
ifFalse: [true]) ifTrue:
[(self isNormalObject: obj)
ifTrue:
[MarkObjectsForEnumerationPrimitives ifTrue:
[self setIsMarkedOf: obj to: false].
(self classIndexOf: obj) = classIndex ifTrue:
[count := count + 1.
ptr < limit ifTrue:
[self longAt: ptr put: obj.
ptr := ptr + self bytesPerSlot]]]
ifFalse:
[MarkObjectsForEnumerationPrimitives ifTrue:
[(self isSegmentBridge: obj) ifFalse:
[self setIsMarkedOf: obj to: false]]]]].
self assert: self allObjectsUnmarked.
self assert: (self isEmptyObjStack: markStack).
self emptyObjStack: weaklingStack.
(count > (ptr - start / self bytesPerSlot) "not enough room"
or: [limit ~= ptr and: [limit - ptr <= self allocationUnit]]) ifTrue: "can't split a single word"
[self freeObject: freeChunk.
^self integerObjectOf: count].
count < self numSlotsMask ifTrue:
[| smallObj |
smallObj := self allocateSlots: count format: self arrayFormat classIndex: ClassArrayCompactIndex.
0 to: count - 1 do:
[:i|
+ self storePointerUnchecked: i ofObject: smallObj withValue: (self fetchPointer: i ofFreeChunk: freeChunk)].
- self storePointerUnchecked: i ofObject: smallObj withValue: (self fetchPointer: i ofObject: freeChunk)].
self freeChunkWithBytes: (self bytesInObject: freeChunk) at: (self startOfObject: freeChunk).
self beRootIfOld: smallObj.
self checkFreeSpace.
^smallObj].
bytes := self largeObjectBytesForSlots: count.
start := self startOfObject: freeChunk.
self freeChunkWithBytes: limit - start - bytes at: start + bytes.
totalFreeOldSpace := totalFreeOldSpace - bytes.
self setOverflowNumSlotsOf: freeChunk to: count.
self set: freeChunk classIndexTo: ClassArrayCompactIndex formatTo: self arrayFormat.
self possibleRootStoreInto: freeChunk.
self checkFreeSpace.
self runLeakCheckerForFullGC: false.
^freeChunk
!
Item was changed:
----- Method: SpurMemoryManager>>fetchClassOfNonImm: (in category 'object access') -----
fetchClassOfNonImm: objOop
| classIndex |
classIndex := self classIndexOf: objOop.
+ classIndex <= self classIsItselfClassIndexPun ifTrue:
+ [classIndex = self classIsItselfClassIndexPun ifTrue:
+ [^objOop].
+ "Answer nil to avoid the assert failure in classOrNilAtIndex:"
+ classIndex = self isForwardedObjectClassIndexPun ifTrue:
+ [^nilObj]].
- classIndex = self classIsItselfClassIndexPun ifTrue:
- [^objOop].
self assert: classIndex >= self arrayClassIndexPun.
^self classOrNilAtIndex: classIndex!
Item was changed:
----- Method: SpurMemoryManager>>followSpecialObjectsOop (in category 'become implementation') -----
followSpecialObjectsOop
(self isForwarded: specialObjectsOop) ifTrue:
+ [specialObjectsOop := self followForwarded: specialObjectsOop].
+ self followForwardedObjectFields: specialObjectsOop toDepth: 0.!
- [specialObjectsOop := self followForwarded: specialObjectsOop]!
Item was added:
+ ----- Method: SpurMemoryManager>>isSemaphoreObj: (in category 'object testing') -----
+ isSemaphoreObj: anObj
+ ^(self classIndexOf: anObj) = (self rawHashBitsOf: (self splObj: ClassSemaphore))!
Item was added:
+ ----- Method: SpurMemoryManager>>isSemaphoreOop: (in category 'object testing') -----
+ isSemaphoreOop: anOop
+ ^(self isNonImmediate: anOop)
+ and: [self isSemaphoreObj: anOop]!
Item was changed:
----- Method: StackInterpreter class>>primitiveAccessorDepthTable (in category 'constants') -----
primitiveAccessorDepthTable
| cg |
cg := CCodeGenerator new.
cg vmClass: StackInterpreter.
^PrimitiveTable collect:
[:thing| |class method |
(thing isInteger "quick prims, 0 for fast primitve fail"
or: [thing == #primitiveFail
+ or: [(class := self primitivesClass whichClassIncludesSelector: thing) isNil]])
- or: [(class := self whichClassIncludesSelector: thing) isNil]])
ifTrue: [-1]
ifFalse:
[method := (class >> thing) methodNode asTranslationMethodOfClass: TMethod.
cg accessorDepthForMethod: method]]!
Item was added:
+ ----- Method: StackInterpreter class>>primitivesClass (in category 'translation') -----
+ primitivesClass
+ ^StackInterpreterPrimitives!
Item was changed:
----- Method: StackInterpreter>>addFirstLink:toList: (in category 'process primitive support') -----
addFirstLink: proc toList: aList
"Add the given process to the front of the given linked list
and set the backpointer of process to its new list."
| firstLink |
+ self assert: (objectMemory isForwarded: aList) not.
self assert: (objectMemory fetchPointer: NextLinkIndex ofObject: proc) = objectMemory nilObject.
firstLink := objectMemory fetchPointer: FirstLinkIndex ofObject: aList.
self assert: firstLink ~= proc.
objectMemory storePointer: FirstLinkIndex ofObject: aList withValue: proc.
firstLink = objectMemory nilObject "a.k.a. (self isEmptyList: aList)"
ifTrue: [objectMemory storePointer: LastLinkIndex ofObject: aList withValue: proc]
ifFalse: [objectMemory storePointer: NextLinkIndex ofObject: proc withValue: firstLink].
objectMemory storePointer: MyListIndex ofObject: proc withValue: aList!
Item was changed:
----- Method: StackInterpreter>>addLastLink:toList: (in category 'process primitive support') -----
addLastLink: proc toList: aList
"Add the given process to the end of the given linked list
and set the backpointer of process to its new list."
| lastLink |
+ self assert: (objectMemory isForwarded: aList) not.
self assert: (objectMemory fetchPointer: NextLinkIndex ofObject: proc) = objectMemory nilObject.
(self isEmptyList: aList)
ifTrue: [objectMemory storePointer: FirstLinkIndex ofObject: aList withValue: proc]
ifFalse:
[lastLink := objectMemory fetchPointer: LastLinkIndex ofObject: aList.
self assert: lastLink ~= proc.
objectMemory storePointer: NextLinkIndex ofObject: lastLink withValue: proc].
objectMemory storePointer: LastLinkIndex ofObject: aList withValue: proc.
objectMemory storePointer: MyListIndex ofObject: proc withValue: aList!
Item was changed:
----- Method: StackInterpreter>>checkForAndFollowForwardedPrimitiveState (in category 'primitive support') -----
checkForAndFollowForwardedPrimitiveState
"In Spur a primitive may fail due to encountering a forwarder.
On failure check the accessorDepth for the primitive and
if non-negative scan the args to the depth, following any
forwarders. Answer if any are found so the prim can be retried."
<option: #SpurObjectMemory>
+ ^self checkForAndFollowForwardedPrimitiveStateFor: (self primitiveIndexOf: newMethod)!
- | primIndex accessorDepth found |
- self assert: self successful not.
- found := false.
- primIndex := self primitiveIndexOf: newMethod.
- accessorDepth := primitiveAccessorDepthTable at: primIndex.
- "For the method-executing primitives, failure could have been in those primitives or the
- primitives of the methods they execute. find out which failed by seeing what is in effect."
- primIndex caseOf: {
- [117] ->
- [primitiveFunctionPointer ~~ #primitiveExternalCall ifTrue:
- [accessorDepth := self primitiveAccessorDepthForExternalPrimitiveMethod: newMethod].
- self assert: argumentCount = (self argumentCountOf: newMethod)].
- [118] -> "with tryPrimitive:withArgs: the argument count has nothing to do with newMethod's, so no arg count assert."
- [self assert: primitiveFunctionPointer = (self functionPointerFor: primIndex inClass: objectMemory nilObject)].
- [218] ->
- [primitiveFunctionPointer ~~ #primitiveDoNamedPrimitiveWithArgs ifTrue:
- [accessorDepth := self primitiveAccessorDepthForExternalPrimitiveMethod: newMethod].
- self assert: argumentCount = (self argumentCountOf: newMethod)]. }
- otherwise:
- [self assert: primitiveFunctionPointer = (self functionPointerFor: primIndex inClass: objectMemory nilObject).
- self assert: argumentCount = (self argumentCountOf: newMethod)].
- accessorDepth >= 0 ifTrue:
- [0 to: argumentCount do:
- [:index| | oop |
- oop := self stackValue: index.
- (objectMemory isNonImmediate: oop) ifTrue:
- [(objectMemory isForwarded: oop) ifTrue:
- [self assert: index < argumentCount. "receiver should have been caught at send time."
- found := true.
- oop := objectMemory followForwarded: oop.
- self stackValue: index put: oop].
- ((objectMemory hasPointerFields: oop)
- and: [objectMemory followForwardedObjectFields: oop toDepth: accessorDepth]) ifTrue:
- [found := true]]]].
- ^found!
Item was added:
+ ----- Method: StackInterpreter>>checkForAndFollowForwardedPrimitiveStateFor: (in category 'primitive support') -----
+ checkForAndFollowForwardedPrimitiveStateFor: primIndex
+ "In Spur a primitive may fail due to encountering a forwarder.
+ On failure check the accessorDepth for the primitive and
+ if non-negative scan the args to the depth, following any
+ forwarders. Answer if any are found so the prim can be retried."
+ <option: #SpurObjectMemory>
+ | accessorDepth found |
+ self assert: self successful not.
+ found := false.
+ accessorDepth := primitiveAccessorDepthTable at: primIndex.
+ "For the method-executing primitives, failure could have been in those primitives or the
+ primitives of the methods they execute. find out which failed by seeing what is in effect."
+ primIndex caseOf: {
+ [117] ->
+ [primitiveFunctionPointer ~~ #primitiveExternalCall ifTrue:
+ [accessorDepth := self primitiveAccessorDepthForExternalPrimitiveMethod: newMethod].
+ self assert: argumentCount = (self argumentCountOf: newMethod)].
+ [118] -> "with tryPrimitive:withArgs: the argument count has nothing to do with newMethod's, so no arg count assert."
+ [self assert: primitiveFunctionPointer = (self functionPointerFor: primIndex inClass: objectMemory nilObject)].
+ [218] ->
+ [primitiveFunctionPointer ~~ #primitiveDoNamedPrimitiveWithArgs ifTrue:
+ [accessorDepth := self primitiveAccessorDepthForExternalPrimitiveMethod: newMethod].
+ self assert: argumentCount = (self argumentCountOf: newMethod)]. }
+ otherwise:
+ ["functionPointer should have been set, unless we're in machine code"
+ instructionPointer > objectMemory nilObject ifTrue:
+ [self assert: primitiveFunctionPointer = (self functionPointerFor: primIndex inClass: objectMemory nilObject).
+ self assert: argumentCount = (self argumentCountOf: newMethod)]].
+ accessorDepth >= 0 ifTrue:
+ [0 to: argumentCount do:
+ [:index| | oop |
+ oop := self stackValue: index.
+ (objectMemory isNonImmediate: oop) ifTrue:
+ [(objectMemory isForwarded: oop) ifTrue:
+ [self assert: index < argumentCount. "receiver should have been caught at send time."
+ found := true.
+ oop := objectMemory followForwarded: oop.
+ self stackValue: index put: oop].
+ ((objectMemory hasPointerFields: oop)
+ and: [objectMemory followForwardedObjectFields: oop toDepth: accessorDepth]) ifTrue:
+ [found := true]]]].
+ ^found!
Item was changed:
----- Method: StackInterpreter>>checkForEventsMayContextSwitch: (in category 'process primitive support') -----
checkForEventsMayContextSwitch: mayContextSwitch
"Check for possible interrupts and handle one if necessary.
Answer if a context switch has occurred."
| switched sema now |
<inline: false>
<var: #now type: #usqLong>
statCheckForEvents := statCheckForEvents + 1.
"restore the stackLimit if it has been smashed."
self restoreStackLimit.
self externalWriteBackHeadFramePointers.
self assert: stackPage = stackPages mostRecentlyUsedPage.
"Allow the platform to do anything it needs to do synchronously."
self ioSynchronousCheckForEvents.
self checkCogCompiledCodeCompactionCalledFor.
objectMemory needGCFlag ifTrue:
["sufficientSpaceAfterGC: runs the incremental GC and
then, if not enough space is available, the fullGC."
(objectMemory sufficientSpaceAfterGC: 0) ifFalse:
[self setSignalLowSpaceFlagAndSaveProcess]].
mayContextSwitch ifFalse: [^false].
switched := false.
(profileProcess ~= objectMemory nilObject
or: [nextProfileTick > 0 and:[self ioHighResClock >= nextProfileTick]]) ifTrue:
+ [nextProfileTick := 0.
+ "Take a sample (if not already done so) for the profiler if it is active. This
- ["Take a sample (if not already done so) for the profiler if it is active. This
must be done before any of the synchronousSignals below or else we will
attribute a pause in ioRelinquishProcessor to the newly activated process."
+ profileProcess = objectMemory nilObject ifTrue:
- profileProcess = objectMemory nilObject ifTrue:
[profileProcess := self activeProcess.
profileMethod := objectMemory nilObject].
+ "and signal the profiler semaphore if it is present"
+ (profileSemaphore ~= objectMemory nilObject
+ and: [self synchronousSignal: profileSemaphore]) ifTrue:
+ [switched := true]].
- "and signal the profiler semaphore if it is present"
- (profileSemaphore ~= objectMemory nilObject
- and: [self synchronousSignal: profileSemaphore]) ifTrue:
- [switched := true].
- nextProfileTick := 0].
self checkDeliveryOfLongRunningPrimitiveSignal ifTrue:
[switched := true].
objectMemory signalLowSpace ifTrue:
[objectMemory signalLowSpace: false. "reset flag"
sema := objectMemory splObj: TheLowSpaceSemaphore.
+ (sema ~= objectMemory nilObject
- (sema ~= objectMemory nilObject
and: [self synchronousSignal: sema]) ifTrue:
[switched := true]].
"inIOProcessEvents prevents reentrancy into ioProcessEvents and allows disabling
ioProcessEvents e.g. for native GUIs. We would like to manage that here but can't
since the platform code may choose to call ioProcessEvents itself in various places."
false
ifTrue:
[((now := self ioUTCMicroseconds) >= nextPollUsecs
and: [inIOProcessEvents = 0]) ifTrue:
[statIOProcessEvents := statIOProcessEvents + 1.
inIOProcessEvents := inIOProcessEvents + 1.
self ioProcessEvents. "sets interruptPending if interrupt key pressed; may callback"
inIOProcessEvents > 0 ifTrue:
[inIOProcessEvents := inIOProcessEvents - 1].
nextPollUsecs := now + 20000
"msecs to wait before next call to ioProcessEvents. Note that strictly
speaking we might need to update 'now' at this point since
ioProcessEvents could take a very long time on some platforms"]]
ifFalse:
[(now := self ioUTCMicroseconds) >= nextPollUsecs ifTrue:
[statIOProcessEvents := statIOProcessEvents + 1.
self ioProcessEvents. "sets interruptPending if interrupt key pressed; may callback"
nextPollUsecs := now + 20000
"msecs to wait before next call to ioProcessEvents. Note that strictly
speaking we might need to update 'now' at this point since
ioProcessEvents could take a very long time on some platforms"]].
interruptPending ifTrue:
[interruptPending := false.
"reset interrupt flag"
sema := objectMemory splObj: TheInterruptSemaphore.
+ (sema ~= objectMemory nilObject
- (sema ~= objectMemory nilObject
and: [self synchronousSignal: sema]) ifTrue:
[switched := true]].
nextWakeupUsecs ~= 0 ifTrue:
[now >= nextWakeupUsecs ifTrue:
[nextWakeupUsecs := 0.
"set timer interrupt to 0 for 'no timer'"
sema := objectMemory splObj: TheTimerSemaphore.
+ (sema ~= objectMemory nilObject
- (sema ~= objectMemory nilObject
and: [self synchronousSignal: sema]) ifTrue:
[switched := true]]].
"signal any pending finalizations"
pendingFinalizationSignals > 0 ifTrue:
+ [pendingFinalizationSignals := 0.
+ sema := objectMemory splObj: TheFinalizationSemaphore.
+ (sema ~= objectMemory nilObject
- [sema := objectMemory splObj: TheFinalizationSemaphore.
- ((objectMemory isClassOfNonImm: sema equalTo: (objectMemory splObj: ClassSemaphore))
and: [self synchronousSignal: sema]) ifTrue:
+ [switched := true]].
- [switched := true].
- pendingFinalizationSignals := 0].
"signal all semaphores in semaphoresToSignal"
self signalExternalSemaphores ifTrue:
[switched := true].
^switched!
Item was changed:
----- Method: StackInterpreter>>codeGeneratorToComputeAccessorDepth (in category 'primitive support') -----
codeGeneratorToComputeAccessorDepth
^VMMaker new
+ buildCodeGeneratorForInterpreter: self primitivesClass
- buildCodeGeneratorForInterpreter: StackInterpreterPrimitives
includeAPIMethods: false
initializeClasses: false!
Item was changed:
----- Method: StackInterpreter>>doSignalSemaphoreWithIndex: (in category 'process primitive support') -----
doSignalSemaphoreWithIndex: index
"Signal the external semaphore with the given index. Answer if a context switch
occurs as a result. Do not bounds check. This has been done in the caller."
<api>
+ | xArray sema |
- | xArray semaphoreClass sema |
xArray := objectMemory splObj: ExternalObjectsArray.
- semaphoreClass := objectMemory splObj: ClassSemaphore.
sema := objectMemory fetchPointer: index - 1 ofObject: xArray. "Note: semaphore indices are 1-based"
+ self assert: (objectMemory isOopForwarded: sema) not.
+ ^(objectMemory isSemaphoreOop: sema)
+ and: [self synchronousSignal: sema]!
- ^(objectMemory isNonIntegerObject: sema)
- and: [(objectMemory fetchClassOfNonImm: sema) = semaphoreClass
- and: [self synchronousSignal: sema]]!
Item was added:
+ ----- Method: StackInterpreter>>followForwardingPointersInProfileState (in category 'object memory support') -----
+ followForwardingPointersInProfileState
+ (objectMemory isForwarded: profileProcess) ifTrue:
+ [profileProcess := objectMemory followForwarded: profileProcess].
+ (objectMemory isForwarded: profileMethod) ifTrue:
+ [profileMethod := objectMemory followForwarded: profileMethod].
+ (objectMemory isForwarded: profileProcess) ifTrue:
+ [profileSemaphore := objectMemory followForwarded: profileSemaphore].!
Item was added:
+ ----- Method: StackInterpreter>>followForwardingPointersInSpecialObjectsArray (in category 'object memory support') -----
+ followForwardingPointersInSpecialObjectsArray
+ "Various semaphores in the specialObjectsArray are signalled in checkForEventsMayContextSwitch:.
+ These must be followed post become to avoid a read barrier in checkForEventsMayContextSwitch:,
+ or worse still in synchronousSignal."
+ | xArray |
+ self followSemaphoreIn: objectMemory specialObjectsOop
+ at: TheLowSpaceSemaphore.
+ self followSemaphoreIn: objectMemory specialObjectsOop
+ at: TheInterruptSemaphore.
+ self followSemaphoreIn: objectMemory specialObjectsOop
+ at: TheTimerSemaphore.
+ self followSemaphoreIn: objectMemory specialObjectsOop
+ at: TheFinalizationSemaphore.
+ xArray := objectMemory splObj: ExternalObjectsArray.
+ (objectMemory isForwarded: xArray) ifTrue:
+ [xArray := objectMemory followForwarded: xArray.
+ objectMemory splObj: ExternalObjectsArray put: xArray].
+ 0 to: (objectMemory numSlotsOf: xArray) - 1 do:
+ [:i|
+ self followSemaphoreIn: xArray at: i]!
Item was added:
+ ----- Method: StackInterpreter>>followSemaphoreIn:at: (in category 'object memory support') -----
+ followSemaphoreIn: anArray at: index
+ "Only follow the reference to the semaphore. synchronousSignal
+ checks the chain to the suspendedContext."
+
+ | obj |
+ obj := objectMemory fetchPointer: index ofObject: anArray.
+ (objectMemory isForwarded: obj) ifTrue:
+ [obj := objectMemory followForwarded: obj.
+ objectMemory storePointer: index ofObject: anArray withValue: obj]!
Item was changed:
----- Method: StackInterpreter>>isEmptyList: (in category 'process primitive support') -----
isEmptyList: aLinkedList
+ self assert: (objectMemory isForwarded: aLinkedList) not.
-
^ (objectMemory fetchPointer: FirstLinkIndex ofObject: aLinkedList) = objectMemory nilObject!
Item was changed:
----- Method: StackInterpreter>>postBecomeAction: (in category 'object memory support') -----
postBecomeAction: theBecomeEffectsFlags
"Insulate the stack zone from the effects of a become.
All receivers must be unfollowed for two reasons:
1. inst var access is direct with no read barrier
2. super sends (always to the receiver) have no class check and so don't trap
for forwarded receivers.
Methods must be unfollowed since bytecode access is direct with no read barrier.
But this only needs to be done if the becomeEffectsFlags indicate that a
CompiledMethod was becommed.
The sceduler state must be followed, but only if the becomeEffectsFlags indicate
that a pointer object was becommed."
self followForwardingPointersInStackZone: theBecomeEffectsFlags.
theBecomeEffectsFlags ~= 0 ifTrue:
[(theBecomeEffectsFlags anyMask: BecameCompiledMethodFlag) ifTrue:
[self followForwardedMethodsInMethodCache.
self followForwardedMethodsInMethodZone]. "for CoInterpreter"
+ self followForwardingPointersInScheduler.
+ self followForwardingPointersInSpecialObjectsArray.
+ self followForwardingPointersInProfileState]!
- self followForwardingPointersInScheduler]!
Item was changed:
----- Method: StackInterpreter>>removeFirstLinkOfList: (in category 'process primitive support') -----
removeFirstLinkOfList: aList
"Remove the first process from the given linked list."
| first last next |
+ self assert: (objectMemory isForwarded: aList) not.
first := objectMemory fetchPointer: FirstLinkIndex ofObject: aList.
last := objectMemory fetchPointer: LastLinkIndex ofObject: aList.
first = last
ifTrue: [objectMemory storePointer: FirstLinkIndex ofObject: aList withValue: objectMemory nilObject.
objectMemory storePointer: LastLinkIndex ofObject: aList withValue: objectMemory nilObject]
ifFalse: [next := objectMemory fetchPointer: NextLinkIndex ofObject: first.
objectMemory storePointer: FirstLinkIndex ofObject: aList withValue: next].
objectMemory storePointer: NextLinkIndex ofObject: first withValue: objectMemory nilObject.
^ first!
Item was changed:
----- Method: StackInterpreter>>removeProcess:fromList: (in category 'process primitive support') -----
removeProcess: aProcess fromList: aList
"Remove a given process from a linked list. May fail if aProcess is not on the list."
| firstLink lastLink nextLink tempLink |
+ self assert: (objectMemory isForwarded: aList) not.
firstLink := objectMemory fetchPointer: FirstLinkIndex ofObject: aList.
lastLink := objectMemory fetchPointer: LastLinkIndex ofObject: aList.
aProcess = firstLink ifTrue:[
nextLink := objectMemory fetchPointer: NextLinkIndex ofObject: aProcess .
objectMemory storePointer: FirstLinkIndex ofObject: aList withValue: nextLink.
aProcess = lastLink ifTrue:[
objectMemory storePointer: LastLinkIndex ofObject: aList withValue: objectMemory nilObject.
].
] ifFalse:[
tempLink := firstLink.
[tempLink = objectMemory nilObject ifTrue:[^self success: false]. "fail"
nextLink := objectMemory fetchPointer: NextLinkIndex ofObject: tempLink.
nextLink = aProcess] whileFalse:[
tempLink := objectMemory fetchPointer: NextLinkIndex ofObject: tempLink.
].
nextLink := objectMemory fetchPointer: NextLinkIndex ofObject: aProcess.
objectMemory storePointer: NextLinkIndex ofObject: tempLink withValue: nextLink.
aProcess = lastLink ifTrue:[
objectMemory storePointer: LastLinkIndex ofObject: aList withValue: tempLink.
].
].
objectMemory storePointer: NextLinkIndex ofObject: aProcess withValue: objectMemory nilObject!
Item was changed:
----- Method: StackInterpreter>>signalExternalSemaphores (in category 'process primitive support') -----
signalExternalSemaphores
"Signal all requested semaphores. Answer if a context switch has occurred."
| xArray |
xArray := objectMemory splObj: ExternalObjectsArray.
+ ^self doSignalExternalSemaphores: (objectMemory numSlotsOf: xArray)!
- ^self doSignalExternalSemaphores: (self stSizeOf: xArray)!
Item was changed:
----- Method: StackInterpreter>>synchronousSignal: (in category 'process primitive support') -----
synchronousSignal: aSemaphore
"Signal the given semaphore from within the interpreter.
Answer if the current process was preempted."
| excessSignals |
<inline: false>
(self isEmptyList: aSemaphore) ifTrue:
["no process is waiting on this semaphore"
excessSignals := self fetchInteger: ExcessSignalsIndex ofObject: aSemaphore.
self storeInteger: ExcessSignalsIndex
ofObject: aSemaphore
withValue: excessSignals + 1.
^false].
+
+ objectMemory hasSpurMemoryManagerAPI ifTrue:
+ [| firstLink |
+ firstLink := objectMemory fetchPointer: FirstLinkIndex ofObject: aSemaphore.
+ (objectMemory isForwarded: firstLink) ifTrue:
+ ["0 = aSemaphore, 1 = aProcess. Hence reference to suspendedContext will /not/ be forwarded."
+ objectMemory followForwardedObjectFields: aSemaphore toDepth: 1].
+ self assert: (objectMemory isForwarded: (objectMemory fetchPointer: SuspendedContextIndex ofObject: firstLink)) not].
+
^self resume: (self removeFirstLinkOfList: aSemaphore)
preemptedYieldingIf: preemptionYields!
Item was changed:
----- Method: StackInterpreter>>traceProfileState (in category 'object memory support') -----
traceProfileState
+ objectMemory hasSpurMemoryManagerAPI ifTrue:
+ [self followForwardingPointersInProfileState].
objectMemory markAndTrace: profileProcess.
objectMemory markAndTrace: profileMethod.
objectMemory markAndTrace: profileSemaphore.
"The longRunningPrimitiveCheckMethod (LRPCM) is sampled in an interrupt. Be very careful with it.
If longRunningPrimitiveCheckSequenceNumber (LRPCSN) = statCheckForEvents then LRPCM has
been recenty sampled, but it must be newMethod and we don't need to trace it twice. If LRPCSN
~= statCheckForEvents then LRPCM must be some extant object and needs to be traced."
self sqLowLevelMFence.
(longRunningPrimitiveCheckMethod ~= nil
and: [longRunningPrimitiveCheckSequenceNumber ~= statCheckForEvents]) ifTrue:
+ [(objectMemory isForwarded: longRunningPrimitiveCheckMethod) ifTrue:
+ [longRunningPrimitiveCheckMethod := objectMemory followForwarded: longRunningPrimitiveCheckMethod].
+ objectMemory markAndTrace: longRunningPrimitiveCheckMethod].
- [objectMemory markAndTrace: longRunningPrimitiveCheckMethod].
longRunningPrimitiveCheckSemaphore ~= nil ifTrue:
+ [(objectMemory isForwarded: longRunningPrimitiveCheckSemaphore) ifTrue:
+ [longRunningPrimitiveCheckSemaphore := objectMemory followForwarded: longRunningPrimitiveCheckSemaphore].
+ objectMemory markAndTrace: longRunningPrimitiveCheckSemaphore]!
- [objectMemory markAndTrace: longRunningPrimitiveCheckSemaphore]!
Item was changed:
----- Method: StackInterpreterPrimitives>>primitiveLongRunningPrimitiveSemaphore (in category 'process primitives') -----
primitiveLongRunningPrimitiveSemaphore
"Primitive. Install the semaphore to be used for collecting long-running primitives,
or nil if no semaphore should be used."
| sema |
<export: true>
sema := self stackValue: 0.
((objectMemory isIntegerObject: sema)
or: [self methodArgumentCount ~= 1]) ifTrue:
[^self primitiveFail].
sema = objectMemory nilObject
ifTrue:
[longRunningPrimitiveCheckSemaphore := nil]
ifFalse:
+ [(objectMemory isSemaphoreOop: sema) ifFalse:
- [(objectMemory fetchClassOfNonImm: sema) = (objectMemory splObj: ClassSemaphore) ifFalse:
[^self primitiveFail].
longRunningPrimitiveCheckSemaphore := sema].
self voidLongRunningPrimitive: 'install'.
self pop: 1!
Item was changed:
----- Method: StackInterpreterPrimitives>>primitiveSignalAtMilliseconds (in category 'system control primitives') -----
primitiveSignalAtMilliseconds
"Cause the time semaphore, if one has been registered, to be
signalled when the microsecond clock is greater than or equal to
the given tick value. A tick value of zero turns off timer interrupts."
| msecsObj msecs deltaMsecs sema |
<var: #msecs type: #usqInt>
msecsObj := self stackTop.
sema := self stackValue: 1.
msecs := self positive32BitValueOf: msecsObj.
+
+ self successful ifTrue:
+ [(objectMemory isSemaphoreOop: sema) ifTrue:
- (self failed
- or: [objectMemory isImmediate: sema]) ifTrue:
- [self primitiveFail.
- ^nil].
- (objectMemory fetchClassOfNonImm: sema) = (objectMemory splObj: ClassSemaphore)
- ifTrue:
[objectMemory splObj: TheTimerSemaphore put: sema.
+ deltaMsecs := msecs - (self ioMSecs bitAnd: MillisecondClockMask).
+ deltaMsecs < 0 ifTrue:
- deltaMsecs := msecs - (self ioMSecs bitAnd: MillisecondClockMask).
- deltaMsecs < 0 ifTrue:
[deltaMsecs := deltaMsecs + MillisecondClockMask + 1].
+ nextWakeupUsecs := self ioUTCMicroseconds + (deltaMsecs * 1000).
+ ^self pop: 2].
+ sema = objectMemory nilObject ifTrue:
- nextWakeupUsecs := self ioUTCMicroseconds + (deltaMsecs * 1000)]
- ifFalse:
[objectMemory
storePointer: TheTimerSemaphore
ofObject: objectMemory specialObjectsOop
withValue: objectMemory nilObject.
+ nextWakeupUsecs := 0.
+ ^self pop: 2]].
+ self primitiveFailFor: PrimErrBadArgument!
- nextWakeupUsecs := 0].
- self pop: 2!
Item was changed:
----- Method: StackInterpreterPrimitives>>primitiveSignalAtUTCMicroseconds (in category 'system control primitives') -----
primitiveSignalAtUTCMicroseconds
"Cause the time semaphore, if one has been registered, to be
signalled when the microsecond clock is greater than or equal to
the given tick value. A tick value of zero turns off timer interrupts."
| usecsObj sema usecs |
<var: #usecs type: #usqLong>
usecsObj := self stackTop.
sema := self stackValue: 1.
usecs := self positive64BitValueOf: usecsObj.
+ self successful ifTrue:
+ [(objectMemory isSemaphoreOop: sema) ifTrue:
- (self failed
- or: [objectMemory isIntegerObject: sema]) ifTrue:
- [self primitiveFail.
- ^nil].
- (objectMemory fetchClassOfNonImm: sema) = (objectMemory splObj: ClassSemaphore)
- ifTrue:
[objectMemory splObj: TheTimerSemaphore put: sema.
+ nextWakeupUsecs := usecs.
+ ^self pop: 2].
+ sema = objectMemory nilObject ifTrue:
- nextWakeupUsecs := usecs]
- ifFalse:
[objectMemory
storePointer: TheTimerSemaphore
ofObject: objectMemory specialObjectsOop
withValue: objectMemory nilObject.
+ nextWakeupUsecs := 0.
+ ^self pop: 2]].
+ self primitiveFailFor: PrimErrBadArgument!
- nextWakeupUsecs := 0].
- self pop: 2!
Item was changed:
----- Method: StackToRegisterMappingCogit>>compileOpenPIC:numArgs: (in category 'in-line cacheing') -----
compileOpenPIC: selector numArgs: numArgs
"Compile the code for an open PIC. Perform a probe of the first-level method
lookup cache followed by a call of ceSendFromInLineCacheMiss: if the probe fails.
Override to push the register args when calling ceSendFromInLineCacheMiss:"
+ | jumpSelectorMiss jumpClassMiss itsAHit jumpBCMethod |
- | jumpSelectorMiss jumpClassMiss itsAHit jumpBCMethod routine |
<var: #jumpSelectorMiss type: #'AbstractInstruction *'>
<var: #jumpClassMiss type: #'AbstractInstruction *'>
<var: #itsAHit type: #'AbstractInstruction *'>
<var: #jumpBCMethod type: #'AbstractInstruction *'>
self compilePICProlog: numArgs.
self cppIf: NewspeakVM ifTrue:
[self Nop. "1st nop differentiates dynSuperEntry from no-check entry if using nextMethod"
dynSuperEntry := self Nop].
entry := objectRepresentation genGetClassTagOf: ReceiverResultReg into: ClassReg scratchReg: TempReg.
"Do first of three probes. See CoInterpreter>>lookupInMethodCacheSel:classTag:"
self flag: #lookupInMethodCacheSel:classTag:. "so this method shows up as a sender of lookupInMethodCacheSel:class:"
self MoveR: ClassReg R: SendNumArgsReg.
self annotate: (self XorCw: selector R: ClassReg) objRef: selector.
self LogicalShiftLeftCq: ShiftForWord R: ClassReg.
self AndCq: MethodCacheMask << ShiftForWord R: ClassReg.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << ShiftForWord)
r: ClassReg
R: TempReg.
self annotate: (self CmpCw: selector R: TempReg) objRef: selector.
jumpSelectorMiss := self JumpNonZero: 0.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << ShiftForWord)
r: ClassReg
R: TempReg.
self CmpR: SendNumArgsReg R: TempReg.
jumpClassMiss := self JumpNonZero: 0.
itsAHit := self Label.
"Fetch the method. The interpret trampoline requires the bytecoded method in SendNumArgsReg"
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheMethod << ShiftForWord)
r: ClassReg
R: SendNumArgsReg.
"If the method is compiled jump to its unchecked entry-point, otherwise interpret it."
objectRepresentation
genLoadSlot: HeaderIndex sourceReg: SendNumArgsReg destReg: TempReg.
self MoveR: TempReg R: ClassReg.
jumpBCMethod := objectRepresentation genJumpSmallIntegerInScratchReg: TempReg.
jumpBCMethod jmpTarget: interpretLabel.
self AddCq: cmNoCheckEntryOffset R: ClassReg.
self JumpR: ClassReg.
"First probe missed. Do second of three probes. Shift hash right one and retry."
jumpSelectorMiss jmpTarget: (jumpClassMiss jmpTarget: self Label).
self MoveR: SendNumArgsReg R: ClassReg.
self annotate: (self XorCw: selector R: ClassReg) objRef: selector.
self LogicalShiftLeftCq: ShiftForWord - 1 R: ClassReg.
self AndCq: MethodCacheMask << ShiftForWord R: ClassReg.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << ShiftForWord)
r: ClassReg
R: TempReg.
self annotate: (self CmpCw: selector R: TempReg) objRef: selector.
jumpSelectorMiss := self JumpNonZero: 0.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << ShiftForWord)
r: ClassReg
R: TempReg.
self CmpR: SendNumArgsReg R: TempReg.
self JumpZero: itsAHit.
"Second probe missed. Do last probe. Shift hash right two and retry."
jumpSelectorMiss jmpTarget: self Label.
self MoveR: SendNumArgsReg R: ClassReg.
self annotate: (self XorCw: selector R: ClassReg) objRef: selector.
ShiftForWord > 2 ifTrue:
[self LogicalShiftLeftCq: ShiftForWord - 1 R: ClassReg].
self AndCq: MethodCacheMask << ShiftForWord R: ClassReg.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << ShiftForWord)
r: ClassReg
R: TempReg.
self annotate: (self CmpCw: selector R: TempReg) objRef: selector.
jumpSelectorMiss := self JumpNonZero: 0.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << ShiftForWord)
r: ClassReg
R: TempReg.
self CmpR: SendNumArgsReg R: TempReg.
self JumpZero: itsAHit.
"Last probe missed. Call ceSendFromInLineCacheMiss: to do the full lookup."
jumpSelectorMiss jmpTarget: self Label.
backEnd genPushRegisterArgsForNumArgs: numArgs.
self genSmalltalkToCStackSwitch.
methodLabel addDependent: (self annotateAbsolutePCRef: (self MoveCw: methodLabel asInteger R: SendNumArgsReg)).
+ self
+ compileCallFor: #ceSendFromInLineCacheMiss:
+ numArgs: 1
+ arg: SendNumArgsReg
+ arg: nil
+ arg: nil
+ arg: nil
+ resultReg: nil
+ saveRegs: false
- cStackAlignment > BytesPerWord ifTrue:
- [backEnd
- genAlignCStackSavingRegisters: false
- numArgs: 1
- wordAlignment: cStackAlignment / BytesPerWord].
- backEnd genPassReg: SendNumArgsReg asArgument: 0.
- routine := self cCode: '(sqInt)ceSendFromInLineCacheMiss'
- inSmalltalk: [self simulatedAddressFor: #ceSendFromInLineCacheMiss:].
- self annotateCall: (self Call: routine)
"Note that this call does not return."!
Item was changed:
----- Method: StackToRegisterMappingCogit>>generateMissAbortTrampolines (in category 'initialization') -----
generateMissAbortTrampolines
"Generate the run-time entries for the various method and PIC entry misses and aborts.
Read the class-side method trampolines for documentation on the various trampolines"
"Slang needs these apparently superfluous asSymbol sends."
0 to: self numRegArgs + 1 do:
[:numArgs|
methodAbortTrampolines
at: numArgs
put: (self genMethodAbortTrampolineFor: numArgs)].
0 to: self numRegArgs + 1 do:
[:numArgs|
picAbortTrampolines
at: numArgs
put: (self genPICAbortTrampolineFor: numArgs)].
0 to: self numRegArgs + 1 do:
[:numArgs|
picMissTrampolines
at: numArgs
+ put: (self genPICMissTrampolineFor: numArgs)]!
- put: (self genPICMissTrampolineFor: numArgs)].
- self cCode: '' inSmalltalk:
- [simulatedTrampolines
- at: (self simulatedAddressFor: #ceSendFromInLineCacheMiss:)
- put: #ceSendFromInLineCacheMiss:]!
1
0