Hi all.
If you could point me in the right direction to think this through, I would be much obliged.
in oscogvm/build.linux32x86/squeak.cog.v3/build.debug
I must add the -DNDEBUG flag in order to compile (i.e. disable assertions). If I enable assertions compilation fails early.
I am not sure how to think about this.
I don't know if these are appropriate errors or not, but here are the first two
/....oscogvm/src/vm/gcc3x-cointerp.c:9098:1: error: conflicting types for 'activateCoggedNewMethod'
activateCoggedNewMethod(sqInt inInterpreter)
^
/....oscogvm/src/vm/gcc3x-cointerp.c:367:13: note: previous declaration of 'activateCoggedNewMethod' was here
static void activateCoggedNewMethod(sqInt inInterpreter) NoDbgRegParms;
thx.
tty
2
2
06 Jul '14
Revision: 3032
Author: eliot
Date: 2014-07-05 21:01:13 -0700 (Sat, 05 Jul 2014)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.804
Cogit:
Change the management of counters in Sista methods to hold the counters well
away from code. This restores the performance of the Sista VMs on x86, where
when counters are close to code the writes to counters flush the instruction
cache and destroy performance. In V3 use malloc to allocate and free them
(this means Sista V3 is not currently simulable). In Spur, store them in
oldSpace in pinned objects (hence Sista Spur simulates just fine).
Split the enilopmarts into those that are used in the context of a call
(entering code as if from a call) and those used in other contexts (converting
interpreted method to machine code method in loops, returning from interpreter
method to machine code one, etc). This fixes enilopmarts on RISCs (i.e. ARM)
where the ret pc must be popped into the LinkReg when entering machine code as
if from a call, but not when entering in other contexts (returning from inter-
preter to machine-code method, converting interpreter method to machine code in
a loop, etc).
Nuke a couple of unused variables in Cogit hierarchy.
Spur:
Fix bug in allocateSlotsForPinningInOldSpace:bytes:format:classIndex: and make
sure answered object is actually pinned. Hence fix pinObject: & primitivePin.
Plugins:
Fix access to the characterTable in the ThreadedFFIPlugins. Replace
characterTable at: with characterObjectOf:, and in Spur support wide characters.
Fix divide-as-shift issue in BalloonEnginePlugin.
Modified Paths:
--------------
branches/Cog/image/envvars.sh
branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.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/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/B2DPlugin/B2DPlugin.c
branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c
branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.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/image/envvars.sh
===================================================================
--- branches/Cog/image/envvars.sh 2014-07-03 13:49:59 UTC (rev 3031)
+++ branches/Cog/image/envvars.sh 2014-07-06 04:01:13 UTC (rev 3032)
@@ -36,6 +36,7 @@
exit 2
fi
fi
+ rm -rf $VMDIR
tar xzf "$VMARC"
if [ ! -d $VMDIR -o "`quietmd5 "$VM"`" != $VMHASH ]; then
echo failed to correctly extract $VMDIR from $VMARC 1>&2
@@ -58,6 +59,7 @@
exit 2
fi
fi
+ rm -rf $VMDIR
unzip -q "$VMARC"
if [ ! -d "$VMDIR" -o "`quietmd5 "$VM"`" != $VMHASH ]; then
echo failed to correctly extract "`dirname $VM`" from $VMARC 1>&2
Modified: branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c 2014-07-03 13:49:59 UTC (rev 3031)
+++ branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c 2014-07-06 04:01:13 UTC (rev 3032)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211
+ VMPluginCodeGenerator VMMaker.oscog-eem.804 uuid: 8f232d31-fa50-4134-8556-da8fc12ab32d
from
- BalloonEnginePlugin VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211
+ BalloonEnginePlugin VMMaker.oscog-eem.804 uuid: 8f232d31-fa50-4134-8556-da8fc12ab32d
*/
-static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 " __DATE__ ;
+static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.804 uuid: 8f232d31-fa50-4134-8556-da8fc12ab32d " __DATE__ ;
@@ -839,9 +839,9 @@
static void * loadBBFn;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "B2DPlugin VMMaker.oscog-eem.787 (i)"
+ "B2DPlugin VMMaker.oscog-eem.804 (i)"
#else
- "B2DPlugin VMMaker.oscog-eem.787 (e)"
+ "B2DPlugin VMMaker.oscog-eem.804 (e)"
#endif
;
static int* objBuffer;
@@ -12123,8 +12123,8 @@
minY = yValue * 256;
while ((minY > lastY)
&& (fwDy1 >= 0)) {
- lastX += (fwDx1 + 32768) / 65536;
- lastY += (fwDy1 + 32768) / 65536;
+ lastX += ((signed)(fwDx1 + 32768) >> 16);
+ lastY += ((signed)(fwDy1 + 32768) >> 16);
fwDx1 += (((int*) updateData1))[GBUpdateDDX];
fwDy1 += (((int*) updateData1))[GBUpdateDDY];
}
@@ -12132,7 +12132,7 @@
(((int*) updateData1))[GBUpdateY] = lastY;
(((int*) updateData1))[GBUpdateDX] = fwDx1;
(((int*) updateData1))[GBUpdateDY] = fwDy1;
- xValue = lastX / 256;
+ xValue = ((signed)lastX >> 8);
objBuffer[bezier + GEXValue] = xValue;
objBuffer[bezier + GENumLines] = (deltaY - (yValue - startY));
}
@@ -12481,8 +12481,8 @@
minY = (workBuffer[GWCurrentY]) * 256;
while ((minY > lastY)
&& (fwDy >= 0)) {
- lastX += (fwDx + 32768) / 65536;
- lastY += (fwDy + 32768) / 65536;
+ lastX += ((signed)(fwDx + 32768) >> 16);
+ lastY += ((signed)(fwDy + 32768) >> 16);
fwDx += (((int*) updateData))[GBUpdateDDX];
fwDy += (((int*) updateData))[GBUpdateDDY];
}
@@ -12490,7 +12490,7 @@
(((int*) updateData))[GBUpdateY] = lastY;
(((int*) updateData))[GBUpdateDX] = fwDx;
(((int*) updateData))[GBUpdateDY] = fwDy;
- xValue = lastX / 256;
+ xValue = ((signed)lastX >> 8);
objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GEXValue] = xValue;
return null;
}
@@ -12522,8 +12522,8 @@
minY = yValue * 256;
while ((minY > lastY)
&& (fwDy >= 0)) {
- lastX += (fwDx + 32768) / 65536;
- lastY += (fwDy + 32768) / 65536;
+ lastX += ((signed)(fwDx + 32768) >> 16);
+ lastY += ((signed)(fwDy + 32768) >> 16);
fwDx += (((int*) updateData))[GBUpdateDDX];
fwDy += (((int*) updateData))[GBUpdateDDY];
}
@@ -12531,7 +12531,7 @@
(((int*) updateData))[GBUpdateY] = lastY;
(((int*) updateData))[GBUpdateDX] = fwDx;
(((int*) updateData))[GBUpdateDY] = fwDy;
- return lastX / 256;
+ return ((signed)lastX >> 8);
}
@@ -12564,8 +12564,8 @@
minY = yValue * 256;
while ((minY > lastY)
&& (fwDy >= 0)) {
- lastX += (fwDx + 32768) / 65536;
- lastY += (fwDy + 32768) / 65536;
+ lastX += ((signed)(fwDx + 32768) >> 16);
+ lastY += ((signed)(fwDy + 32768) >> 16);
fwDx += (((int*) updateData))[GBUpdateDDX];
fwDy += (((int*) updateData))[GBUpdateDDY];
}
@@ -12573,7 +12573,7 @@
(((int*) updateData))[GBUpdateY] = lastY;
(((int*) updateData))[GBUpdateDX] = fwDx;
(((int*) updateData))[GBUpdateDY] = fwDy;
- xValue = lastX / 256;
+ xValue = ((signed)lastX >> 8);
objBuffer[bezier + GEXValue] = xValue;
}
@@ -12683,8 +12683,8 @@
minY = yValue * 256;
while ((minY > lastY)
&& (fwDy >= 0)) {
- lastX += (fwDx + 32768) / 65536;
- lastY += (fwDy + 32768) / 65536;
+ lastX += ((signed)(fwDx + 32768) >> 16);
+ lastY += ((signed)(fwDy + 32768) >> 16);
fwDx += (((int*) updateData))[GBUpdateDDX];
fwDy += (((int*) updateData))[GBUpdateDDY];
}
@@ -12692,7 +12692,7 @@
(((int*) updateData))[GBUpdateY] = lastY;
(((int*) updateData))[GBUpdateDX] = fwDx;
(((int*) updateData))[GBUpdateDY] = fwDy;
- lastX / 256;
+ ((signed)lastX >> 8);
}
else {
@@ -12716,8 +12716,8 @@
minY1 = yValue * 256;
while ((minY1 > lastY1)
&& (fwDy1 >= 0)) {
- lastX1 += (fwDx1 + 32768) / 65536;
- lastY1 += (fwDy1 + 32768) / 65536;
+ lastX1 += ((signed)(fwDx1 + 32768) >> 16);
+ lastY1 += ((signed)(fwDy1 + 32768) >> 16);
fwDx1 += (((int*) updateData1))[GBUpdateDDX];
fwDy1 += (((int*) updateData1))[GBUpdateDDY];
}
@@ -12725,7 +12725,7 @@
(((int*) updateData1))[GBUpdateY] = lastY1;
(((int*) updateData1))[GBUpdateDX] = fwDx1;
(((int*) updateData1))[GBUpdateDY] = fwDy1;
- lastX1 / 256;
+ ((signed)lastX1 >> 8);
computeFinalWideBezierValueswidth(bezier, lineWidth);
}
Modified: branches/Cog/nscogsrc/vm/cogit.c
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.c 2014-07-03 13:49:59 UTC (rev 3031)
+++ branches/Cog/nscogsrc/vm/cogit.c 2014-07-06 04:01:13 UTC (rev 3032)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.798 uuid: f47e2c22-fea0-4762-b689-8b295a59d8ac
+ CCodeGenerator VMMaker.oscog-eem.804 uuid: 8f232d31-fa50-4134-8556-da8fc12ab32d
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.798 uuid: f47e2c22-fea0-4762-b689-8b295a59d8ac
+ StackToRegisterMappingCogit VMMaker.oscog-eem.804 uuid: 8f232d31-fa50-4134-8556-da8fc12ab32d
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.798 uuid: f47e2c22-fea0-4762-b689-8b295a59d8ac " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.804 uuid: 8f232d31-fa50-4134-8556-da8fc12ab32d " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -301,6 +301,7 @@
#define OrCqR 93
#define OrCwR 100
#define OrRR 86
+#define PCReg -18
#define PopR 69
#define PrefetchAw 72
#define PrimCallCollectsProfileSamples 8
@@ -380,6 +381,7 @@
static AbstractInstruction * genJumpFPLess(AbstractInstruction * self_in_genJumpFPLess, void *jumpTarget) NoDbgRegParms;
static AbstractInstruction * genWriteCResultIntoReg(AbstractInstruction * self_in_genWriteCResultIntoReg, sqInt abstractRegister) NoDbgRegParms;
static AbstractInstruction * getJmpTarget(AbstractInstruction * self_in_getJmpTarget) NoDbgRegParms;
+static sqInt hasPCRegister(AbstractInstruction * self_in_hasPCRegister) NoDbgRegParms;
static sqInt isAFixup(AbstractInstruction * self_in_isAFixup, void *fixupOrAddress) NoDbgRegParms;
static sqInt isAnInstruction(AbstractInstruction * self_in_isAnInstruction, AbstractInstruction *addressOrInstruction) NoDbgRegParms;
static sqInt isJump(AbstractInstruction * self_in_isJump) NoDbgRegParms;
@@ -572,6 +574,8 @@
static AbstractInstruction * gCall(sqInt callTarget) NoDbgRegParms;
static AbstractInstruction * gCmpCqR(sqInt quickConstant, sqInt reg) NoDbgRegParms;
static AbstractInstruction * gCmpCwR(sqInt wordConstant, sqInt reg) NoDbgRegParms;
+void callCogCodePopReceiver(void);
+void callCogCodePopReceiverAndClassRegs(void);
sqInt ceCPICMissreceiver(CogMethod *cPIC, sqInt receiver);
static sqInt ceImplicitReceiverForreceiverclass(sqInt selector, sqInt receiver, sqInt rcvrClass) NoDbgRegParms;
sqInt ceSICMiss(sqInt receiver);
@@ -615,7 +619,6 @@
static AbstractInstruction * gDivRRQuoRem(sqInt rDivisor, sqInt rDividend, sqInt rQuotient, sqInt rRemainder) NoDbgRegParms;
static sqInt endPCOf(sqInt aMethod) NoDbgRegParms;
void enterCogCodePopReceiver(void);
-void enterCogCodePopReceiverAndClassRegs(void);
static sqInt extABytecode(void);
static sqInt extBBytecode(void);
static sqInt fillInBlockHeadersAt(sqInt startAddress) NoDbgRegParms;
@@ -628,10 +631,12 @@
static sqInt findIsBackwardBranchMcpcBcpcMatchingMcpc(BytecodeDescriptor *descriptor, sqInt isBackwardBranch, char *mcpc, sqInt bcpc, void *targetMcpc) NoDbgRegParms;
static void freePICsWithFreedTargets(void);
void freeUnmarkedMachineCode(void);
+static void (*genCallEnilopmartForandcalled(sqInt regArg1, sqInt regArg2, char *trampolineName))(void) NoDbgRegParms;
+static void (*genCallEnilopmartForcalled(sqInt regArg1, char *trampolineName))(void) NoDbgRegParms;
static sqInt genCheckForInterruptsTrampoline(void);
static void (*genEnilopmartForandandcalled(sqInt regArg1, sqInt regArg2, sqInt regArg3, char *trampolineName))(void) NoDbgRegParms;
static void (*genEnilopmartForandcalled(sqInt regArg1, sqInt regArg2, char *trampolineName))(void) NoDbgRegParms;
-static void (*genEnilopmartForcalled(sqInt regArg, char *trampolineName))(void) NoDbgRegParms;
+static void (*genEnilopmartForcalled(sqInt regArg1, char *trampolineName))(void) NoDbgRegParms;
static void generateCaptureCStackPointers(sqInt captureFramePointer) NoDbgRegParms;
static void generateClosedPICPrototype(void);
static CogMethod * generateCogMethod(sqInt selector) NoDbgRegParms;
@@ -711,6 +716,7 @@
static sqInt maybeFreeCogMethodDoesntLookKosher(CogMethod *cogMethod) NoDbgRegParms;
static sqInt maybeGenerateCheckFeatures(void);
static sqInt maybeGenerateICacheFlush(void);
+static void maybeMarkCountersIn(CogMethod *cogMethod) NoDbgRegParms;
usqInt mcPCForBackwardBranchstartBcpcin(sqInt bcpc, sqInt startbcpc, CogBlockMethod *cogMethod);
static sqInt methodhasSameCodeAscheckPenultimate(sqInt methodA, sqInt methodB, sqInt comparePenultimateLiteral) NoDbgRegParms;
sqInt minCogMethodAddress(void);
@@ -858,10 +864,12 @@
static sqInt isSmallIntegerTagNonZero(void);
static void markAndTraceLiteralIfYoung(sqInt literal) NoDbgRegParms;
static void markAndTraceLiteral(sqInt literal) NoDbgRegParms;
+static sqInt numCountersFor(usqInt theCounters) NoDbgRegParms;
sqInt numRegArgs(void);
static sqInt numSmallIntegerBits(void);
static sqInt remapObject(sqInt oop) NoDbgRegParms;
static sqInt remapOop(sqInt oop) NoDbgRegParms;
+void resetCountersIn(CogMethod *cogMethod);
static sqInt shouldAnnotateObjectReference(sqInt anOop) NoDbgRegParms;
static sqInt slotOffsetOfInstVarIndex(sqInt index) NoDbgRegParms;
static sqInt smallIntegerIsOnlyImmediateType(void);
@@ -978,6 +986,8 @@
static BlockStart * addBlockStartAtnumArgsnumCopiedspan(sqInt bytecodepc, sqInt numArgs, sqInt numCopied, sqInt span) NoDbgRegParms;
static void annotateBytecodeIfAnnotated(CogSimStackEntry *aSimStackEntry) NoDbgRegParms;
static sqInt anyReferencesToRegisterinTopNItems(sqInt reg, sqInt n) NoDbgRegParms;
+void callCogCodePopReceiverArg0Regs(void);
+void callCogCodePopReceiverArg1Arg0Regs(void);
static sqInt compileAbstractInstructionsFromthrough(sqInt start, sqInt end) NoDbgRegParms;
static sqInt compileBlockBodies(void);
static void compileBlockFrameBuild(BlockStart *blockStart) NoDbgRegParms;
@@ -992,12 +1002,10 @@
static BytecodeFixup * ensureFixupAt(sqInt targetIndex) NoDbgRegParms;
static BytecodeFixup * ensureNonMergeFixupAt(sqInt targetIndex) NoDbgRegParms;
static void ensureReceiverResultRegContainsSelf(void);
-void enterCogCodePopReceiverArg0Regs(void);
-void enterCogCodePopReceiverArg1Arg0Regs(void);
static void evaluateat(BytecodeDescriptor *descriptor, sqInt pc) NoDbgRegParms;
+static void (*genCallPICEnilopmartNumArgs(sqInt numArgs))(void) NoDbgRegParms;
static sqInt genDoubleArithmeticpreOpCheck(sqInt arithmeticOperator, AbstractInstruction *(*preOpCheckOrNil)(int rcvrReg, int argReg)) NoDbgRegParms;
static sqInt genDoubleComparisoninvert(AbstractInstruction *(*jumpOpcodeGenerator)(void *), sqInt invertComparison) NoDbgRegParms;
-static void (*genEnterPICEnilopmartNumArgs(sqInt numArgs))(void) NoDbgRegParms;
static sqInt genExternalizePointersForPrimitiveCall(void);
static sqInt genExtPushClosureBytecode(void);
static void generateEnilopmarts(void);
@@ -1151,6 +1159,13 @@
static sqInt callerSavedRegMask;
static sqInt ceActiveContextTrampoline;
sqInt ceBaseFrameReturnTrampoline;
+void (*ceCall0ArgsPIC)(void);
+void (*ceCall1ArgsPIC)(void);
+void (*ceCall2ArgsPIC)(void);
+void (*ceCallCogCodePopReceiverAndClassRegs)(void);
+void (*ceCallCogCodePopReceiverArg0Regs)(void);
+void (*ceCallCogCodePopReceiverArg1Arg0Regs)(void);
+void (*ceCallCogCodePopReceiverReg)(void);
sqInt ceCannotResumeTrampoline;
void (*ceCaptureCStackPointers)(void);
static unsigned long (*ceCheckFeaturesFunction)(void);
@@ -1158,12 +1173,6 @@
static sqInt ceClosureCopyTrampoline;
static sqInt ceCPICMissTrampoline;
static sqInt ceCreateNewArrayTrampoline;
-void (*ceEnter0ArgsPIC)(void);
-void (*ceEnter1ArgsPIC)(void);
-void (*ceEnter2ArgsPIC)(void);
-void (*ceEnterCogCodePopReceiverAndClassRegs)(void);
-void (*ceEnterCogCodePopReceiverArg0Regs)(void);
-void (*ceEnterCogCodePopReceiverArg1Arg0Regs)(void);
void (*ceEnterCogCodePopReceiverReg)(void);
static sqInt ceExplicitReceiverTrampoline;
static sqInt ceFetchContextInstVarTrampoline;
@@ -1740,7 +1749,6 @@
static sqInt lastSend;
static usqInt limitAddress;
static sqInt maxLitIndex;
-static CogBlockMethod * maxMethodBefore;
static sqInt methodAbortTrampolines[4];
static sqInt methodBytesFreedSinceLastCompaction;
static sqInt methodCount;
@@ -1993,9 +2001,10 @@
{ genPrimitiveClosureValue, 1, 0 }
};
static sqInt primitiveIndex;
-void (*realCEEnterCogCodePopReceiverAndClassRegs)(void);
-void (*realCEEnterCogCodePopReceiverArg0Regs)(void);
-void (*realCEEnterCogCodePopReceiverArg1Arg0Regs)(void);
+void (*realCECallCogCodePopReceiverAndClassRegs)(void);
+void (*realCECallCogCodePopReceiverArg0Regs)(void);
+void (*realCECallCogCodePopReceiverArg1Arg0Regs)(void);
+void (*realCECallCogCodePopReceiverReg)(void);
void (*realCEEnterCogCodePopReceiverReg)(void);
static sqInt regArgsHaveBeenPushed;
static sqInt runtimeObjectRefIndex;
@@ -2256,7 +2265,21 @@
return ((AbstractInstruction *) (((self_in_getJmpTarget->operands))[0]));
}
+
+/* Answer if the processor has a generally addressable pc register, such as
+ the ARM.
+ On such processors we can execute jumping to pop top of stack by popping
+ into the pc register. Note that this is not a generic RISC feature. The
+ PowerPC does not
+ allow one to pop into the pc for example. So by default, answer false. */
+
static sqInt
+hasPCRegister(AbstractInstruction * self_in_hasPCRegister)
+{
+ return 0;
+}
+
+static sqInt
isAFixup(AbstractInstruction * self_in_isAFixup, void *fixupOrAddress)
{
return addressIsInFixups(fixupOrAddress);
@@ -8696,6 +8719,30 @@
}
+/* This is a static version of ceCallCogCodePopReceiverReg
+ for break-pointing when debugging in C. */
+/* This exists only for break-pointing. */
+
+void
+callCogCodePopReceiver(void)
+{
+ realCECallCogCodePopReceiverReg();
+ error("what??");
+
+}
+
+
+/* This is a static version of ceCallCogCodePopReceiverAndClassRegs
+ for break-pointing when debugging in C. */
+/* This exists only for break-pointing. */
+
+void
+callCogCodePopReceiverAndClassRegs(void)
+{
+ realCECallCogCodePopReceiverAndClassRegs();
+}
+
+
/* Code entry closed PIC miss. A send has fallen
through a closed (finite) polymorphic inline cache.
Either extend it or patch the send site to an open PIC.
@@ -9797,6 +9844,7 @@
if ((((sqInt)cogMethod)) == InsufficientCodeSpace) {
callForCogCompiledCodeCompaction();
}
+ /* begin maybeFreeCounters */
return null;
}
return cogMethod;
@@ -10461,17 +10509,6 @@
}
-/* This is a static version of ceEnterCogCodePopReceiverAndClassRegs
- for break-pointing when debugging in C. */
-/* This exists only for break-pointing. */
-
-void
-enterCogCodePopReceiverAndClassRegs(void)
-{
- realCEEnterCogCodePopReceiverAndClassRegs();
-}
-
-
/* 224 11100000 aaaaaaaa Extend A (Ext A = Ext A prev * 256 + Ext A) */
static sqInt
@@ -10754,12 +10791,111 @@
}
}
+
+/* An enilopmart (the reverse of a trampoline) is a piece of code that makes
+ the system-call-like transition from the C runtime into generated machine
+ code. This version is for entering code as if from a call. The desired
+ arguments and entry-point are pushed on a stackPage's stack, and beneath
+ them is the call's return address. The enilopmart pops off the values to
+ be loaded into registers, and on CISCs then executes a return instruction
+ to pop
+ off the entry-point and jump to it. On RISCs the enilopmart pops off the
+ values to be loaded into registers, pops the entry-point into a scratch
+ register, pops
+ the return address into the LinkReg and then jumps to the entry point.
+
+ BEFORE AFTER (stacks grow down)
+ whatever stackPointer -> whatever
+ call return pc
+ target address => reg1 = reg1val, etc
+ reg1val LinkReg = call return pc
+ stackPointer -> reg2val pc = target address
+
+ C.F. genEnilopmartFor:and:and:called: */
+
+static void (*genCallEnilopmartForandcalled(sqInt regArg1, sqInt regArg2, char *trampolineName))(void)
+
+{
+ sqInt endAddress;
+ sqInt enilopmart;
+ sqInt size;
+
+ opcodeIndex = 0;
+ genLoadStackPointers(backEnd);
+ /* begin PopR: */
+ genoperand(PopR, regArg2);
+ /* begin PopR: */
+ genoperand(PopR, regArg1);
+ /* begin RetN: */
+ genoperand(RetN, 0);
+
+ computeMaximumSizes();
+ size = generateInstructionsAt(methodZoneBase);
+ endAddress = outputInstructionsAt(methodZoneBase);
+ assert((methodZoneBase + size) == endAddress);
+ enilopmart = methodZoneBase;
+ methodZoneBase = alignUptoRoutineBoundary(endAddress);
+ nopsFromto(backEnd, endAddress, methodZoneBase - 1);
+ recordGeneratedRunTimeaddress(trampolineName, enilopmart);
+ return ((void (*)(void)) enilopmart);
+}
+
+
+/* An enilopmart (the reverse of a trampoline) is a piece of code that makes
+ the system-call-like transition from the C runtime into generated machine
+ code. This version is for entering code as if from a call. The desired
+ arguments and entry-point are pushed on a stackPage's stack, and beneath
+ them is the call's return address. The enilopmart pops off the values to
+ be loaded into registers, and on CISCs then executes a return instruction
+ to pop
+ off the entry-point and jump to it. On RISCs the enilopmart pops off the
+ values to be loaded into registers, pops the entry-point into a scratch
+ register, pops
+ the return address into the LinkReg and then jumps to the entry point.
+
+ BEFORE AFTER (stacks grow down)
+ whatever stackPointer -> whatever
+ call return pc reg1 = reg1val
+ target address => LinkReg = call return pc
+ stackPointer -> reg1val pc = target address
+
+ C.F. genEnilopmartFor:and:and:called: */
+
+static void (*genCallEnilopmartForcalled(sqInt regArg1, char *trampolineName))(void)
+
+{
+ sqInt endAddress;
+ sqInt enilopmart;
+ sqInt size;
+
+ opcodeIndex = 0;
+ genLoadStackPointers(backEnd);
+ /* begin PopR: */
+ genoperand(PopR, regArg1);
+ /* begin RetN: */
+ genoperand(RetN, 0);
+
+ computeMaximumSizes();
+ size = generateInstructionsAt(methodZoneBase);
+ endAddress = outputInstructionsAt(methodZoneBase);
+ assert((methodZoneBase + size) == endAddress);
+ enilopmart = methodZoneBase;
+ methodZoneBase = alignUptoRoutineBoundary(endAddress);
+ nopsFromto(backEnd, endAddress, methodZoneBase - 1);
+ recordGeneratedRunTimeaddress(trampolineName, enilopmart);
+ return ((void (*)(void)) enilopmart);
+}
+
static sqInt
genCheckForInterruptsTrampoline(void)
{
sqInt address;
sqInt address1;
+
+ /* if we have a link register we will assume that it does not get automatically pushed onto the stack
+ and thus there is no need to pop it before saving to instructionPointerAddress */
+
opcodeIndex = 0;
/* begin PopR: */
genoperand(PopR, TempReg);
@@ -10776,7 +10912,15 @@
code. The desired arguments and entry-point are pushed on a stackPage's
stack. The enilopmart pops off the values to be loaded into registers and
then executes a return instruction to pop off the entry-point and jump to
- it. */
+ it.
+ BEFORE AFTER (stacks grow down)
+ whatever stackPointer -> whatever
+ target address => reg1 = reg1val, etc
+ reg1val pc = target address
+ reg2val
+ stackPointer -> reg3val
+
+ C.F. genCallEnilopmartFor:and:and:called: */
static void (*genEnilopmartForandandcalled(sqInt regArg1, sqInt regArg2, sqInt regArg3, char *trampolineName))(void)
@@ -10793,9 +10937,9 @@
genoperand(PopR, regArg2);
/* begin PopR: */
genoperand(PopR, regArg1);
-
/* begin RetN: */
genoperand(RetN, 0);
+
computeMaximumSizes();
size = generateInstructionsAt(methodZoneBase);
endAddress = outputInstructionsAt(methodZoneBase);
@@ -10813,7 +10957,14 @@
code. The desired arguments and entry-point are pushed on a stackPage's
stack. The enilopmart pops off the values to be loaded into registers and
then executes a return instruction to pop off the entry-point and jump to
- it. */
+ it.
+ BEFORE AFTER (stacks grow down)
+ whatever stackPointer -> whatever
+ target address => reg1 = reg1val, etc
+ reg1val pc = target address
+ stackPointer -> reg2val
+
+ C.F. genCallEnilopmartFor:and:and:called: */
static void (*genEnilopmartForandcalled(sqInt regArg1, sqInt regArg2, char *trampolineName))(void)
@@ -10828,9 +10979,9 @@
genoperand(PopR, regArg2);
/* begin PopR: */
genoperand(PopR, regArg1);
-
/* begin RetN: */
genoperand(RetN, 0);
+
computeMaximumSizes();
size = generateInstructionsAt(methodZoneBase);
endAddress = outputInstructionsAt(methodZoneBase);
@@ -10848,9 +10999,15 @@
code. The desired arguments and entry-point are pushed on a stackPage's
stack. The enilopmart pops off the values to be loaded into registers and
then executes a return instruction to pop off the entry-point and jump to
- it. */
+ it.
+ BEFORE AFTER (stacks grow down)
+ whatever stackPointer -> whatever
+ target address => reg1 = reg1val
+ stackPointer -> reg1val pc = target address
+
+ C.F. genCallEnilopmartFor:and:and:called: */
-static void (*genEnilopmartForcalled(sqInt regArg, char *trampolineName))(void)
+static void (*genEnilopmartForcalled(sqInt regArg1, char *trampolineName))(void)
{
sqInt endAddress;
@@ -10860,10 +11017,10 @@
opcodeIndex = 0;
genLoadStackPointers(backEnd);
/* begin PopR: */
- genoperand(PopR, regArg);
-
+ genoperand(PopR, regArg1);
/* begin RetN: */
genoperand(RetN, 0);
+
computeMaximumSizes();
size = generateInstructionsAt(methodZoneBase);
endAddress = outputInstructionsAt(methodZoneBase);
@@ -12493,6 +12650,7 @@
&& ((isImmediate((cogMethod->selector)))
|| (isMarked((cogMethod->selector))))));
markAndTraceLiteral((cogMethod->selector));
+ maybeMarkCountersIn(cogMethod);
/* begin mapFor:performUntil:arg: */
mcpc = (((sqInt)cogMethod)) + cmNoCheckEntryOffset;
map = ((((usqInt)cogMethod)) + ((cogMethod->blockSize))) - 1;
@@ -12525,6 +12683,7 @@
&& ((isImmediate((cogMethod->selector)))
|| (isMarked((cogMethod->selector))))));
markAndTraceLiteral((cogMethod->selector));
+ maybeMarkCountersIn(cogMethod);
/* begin mapFor:performUntil:arg: */
mcpc1 = (((sqInt)cogMethod)) + cmNoCheckEntryOffset;
map1 = ((((usqInt)cogMethod)) + ((cogMethod->blockSize))) - 1;
@@ -12624,6 +12783,7 @@
assert(((cogMethod->cmType)) == CMMethod);
assert(isMarked((cogMethod->methodObject)));
markAndTraceLiteral((cogMethod->selector));
+ maybeMarkCountersIn(cogMethod);
/* begin mapFor:performUntil:arg: */
mcpc = (((sqInt)cogMethod)) + cmNoCheckEntryOffset;
map = ((((usqInt)cogMethod)) + ((cogMethod->blockSize))) - 1;
@@ -13032,6 +13192,18 @@
}
+/* In SIsta Spur counters are held on the heap in pinned objects which must
+ be marked
+ to avoid them being garbage collected. This is the hook through which that
+ happens.
+ */
+
+static void
+maybeMarkCountersIn(CogMethod *cogMethod)
+{
+}
+
+
/* Answer the absolute machine code pc matching the zero-relative
bytecode pc of a backward branch in cogMethod, given the start
of the bytecodes for cogMethod's block or method object. */
@@ -14704,6 +14876,7 @@
removeFromUnpairedMethodList(cogMethod);
}
+ /* begin maybeFreeCountersOf: */
(cogMethod->cmRefersToYoung = 0);
}
if (((cogMethod->cmType)) == CMOpenPIC) {
@@ -16391,7 +16564,13 @@
}
}
+static sqInt
+numCountersFor(usqInt theCounters)
+{
+ return longAt(theCounters - (sizeof(sqInt)));
+}
+
/* Define how many register arguments a StackToRegisterMappingCogit can
and should use with the receiver. The value must be 0, 1 or 2. Note that a
SimpleStackBasedCogit always has 0 register args (although the receiver is
@@ -16430,7 +16609,13 @@
: remap(oop));
}
+void
+resetCountersIn(CogMethod *cogMethod)
+{
+ fillInCountersatStartAddress(numCountersFor(counters(cogMethod)), counters(cogMethod));
+}
+
/* self assert: ((objectMemory isIntegerObject: anOop)
or: [objectMemory addressCouldBeObj: anOop]). */
@@ -18352,6 +18537,28 @@
}
+/* This is a static version of ceCallCogCodePopReceiverArg0Regs
+ for break-pointing when debugging in C. */
+/* This exists only for break-pointing. */
+
+void
+callCogCodePopReceiverArg0Regs(void)
+{
+ realCECallCogCodePopReceiverArg0Regs();
+}
+
+
+/* This is a static version of ceCallCogCodePopReceiverArg1Arg0Regs
+ for break-pointing when debugging in C. */
+/* This exists only for break-pointing. */
+
+void
+callCogCodePopReceiverArg1Arg0Regs(void)
+{
+ realCECallCogCodePopReceiverArg1Arg0Regs();
+}
+
+
/* Loop over bytecodes, dispatching to the generator for each bytecode,
handling fixups in due course.
*/
@@ -18641,7 +18848,7 @@
if (numCleanBlocks > 0) {
addCleanBlockStarts();
}
- /* begin maybeAllocAndInitCounters */
+
blockEntryLabel = null;
(methodLabel->dependent = null);
if (((result = compileEntireMethod())) < 0) {
@@ -19033,28 +19240,6 @@
}
}
-
-/* This is a static version of ceEnterCogCodePopReceiverArg0Regs
- for break-pointing when debugging in C. */
-/* This exists only for break-pointing. */
-
-void
-enterCogCodePopReceiverArg0Regs(void)
-{
- realCEEnterCogCodePopReceiverArg0Regs();
-}
-
-
-/* This is a static version of ceEnterCogCodePopReceiverArg1Arg0Regs
- for break-pointing when debugging in C. */
-/* This exists only for break-pointing. */
-
-void
-enterCogCodePopReceiverArg1Arg0Regs(void)
-{
- realCEEnterCogCodePopReceiverArg1Arg0Regs();
-}
-
static void
evaluateat(BytecodeDescriptor *descriptor, sqInt pc)
{
@@ -19065,6 +19250,55 @@
}
+/* Generate special versions of the ceCallCogCodePopReceiverAndClassRegs
+ enilopmart that also pop register args from the stack to undo the pushing
+ of register args in the abort/miss trampolines. */
+
+static void (*genCallPICEnilopmartNumArgs(sqInt numArgs))(void)
+
+{
+ sqInt endAddress;
+ sqInt enilopmart;
+ sqInt reg;
+ sqInt size;
+
+ opcodeIndex = 0;
+ genLoadStackPointers(backEnd);
+ /* begin PopR: */
+ genoperand(PopR, ClassReg);
+ /* begin PopR: */
+ genoperand(PopR, TempReg);
+ /* begin PopR: */
+ reg = SendNumArgsReg;
+ genoperand(PopR, reg);
+ if (numArgs > 0) {
+ if (numArgs > 1) {
+ /* begin PopR: */
+ genoperand(PopR, Arg1Reg);
+ assert((numRegArgs()) == 2);
+ }
+ /* begin PopR: */
+ genoperand(PopR, Arg0Reg);
+ }
+ /* begin PopR: */
+ genoperand(PopR, ReceiverResultReg);
+ /* begin PushR: */
+ genoperand(PushR, SendNumArgsReg);
+
+ /* begin JumpR: */
+ genoperand(JumpR, TempReg);
+ computeMaximumSizes();
+ size = generateInstructionsAt(methodZoneBase);
+ endAddress = outputInstructionsAt(methodZoneBase);
+ assert((methodZoneBase + size) == endAddress);
+ enilopmart = methodZoneBase;
+ methodZoneBase = alignUptoRoutineBoundary(endAddress);
+ nopsFromto(backEnd, endAddress, methodZoneBase - 1);
+ recordGeneratedRunTimeaddress(trampolineNamenumArgs("ceCallPIC", numArgs), enilopmart);
+ return ((void (*)(void)) enilopmart);
+}
+
+
/* Receiver and arg in registers.
Stack looks like
return address */
@@ -19186,52 +19420,6 @@
}
-/* Generate special versions of the ceEnterCogCodePopReceiverAndClassRegs
- enilopmart that also pop register args from the stack to undo the pushing
- of register args in the abort/miss trampolines. */
-
-static void (*genEnterPICEnilopmartNumArgs(sqInt numArgs))(void)
-
-{
- sqInt endAddress;
- sqInt enilopmart;
- sqInt size;
-
- opcodeIndex = 0;
- genLoadStackPointers(backEnd);
- /* begin PopR: */
- genoperand(PopR, ClassReg);
- /* begin PopR: */
- genoperand(PopR, TempReg);
- /* begin PopR: */
- genoperand(PopR, SendNumArgsReg);
- if (numArgs > 0) {
- if (numArgs > 1) {
- /* begin PopR: */
- genoperand(PopR, Arg1Reg);
- assert((numRegArgs()) == 2);
- }
- /* begin PopR: */
- genoperand(PopR, Arg0Reg);
- }
- /* begin PopR: */
- genoperand(PopR, ReceiverResultReg);
- /* begin PushR: */
- genoperand(PushR, SendNumArgsReg);
- /* begin JumpR: */
- genoperand(JumpR, TempReg);
- computeMaximumSizes();
- size = generateInstructionsAt(methodZoneBase);
- endAddress = outputInstructionsAt(methodZoneBase);
- assert((methodZoneBase + size) == endAddress);
- enilopmart = methodZoneBase;
- methodZoneBase = alignUptoRoutineBoundary(endAddress);
- nopsFromto(backEnd, endAddress, methodZoneBase - 1);
- recordGeneratedRunTimeaddress(trampolineNamenumArgs("ceEnterPIC", numArgs), enilopmart);
- return ((void (*)(void)) enilopmart);
-}
-
-
/* Override to push the register receiver and register arguments, if any. */
static sqInt
@@ -19309,12 +19497,15 @@
# if Debug
realCEEnterCogCodePopReceiverReg = genEnilopmartForcalled(ReceiverResultReg, "realCEEnterCogCodePopReceiverReg");
ceEnterCogCodePopReceiverReg = enterCogCodePopReceiver;
- realCEEnterCogCodePopReceiverAndClassRegs = genEnilopmartForandcalled(ReceiverResultReg, ClassReg, "realCEEnterCogCodePopReceiverAndClassRegs");
- ceEnterCogCodePopReceiverAndClassRegs = enterCogCodePopReceiverAndClassRegs;
+ realCECallCogCodePopReceiverReg = genCallEnilopmartForcalled(ReceiverResultReg, "realCEEnterCogCodePopReceiverReg");
+ ceCallCogCodePopReceiverReg = callCogCodePopReceiver;
+ realCECallCogCodePopReceiverAndClassRegs = genCallEnilopmartForandcalled(ReceiverResultReg, ClassReg, "realCECallCogCodePopReceiverAndClassRegs");
+ ceCallCogCodePopReceiverAndClassRegs = callCogCodePopReceiverAndClassRegs;
# else /* Debug */
ceEnterCogCodePopReceiverReg = genEnilopmartForcalled(ReceiverResultReg, "ceEnterCogCodePopReceiverReg");
- ceEnterCogCodePopReceiverAndClassRegs = genEnilopmartForandcalled(ReceiverResultReg, ClassReg, "ceEnterCogCodePopReceiverAndClassRegs");
+ ceCallCogCodePopReceiverReg = genCallEnilopmartForcalled(ReceiverResultReg, "ceCallCogCodePopReceiverReg");
+ ceCallCogCodePopReceiverAndClassRegs = genCallEnilopmartForandcalled(ReceiverResultReg, ClassReg, "ceCallCogCodePopReceiverAndClassRegs");
# endif /* Debug */
@@ -19328,19 +19519,19 @@
recordGeneratedRunTimeaddress("cePrimReturnEnterCogCodeProfiling", cePrimReturnEnterCogCodeProfiling);
# if Debug
- realCEEnterCogCodePopReceiverArg0Regs = genEnilopmartForandcalled(ReceiverResultReg, Arg0Reg, "realCEEnterCogCodePopReceiverArg0Regs");
- ceEnterCogCodePopReceiverArg0Regs = enterCogCodePopReceiverArg0Regs;
- realCEEnterCogCodePopReceiverArg1Arg0Regs = genEnilopmartForandandcalled(ReceiverResultReg, Arg0Reg, Arg1Reg, "realCEEnterCogCodePopReceiverArg1Arg0Regs");
- ceEnterCogCodePopReceiverArg1Arg0Regs = enterCogCodePopReceiverArg1Arg0Regs;
+ realCECallCogCodePopReceiverArg0Regs = genEnilopmartForandcalled(ReceiverResultReg, Arg0Reg, "realCECallCogCodePopReceiverArg0Regs");
+ ceCallCogCodePopReceiverArg0Regs = callCogCodePopReceiverArg0Regs;
+ realCECallCogCodePopReceiverArg1Arg0Regs = genEnilopmartForandandcalled(ReceiverResultReg, Arg0Reg, Arg1Reg, "realCECallCogCodePopReceiverArg1Arg0Regs");
+ ceCallCogCodePopReceiverArg1Arg0Regs = callCogCodePopReceiverArg1Arg0Regs;
# else /* Debug */
- ceEnterCogCodePopReceiverArg0Regs = genEnilopmartForandcalled(ReceiverResultReg, Arg0Reg, "ceEnterCogCodePopReceiverArg0Regs");
- ceEnterCogCodePopReceiverArg1Arg0Regs = genEnilopmartForandandcalled(ReceiverResultReg, Arg0Reg, Arg1Reg, "ceEnterCogCodePopReceiverArg1Arg0Regs");
+ ceCallCogCodePopReceiverArg0Regs = genEnilopmartForandcalled(ReceiverResultReg, Arg0Reg, "ceCallCogCodePopReceiverArg0Regs");
+ ceCallCogCodePopReceiverArg1Arg0Regs = genEnilopmartForandandcalled(ReceiverResultReg, Arg0Reg, Arg1Reg, "ceCallCogCodePopReceiverArg1Arg0Regs");
# endif /* Debug */
- ceEnter0ArgsPIC = genEnterPICEnilopmartNumArgs(0);
- ceEnter1ArgsPIC = genEnterPICEnilopmartNumArgs(1);
+ ceCall0ArgsPIC = genCallPICEnilopmartNumArgs(0);
+ ceCall1ArgsPIC = genCallPICEnilopmartNumArgs(1);
}
Modified: branches/Cog/nscogsrc/vm/cogit.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.h 2014-07-03 13:49:59 UTC (rev 3031)
+++ branches/Cog/nscogsrc/vm/cogit.h 2014-07-06 04:01:13 UTC (rev 3032)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.798 uuid: f47e2c22-fea0-4762-b689-8b295a59d8ac
+ CCodeGenerator VMMaker.oscog-eem.804 uuid: 8f232d31-fa50-4134-8556-da8fc12ab32d
*/
@@ -17,6 +17,8 @@
sqInt abortOffset(void);
void addCogMethodsToHeapMap(void);
sqInt bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod);
+void callCogCodePopReceiver(void);
+void callCogCodePopReceiverAndClassRegs(void);
sqInt ceCPICMissreceiver(CogMethod *cPIC, sqInt receiver);
sqInt ceSICMiss(sqInt receiver);
void checkAssertsEnabledInCogit(void);
@@ -31,7 +33,6 @@
CogMethod * cogselector(sqInt aMethodObj, sqInt aSelectorOop);
void compactCogCompiledCode(void);
void enterCogCodePopReceiver(void);
-void enterCogCodePopReceiverAndClassRegs(void);
CogBlockMethod * findMethodForStartBcpcinHomeMethod(sqInt startbcpc, CogMethod *cogMethod);
void freeUnmarkedMachineCode(void);
void initializeCodeZoneFromupTo(sqInt startAddress, sqInt endAddress);
@@ -71,14 +72,15 @@
char * whereIsMaybeCodeThing(sqInt anOop);
sqInt canLinkToYoungClasses(void);
sqInt numRegArgs(void);
+void resetCountersIn(CogMethod *cogMethod);
sqInt genQuickReturnConst(void);
sqInt genQuickReturnInstVar(void);
sqInt genQuickReturnSelf(void);
void recordCallOffsetInof(CogMethod *cogMethod, void *callLabelArg);
void rewritePrimInvocationInto(CogMethod *cogMethod, void (*primFunctionPointer)(void));
void voidCogCompiledCode(void);
-void enterCogCodePopReceiverArg0Regs(void);
-void enterCogCodePopReceiverArg1Arg0Regs(void);
+void callCogCodePopReceiverArg0Regs(void);
+void callCogCodePopReceiverArg1Arg0Regs(void);
/*** Global Variables ***/
@@ -87,15 +89,16 @@
void * CFramePointer;
void * CStackPointer;
sqInt ceBaseFrameReturnTrampoline;
+void (*ceCall0ArgsPIC)(void);
+void (*ceCall1ArgsPIC)(void);
+void (*ceCall2ArgsPIC)(void);
+void (*ceCallCogCodePopReceiverAndClassRegs)(void);
+void (*ceCallCogCodePopReceiverArg0Regs)(void);
+void (*ceCallCogCodePopReceiverArg1Arg0Regs)(void);
+void (*ceCallCogCodePopReceiverReg)(void);
sqInt ceCannotResumeTrampoline;
void (*ceCaptureCStackPointers)(void);
sqInt ceCheckForInterruptTrampoline;
-void (*ceEnter0ArgsPIC)(void);
-void (*ceEnter1ArgsPIC)(void);
-void (*ceEnter2ArgsPIC)(void);
-void (*ceEnterCogCodePopReceiverAndClassRegs)(void);
-void (*ceEnterCogCodePopReceiverArg0Regs)(void);
-void (*ceEnterCogCodePopReceiverArg1Arg0Regs)(void);
void (*ceEnterCogCodePopReceiverReg)(void);
unsigned long (*ceGetSP)(void);
sqInt ceReturnToInterpreterTrampoline;
@@ -107,9 +110,10 @@
sqInt cmNoCheckEntryOffset;
unsigned long debugPrimCallStackOffset;
sqInt missOffset;
-void (*realCEEnterCogCodePopReceiverAndClassRegs)(void);
-void (*realCEEnterCogCodePopReceiverArg0Regs)(void);
-void (*realCEEnterCogCodePopReceiverArg1Arg0Regs)(void);
+void (*realCECallCogCodePopReceiverAndClassRegs)(void);
+void (*realCECallCogCodePopReceiverArg0Regs)(void);
+void (*realCECallCogCodePopReceiverArg1Arg0Regs)(void);
+void (*realCECallCogCodePopReceiverReg)(void);
void (*realCEEnterCogCodePopReceiverReg)(void);
int traceFlags ;
sqInt traceStores;
Modified: branches/Cog/nscogsrc/vm/cogmethod.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogmethod.h 2014-07-03 13:49:59 UTC (rev 3031)
+++ branches/Cog/nscogsrc/vm/cogmethod.h 2014-07-06 04:01:13 UTC (rev 3032)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.798 uuid: f47e2c22-fea0-4762-b689-8b295a59d8ac
+ CCodeGenerator VMMaker.oscog-eem.804 uuid: 8f232d31-fa50-4134-8556-da8fc12ab32d
*/
typedef struct {
Modified: branches/Cog/nscogsrc/vm/cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.c 2014-07-03 13:49:59 UTC (rev 3031)
+++ branches/Cog/nscogsrc/vm/cointerp.c 2014-07-06 04:01:13 UTC (rev 3032)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.800 uuid: 33fd7d74-ad59-446d-ac56-1e9c2eb4c089
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.804 uuid: 8f232d31-fa50-4134-8556-da8fc12ab32d
from
- CoInterpreter VMMaker.oscog-eem.800 uuid: 33fd7d74-ad59-446d-ac56-1e9c2eb4c089
+ CoInterpreter VMMaker.oscog-eem.804 uuid: 8f232d31-fa50-4134-8556-da8fc12ab32d
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.800 uuid: 33fd7d74-ad59-446d-ac56-1e9c2eb4c089 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.804 uuid: 8f232d31-fa50-4134-8556-da8fc12ab32d " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -377,6 +377,7 @@
static void attemptToSwitchToMachineCode(sqInt bcpc) NoDbgRegParms;
EXPORT(sqInt) callbackEnter(sqInt *callbackID);
void callForCogCompiledCodeCompaction(void);
+static void callRegisterArgCogMethodatreceiver(CogMethod *cogMethod, sqInt entryOffset, sqInt rcvr) NoDbgRegParms;
void ceActivateFailingPrimitiveMethod(sqInt aPrimitiveMethod);
sqInt ceActiveContext(void);
sqInt ceBaseFrameReturn(sqInt returnValue);
@@ -418,7 +419,6 @@
void dumpPrimTraceLog(void);
void dumpTraceLog(void);
static void ensureContextIsExecutionSafeAfterAssignToStackPointer(sqInt aContext) NoDbgRegParms;
-static void enterRegisterArgCogMethodatreceiver(CogMethod *cogMethod, sqInt entryOffset, sqInt rcvr) NoDbgRegParms;
static sqInt enterSmalltalkExecutiveImplementation(void);
void executeCogMethodfromLinkedSendWithReceiver(CogMethod *cogMethod, sqInt rcvr);
void executeCogMethodfromLinkedSendWithReceiverandCacheTag(CogMethod *cogMethod, sqInt rcvr, sqInt cacheTag);
@@ -835,7 +835,7 @@
void printWronglySizedContexts(sqInt printContexts);
static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) 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;
static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms;
static sqInt sizeBitsOfSafe(sqInt oop) NoDbgRegParms;
@@ -2064,7 +2064,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.800";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.804";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -13146,7 +13146,7 @@
/* dont use and: so as to get Slang to inline cogit numRegArgs > 0 */
if (((cogMethod->cmNumArgs)) <= (numRegArgs())) {
- enterRegisterArgCogMethodatreceiver(cogMethod, noCheckEntryOffset(), rcvr);
+ callRegisterArgCogMethodatreceiver(cogMethod, noCheckEntryOffset(), rcvr);
}
/* begin push: */
@@ -13156,7 +13156,7 @@
/* begin push: */
longAtput((sp1 = GIV(stackPointer) - BytesPerWord), rcvr);
GIV(stackPointer) = sp1;
- ceEnterCogCodePopReceiverReg();
+ ceCallCogCodePopReceiverReg();
error("should not be reached");
}
/* begin push: */
@@ -13815,6 +13815,60 @@
}
+/* convert
+ rcvr base
+ arg(s)
+ retpc <- sp
+ to
+ retpc base
+ entrypc
+ rcvr
+ arg(s) <- sp
+ and then enter at either the checked or the unchecked entry-point. */
+
+static void
+callRegisterArgCogMethodatreceiver(CogMethod *cogMethod, sqInt entryOffset, sqInt rcvr)
+{ DECL_MAYBE_SQ_GLOBAL_STRUCT
+ sqInt object;
+ sqInt object1;
+ char *sp;
+ char *sp1;
+ char *sp2;
+
+ assert(((numRegArgs()) > 0)
+ && (((numRegArgs()) <= 2)
+ && (((cogMethod->cmNumArgs)) <= (numRegArgs()))));
+ if (((cogMethod->cmNumArgs)) == 2) {
+ longAtput(GIV(stackPointer) + (3 * BytesPerWord), longAt(GIV(stackPointer)));
+ /* begin push: */
+ object = longAt(GIV(stackPointer) + (1 * BytesPerWord));
+ longAtput((sp = GIV(stackPointer) - BytesPerWord), object);
+ GIV(stackPointer) = sp;
+ longAtput(GIV(stackPointer) + (1 * BytesPerWord), longAt(GIV(stackPointer) + (3 * BytesPerWord)));
+ longAtput(GIV(stackPointer) + (2 * BytesPerWord), rcvr);
+ longAtput(GIV(stackPointer) + (3 * BytesPerWord), (((sqInt)cogMethod)) + entryOffset);
+ ceCallCogCodePopReceiverArg1Arg0Regs();
+ }
+ if (((cogMethod->cmNumArgs)) == 1) {
+ longAtput(GIV(stackPointer) + (2 * BytesPerWord), longAt(GIV(stackPointer)));
+ /* begin push: */
+ object1 = longAt(GIV(stackPointer) + (1 * BytesPerWord));
+ longAtput((sp1 = GIV(stackPointer) - BytesPerWord), object1);
+ GIV(stackPointer) = sp1;
+ longAtput(GIV(stackPointer) + (1 * BytesPerWord), rcvr);
+ longAtput(GIV(stackPointer) + (2 * BytesPerWord), (((sqInt)cogMethod)) + entryOffset);
+ ceCallCogCodePopReceiverArg0Regs();
+ }
+ assert(((cogMethod->cmNumArgs)) == 0);
+ longAtput(GIV(stackPointer) + (1 * BytesPerWord), longAt(GIV(stackPointer)));
+ longAtput(GIV(stackPointer) + (0 * BytesPerWord), (((sqInt)cogMethod)) + entryOffset);
+ /* begin push: */
+ longAtput((sp2 = GIV(stackPointer) - BytesPerWord), rcvr);
+ GIV(stackPointer) = sp2;
+ ceCallCogCodePopReceiverReg();
+}
+
+
/* An external call or FFI primitive has failed. Build the frame and
activate as appropriate. Enter either the interpreter or machine
code depending on whether aPrimitiveMethod has been or is still
@@ -15857,60 +15911,6 @@
}
-/* convert
- rcvr base
- arg(s)
- retpc <- sp
- to
- retpc base
- entrypc
- rcvr
- arg(s) <- sp
- and then enter at either the checked or the unchecked entry-point. */
-
-static void
-enterRegisterArgCogMethodatreceiver(CogMethod *cogMethod, sqInt entryOffset, sqInt rcvr)
-{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt object;
- sqInt object1;
- char *sp;
- char *sp1;
- char *sp2;
-
- assert(((numRegArgs()) > 0)
- && (((numRegArgs()) <= 2)
- && (((cogMethod->cmNumArgs)) <= (numRegArgs()))));
- if (((cogMethod->cmNumArgs)) == 2) {
- longAtput(GIV(stackPointer) + (3 * BytesPerWord), longAt(GIV(stackPointer)));
- /* begin push: */
- object = longAt(GIV(stackPointer) + (1 * BytesPerWord));
- longAtput((sp = GIV(stackPointer) - BytesPerWord), object);
- GIV(stackPointer) = sp;
- longAtput(GIV(stackPointer) + (1 * BytesPerWord), longAt(GIV(stackPointer) + (3 * BytesPerWord)));
- longAtput(GIV(stackPointer) + (2 * BytesPerWord), rcvr);
- longAtput(GIV(stackPointer) + (3 * BytesPerWord), (((sqInt)cogMethod)) + entryOffset);
- ceEnterCogCodePopReceiverArg1Arg0Regs();
- }
- if (((cogMethod->cmNumArgs)) == 1) {
- longAtput(GIV(stackPointer) + (2 * BytesPerWord), longAt(GIV(stackPointer)));
- /* begin push: */
- object1 = longAt(GIV(stackPointer) + (1 * BytesPerWord));
- longAtput((sp1 = GIV(stackPointer) - BytesPerWord), object1);
- GIV(stackPointer) = sp1;
- longAtput(GIV(stackPointer) + (1 * BytesPerWord), rcvr);
- longAtput(GIV(stackPointer) + (2 * BytesPerWord), (((sqInt)cogMethod)) + entryOffset);
- ceEnterCogCodePopReceiverArg0Regs();
- }
- assert(((cogMethod->cmNumArgs)) == 0);
- longAtput(GIV(stackPointer) + (1 * BytesPerWord), longAt(GIV(stackPointer)));
- longAtput(GIV(stackPointer) + (0 * BytesPerWord), (((sqInt)cogMethod)) + entryOffset);
- /* begin push: */
- longAtput((sp2 = GIV(stackPointer) - BytesPerWord), rcvr);
- GIV(stackPointer) = sp2;
- ceEnterCogCodePopReceiverReg();
-}
-
-
/* Main entry-point into the interpreter at each execution level, where an
execution level is either the start of execution or reentry for a
callback. Capture the C stack
@@ -15969,7 +15969,7 @@
/* dont use and: so as to get Slang to inline cogit numRegArgs > 0 */
if (((cogMethod->cmNumArgs)) <= (numRegArgs())) {
- enterRegisterArgCogMethodatreceiver(cogMethod, entryOffset(), rcvr);
+ callRegisterArgCogMethodatreceiver(cogMethod, entryOffset(), rcvr);
}
/* begin push: */
@@ -15979,7 +15979,7 @@
/* begin push: */
longAtput((sp1 = GIV(stackPointer) - BytesPerWord), rcvr);
GIV(stackPointer) = sp1;
- ceEnterCogCodePopReceiverReg();
+ ceCallCogCodePopReceiverReg();
}
@@ -16018,13 +16018,13 @@
switch ((cogMethod->cmNumArgs)) {
case 0:
- ceEnter0ArgsPIC();
+ ceCall0ArgsPIC();
break;
case 1:
- ceEnter1ArgsPIC();
+ ceCall1ArgsPIC();
break;
case 2:
- ceEnter2ArgsPIC();
+ ceCall2ArgsPIC();
break;
default:
null;
@@ -16039,7 +16039,7 @@
/* begin push: */
longAtput((sp3 = GIV(stackPointer) - BytesPerWord), cacheTag);
GIV(stackPointer) = sp3;
- ceEnterCogCodePopReceiverAndClassRegs();
+ ceCallCogCodePopReceiverAndClassRegs();
}
@@ -16066,7 +16066,7 @@
/* dont use and: so as to get Slang to inline cogit numRegArgs > 0 */
if (((cogMethod->cmNumArgs)) <= (numRegArgs())) {
- enterRegisterArgCogMethodatreceiver(cogMethod, noCheckEntryOffset(), rcvr);
+ callRegisterArgCogMethodatreceiver(cogMethod, noCheckEntryOffset(), rcvr);
}
/* begin push: */
@@ -16076,7 +16076,7 @@
/* begin push: */
longAtput((sp1 = GIV(stackPointer) - BytesPerWord), rcvr);
GIV(stackPointer) = sp1;
- ceEnterCogCodePopReceiverReg();
+ ceCallCogCodePopReceiverReg();
}
@@ -25361,7 +25361,7 @@
/* begin push: */
longAtput((sp31 = GIV(stackPointer) - BytesPerWord), blockClosure);
GIV(stackPointer) = sp31;
- ceEnterCogCodePopReceiverReg();
+ ceCallCogCodePopReceiverReg();
goto l1;
}
if ((((((sqInt) methodHeader)) < 0
@@ -25412,7 +25412,7 @@
/* begin push: */
longAtput((sp32 = GIV(stackPointer) - BytesPerWord), blockClosure);
GIV(stackPointer) = sp32;
- ceEnterCogCodePopReceiverReg();
+ ceCallCogCodePopReceiverReg();
goto l1;
}
if (!GIV(cogCompiledCodeCompactionCalledFor)) {
@@ -25616,7 +25616,7 @@
/* begin push: */
longAtput((sp31 = GIV(stackPointer) - BytesPerWord), blockClosure);
GIV(stackPointer) = sp31;
- ceEnterCogCodePopReceiverReg();
+ ceCallCogCodePopReceiverReg();
goto l1;
}
if ((((((sqInt) methodHeader)) < 0
@@ -25667,7 +25667,7 @@
/* begin push: */
longAtput((sp32 = GIV(stackPointer) - BytesPerWord), blockClosure);
GIV(stackPointer) = sp32;
- ceEnterCogCodePopReceiverReg();
+ ceCallCogCodePopReceiverReg();
goto l1;
}
if (!GIV(cogCompiledCodeCompactionCalledFor)) {
@@ -25906,7 +25906,7 @@
/* begin push: */
longAtput((sp31 = GIV(stackPointer) - BytesPerWord), blockClosure);
GIV(stackPointer) = sp31;
- ceEnterCogCodePopReceiverReg();
+ ceCallCogCodePopReceiverReg();
goto l1;
}
if ((((((sqInt) methodHeader)) < 0
@@ -25957,7 +25957,7 @@
/* begin push: */
longAtput((sp32 = GIV(stackPointer) - BytesPerWord), blockClosure);
GIV(stackPointer) = sp32;
- ceEnterCogCodePopReceiverReg();
+ ceCallCogCodePopReceiverReg();
goto l1;
}
if (!GIV(cogCompiledCodeCompactionCalledFor)) {
@@ -36993,17 +36993,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;
@@ -37014,21 +37012,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;
@@ -37043,7 +37027,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)) {
@@ -37097,18 +37081,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)) {
@@ -38976,7 +38960,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/nscogsrc/vm/cointerp.h
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.h 2014-07-03 13:49:59 UTC (rev 3031)
@@ 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.804.mcz
==================== Summary ====================
Name: VMMaker.oscog-eem.804
Author: eem
Time: 5 July 2014, 8:43:20.915 pm
UUID: 8f232d31-fa50-4134-8556-da8fc12ab32d
Ancestors: VMMaker.oscog-tpr.803
Cogit:
Change the management of counters in Sista methods to
hold the counters well away from code. In V3 use malloc
to allocate and free them (this means Sista V3 is not
currently simulable). In Spur, store them in oldSpace in
pinned objects (hence Sista Spur simulates just fine).
Nuke unused variables in Cogit hierarchy.
Fix a few slips with the ceEnterCogCode => ceCallCogCode
putch in VMMaker.oscog-eem.802/tpr.803
Spur:
Fix bug in allocateSlotsForPinningInOldSpace:bytes:format:classIndex:
and make sure answered object is actually pinned. Hence
fix pinObject: & primitivePin.
Plugins:
Fix access to the characterTable in the ThreadedFFIPlugins.
Replace characterTable at: with characterObjectOf:, and in
Spur, support wide characters.
Fix divide-as-shift issue in BalloonEnginePlugin.
SImulator:
Fix offset of counters in CogSistaMethodSurrogates for
Spur.
Slang:
Make the generateDivide:on:indent: check for the divide-as-
shift issue pull in sqAssert.h.
Add generateAllSistaConfigurationsUnderVersionControl
convenience.
=============== Diff against VMMaker.oscog-tpr.803 ===============
Item was changed:
----- Method: BalloonEnginePlugin>>stepToNextBezierForward:at: (in category 'beziers-simple') -----
stepToNextBezierForward: updateData at: yValue
"Incrementally step to the next scan line in the given bezier update data.
Note: This method has been written so that inlining works, e.g.,
not declaring updateData as 'int*' but casting it on every use."
| minY lastX lastY fwDx fwDy |
<inline: true>
lastX := (self cCoerce: updateData to: 'int*') at: GBUpdateX.
lastY := (self cCoerce: updateData to: 'int*') at: GBUpdateY.
fwDx := (self cCoerce: updateData to: 'int*') at: GBUpdateDX.
fwDy := (self cCoerce: updateData to: 'int*') at: GBUpdateDY.
minY := yValue * 256.
"Step as long as we haven't yet reached minY and also
as long as fwDy is greater than zero thus stepping down.
Note: The test for fwDy should not be necessary in theory
but is a good insurance in practice."
[minY > lastY and:[fwDy >= 0]] whileTrue:[
+ lastX := lastX + ((fwDx + 16r8000) signedBitShift: -16).
+ lastY := lastY + ((fwDy + 16r8000) signedBitShift: -16).
- lastX := lastX + ((fwDx + 16r8000) // 16r10000).
- lastY := lastY + ((fwDy + 16r8000) // 16r10000).
fwDx := fwDx + ((self cCoerce: updateData to: 'int*') at: GBUpdateDDX).
fwDy := fwDy + ((self cCoerce: updateData to: 'int*') at: GBUpdateDDY).
].
(self cCoerce: updateData to: 'int*') at: GBUpdateX put: lastX.
(self cCoerce: updateData to: 'int*') at: GBUpdateY put: lastY.
(self cCoerce: updateData to: 'int*') at: GBUpdateDX put: fwDx.
(self cCoerce: updateData to: 'int*') at: GBUpdateDY put: fwDy.
+ ^lastX signedBitShift: -8
- ^lastX // 256
!
Item was changed:
----- Method: CCodeGenerator>>generateDivide:on:indent: (in category 'C translation') -----
generateDivide: msgNode on: aStream indent: level
"Generate the C code for this message onto the given stream."
| rcvr arg divisor check |
rcvr := msgNode receiver.
arg := msgNode args first.
check := false "If you need to check the validity of divides that had been implemented by signed shifts, change this to true..."
and: [arg isConstant
and: [(divisor := arg value) isInteger
and: [divisor isPowerOfTwo
and: [divisor > 0
and: [divisor <= (1 bitShift: 31)]]]]].
check ifTrue:
+ [(headerFiles includes: '"sqAssert.h"') ifFalse:
+ [self addHeaderFile: '"sqAssert.h"'].
+ aStream nextPut: $(; nextPutAll: 'assert(((sqInt) '.
- [aStream nextPut: $(; nextPutAll: 'assert(((sqInt) '.
self emitCExpression: rcvr on: aStream.
aStream nextPutAll: ' >> ', (divisor log: 2) asInteger printString.
aStream nextPutAll: ') == ('.
self emitCExpression: rcvr on: aStream.
aStream nextPutAll: ' / '.
self emitCExpression: msgNode args first on: aStream.
aStream nextPutAll: ')),'].
self emitCExpression: msgNode receiver on: aStream.
aStream nextPutAll: ' / '.
self emitCExpression: msgNode args first on: aStream.
check ifTrue:
[aStream nextPut: $)]!
Item was changed:
----- Method: CogBlockMethod class>>instVarNamesAndTypesForTranslationDo: (in category 'translation') -----
instVarNamesAndTypesForTranslationDo: aBinaryBlock
"enumerate aBinaryBlock with the names and C type strings for the
inst vars to include in a CogMethod or CogBlockMethod struct."
self allInstVarNames do:
[:ivn|
"Notionally objectHeader is in a union with homeOffset and startpc but
we don't have any convenient support for unions. So hack, hack, hack, hack."
((self == CogBlockMethod
ifTrue: [#('objectHeader')]
ifFalse: [#('homeOffset' 'startpc' 'padToWord')]) includes: ivn) ifFalse:
[aBinaryBlock
value: ivn
value: (ivn caseOf: {
['objectHeader'] -> [self objectMemoryClass baseHeaderSize = 8
ifTrue: [#sqLong]
ifFalse: [#sqInt]].
+ ['cmNumArgs'] -> [#(unsigned ' : 8')]. "SqueakV3 needs only 5 bits"
- ['cmNumArgs'] -> [#(unsigned ' : 8')]. "SqueakV3 needs only 5 bits"
['cmType'] -> [#(unsigned ' : 3')].
['cmRefersToYoung'] -> [#(unsigned #Boolean ' : 1')].
['cpicHasMNUCase'] -> [#(unsigned #Boolean ' : 1')].
+ ['cmUsageCount'] -> [#(unsigned ' : 3')]. "See CMMaxUsageCount in initialize"
- ['cmUsageCount'] -> [#(unsigned ' : 3')]. "see CMMaxUsageCount in initialize"
['cmUsesPenultimateLit'] -> [#(unsigned #Boolean ' : 1')].
['cmUsesMethodClass'] -> [#(unsigned #Boolean ' : 1')].
['cmUnusedFlags'] -> [#(unsigned ' : 2')].
+ ['stackCheckOffset'] -> [#(unsigned ' : 12')]. "See MaxStackCheckOffset in initialize. a.k.a. cPICNumCases"
+ ['blockSize'] -> [#'unsigned short']. "See MaxMethodSize in initialize"
- ['stackCheckOffset'] -> [#(unsigned ' : 12')]. "See MaxStackCheckOffset in initialize. a.k.a. cPICNumCases"
- ['blockSize'] -> [#'unsigned short']. "See MaxMethodSize in initialize"
['blockEntryOffset'] -> [#'unsigned short'].
['homeOffset'] -> [#'unsigned short'].
['startpc'] -> [#'unsigned short'].
['padToWord'] -> [#(#BaseHeaderSize 8 'unsigned int')].
+ ['nextMethod'] -> ['struct _CogMethod *']. "See NewspeakCogMethod"
+ ['counters'] -> [#usqInt]} "See SistaCogMethod"
- ['nextMethod'] -> ['struct _CogMethod *']} "see NewspeakCogMethod"
otherwise:
[#sqInt])]]!
Item was added:
+ ----- Method: CogObjectRepresentation>>allocateCounters: (in category 'sista support') -----
+ allocateCounters: nCounters
+ self subclassResponsibility!
Item was added:
+ ----- Method: CogObjectRepresentation>>freeCounters: (in category 'sista support') -----
+ freeCounters: theCounters
+ <var: #theCounters type: #usqInt>
+ self subclassResponsibility!
Item was added:
+ ----- Method: CogObjectRepresentation>>maybeMarkCounters: (in category 'sista support') -----
+ maybeMarkCounters: theCounters
+ "In SIsta Spur counters are held on the heap in pinned objects which must be marked
+ to avoid them being garbage collected. This is the hook through which that happens.
+ By default, do nothing."
+ <var: #counters type: #usqInt>
+ <inline: true>!
Item was added:
+ ----- Method: CogObjectRepresentation>>numCountersFor: (in category 'sista support') -----
+ numCountersFor: theCounters
+ <var: #counters type: #usqInt>
+ self subclassResponsibility!
Item was added:
+ ----- Method: CogObjectRepresentation>>resetCountersIn: (in category 'sista support') -----
+ resetCountersIn: cogMethod
+ <var: #cogMethod type: #'CogMethod *'>
+ <api>
+ self subclassResponsibility!
Item was added:
+ ----- Method: CogObjectRepresentationFor32BitSpur>>numCountersFor: (in category 'sista support') -----
+ numCountersFor: theCounters
+ <var: #theCounters type: #usqInt>
+ | objOop |
+ theCounters = 0 ifTrue:
+ [^0].
+ objOop := theCounters - objectMemory baseHeaderSize.
+ ^objectMemory numSlotsOf: objOop!
Item was added:
+ ----- Method: CogObjectRepresentationFor64BitSpur>>numCountersFor: (in category 'sista support') -----
+ numCountersFor: theCounters
+ <var: #theCounters type: #usqInt>
+ | objOop |
+ theCounters = 0 ifTrue:
+ [^0].
+ objOop := theCounters - objectMemory baseHeaderSize.
+ ^2 * (objectMemory numSlotsOf: objOop)!
Item was added:
+ ----- Method: CogObjectRepresentationForSpur>>allocateCounters: (in category 'sista support') -----
+ allocateCounters: nCounters
+ "On Spur allocate the counters on the heap as pinned objects. The
+ number of counters can be derived from the nbumber of slots in the obj."
+ <inline: true>
+ | objOop |
+ objOop := objectMemory allocatePinnedCounters: nCounters.
+ ^objOop
+ ifNil: [0]
+ ifNotNil: [objOop + objectMemory baseHeaderSize]!
Item was added:
+ ----- Method: CogObjectRepresentationForSpur>>freeCounters: (in category 'sista support') -----
+ freeCounters: theCounters
+ <var: #theCounters type: #usqInt>
+ <inline: true>
+ theCounters ~= 0 ifTrue:
+ [objectMemory freeObject: theCounters - objectMemory baseHeaderSize]!
Item was added:
+ ----- Method: CogObjectRepresentationForSpur>>maybeMarkCounters: (in category 'sista support') -----
+ maybeMarkCounters: theCounters
+ "In SIsta Spur counters are held on the heap in pinned objects which must be marked
+ to avoid them being garbage collected. This is the hook through which that happens."
+ <var: #counters type: #usqInt>
+ <inline: true>
+ theCounters ~= 0 ifTrue:
+ [objectMemory markAndTrace: theCounters - objectMemory baseHeaderSize]!
Item was added:
+ ----- Method: CogObjectRepresentationForSpur>>resetCountersIn: (in category 'sista support') -----
+ resetCountersIn: cogMethod
+ <var: #cogMethod type: #'CogMethod *'>
+ <api>
+ cogit fillInCounters: (self numCountersFor: cogMethod counters) atStartAddress: cogMethod counters!
Item was added:
+ ----- Method: CogObjectRepresentationForSqueakV3>>allocateCounters: (in category 'sista support') -----
+ allocateCounters: nCounters
+ "Malloc the counter space. Fill the first slot with the number of counters for resetCountersIn:"
+ | theCounters |
+ <var: #theCounters type: #usqInt>
+ theCounters := self malloc: nCounters + 1 * (self sizeof: #sqInt).
+ theCounters = 0 ifTrue:
+ [^theCounters].
+ self longAt: theCounters put: nCounters.
+ ^theCounters + (self sizeof: #sqInt)!
Item was added:
+ ----- Method: CogObjectRepresentationForSqueakV3>>freeCounters: (in category 'sista support') -----
+ freeCounters: theCounters
+ <var: #theCounters type: #usqInt>
+ theCounters ~= 0 ifTrue:
+ [self free: theCounters - (self sizeof: #sqInt)]!
Item was added:
+ ----- Method: CogObjectRepresentationForSqueakV3>>numCountersFor: (in category 'sista support') -----
+ numCountersFor: theCounters
+ <var: #theCounters type: #usqInt>
+ ^objectMemory longAt: theCounters - (self sizeof: #sqInt)!
Item was added:
+ ----- Method: CogObjectRepresentationForSqueakV3>>resetCountersIn: (in category 'sista support') -----
+ resetCountersIn: cogMethod
+ <var: #cogMethod type: #'CogMethod *'>
+ <api>
+ cogit
+ fillInCounters: (self numCountersFor: cogMethod counters)
+ atStartAddress: cogMethod counters!
Item was changed:
----- Method: CogSistaMethodSurrogate32 class>>alignedByteSize (in category 'accessing') -----
alignedByteSize
+ ^24 + self baseHeaderSize!
- ^28!
Item was changed:
----- Method: CogSistaMethodSurrogate32 class>>offsetOf: (in category 'accessing') -----
offsetOf: aByteSymbol
"These should be generated!!!!"
self assert: self objectMemoryClass baseHeaderSize = BaseHeaderSize.
+ ^aByteSymbol == #counters
- ^aByteSymbol == #numCounters
ifTrue: [20 + BaseHeaderSize]
ifFalse: [super offsetOf: aByteSymbol]!
Item was added:
+ ----- Method: CogSistaMethodSurrogate32>>counters (in category 'accessing') -----
+ counters
+ ^memory unsignedLongAt: address + 21 + baseHeaderSize!
Item was added:
+ ----- Method: CogSistaMethodSurrogate32>>counters: (in category 'accessing') -----
+ counters: aValue
+ ^memory
+ unsignedLongAt: address + 21 + baseHeaderSize
+ put: aValue!
Item was removed:
- ----- Method: CogSistaMethodSurrogate32>>numCounters (in category 'accessing') -----
- numCounters
- ^memory unsignedLongAt: address + 21 + baseHeaderSize!
Item was removed:
- ----- Method: CogSistaMethodSurrogate32>>numCounters: (in category 'accessing') -----
- numCounters: aValue
- ^memory
- unsignedLongAt: address + 21 + baseHeaderSize
- put: aValue!
Item was changed:
----- Method: CogSistaMethodSurrogate64 class>>alignedByteSize (in category 'accessing') -----
alignedByteSize
+ ^40 + self baseHeaderSize!
- ^48!
Item was changed:
----- Method: CogSistaMethodSurrogate64 class>>offsetOf: (in category 'accessing') -----
offsetOf: aByteSymbol
"These should be generated!!!!"
self assert: self objectMemoryClass baseHeaderSize = BaseHeaderSize.
+ ^aByteSymbol == #counters
- ^aByteSymbol == #numCounters
ifTrue: [32 + BaseHeaderSize]
ifFalse: [super offsetOf: aByteSymbol]!
Item was added:
+ ----- Method: CogSistaMethodSurrogate64>>counters (in category 'accessing') -----
+ counters
+ ^memory unsignedLongLongAt: address + 33 + baseHeaderSize!
Item was added:
+ ----- Method: CogSistaMethodSurrogate64>>counters: (in category 'accessing') -----
+ counters: aValue
+ ^memory
+ unsignedLongLongAt: address + 33 + baseHeaderSize
+ put: aValue!
Item was removed:
- ----- Method: CogSistaMethodSurrogate64>>numCounters (in category 'accessing') -----
- numCounters
- ^memory unsignedLongLongAt: address + 33 + baseHeaderSize!
Item was removed:
- ----- Method: CogSistaMethodSurrogate64>>numCounters: (in category 'accessing') -----
- numCounters: aValue
- ^memory
- unsignedLongLongAt: address + 33 + baseHeaderSize
- put: aValue!
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 maxLitIndex ceMethodAbortTrampoline cePICAbortTrampoline ceCheckForInterruptTrampoline ceCPICMissTrampoline ceReturnToInterpreterTrampoline ceBaseFrameReturnTrampoline ceSendMustBeBooleanAddTrueTrampoline ceSendMustBeBooleanAddFalseTrampoline ceCannotResumeTrampoline ceEnterCogCodePopReceiverReg ceCallCogCodePopReceiverReg ceCallCogCodePopReceiverAndClassRegs cePrimReturnEnterCogCode cePrimReturnEnterCogCodeProfiling ceNonLocalReturnTrampoline ceFetchContextInstVarTrampoline ceStoreContextInstVarTrampoline ceImplicitReceiverTrampoline ceExplicitReceiverTrampoline ceCaptureCStackPointers ceFlushICache ceCheckFeaturesFunction ceTraceLinkedSendTrampoline ceTraceBlockActivationTrampoline ceTraceStoreTrampoline ceGetSP sendTrampolines superSendTrampolines dynamicSuperSendTrampolines firstSend lastSend realCEEnterCogCodePopReceiverReg realCECallCogCodePopReceiverReg realCECallCogCodePopReceiverAndClassRegs trampolineTableIndex trampolineAddresses objectReferencesInRuntime runtimeObjectRefIndex cFramePointerInUse debugPrimCallStackOffset ceTryLockVMOwner ceUnlockVMOwner cogMethodSurrogateClass cogBlockMethodSurrogateClass extA extB'
- 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 ceCallCogCodePopReceiverReg ceCallCogCodePopReceiverAndClassRegs cePrimReturnEnterCogCode cePrimReturnEnterCogCodeProfiling ceNonLocalReturnTrampoline ceFetchContextInstVarTrampoline ceStoreContextInstVarTrampoline ceImplicitReceiverTrampoline ceExplicitReceiverTrampoline ceCaptureCStackPointers ceFlushICache ceCheckFeaturesFunction ceTraceLinkedSendTrampoline ceTraceBlockActivationTrampoline ceTraceStoreTrampoline ceGetSP sendTrampolines superSendTrampolines dynamicSuperSendTrampolines firstSend lastSend realCEEnterCogCodePopReceiverReg realCECallCogCodePopReceiverReg realCECallCogCodePopReceiverAndClassRegs 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'
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>>mustBeGlobal: (in category 'translation') -----
mustBeGlobal: var
"Answer if a variable must be global and exported. Used for inst vars that are accessed from VM
support code. include cePositive32BitIntegerTrampoline as a hack to prevent it being inlined (it is
only used outside of Cogit by the object representation). Include CFramePointer CStackPointer as
a hack to get them declared at all."
^#('ceBaseFrameReturnTrampoline' 'ceCaptureCStackPointers' 'ceCheckForInterruptTrampoline'
'ceEnterCogCodePopReceiverReg' 'realCEEnterCogCodePopReceiverReg'
+ 'ceCallCogCodePopReceiverReg' 'realCECallCogCodePopReceiverReg'
+ 'ceCallCogCodePopReceiverAndClassRegs' 'realCECallCogCodePopReceiverAndClassRegs'
- 'ceEnterCogCodePopReceiverAndClassRegs' 'realCEEnterCogCodePopReceiverAndClassRegs'
'ceReturnToInterpreterTrampoline' 'ceCannotResumeTrampoline'
'ceTryLockVMOwner' 'ceUnlockVMOwner'
'cmEntryOffset' 'cmNoCheckEntryOffset' 'cmDynSuperEntryOffset' 'missOffset'
'blockNoContextSwitchOffset' 'breakPC'
'CFramePointer' 'CStackPointer' 'cFramePointerInUse' 'ceGetSP'
'traceFlags' 'traceStores' 'debugPrimCallStackOffset')
includes: var!
Item was changed:
----- Method: Cogit>>cog:selector: (in category 'jit - api') -----
cog: aMethodObj selector: aSelectorOop
"Attempt to produce a machine code method for the bytecode method
object aMethodObj. N.B. If there is no code memory available do *NOT*
attempt to reclaim the method zone. Certain clients (e.g. ceSICMiss:)
depend on the zone remaining constant across method generation."
<api>
<returnTypeC: #'CogMethod *'>
| cogMethod |
<var: #cogMethod type: #'CogMethod *'>
self assert: ((coInterpreter methodHasCogMethod: aMethodObj) not
or: [(self noAssertMethodClassAssociationOf: aMethodObj) = objectMemory nilObject]).
"coInterpreter stringOf: aSelectorOop"
coInterpreter
compilationBreak: aSelectorOop
point: (objectMemory lengthOf: aSelectorOop).
aMethodObj = breakMethod ifTrue: [self halt: 'Compilation of breakMethod'].
self cppIf: NewspeakVM
ifTrue: [cogMethod := methodZone findPreviouslyCompiledVersionOf: aMethodObj with: aSelectorOop.
cogMethod ifNotNil:
[(coInterpreter methodHasCogMethod: aMethodObj) not ifTrue:
[self assert: (coInterpreter rawHeaderOf: aMethodObj) = cogMethod methodHeader.
cogMethod methodObject: aMethodObj.
coInterpreter rawHeaderOf: aMethodObj put: cogMethod asInteger].
^cogMethod]].
"If the generators for the alternate bytecode set are missing then interpret."
(coInterpreter methodUsesAlternateBytecodeSet: aMethodObj)
ifTrue:
[(self numElementsIn: generatorTable) <= 256 ifTrue:
[^nil].
bytecodeSetOffset := 256]
ifFalse:
[bytecodeSetOffset := 0].
extA := extB := 0.
objectRepresentation ensureNoForwardedLiteralsIn: aMethodObj.
methodObj := aMethodObj.
cogMethod := self compileCogMethod: aSelectorOop.
(cogMethod asInteger between: MaxNegativeErrorCode and: -1) ifTrue:
[cogMethod asInteger = InsufficientCodeSpace ifTrue:
[coInterpreter callForCogCompiledCodeCompaction].
+ self maybeFreeCounters.
+ "Right now no errors should be reported, so nothing more to do."
+ "self reportError: (self cCoerceSimple: cogMethod to: #sqInt)."
- "Right now no errors should be reported, so nothing more to do."
- "self reportError: (self cCoerceSimple: cogMethod to: #sqInt)."
^nil].
"self cCode: ''
inSmalltalk:
[coInterpreter printCogMethod: cogMethod.
""coInterpreter symbolicMethod: aMethodObj.""
self assertValidMethodMap: cogMethod."
"self disassembleMethod: cogMethod."
"printInstructions := clickConfirm := true""]."
^cogMethod!
Item was changed:
----- Method: Cogit>>compileCogMethod: (in category 'compile abstract instructions') -----
compileCogMethod: selector
<returnTypeC: #'CogMethod *'>
| numBytecodes numBlocks numCleanBlocks result extra |
hasYoungReferent := (objectMemory isYoungObject: methodObj)
or: [objectMemory isYoung: selector].
methodOrBlockNumArgs := coInterpreter argumentCountOf: methodObj.
inBlock := false.
primInvokeLabel := nil.
postCompileHook := nil.
maxLitIndex := -1.
usesMethodClass := false.
extra := ((primitiveIndex := coInterpreter primitiveIndexOf: methodObj) > 0
and: [(coInterpreter isQuickPrimitiveIndex: primitiveIndex) not])
ifTrue: [30]
ifFalse: [10].
initialPC := coInterpreter startPCOfMethod: methodObj.
"initial estimate. Actual endPC is determined in scanMethod."
endPC := (coInterpreter isQuickPrimitiveIndex: primitiveIndex)
ifTrue: [initialPC - 1]
ifFalse: [objectMemory byteLengthOf: methodObj].
numBytecodes := endPC - initialPC + 1.
self allocateOpcodes: (numBytecodes + extra) * 10
bytecodes: numBytecodes
ifFail: [^coInterpreter cCoerceSimple: MethodTooBig to: #'CogMethod *'].
(numBlocks := self scanMethod) < 0 ifTrue:
[^coInterpreter cCoerceSimple: numBlocks to: #'CogMethod *'].
numCleanBlocks := self scanForCleanBlocks.
self allocateBlockStarts: numBlocks + numCleanBlocks.
blockCount := 0.
numCleanBlocks > 0 ifTrue:
[self addCleanBlockStarts].
+ self maybeAllocAndInitCounters ifFalse: "Inaccurate error code, but it'll do. This will likely never fail."
+ [^coInterpreter cCoerceSimple: InsufficientCodeSpace to: #'CogMethod *'].
- self maybeAllocAndInitCounters.
blockEntryLabel := nil.
methodLabel dependent: nil.
(result := self compileEntireMethod) < 0 ifTrue:
[^coInterpreter cCoerceSimple: result to: #'CogMethod *'].
^self generateCogMethod: selector!
Item was changed:
----- Method: Cogit>>genCallEnilopmartFor:and:called: (in category 'initialization') -----
genCallEnilopmartFor: regArg1 and: regArg2 called: trampolineName
"An enilopmart (the reverse of a trampoline) is a piece of code that makes
the system-call-like transition from the C runtime into generated machine
code. This version is for entering code as if from a call. The desired
arguments and entry-point are pushed on a stackPage's stack, and beneath
them is the call's return address. The enilopmart pops off the values to be
loaded into registers, and on CISCs then executes a return instruction to pop
off the entry-point and jump to it. On RISCs the enilopmart pops off the values
to be loaded into registers, pops the entry-point into a scratch register, pops
the return address into the LinkReg and then jumps to the entry point.
BEFORE AFTER (stacks grow down)
whatever stackPointer -> whatever
call return pc
target address => reg1 = reg1val, etc
reg1val LinkReg = call return pc
stackPointer -> reg2val pc = target address
C.F. genEnilopmartFor:and:and:called:"
+ <returnTypeC: 'void (*genCallEnilopmartForandcalled(sqInt regArg1, sqInt regArg2, char *trampolineName))(void)'>
- <returnTypeC: 'void (*genCallEnilopmartForandandcalled(sqInt regArg1, sqInt regArg2, char *trampolineName))(void)'>
| size endAddress enilopmart |
opcodeIndex := 0.
backEnd genLoadStackPointers.
self PopR: regArg2.
self PopR: regArg1.
backEnd hasLinkRegister
ifTrue:
[self PopR: TempReg.
self PopR: LinkReg.
self JumpR: TempReg]
ifFalse:
[self RetN: 0].
self computeMaximumSizes.
size := self generateInstructionsAt: methodZoneBase.
endAddress := self outputInstructionsAt: methodZoneBase.
self assert: methodZoneBase + size = endAddress.
enilopmart := methodZoneBase.
methodZoneBase := self alignUptoRoutineBoundary: endAddress.
backEnd nopsFrom: endAddress to: methodZoneBase - 1.
self recordGeneratedRunTime: trampolineName address: enilopmart.
^self cCoerceSimple: enilopmart to: #'void (*)(void)'!
Item was changed:
----- Method: Cogit>>genCallEnilopmartFor:called: (in category 'initialization') -----
genCallEnilopmartFor: regArg1 called: trampolineName
"An enilopmart (the reverse of a trampoline) is a piece of code that makes
the system-call-like transition from the C runtime into generated machine
code. This version is for entering code as if from a call. The desired
arguments and entry-point are pushed on a stackPage's stack, and beneath
them is the call's return address. The enilopmart pops off the values to be
loaded into registers, and on CISCs then executes a return instruction to pop
off the entry-point and jump to it. On RISCs the enilopmart pops off the values
to be loaded into registers, pops the entry-point into a scratch register, pops
the return address into the LinkReg and then jumps to the entry point.
BEFORE AFTER (stacks grow down)
whatever stackPointer -> whatever
call return pc reg1 = reg1val
target address => LinkReg = call return pc
stackPointer -> reg1val pc = target address
C.F. genEnilopmartFor:and:and:called:"
+ <returnTypeC: 'void (*genCallEnilopmartForcalled(sqInt regArg1, char *trampolineName))(void)'>
- <returnTypeC: 'void (*genCallEnilopmartForandandcalled(sqInt regArg1, char *trampolineName))(void)'>
| size endAddress enilopmart |
opcodeIndex := 0.
backEnd genLoadStackPointers.
self PopR: regArg1.
backEnd hasLinkRegister
ifTrue:
[self PopR: TempReg.
self PopR: LinkReg.
self JumpR: TempReg]
ifFalse:
[self RetN: 0].
self computeMaximumSizes.
size := self generateInstructionsAt: methodZoneBase.
endAddress := self outputInstructionsAt: methodZoneBase.
self assert: methodZoneBase + size = endAddress.
enilopmart := methodZoneBase.
methodZoneBase := self alignUptoRoutineBoundary: endAddress.
backEnd nopsFrom: endAddress to: methodZoneBase - 1.
self recordGeneratedRunTime: trampolineName address: enilopmart.
^self cCoerceSimple: enilopmart to: #'void (*)(void)'!
Item was changed:
----- Method: Cogit>>genEnilopmartFor:and:called: (in category 'initialization') -----
genEnilopmartFor: regArg1 and: regArg2 called: trampolineName
"An enilopmart (the reverse of a trampoline) is a piece of code that makes
the system-call-like transition from the C runtime into generated machine
code. The desired arguments and entry-point are pushed on a stackPage's
stack. The enilopmart pops off the values to be loaded into registers and
then executes a return instruction to pop off the entry-point and jump to it.
BEFORE AFTER (stacks grow down)
whatever stackPointer -> whatever
target address => reg1 = reg1val, etc
reg1val pc = target address
stackPointer -> reg2val
C.F. genCallEnilopmartFor:and:and:called:"
+ <returnTypeC: 'void (*genEnilopmartForandcalled(sqInt regArg1, sqInt regArg2, char *trampolineName))(void)'>
- <returnTypeC: 'void (*genEnilopmartForandandcalled(sqInt regArg1, sqInt regArg2, char *trampolineName))(void)'>
| size endAddress enilopmart |
opcodeIndex := 0.
backEnd genLoadStackPointers.
self PopR: regArg2.
self PopR: regArg1.
backEnd hasLinkRegister
ifTrue: [backEnd hasPCRegister
ifTrue: [self PopR: PCReg]
ifFalse: [self PopR: LinkReg; RetN: 0]]
ifFalse: [self RetN: 0].
self computeMaximumSizes.
size := self generateInstructionsAt: methodZoneBase.
endAddress := self outputInstructionsAt: methodZoneBase.
self assert: methodZoneBase + size = endAddress.
enilopmart := methodZoneBase.
methodZoneBase := self alignUptoRoutineBoundary: endAddress.
backEnd nopsFrom: endAddress to: methodZoneBase - 1.
self recordGeneratedRunTime: trampolineName address: enilopmart.
^self cCoerceSimple: enilopmart to: #'void (*)(void)'!
Item was changed:
----- Method: Cogit>>genEnilopmartFor:called: (in category 'initialization') -----
genEnilopmartFor: regArg1 called: trampolineName
"An enilopmart (the reverse of a trampoline) is a piece of code that makes
the system-call-like transition from the C runtime into generated machine
code. The desired arguments and entry-point are pushed on a stackPage's
stack. The enilopmart pops off the values to be loaded into registers and
then executes a return instruction to pop off the entry-point and jump to it.
BEFORE AFTER (stacks grow down)
whatever stackPointer -> whatever
target address => reg1 = reg1val
stackPointer -> reg1val pc = target address
C.F. genCallEnilopmartFor:and:and:called:"
+ <returnTypeC: 'void (*genEnilopmartForcalled(sqInt regArg1, char *trampolineName))(void)'>
- <returnTypeC: 'void (*genEnilopmartForandandcalled(sqInt regArg1, char *trampolineName))(void)'>
| size endAddress enilopmart |
opcodeIndex := 0.
backEnd genLoadStackPointers.
self PopR: regArg1.
backEnd hasLinkRegister
ifTrue: [backEnd hasPCRegister
ifTrue: [self PopR: PCReg]
ifFalse: [self PopR: LinkReg; RetN: 0]]
ifFalse: [self RetN: 0].
self computeMaximumSizes.
size := self generateInstructionsAt: methodZoneBase.
endAddress := self outputInstructionsAt: methodZoneBase.
self assert: methodZoneBase + size = endAddress.
enilopmart := methodZoneBase.
methodZoneBase := self alignUptoRoutineBoundary: endAddress.
backEnd nopsFrom: endAddress to: methodZoneBase - 1.
self recordGeneratedRunTime: trampolineName address: enilopmart.
^self cCoerceSimple: enilopmart to: #'void (*)(void)'!
Item was changed:
----- Method: Cogit>>generateEnilopmarts (in category 'initialization') -----
generateEnilopmarts
"Enilopmarts transfer control from C into machine code (backwards trampolines)."
self cppIf: Debug
ifTrue:
[realCEEnterCogCodePopReceiverReg :=
self genEnilopmartFor: ReceiverResultReg
called: 'realCEEnterCogCodePopReceiverReg'.
ceEnterCogCodePopReceiverReg := #enterCogCodePopReceiver.
realCECallCogCodePopReceiverReg :=
self genCallEnilopmartFor: ReceiverResultReg
called: 'realCEEnterCogCodePopReceiverReg'.
+ ceCallCogCodePopReceiverReg := #callCogCodePopReceiver.
- ceEnterCogCodePopReceiverReg := #callCogCodePopReceiver.
realCECallCogCodePopReceiverAndClassRegs :=
self genCallEnilopmartFor: ReceiverResultReg
and: ClassReg
called: 'realCECallCogCodePopReceiverAndClassRegs'.
ceCallCogCodePopReceiverAndClassRegs := #callCogCodePopReceiverAndClassRegs]
ifFalse:
[ceEnterCogCodePopReceiverReg := self genEnilopmartFor: ReceiverResultReg
called: 'ceEnterCogCodePopReceiverReg'.
ceCallCogCodePopReceiverReg := self genCallEnilopmartFor: ReceiverResultReg
called: 'ceCallCogCodePopReceiverReg'.
ceCallCogCodePopReceiverAndClassRegs :=
self genCallEnilopmartFor: ReceiverResultReg
and: ClassReg
called: 'ceCallCogCodePopReceiverAndClassRegs'].
self genPrimReturnEnterCogCodeEnilopmart: false.
cePrimReturnEnterCogCode := methodZoneBase.
self outputInstructionsForGeneratedRuntimeAt: cePrimReturnEnterCogCode.
self recordGeneratedRunTime: 'cePrimReturnEnterCogCode' address: cePrimReturnEnterCogCode.
self genPrimReturnEnterCogCodeEnilopmart: true.
cePrimReturnEnterCogCodeProfiling := methodZoneBase.
self outputInstructionsForGeneratedRuntimeAt: cePrimReturnEnterCogCodeProfiling.
self recordGeneratedRunTime: 'cePrimReturnEnterCogCodeProfiling' address: cePrimReturnEnterCogCodeProfiling!
Item was changed:
----- Method: Cogit>>markAndTraceLiteralsIn: (in category 'garbage collection') -----
markAndTraceLiteralsIn: cogMethod
<option: #SpurMemoryManager>
"Unlink sends that have unmarked classes in inline caches or freed/freeable targets.
Nil-out inline caches linked to open PICs.
Assert that any selectors are marked. We can do this since
this is only run on marked methods and thus any selectors they
reference should already be marked."
<var: #cogMethod type: #'CogMethod *'>
<inline: true>
self assert: ((cogMethod cmType = CMMethod
and: [objectMemory isMarked: cogMethod methodObject])
or: [cogMethod cmType = CMOpenPIC
and: [(objectMemory isImmediate: cogMethod selector)
or: [objectMemory isMarked: cogMethod selector]]]).
objectRepresentation markAndTraceLiteral: cogMethod selector.
+ self maybeMarkCountersIn: cogMethod.
self mapFor: cogMethod
performUntil: #markLiterals:pc:method:
arg: cogMethod asInteger!
Item was changed:
----- Method: Cogit>>markLiteralsAndUnlinkUnmarkedSendsIn: (in category 'garbage collection') -----
markLiteralsAndUnlinkUnmarkedSendsIn: cogMethod
"Unlink sends that have unmarked classes in inline caches or freed/freeable targets.
Nil-out inline caches linked to open PICs.
Assert that any selectors are marked. We can do this since
this is only run on marked methods and thus any selectors they
reference should already be marked."
<var: #cogMethod type: #'CogMethod *'>
<inline: true>
self assert: cogMethod cmType = CMMethod.
self assert: (objectMemory isMarked: cogMethod methodObject).
objectRepresentation markAndTraceLiteral: cogMethod selector.
+ self maybeMarkCountersIn: cogMethod.
self mapFor: cogMethod
performUntil: #markLiteralsAndUnlinkIfUnmarkedSend:pc:method:
arg: cogMethod asInteger!
Item was changed:
----- Method: Cogit>>maybeAllocAndInitCounters (in category 'compile abstract instructions') -----
maybeAllocAndInitCounters
"No-op in the non-Sista Cogits..."
+ <inline: true>
+ ^true!
- <inline: true>!
Item was added:
+ ----- Method: Cogit>>maybeFreeCounters (in category 'compile abstract instructions') -----
+ maybeFreeCounters
+ "No-op in the non-Sista Cogits..."
+ <inline: true>!
Item was added:
+ ----- Method: Cogit>>maybeMarkCountersIn: (in category 'garbage collection') -----
+ maybeMarkCountersIn: cogMethod
+ "In SIsta Spur counters are held on the heap in pinned objects which must be marked
+ to avoid them being garbage collected. This is the hook through which that happens."
+ <var: #cogMethod type: #'CogMethod *'>!
Item was changed:
----- Method: Cogit>>printMethodHeader:on: (in category 'disassembly') -----
printMethodHeader: cogMethod on: aStream
<doNotGenerate>
self cCode: ''
inSmalltalk:
[cogMethod isInteger ifTrue:
[^self printMethodHeader: (self cogMethodOrBlockSurrogateAt: cogMethod) on: aStream]].
aStream ensureCr.
cogMethod asInteger printOn: aStream base: 16.
aStream crtab.
cogMethod cmType = CMMethod ifTrue:
[aStream nextPutAll: 'objhdr: '.
cogMethod objectHeader printOn: aStream base: 16].
cogMethod cmType = CMBlock ifTrue:
[aStream nextPutAll: 'homemth: '.
cogMethod cmHomeMethod asUnsignedInteger printOn: aStream base: 16.
aStream crtab; nextPutAll: 'startpc: '; print: cogMethod startpc].
aStream
crtab; nextPutAll: 'nArgs: '; print: cogMethod cmNumArgs;
tab; nextPutAll: 'type: '; print: cogMethod cmType.
(cogMethod cmType ~= 0 and: [cogMethod cmType ~= CMBlock]) ifTrue:
[aStream crtab; nextPutAll: 'blksiz: '.
cogMethod blockSize printOn: aStream base: 16.
aStream crtab; nextPutAll: 'method: '.
cogMethod methodObject printOn: aStream base: 16.
aStream crtab; nextPutAll: 'mthhdr: '.
cogMethod methodHeader printOn: aStream base: 16.
aStream crtab; nextPutAll: 'selctr: '.
cogMethod selector printOn: aStream base: 16.
(coInterpreter lookupAddress: cogMethod selector) ifNotNil:
[:string| aStream nextPut: $=; nextPutAll: string].
aStream crtab; nextPutAll: 'blkentry: '.
cogMethod blockEntryOffset printOn: aStream base: 16.
cogMethod blockEntryOffset ~= 0 ifTrue:
[aStream nextPutAll: ' => '.
cogMethod asInteger + cogMethod blockEntryOffset printOn: aStream base: 16]].
cogMethod cmType = CMClosedPIC
ifTrue:
[aStream crtab; nextPutAll: 'cPICNumCases: '.
cogMethod cPICNumCases printOn: aStream base: 16.]
ifFalse:
[aStream crtab; nextPutAll: 'stackCheckOffset: '.
cogMethod stackCheckOffset printOn: aStream base: 16.
cogMethod stackCheckOffset > 0 ifTrue:
[aStream nextPut: $/.
cogMethod asInteger + cogMethod stackCheckOffset printOn: aStream base: 16].
cogMethod cmType ~= CMBlock ifTrue:
[aStream
crtab;
nextPutAll: 'cmRefersToYoung: ';
nextPutAll: (cogMethod cmRefersToYoung ifTrue: ['yes'] ifFalse: ['no'])].
cogMethod cmType = CMMethod ifTrue:
+ [([cogMethod counters] on: MessageNotUnderstood do: [:ex| nil]) ifNotNil:
+ [:cntrs| aStream crtab; nextPutAll: 'counters: '.
+ cntrs = 0 ifTrue: [aStream print: cntrs] ifFalse: [self printHex: cntrs]]]].
- [([cogMethod numCounters] on: MessageNotUnderstood do: [:ex| nil]) ifNotNil:
- [:nc| aStream crtab; nextPutAll: 'numCounters: '; print: nc]]].
aStream cr; flush!
Item was changed:
CogMethod subclass: #SistaCogMethod
+ instanceVariableNames: 'counters'
- instanceVariableNames: 'numCounters'
classVariableNames: ''
poolDictionaries: ''
category: 'VMMaker-JIT'!
+
+ !SistaCogMethod commentStamp: 'eem 7/4/2014 11:59' prior: 0!
+ A SistaCogMethod is a CogMethod with a pointer to memory holding the Sista performance counters decremented in conditional branches.
+
+ Instance Variables
+ counters: <pointer>
+
+ counters
+ - counters points to the first field of either a pinned object on the Spur heap or malloced memory.
+ !
Item was added:
+ ----- Method: SistaCogMethod>>counters (in category 'accessing') -----
+ counters
+ "Answer the value of counters"
+
+ ^ counters!
Item was added:
+ ----- Method: SistaCogMethod>>counters: (in category 'accessing') -----
+ counters: anObject
+ "Set the value of counters"
+
+ ^counters := anObject!
Item was removed:
- ----- Method: SistaCogMethod>>numCounters (in category 'accessing') -----
- numCounters
- "Answer the value of numCounters"
-
- ^ numCounters!
Item was removed:
- ----- Method: SistaCogMethod>>numCounters: (in category 'accessing') -----
- numCounters: anObject
- "Set the value of numCounters"
-
- ^numCounters := anObject!
Item was changed:
StackToRegisterMappingCogit subclass: #SistaStackToRegisterMappingCogit
+ instanceVariableNames: 'picDataIndex picData numCounters counters counterIndex initialCounterValue prevMapAbsPCMcpc'
- instanceVariableNames: 'picDataIndex picData numCounters counters counterIndex initialCounterValue counterMethodCache prevMapAbsPCMcpc'
classVariableNames: 'CounterBytes MaxCounterValue'
poolDictionaries: 'VMSqueakClassIndices'
category: 'VMMaker-JIT'!
!SistaStackToRegisterMappingCogit commentStamp: 'eem 4/7/2014 12:23' prior: 0!
A SistaStackToRegisterMappingCogit is a refinement of StackToRegisterMappingCogit that generates code suitable for dynamic optimization by Sista, the Speculative Inlining Smalltalk Architecture, a project by Clément Bera and Eliot Miranda. Sista is an optimizer that exists in the Smalltalk image, /not/ in the VM, and optimizes by substituting normal bytecoded methods by optimized bytecoded methods that may use special bytecodes for which the Cogit can generate faster code. These bytecodes eliminate overheads such as bounds checks or polymorphic code (indexing Array, ByteArray, String etc). But the bulk of the optimization performed is in inlining blocks and sends for the common path.
The basic scheme is that SistaStackToRegisterMappingCogit generates code containing performance counters. When these counters trip, a callback into the image is performed, at which point Sista analyses some portion of the stack, looking at performance data for the methods on the stack, and optimises based on the stack and performance data. Execution then resumes in the optimized code.
SistaStackToRegisterMappingCogit adds counters to conditional branches. Each branch has an executed and a taken count, implemented at the two 16-bit halves of a single 32-bit word. Each counter pair is initialized with initialCounterValue. On entry to the branch the executed count is decremented and if the count goes below zero the ceMustBeBooleanAdd[True|False] trampoline called. The trampoline distinguishes between true mustBeBoolean and counter trips because in the former the register temporarily holding the counter value will contain zero. Then the condition is tested, and if the branch is taken the taken count is decremented. The two counter values allow an optimizer to collect basic block execution paths and to know what are the "hot" paths through execution that are worth agressively optimizing. Since conditional branches are about 1/6 as frequent as sends, and since they can be used to determine the hot path through code, they are a better choice to count than, for example, method or block entry.
SistaStackToRegisterMappingCogit implements picDataFor:into: that fills an Array with the state of the counters in a method and the state of each linked send in a method. This is used to implement a primitive used by the optimizer to answer the branch and send data for a method as an Array.
Instance Variables
counterIndex: <Integer>
counterMethodCache: <CogMethod>
counters: <Array of AbstractInstruction>
initialCounterValue: <Integer>
numCounters: <Integer>
picData: <Integer Oop>
picDataIndex: <Integer>
prevMapAbsPCMcpc: <Integer>
counterIndex
- xxxxx
counterMethodCache
- xxxxx
counters
- xxxxx
initialCounterValue
- xxxxx
numCounters
- xxxxx
picData
- xxxxx
picDataIndex
- xxxxx
prevMapAbsPCMcpc
- xxxxx
!
Item was changed:
----- Method: SistaStackToRegisterMappingCogit class>>declareCVarsIn: (in category 'translation') -----
declareCVarsIn: aCodeGen
+ aCodeGen var: 'counters' type: #usqInt!
- aCodeGen
- var: 'counters'
- type: #'AbstractInstruction *'!
Item was removed:
- ----- Method: SistaStackToRegisterMappingCogit>>addressIsInInstructions: (in category 'testing') -----
- addressIsInInstructions: address
- <var: #address type: #'AbstractInstruction *'>
- ^self cCode:
- 'address >= &abstractOpcodes[0] && address < &abstractOpcodes[opcodeIndex]
- || address >= &counters[0] && address < &counters[counterIndex]'
- inSmalltalk:
- [((abstractOpcodes object identityIndexOf: address) between: 1 and: opcodeIndex)
- or: [(counters object identityIndexOf: address) between: 1 and: counterIndex]]!
Item was removed:
- ----- Method: SistaStackToRegisterMappingCogit>>allocateCounters (in category 'initialization') -----
- allocateCounters
- "Allocate the structures used to manage counting conditional branch
- compilation. This needs to be a macro since the structures are alloca'ed
- (stack allocated) to ensure their being freed when compilation is done."
- <cmacro: '() do { \
- counters = numCounters ? alloca(sizeof(AbstractInstruction) * numCounters) : 0; \
- } while (0)'>
- counters := CArrayAccessor on:
- ((1 to: numCounters) collect:
- [:ign| backEnd class new])!
Item was changed:
----- Method: SistaStackToRegisterMappingCogit>>compileBlockBodies (in category 'compile abstract instructions') -----
compileBlockBodies
"override to maintain counterIndex when recompiling blocks; sigh."
<inline: false>
| result compiledBlocksCount blockStart savedNeedsFrame savedNumArgs savedNumTemps
initialStackPtr initialOpcodeIndex initialAnnotationIndex initialCounterIndex |
<var: #blockStart type: #'BlockStart *'>
self assert: blockCount > 0.
"scanBlock: in compileBlockEntry: sets both of these appropriately for each block."
savedNeedsFrame := needsFrame.
savedNumArgs := methodOrBlockNumArgs.
savedNumTemps := methodOrBlockNumTemps.
inBlock := true.
compiledBlocksCount := 0.
[compiledBlocksCount < blockCount] whileTrue:
[blockStart := self blockStartAt: compiledBlocksCount.
self scanBlock: blockStart.
initialOpcodeIndex := opcodeIndex.
initialAnnotationIndex := annotationIndex.
initialCounterIndex := counterIndex.
[self compileBlockEntry: blockStart.
initialStackPtr := simStackPtr.
(result := self compileAbstractInstructionsFrom: blockStart startpc + ((self pushNilSize: methodObj) * blockStart numInitialNils)
through: blockStart startpc + blockStart span - 1) < 0 ifTrue:
[^result].
"If the final simStackPtr is less than the initial simStackPtr then scanBlock: over-
estimated the number of initial nils (because it assumed one or more pushNils to
produce an operand were pushNils to initialize temps. This is very rare, so
compensate by checking, adjusting numInitialNils and recompiling the block body."
initialStackPtr = simStackPtr]
whileFalse:
[self assert: initialStackPtr > simStackPtr.
blockStart numInitialNils: blockStart numInitialNils + simStackPtr - initialStackPtr.
blockStart fakeHeader dependent: nil.
self reinitializeFixupsFrom: blockStart startpc + blockStart numInitialNils
through: blockStart startpc + blockStart span - 1.
- self reinitializeCountersFrom: initialCounterIndex to: counterIndex - 1.
self cCode: 'bzero(abstractOpcodes + initialOpcodeIndex,
(opcodeIndex - initialOpcodeIndex) * sizeof(AbstractInstruction))'
inSmalltalk: [initialOpcodeIndex to: opcodeIndex - 1 do:
[:i|
abstractOpcodes
at: i
put: (processor abstractInstructionCompilerClass for: self)]].
opcodeIndex := initialOpcodeIndex.
annotationIndex := initialAnnotationIndex.
counterIndex := initialCounterIndex].
compiledBlocksCount := compiledBlocksCount + 1].
needsFrame := savedNeedsFrame.
methodOrBlockNumArgs := savedNumArgs.
methodOrBlockNumTemps := savedNumTemps.
^0!
Item was added:
+ ----- Method: SistaStackToRegisterMappingCogit>>compileCogMethod: (in category 'compile abstract instructions') -----
+ compileCogMethod: selector
+ counters := 0.
+ ^super compileCogMethod: selector!
Item was removed:
- ----- Method: SistaStackToRegisterMappingCogit>>counterAt:in: (in category 'method introspection') -----
- counterAt: index in: cogMethod
- <var: #cogMethod type: #'CogMethod *'>
- "zero-relative counter access"
- ^objectMemory longAt: cogMethod asUnsignedInteger + cogMethod blockSize - (cogMethod numCounters - index * CounterBytes)!
Item was removed:
- ----- Method: SistaStackToRegisterMappingCogit>>counterAt:put:in: (in category 'method introspection') -----
- counterAt: index put: aValue in: cogMethod
- <var: #cogMethod type: #'CogMethod *'>
- "zero-relative counter access"
- ^objectMemory
- longAt: cogMethod asUnsignedInteger + cogMethod blockSize - (cogMethod numCounters - index * CounterBytes)
- put: aValue!
Item was changed:
----- Method: SistaStackToRegisterMappingCogit>>disassembleMethod:on: (in category 'disassembly') -----
disassembleMethod: surrogateOrAddress on: aStream
<doNotGenerate>
+ | cogMethod |
- | cogMethod firstCounter |
cogMethod := super disassembleMethod: surrogateOrAddress on: aStream.
(cogMethod cmType = CMMethod
+ and: [cogMethod counters ~= 0]) ifTrue:
- and: [cogMethod numCounters > 0]) ifTrue:
[aStream nextPutAll: 'counters:'; cr.
+ numCounters := objectRepresentation numCountersFor: counters.
+ 0 to: numCounters - 1 do:
- firstCounter := cogMethod address + cogMethod blockSize - (cogMethod numCounters * CounterBytes).
- 0 to: cogMethod numCounters - 1 do:
[:i| | addr |
+ addr := i * CounterBytes + counters.
- addr := i * CounterBytes + firstCounter.
addr printOn: aStream base: 16.
aStream nextPut: $:; space.
(objectMemory longAt: addr) printOn: aStream base: 16.
aStream cr].
aStream flush]!
Item was added:
+ ----- Method: SistaStackToRegisterMappingCogit>>fillInCPICHeader:size:numArgs:numCases:hasMNUCase:selector: (in category 'generate machine code') -----
+ fillInCPICHeader: pic size: size numArgs: numArgs numCases: numCases hasMNUCase: hasMNUCase selector: selector
+ pic counters: 0.
+ ^super fillInCPICHeader: pic size: size numArgs: numArgs numCases: numCases hasMNUCase: hasMNUCase selector: selector!
Item was added:
+ ----- Method: SistaStackToRegisterMappingCogit>>fillInCounters:atStartAddress: (in category 'generate machine code') -----
+ fillInCounters: nCounters atStartAddress: startAddress
+ startAddress
+ to: startAddress + (nCounters - 1 * CounterBytes)
+ by: CounterBytes
+ do: [:address|
+ objectMemory
+ long32At: address
+ put: (initialCounterValue << 16 + initialCounterValue)]!
Item was changed:
----- Method: SistaStackToRegisterMappingCogit>>fillInMethodHeader:size:selector: (in category 'generate machine code') -----
fillInMethodHeader: method size: size selector: selector
super fillInMethodHeader: method size: size selector: selector.
+ self fillInCounters: numCounters atStartAddress: counters.
+ method counters: counters.
- method numCounters: counterIndex.
^method!
Item was changed:
----- Method: SistaStackToRegisterMappingCogit>>fillInOPICHeader:size:numArgs:selector: (in category 'generate machine code') -----
fillInOPICHeader: pic size: size numArgs: numArgs selector: selector
+ pic counters: 0.
- pic numCounters: 0.
^super fillInOPICHeader: pic size: size numArgs: numArgs selector: selector!
Item was changed:
----- Method: SistaStackToRegisterMappingCogit>>genJumpIf:to: (in category 'bytecode generators') -----
genJumpIf: boolean to: targetBytecodePC
"The heart of performance counting in Sista. Conditional branches are 6 times less
frequent than sends and can provide basic block frequencies (send counters can't).
Each conditional has a 32-bit counter split into an upper 16 bits counting executions
and a lower half counting untaken executions of the branch. Executing the branch
decrements the upper half, tripping if the count goes negative. Not taking the branch
decrements the lower half. N.B. We *do not* eliminate dead branches (true ifTrue:/true ifFalse:)
so that scanning for send and branch data is simplified and that branch data is correct."
<inline: false>
+ | desc ok counterAddress countTripped retry |
- | desc ok counter countTripped retry |
- <var: #desc type: #'CogSimStackEntry *'>
<var: #ok type: #'AbstractInstruction *'>
+ <var: #desc type: #'CogSimStackEntry *'>
<var: #retry type: #'AbstractInstruction *'>
- <var: #counter type: #'AbstractInstruction *'>
<var: #countTripped type: #'AbstractInstruction *'>
self ssFlushTo: simStackPtr - 1.
desc := self ssTop.
self ssPop: 1.
desc popToReg: TempReg.
self ssAllocateRequiredReg: SendNumArgsReg. "Use this as the count reg."
+ counterAddress := counters + ((self sizeof: #sqInt) * counterIndex).
- counter := self addressOf: (counters at: counterIndex).
counterIndex := counterIndex + 1.
self flag: 'will need to use MoveAw32:R: if 64 bits'.
self assert: BytesPerWord = CounterBytes.
+ retry := self MoveAw: counterAddress R: SendNumArgsReg.
- retry := self MoveAw: counter asUnsignedInteger R: SendNumArgsReg.
- counter addDependent: (self annotateAbsolutePCRef: retry).
self SubCq: 16r10000 R: SendNumArgsReg. "Count executed"
"Don't write back if we trip; avoids wrapping count back to initial value, and if we trip we don't execute."
countTripped := self JumpCarry: 0.
+ self MoveR: SendNumArgsReg Aw: counterAddress. "write back"
- counter addDependent: (self annotateAbsolutePCRef:
- (self MoveR: SendNumArgsReg Aw: counter asUnsignedInteger)). "write back"
"Cunning trick by LPD. If true and false are contiguous subtract the smaller.
Correct result is either 0 or the distance between them. If result is not 0 or
their distance send mustBeBoolean."
self assert: (objectMemory objectAfter: objectMemory falseObject) = objectMemory trueObject.
self annotate: (self SubCw: boolean R: TempReg) objRef: boolean.
self JumpZero: (self ensureFixupAt: targetBytecodePC - initialPC).
self SubCq: 1 R: SendNumArgsReg. "Count untaken"
+ self MoveR: SendNumArgsReg Aw: counterAddress. "write back"
- counter addDependent: (self annotateAbsolutePCRef:
- (self MoveR: SendNumArgsReg Aw: counter asUnsignedInteger)). "write back"
self CmpCq: (boolean == objectMemory falseObject
ifTrue: [objectMemory trueObject - objectMemory falseObject]
ifFalse: [objectMemory falseObject - objectMemory trueObject])
R: TempReg.
ok := self JumpZero: 0.
self MoveCq: 0 R: SendNumArgsReg. "if SendNumArgsReg is 0 this is a mustBeBoolean, not a counter trip."
countTripped jmpTarget:
(self CallRT: (boolean == objectMemory falseObject
ifTrue: [ceSendMustBeBooleanAddFalseTrampoline]
ifFalse: [ceSendMustBeBooleanAddTrueTrampoline])).
"If we're in an image which hasn't got the Sista code loaded then the ceCounterTripped:
trampoline will return directly to machine code, returning the boolean. So the code should
jump back to the retry point. The trampoline makes sure that TempReg has been reloaded."
self annotateBytecode: self Label.
self Jump: retry.
ok jmpTarget: self Label.
^0!
Item was changed:
----- Method: SistaStackToRegisterMappingCogit>>genSpecialSelectorComparison (in category 'bytecode generators') -----
genSpecialSelectorComparison
"Override to count inlined branches if followed by a conditional branch.
We borrow the following conditional branch's counter and when about to
inline the comparison we decrement the counter (without writing it back)
and if it trips simply abort the inlining, falling back to the normal send which
will then continue to the conditional branch which will trip and enter the abort."
| nextPC postBranchPC targetBytecodePC primDescriptor branchDescriptor nExts
+ rcvrIsInt argIsInt rcvrInt argInt result jumpNotSmallInts inlineCAB annotateInst
+ counterAddress countTripped |
+ <var: #countTripped type: #'AbstractInstruction *'>
- rcvrIsInt argIsInt rcvrInt argInt result jumpNotSmallInts inlineCAB annotateInst counter countTripped |
<var: #primDescriptor type: #'BytecodeDescriptor *'>
- <var: #branchDescriptor type: #'BytecodeDescriptor *'>
<var: #jumpNotSmallInts type: #'AbstractInstruction *'>
+ <var: #branchDescriptor type: #'BytecodeDescriptor *'>
- <var: #counter type: #'AbstractInstruction *'>
- <var: #countTripped type: #'AbstractInstruction *'>
self ssFlushTo: simStackPtr - 2.
primDescriptor := self generatorAt: byte0.
argIsInt := self ssTop type = SSConstant
and: [objectMemory isIntegerObject: (argInt := self ssTop constant)].
rcvrIsInt := (self ssValue: 1) type = SSConstant
and: [objectMemory isIntegerObject: (rcvrInt := (self ssValue: 1) constant)].
"short-cut the jump if operands are SmallInteger constants."
(argIsInt and: [rcvrIsInt]) ifTrue:
[self cCode: '' inSmalltalk: "In Simulator ints are unsigned..."
[rcvrInt := objectMemory integerValueOf: rcvrInt.
argInt := objectMemory integerValueOf: argInt].
primDescriptor opcode caseOf: {
[JumpLess] -> [result := rcvrInt < argInt].
[JumpLessOrEqual] -> [result := rcvrInt <= argInt].
[JumpGreater] -> [result := rcvrInt > argInt].
[JumpGreaterOrEqual] -> [result := rcvrInt >= argInt].
[JumpZero] -> [result := rcvrInt = argInt].
[JumpNonZero] -> [result := rcvrInt ~= argInt] }.
"Must enter any annotatedConstants into the map"
self annotateBytecodeIfAnnotated: (self ssValue: 1).
self annotateBytecodeIfAnnotated: self ssTop.
"Must annotate the bytecode for correct pc mapping."
self ssPop: 2.
^self ssPushAnnotatedConstant: (result
ifTrue: [objectMemory trueObject]
ifFalse: [objectMemory falseObject])].
nextPC := bytecodePC + primDescriptor numBytes.
nExts := 0.
[branchDescriptor := self generatorAt: (objectMemory fetchByte: nextPC ofObject: methodObj) + (byte0 bitAnd: 256).
branchDescriptor isExtension] whileTrue:
[nExts := nExts + 1.
nextPC := nextPC + branchDescriptor numBytes].
"Only interested in inlining if followed by a conditional branch."
inlineCAB := branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse].
"Further, only interested in inlining = and ~= if there's a SmallInteger constant involved.
The relational operators successfully statically predict SmallIntegers; the equality operators do not."
(inlineCAB and: [primDescriptor opcode = JumpZero or: [primDescriptor opcode = JumpNonZero]]) ifTrue:
[inlineCAB := argIsInt or: [rcvrIsInt]].
inlineCAB ifFalse:
[^self genSpecialSelectorSend].
targetBytecodePC := nextPC
+ branchDescriptor numBytes
+ (self spanFor: branchDescriptor at: nextPC exts: nExts in: methodObj).
postBranchPC := nextPC + branchDescriptor numBytes.
argIsInt
ifTrue:
[(self ssValue: 1) popToReg: ReceiverResultReg.
annotateInst := self ssTop annotateUse.
self ssPop: 2.
self MoveR: ReceiverResultReg R: TempReg]
ifFalse:
[self marshallSendArguments: 1.
self MoveR: Arg0Reg R: TempReg.
rcvrIsInt ifFalse:
[objectRepresentation isSmallIntegerTagNonZero
ifTrue: [self AndR: ReceiverResultReg R: TempReg]
ifFalse: [self OrR: ReceiverResultReg R: TempReg]]].
jumpNotSmallInts := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg.
self ssAllocateRequiredReg: SendNumArgsReg. "Use this as the count reg."
+ counterAddress := counters + ((self sizeof: #sqInt) * counterIndex).
- counter := self addressOf: (counters at: counterIndex).
self flag: 'will need to use MoveAw32:R: if 64 bits'.
self assert: BytesPerWord = CounterBytes.
+ self MoveAw: counterAddress R: SendNumArgsReg.
- counter addDependent: (self annotateAbsolutePCRef:
- (self MoveAw: counter asUnsignedInteger R: SendNumArgsReg)).
self SubCq: 16r10000 R: SendNumArgsReg. "Count executed"
"If counter trips simply abort the inlined comparison and send continuing to the following
branch *without* writing back. A double decrement will not trip the second time."
countTripped := self JumpCarry: 0.
+ self MoveR: SendNumArgsReg Aw: counterAddress. "write back"
- counter addDependent: (self annotateAbsolutePCRef:
- (self MoveR: SendNumArgsReg Aw: counter asUnsignedInteger)). "write back"
argIsInt
ifTrue: [annotateInst
ifTrue: [self annotateBytecode: (self CmpCq: argInt R: ReceiverResultReg)]
ifFalse: [self CmpCq: argInt R: ReceiverResultReg]]
ifFalse: [self CmpR: Arg0Reg R: ReceiverResultReg].
"Cmp is weird/backwards so invert the comparison. Further since there is a following conditional
jump bytecode define non-merge fixups and leave the cond bytecode to set the mergeness."
self gen: (branchDescriptor isBranchTrue
ifTrue: [primDescriptor opcode]
ifFalse: [self inverseBranchFor: primDescriptor opcode])
operand: (self ensureNonMergeFixupAt: targetBytecodePC - initialPC) asUnsignedInteger.
self SubCq: 1 R: SendNumArgsReg. "Count untaken"
+ self MoveR: SendNumArgsReg Aw: counterAddress. "write back"
- counter addDependent: (self annotateAbsolutePCRef:
- (self MoveR: SendNumArgsReg Aw: counter asUnsignedInteger)). "write back"
self Jump: (self ensureNonMergeFixupAt: postBranchPC - initialPC).
countTripped jmpTarget: (jumpNotSmallInts jmpTarget: self Label).
argIsInt ifTrue:
[self MoveCq: argInt R: Arg0Reg].
^self genMarshalledSend: (coInterpreter specialSelector: byte0 - self firstSpecialSelectorBytecodeOffset)
numArgs: 1!
Item was changed:
----- Method: SistaStackToRegisterMappingCogit>>genSpecialSelectorEqualsEquals (in category 'bytecode generators') -----
genSpecialSelectorEqualsEquals
"Override to count inlined branches if followed by a conditional branch.
We borrow the following conditional branch's counter and when about to
inline the comparison we decrement the counter (without writing it back)
and if it trips simply abort the inlining, falling back to the normal send which
will then continue to the conditional branch which will trip and enter the abort."
| nextPC postBranchPC targetBytecodePC primDescriptor branchDescriptor nExts
+ counterAddress countTripped unforwardArg unforwardRcvr |
+ <var: #countTripped type: #'AbstractInstruction *'>
- counter countTripped unforwardArg unforwardRcvr |
<var: #primDescriptor type: #'BytecodeDescriptor *'>
<var: #branchDescriptor type: #'BytecodeDescriptor *'>
- <var: #counter type: #'AbstractInstruction *'>
- <var: #countTripped type: #'AbstractInstruction *'>
self ssFlushTo: simStackPtr - 2.
primDescriptor := self generatorAt: byte0.
nextPC := bytecodePC + primDescriptor numBytes.
nExts := 0.
[branchDescriptor := self generatorAt: (objectMemory fetchByte: nextPC ofObject: methodObj) + (byte0 bitAnd: 256).
branchDescriptor isExtension] whileTrue:
[nExts := nExts + 1.
nextPC := nextPC + branchDescriptor numBytes].
"Only interested in inlining if followed by a conditional branch."
(branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]) ifFalse:
[^self genSpecialSelectorSend].
targetBytecodePC := nextPC
+ branchDescriptor numBytes
+ (self spanFor: branchDescriptor at: nextPC exts: nExts in: methodObj).
postBranchPC := nextPC + branchDescriptor numBytes.
unforwardRcvr := (self ssValue: 1) type ~= SSConstant
or: [objectRepresentation shouldAnnotateObjectReference: (self ssValue: 1) constant].
unforwardArg := self ssTop type ~= SSConstant
or: [objectRepresentation shouldAnnotateObjectReference: self ssTop constant].
self marshallSendArguments: 1.
self ssAllocateRequiredReg: SendNumArgsReg. "Use this as the count reg."
+ counterAddress := counters + ((self sizeof: #sqInt) * counterIndex).
- counter := self addressOf: (counters at: counterIndex).
self flag: 'will need to use MoveAw32:R: if 64 bits'.
self assert: BytesPerWord = CounterBytes.
+ self MoveAw: counterAddress R: SendNumArgsReg.
- counter addDependent: (self annotateAbsolutePCRef:
- (self MoveAw: counter asUnsignedInteger R: SendNumArgsReg)).
self SubCq: 16r10000 R: SendNumArgsReg. "Count executed"
"If counter trips simply abort the inlined comparison and send continuing to the following
branch *without* writing back. A double decrement will not trip the second time."
countTripped := self JumpCarry: 0.
+ self MoveR: SendNumArgsReg Aw: counterAddress. "write back"
- counter addDependent: (self annotateAbsolutePCRef:
- (self MoveR: SendNumArgsReg Aw: counter asUnsignedInteger)). "write back"
unforwardRcvr ifTrue:
[objectRepresentation genEnsureOopInRegNotForwarded: ReceiverResultReg scratchReg: TempReg].
unforwardArg ifTrue:
[objectRepresentation genEnsureOopInRegNotForwarded: Arg0Reg scratchReg: TempReg].
self CmpR: Arg0Reg R: ReceiverResultReg.
"Cmp is weird/backwards so invert the comparison. Further since there is a following conditional
jump bytecode define non-merge fixups and leave the cond bytecode to set the mergeness."
self gen: (branchDescriptor isBranchTrue ifTrue: [JumpZero] ifFalse: [JumpNonZero])
operand: (self ensureNonMergeFixupAt: targetBytecodePC - initialPC) asUnsignedInteger.
self SubCq: 1 R: SendNumArgsReg. "Count untaken"
+ self MoveR: SendNumArgsReg Aw: counterAddress. "write back"
- counter addDependent: (self annotateAbsolutePCRef:
- (self MoveR: SendNumArgsReg Aw: counter asUnsignedInteger)). "write back"
self Jump: (self ensureNonMergeFixupAt: postBranchPC - initialPC).
countTripped jmpTarget: self Label.
^self genMarshalledSend: (coInterpreter specialSelector: byte0 - self firstSpecialSelectorBytecodeOffset)
numArgs: 1!
Item was removed:
- ----- Method: SistaStackToRegisterMappingCogit>>generateCogMethod: (in category 'generate machine code') -----
- generateCogMethod: selector
- "We handle jump sizing simply. First we make a pass that asks each
- instruction to compute its maximum size. Then we make a pass that
- sizes jumps based on the maxmimum sizes. Then we make a pass
- that fixes up jumps. When fixing up a jump the jump is not allowed to
- choose a smaller offset but must stick to the size set in the second pass.
-
- Override to add counters"
- <returnTypeC: #'CogMethod *'>
- | codeSize headerSize mapSize countersSize totalSize startAddress result method |
- <var: #method type: #'CogMethod *'>
- headerSize := self sizeof: CogMethod.
- methodLabel address: headerSize negated.
- self computeMaximumSizes.
- methodLabel concretizeAt: (methodZone allocate: 0).
- codeSize := self generateInstructionsAt: methodLabel address + headerSize.
- mapSize := self generateMapAt: 0 start: methodLabel address + cmNoCheckEntryOffset.
- countersSize := counterIndex * CounterBytes.
- totalSize := methodZone roundUpLength: headerSize + codeSize + mapSize + countersSize.
- totalSize > MaxMethodSize ifTrue:
- [^self cCoerceSimple: MethodTooBig to: #'CogMethod *'].
- startAddress := methodZone allocate: totalSize.
- startAddress = 0 ifTrue:
- [^self cCoerceSimple: InsufficientCodeSpace to: #'CogMethod *'].
- self assert: startAddress + cmEntryOffset = entry address.
- self assert: startAddress + cmNoCheckEntryOffset = noCheckEntry address.
- self regenerateCounterReferences: startAddress + totalSize.
- result := self outputInstructionsAt: startAddress + headerSize.
- self assert: startAddress + headerSize + codeSize = result.
- backEnd nopsFrom: result to: startAddress + totalSize - mapSize.
- self generateMapAt: startAddress + totalSize - countersSize - 1 start: startAddress + cmNoCheckEntryOffset.
- self fillInBlockHeadersAt: startAddress.
- self fillInCounters: counterIndex atEndAddress: startAddress + totalSize.
- method := self fillInMethodHeader: (self cCoerceSimple: startAddress to: #'CogMethod *')
- size: totalSize
- selector: selector.
- postCompileHook notNil ifTrue:
- [self perform: postCompileHook with: method with: primInvokeLabel.
- postCompileHook := nil].
- processor flushICacheFrom: startAddress to: startAddress + headerSize + codeSize.
- ^method!
Item was removed:
- ----- Method: SistaStackToRegisterMappingCogit>>handleWriteSimulationTrap: (in category 'simulation only') -----
- handleWriteSimulationTrap: aProcessorSimulationTrap
- <doNotGenerate>
- | address end |
- address := aProcessorSimulationTrap address.
- (address >= methodZone freeStart
- or: [address <= methodZoneBase]) ifTrue:
- [^super handleWriteSimulationTrap: aProcessorSimulationTrap].
-
- (counterMethodCache isNil
- or: [address < counterMethodCache
- or: [counterMethodCache address + counterMethodCache blockSize < address]]) ifTrue:
- [counterMethodCache := methodZone methodFor: address].
- end := counterMethodCache address + counterMethodCache blockSize.
- self assert: (address
- between: end - (CounterBytes * counterMethodCache numCounters)
- and: end).
- objectMemory longAt: address put: (processor perform: aProcessorSimulationTrap registerAccessor).
- processor pc: aProcessorSimulationTrap nextpc!
Item was changed:
----- Method: SistaStackToRegisterMappingCogit>>initializeCodeZoneFrom:upTo: (in category 'initialization') -----
initializeCodeZoneFrom: startAddress upTo: endAddress
initialCounterValue := MaxCounterValue.
- numCounters := 0.
- self allocateCounters.
super initializeCodeZoneFrom: startAddress upTo: endAddress!
Item was removed:
- ----- Method: SistaStackToRegisterMappingCogit>>initializeCounters (in category 'initialization') -----
- initializeCounters
- "Initialize the counter labels for the current compilation. We give them bogus
- addresses since we can't determine their address until after the map is generated.
- So we have to regenerate their dependent instructions after map generation."
- self reinitializeCountersFrom: 0 to: numCounters - 1.
- counterIndex := 0!
Item was removed:
- ----- Method: SistaStackToRegisterMappingCogit>>mapStartFor: (in category 'method map') -----
- mapStartFor: cogMethod
- "Answer the address of the first byte of the method map."
- <var: #cogMethod type: #'CogMethod *'>
- <inline: true>
- ^cogMethod asUnsignedInteger + cogMethod blockSize - (cogMethod numCounters * CounterBytes) - 1!
Item was changed:
----- Method: SistaStackToRegisterMappingCogit>>maybeAllocAndInitCounters (in category 'compile abstract instructions') -----
maybeAllocAndInitCounters
<inline: true>
+ self assert: counters = 0.
+ counterIndex := 0.
+ numCounters = 0 ifTrue:
+ [^true].
+ counters := objectRepresentation allocateCounters: numCounters.
+ ^counters ~= 0!
- self allocateCounters; initializeCounters!
Item was added:
+ ----- Method: SistaStackToRegisterMappingCogit>>maybeFreeCounters (in category 'compile abstract instructions') -----
+ maybeFreeCounters
+ <inline: true>
+ counters ~= 0 ifTrue:
+ [objectMemory freeCounters: counters]!
Item was changed:
----- Method: SistaStackToRegisterMappingCogit>>maybeFreeCountersOf: (in category 'compaction') -----
maybeFreeCountersOf: aCogMethod
"Free any counters in the method."
<inline: true>
+ objectRepresentation freeCounters: aCogMethod counters!
- self shouldBeImplemented!
Item was added:
+ ----- Method: SistaStackToRegisterMappingCogit>>maybeMarkCountersIn: (in category 'garbage collection') -----
+ maybeMarkCountersIn: cogMethod
+ "In SIsta Spur counters are held on the heap in pinned objects which must be marked
+ to avoid them being garbage collected. This is the hook through which that happens."
+ <var: #cogMethod type: #'CogMethod *'>
+ <inline: true>
+ objectRepresentation maybeMarkCounters: cogMethod counters!
Item was removed:
- ----- Method: SistaStackToRegisterMappingCogit>>printCountersFor:on: (in category 'simulation only') -----
- printCountersFor: cogMethod on: aStream
- | firstCounter |
- firstCounter := cogMethod address + cogMethod blockSize - (cogMethod numCounters * CounterBytes).
- 0 to: cogMethod numCounters - 1 do:
- [:i| | addr |
- addr := i * CounterBytes + firstCounter.
- addr printOn: aStream base: 16.
- aStream nextPut: $:; space.
- (objectMemory longAt: addr) printOn: aStream base: 16.
- aStream cr]!
Item was removed:
- ----- Method: SistaStackToRegisterMappingCogit>>regenerateCounterReferences: (in category 'generate machine code') -----
- regenerateCounterReferences: methodEndAddress
- <var: #label type: #'AbstractInstruction *'>
- <var: #dependentInstruction type: #'AbstractInstruction *'>
- 0 to: counterIndex - 1 do:
- [:i| | label dependentInstruction |
- label := self addressOf: (counters at: i).
- label address: methodEndAddress - ((counterIndex - i) * CounterBytes).
- dependentInstruction := label dependent.
- [dependentInstruction concretizeAt: dependentInstruction address.
- dependentInstruction := dependentInstruction dependent.
- dependentInstruction ~= nil] whileTrue]!
Item was removed:
- ----- Method: SistaStackToRegisterMappingCogit>>reinitializeCountersFrom:to: (in category 'initialization') -----
- reinitializeCountersFrom: start to: stop
- "Reinitialize the counter labels in the given range. We give them bogus
- addresses since we can't determine their address until after the map
- is generated. So we have to regenerate their dependent instructions
- after map generation."
- | label |
- <var: #label type: #'AbstractInstruction *'>
- start to: stop do:
- [:i|
- label := self addressOf: (counters at: i).
- label
- opcode: Label;
- dependent: nil;
- address: methodZone zoneEnd - (numCounters + i * CounterBytes)]!
Item was changed:
----- Method: SistaStackToRegisterMappingCogit>>resetCountersIn: (in category 'sista callbacks') -----
resetCountersIn: cogMethod
+ <doNotGenerate>
+ objectRepresentation resetCountersIn: cogMethod!
- <var: #cogMethod type: #'CogMethod *'>
- <api>
- self
- fillInCounters: cogMethod numCounters
- atEndAddress: cogMethod asUnsignedInteger + cogMethod blockSize!
Item was added:
+ ----- Method: Spur32BitCoMemoryManager>>allocatePinnedCounters: (in category 'sista support') -----
+ allocatePinnedCounters: nCounters
+ <api>
+ <option: #SistaStackToRegisterMappingCogit>
+ ^self allocateSlotsForPinningInOldSpace: nCounters
+ bytes: (self objectBytesForSlots: nCounters)
+ format: self firstLongFormat
+ classIndex: self thirtyTwoBitLongsClassIndexPun!
Item was changed:
----- Method: Spur32BitMemoryManager>>allocateSlotsForPinningInOldSpace:bytes:format:classIndex: (in category 'allocation') -----
allocateSlotsForPinningInOldSpace: numSlots bytes: totalBytes format: formatField classIndex: classIndex
"Answer the oop of a chunk of space in oldSpace with numSlots slots. Try and
allocate in a segment that already includes pinned objects. The header of the
result will have been filled-in but not the contents."
<var: #totalBytes type: #usqInt>
<inline: false>
| chunk |
chunk := self allocateOldSpaceChunkOfBytes: totalBytes
suchThat: [:f| (segmentManager segmentContainingObj: f) containsPinned].
chunk ifNil:
[chunk := self allocateOldSpaceChunkOfBytes: totalBytes.
chunk ifNotNil:
[(segmentManager segmentContainingObj: chunk) containsPinned: true]].
self checkFreeSpace.
chunk ifNil:
[^nil].
numSlots >= self numSlotsMask ifTrue: "for header parsing we put a saturated slot count in the prepended overflow size word"
[self flag: #endianness.
self longAt: chunk put: numSlots.
self longAt: chunk + 4 put: self numSlotsMask << self numSlotsHalfShift.
self long64At: chunk + self baseHeaderSize
+ put: ((self headerForSlots: self numSlotsMask format: formatField classIndex: classIndex)
+ bitOr: 1 << self pinnedBitShift).
- put: (self headerForSlots: self numSlotsMask format: formatField classIndex: classIndex).
^chunk + self baseHeaderSize].
+ self long64At: chunk
+ put: ((self headerForSlots: numSlots format: formatField classIndex: classIndex)
+ bitOr: 1 << self pinnedBitShift).
- self long64At: chunk put: (self headerForSlots: numSlots format: formatField classIndex: classIndex).
^chunk!
Item was added:
+ ----- Method: Spur64BitMemoryManager>>allocatePinnedCounters: (in category 'sista support') -----
+ allocatePinnedCounters: nCounters
+ <api>
+ <option: #SistaStackToRegisterMappingCogit>
+ | numSlots |
+ numSlots := nCounters + 1 // 2.
+ ^self allocateSlotsForPinningInOldSpace: numSlots
+ bytes: (self objectBytesForSlots: numSlots)
+ format: self firstLongFormat + (nCounters bitAnd: 1)
+ classIndex: self thirtyTwoBitLongsClassIndexPun!
Item was changed:
----- Method: Spur64BitMemoryManager>>allocateSlotsForPinningInOldSpace:bytes:format:classIndex: (in category 'allocation') -----
allocateSlotsForPinningInOldSpace: numSlots bytes: totalBytes format: formatField classIndex: classIndex
"Answer the oop of a chunk of space in oldSpace with numSlots slots. Try and
allocate in a segment that already includes pinned objects. The header of the
result will have been filled-in but not the contents."
<var: #totalBytes type: #usqInt>
<inline: false>
| chunk |
chunk := self allocateOldSpaceChunkOfBytes: totalBytes
suchThat: [:f| (segmentManager segmentContainingObj: f) containsPinned].
chunk ifNil:
[chunk := self allocateOldSpaceChunkOfBytes: totalBytes].
self checkFreeSpace.
chunk ifNil:
[^nil].
numSlots >= self numSlotsMask ifTrue: "for header parsing we put a saturated slot count in the prepended overflow size word"
[self longAt: chunk
put: numSlots + (self numSlotsMask << self numSlotsFullShift).
self longAt: chunk + self baseHeaderSize
+ put: ((self headerForSlots: self numSlotsMask format: formatField classIndex: classIndex)
+ bitOr: 1 << self pinnedBitShift).
- put: (self headerForSlots: self numSlotsMask format: formatField classIndex: classIndex).
^chunk + self baseHeaderSize].
self longAt: chunk
+ put: ((self headerForSlots: numSlots format: formatField classIndex: classIndex)
+ bitOr: 1 << self pinnedBitShift).
- put: (self headerForSlots: numSlots format: formatField classIndex: classIndex).
^chunk!
Item was changed:
----- Method: SpurMemoryManager>>freeObject: (in category 'free space') -----
freeObject: objOop
+ <api>
| bytes |
bytes := self bytesInObject: objOop.
totalFreeOldSpace := totalFreeOldSpace + bytes.
^self freeChunkWithBytes: bytes at: (self startOfObject: objOop)!
Item was changed:
----- Method: SpurMemoryManager>>numSlotsOf: (in category 'object access') -----
numSlotsOf: objOop
<returnTypeC: #usqInt>
+ <api>
| numSlots |
self flag: #endianness.
"numSlotsOf: should not be applied to free or forwarded objects."
self assert: (self classIndexOf: objOop) > self isForwardedObjectClassIndexPun.
numSlots := self rawNumSlotsOf: objOop..
^numSlots = self numSlotsMask "overflow slots; (2^32)-1 slots are plenty"
ifTrue: [self rawOverflowSlotsOf: objOop]
ifFalse: [numSlots]!
Item was changed:
SimpleStackBasedCogit subclass: #StackToRegisterMappingCogit
+ instanceVariableNames: 'prevBCDescriptor isPushNilFunction pushNilSizeFunction methodOrBlockNumTemps regArgsHaveBeenPushed simSelf simStack simStackPtr simSpillBase optStatus ceCallCogCodePopReceiverArg0Regs ceCallCogCodePopReceiverArg1Arg0Regs methodAbortTrampolines picAbortTrampolines picMissTrampolines ceCall0ArgsPIC ceCall1ArgsPIC ceCall2ArgsPIC debugStackPointers debugFixupBreaks debugBytecodePointers realCECallCogCodePopReceiverArg0Regs realCECallCogCodePopReceiverArg1Arg0Regs deadCode'
- instanceVariableNames: 'prevBCDescriptor isPushNilFunction pushNilSizeFunction methodOrBlockNumTemps regArgsHaveBeenPushed simSelf simStack simStackPtr simSpillBase optStatus ceEnterCogCodePopReceiverArg0Regs ceEnterCogCodePopReceiverArg1Arg0Regs ceCallCogCodePopReceiverArg0Regs ceCallCogCodePopReceiverArg1Arg0Regs methodAbortTrampolines picAbortTrampolines picMissTrampolines ceCall0ArgsPIC ceCall1ArgsPIC ceCall2ArgsPIC debugStackPointers debugFixupBreaks debugBytecodePointers realCECallCogCodePopReceiverArg0Regs realCECallCogCodePopReceiverArg1Arg0Regs deadCode'
classVariableNames: ''
poolDictionaries: 'CogCompilationConstants VMMethodCacheConstants VMObjectIndices VMStackFrameOffsets'
category: 'VMMaker-JIT'!
StackToRegisterMappingCogit class
instanceVariableNames: 'isPushNilFunction pushNilSizeFunction'!
!StackToRegisterMappingCogit commentStamp: 'eem 12/19/2010 18:12' prior: 0!
StackToRegisterMappingCogit is an optimizing code generator that eliminates a lot of stack operations and inlines some special selector arithmetic. It does so by a simple stack-to-register mapping scheme based on deferring the generation of code to produce operands until operand-consuming operations. The operations that consume operands are sends, stores and returns.
See methods in the class-side documentation protocol for more detail.
Instance Variables
callerSavedRegMask: <Integer>
ceEnter0ArgsPIC: <Integer>
ceEnter1ArgsPIC: <Integer>
ceEnter2ArgsPIC: <Integer>
ceEnterCogCodePopReceiverArg0Regs: <Integer>
ceEnterCogCodePopReceiverArg1Arg0Regs: <Integer>
debugBytecodePointers: <Set of Integer>
debugFixupBreaks: <Set of Integer>
debugStackPointers: <CArrayAccessor of (Integer|nil)>
methodAbortTrampolines: <CArrayAccessor of Integer>
methodOrBlockNumTemps: <Integer>
optStatus: <Integer>
picAbortTrampolines: <CArrayAccessor of Integer>
picMissTrampolines: <CArrayAccessor of Integer>
realCEEnterCogCodePopReceiverArg0Regs: <Integer>
realCEEnterCogCodePopReceiverArg1Arg0Regs: <Integer>
regArgsHaveBeenPushed: <Boolean>
simSelf: <CogSimStackEntry>
simSpillBase: <Integer>
simStack: <CArrayAccessor of CogSimStackEntry>
simStackPtr: <Integer>
traceSimStack: <Integer>
callerSavedRegMask
- the bitmask of the ABI's caller-saved registers
ceEnter0ArgsPIC ceEnter1ArgsPIC ceEnter2ArgsPIC
- the trampoline for entering an N-arg PIC
ceEnterCogCodePopReceiverArg0Regs ceEnterCogCodePopReceiverArg1Arg0Regs
- teh trampoline for entering a method with N register args
debugBytecodePointers
- a Set of bytecode pcs for setting breakpoints (simulation only)
debugFixupBreaks
- a Set of fixup indices for setting breakpoints (simulation only)
debugStackPointers
- an Array of stack depths for each bytecode for code verification
methodAbortTrampolines
- a CArrayAccessor of abort trampolines for 0, 1, 2 and N args
methodOrBlockNumTemps
- the number of method or block temps (including args) in the current compilation unit (method or block)
optStatus
- the variable used to track the status of ReceiverResultReg for avoiding reloading that register with self between adjacent inst var accesses
picAbortTrampolines
- a CArrayAccessor of abort trampolines for 0, 1, 2 and N args
picMissTrampolines
- a CArrayAccessor of abort trampolines for 0, 1, 2 and N args
realCEEnterCogCodePopReceiverArg0Regs realCEEnterCogCodePopReceiverArg1Arg0Regs
- the real trampolines for ebtering machine code with N reg args when in the Debug regime
regArgsHaveBeenPushed
- whether the register args have been pushed before frame build (e.g. when an interpreter primitive is called)
simSelf
- the simulation stack entry representing self in the current compilation unit
simSpillBase
- the variable tracking how much of the simulation stack has been spilled to the real stack
simStack
- the simulation stack itself
simStackPtr
- the pointer to the top of the simulation stack
!
StackToRegisterMappingCogit class
instanceVariableNames: 'isPushNilFunction pushNilSizeFunction'!
Item was changed:
----- Method: StackToRegisterMappingCogit class>>mustBeGlobal: (in category 'translation') -----
mustBeGlobal: var
"Answer if a variable must be global and exported. Used for inst vars that are accessed from VM support code."
^(super mustBeGlobal: var)
+ or: [#('ceCallCogCodePopReceiverArg0Regs' 'ceCallCogCodePopReceiverArg1Arg0Regs'
+ 'realCECallCogCodePopReceiverArg0Regs' 'realCECallCogCodePopReceiverArg1Arg0Regs'
+ 'ceCall0ArgsPIC' 'ceCall1ArgsPIC' 'ceCall2ArgsPIC') includes: var]!
- or: [#('ceEnterCogCodePopReceiverArg0Regs' 'ceEnterCogCodePopReceiverArg1Arg0Regs'
- 'realCEEnterCogCodePopReceiverArg0Regs' 'realCEEnterCogCodePopReceiverArg1Arg0Regs'
- 'ceEnter0ArgsPIC' 'ceEnter1ArgsPIC' 'ceEnter2ArgsPIC') includes: var]!
Item was removed:
- ----- Method: StackToRegisterMappingCogit>>ceEnterCogCodePopReceiverArg0Regs (in category 'simulation only') -----
- ceEnterCogCodePopReceiverArg0Regs
- <api: 'extern void (*ceEnterCogCodePopReceiverArg0Regs)()'>
- <doNotGenerate>
- self simulateEnilopmart: ceEnterCogCodePopReceiverArg0Regs numArgs: 2!
Item was removed:
- ----- Method: StackToRegisterMappingCogit>>ceEnterCogCodePopReceiverArg1Arg0Regs (in category 'simulation only') -----
- ceEnterCogCodePopReceiverArg1Arg0Regs
- <api: 'extern void (*ceEnterCogCodePopReceiverArg1Arg0Regs)()'>
- <doNotGenerate>
- self simulateEnilopmart: ceEnterCogCodePopReceiverArg1Arg0Regs numArgs: 3!
Item was removed:
- ----- Method: StackToRegisterMappingCogit>>enterCogCodePopReceiverArg0Regs (in category 'debugging') -----
- enterCogCodePopReceiverArg0Regs
- "This is a static version of ceEnterCogCodePopReceiverArg0Regs
- for break-pointing when debugging in C."
- <api>
- <inline: false>
- "This exists only for break-pointing."
- self cCode: [self realCEEnterCogCodePopReceiverArg0Regs]
- inSmalltalk: [self ceEnterCogCodePopReceiverArg0Regs]!
Item was removed:
- ----- Method: StackToRegisterMappingCogit>>enterCogCodePopReceiverArg1Arg0Regs (in category 'debugging') -----
- enterCogCodePopReceiverArg1Arg0Regs
- "This is a static version of ceEnterCogCodePopReceiverArg1Arg0Regs
- for break-pointing when debugging in C."
- <api>
- <inline: false>
- "This exists only for break-pointing."
- self cCode: [self realCEEnterCogCodePopReceiverArg1Arg0Regs]
- inSmalltalk: [self ceEnterCogCodePopReceiverArg1Arg0Regs]!
Item was changed:
----- Method: ThreadedFFIPlugin>>ffiCreateIntegralResultOop:ofAtomicType:in: (in category 'callout support') -----
ffiCreateIntegralResultOop: retVal ofAtomicType: atomicType in: calloutState
<var: #calloutState type: #'CalloutState *'>
<var: #retVal type: #usqLong>
"Callout support. Return the appropriate oop for the given atomic type"
| shift value mask byteSize |
self assert: atomicType < FFITypeSingleFloat.
atomicType = FFITypeBool ifTrue:[
"Make sure bool honors the byte size requested"
byteSize := calloutState ffiRetHeader bitAnd: FFIStructSizeMask.
value := byteSize = 4
ifTrue:[retVal]
ifFalse:[retVal bitAnd: 1 << (byteSize * 8) - 1].
^value = 0
ifTrue:[interpreterProxy falseObject]
ifFalse:[interpreterProxy trueObject]].
atomicType <= FFITypeSignedInt ifTrue:[
"these are all generall integer returns"
atomicType <= FFITypeSignedShort ifTrue:[
"byte/short. first extract partial word, then sign extend"
shift := (atomicType >> 1) * 8. "# of significant bits"
value := retVal bitAnd: (1 << shift - 1).
(atomicType anyMask: 1) ifTrue:[
"make the guy signed"
mask := 1 << (shift-1).
value := (value bitAnd: mask-1) - (value bitAnd: mask)].
^interpreterProxy integerObjectOf: value].
"32bit integer return"
^(atomicType anyMask: 1)
ifTrue:[interpreterProxy signed32BitIntegerFor: retVal] "signed return"
ifFalse:[interpreterProxy positive32BitIntegerFor: retVal]]. "unsigned return"
"longlong, char"
+ ^(atomicType >> 1) = (FFITypeSignedLongLong >> 1)
+ ifTrue:
+ [(atomicType anyMask: 1)
- (atomicType >> 1) = (FFITypeSignedLongLong >> 1)
- ifTrue:[^(atomicType anyMask: 1)
ifTrue:[interpreterProxy signed64BitIntegerFor: retVal] "signed return"
ifFalse:[interpreterProxy positive64BitIntegerFor: retVal]]
+ ifFalse:
+ [interpreterProxy characterObjectOf:
+ (retVal bitAnd: (self cppIf: #SPURVM
+ ifTrue: [16rFFFFFFFF]
+ ifFalse: [255]))]!
- ifFalse:[^interpreterProxy
- fetchPointer: (retVal bitAnd: 255)
- ofObject: interpreterProxy characterTable]!
Item was added:
+ ----- Method: VMMaker class>>generateAllSistaConfigurationsUnderVersionControl (in category 'configurations') -----
+ generateAllSistaConfigurationsUnderVersionControl
+ self generateSqueakCogSistaVM;
+ generateSqueakSpurCogSistaVM!
1
0
A quick overview of Ian's CMakeLists.txt/cmake process and encouraging progress on generating config.h in CMakeVMMaker(Squeak)
by gettimothy 05 Jul '14
by gettimothy 05 Jul '14
05 Jul '14
Hi All.
I am tackling the "cmake must generate config.h" problem now. In doing so, I had to study Ian's code to see how he did it and this is what I learned.*
In Ian's CMake code (svn co http://squeakvm.org/svn/squeak/trunk), the overview I see is as follows.
platforms/unix/cmake/configure script collects some shell variables and invokes cmake with some arguments collected from the shell script.
This runs cmake which uses the platforms/unix/CMakeLists.txt file as its commands.
The structure of this file is (broadly)
1 outer global structure/variables.
2. INCLUDE (in place substitution) of platforms/unix/vm/build.cmake Which is basically what is done in the current CMakeVMMaker
3. INCLUDE (in place substitution) of platforms/unix/vm/config.cmake. This handles testing the system and generating the config.h files on *nix.
4. other stuff (packaging and stuff I glossed over)
There are ancilliary files used for testing and Macros, but that is the overall structure.
Now, the encouraging part is that I am porting 3 above into the CMakeVMMaker(Squeak) stuff and it is going through the config routine and giving me output (:
........
-- Check size of void *
-- Check size of void * - done
CMake Error: The source directory "CMAKE_BINARY_DIR/CMakeFiles/CMakeTmp" does not exist.
Specify --help for usage, or press the help button on the CMake GUI.
CMake Error: Internal CMake error, TryCompile configure of cmake failed
CMake Error: The source directory "CMAKE_BINARY_DIR/CMakeFiles/CMakeTmp" does not exist.
Specify --help for usage, or press the help button on the CMake GUI.
CMake Error: Internal CMake error, TryCompile configure of cmake failed
-- Looking for alloca.h
-- Looking for alloca.h - found
-- Looking for sys/time.h
-- Looking for sys/time.h - found
-- Looking for sys/filio.h
-- Looking for sys/filio.h - not found
-- Looking for nanosleep
-- Looking for nanosleep - found
-- Looking for iconv.h
-- Looking for iconv.h - found
-- Looking for langinfo.h
-- Looking for langinfo.h - found
CMake Error at config.cmake:147 (TRY_COMPILE):
try_compile unknown error.
Call Stack (most recent call first):
CMakeLists.txt:88 (include)
-- Looking for libiconv_open in iconv
-- Looking for libiconv_open in iconv - not found
-- Looking for dlfcn.h
-- Looking for dlfcn.h - found
-- Looking for dlopen in dl
-- Looking for dlopen in dl - found
-- Looking for _dyld_present
-- Looking for _dyld_present - not found
-- Looking for snprintf
-- Looking for snprintf - found
-- Looking for __snprintf
-- Looking for __snprintf - not found
-- Looking for tzset
-- Looking for tzset - found
-- Looking for timezone
-- Looking for timezone - found
-- Performing Test HAVE_TM_GMTOFF
-- Performing Test HAVE_TM_GMTOFF - Success
-- Looking for mmap
-- Looking for mmap - found
-- Configuring incomplete, errors occurred!
Which is good. I will be getting this cleaned and ported, but the gist is it is looking good for the requirements.
Then comes modifying the plugin generation such that each plugin contributes its own config.h (this is what Ian's code does. you do a find for cmake.config in the trunk directory and you will see the individual config inputs for the plugins)
Its getting close. If this goes well, I should have something releasable/repeatable and documented for people to poke around in next week.
cheers.
tty
*yes, I "should" have studied it earlier, but frankly, I did not have a good feel for CMake syntax or methods, so it was all greek to me. I have a better handle on CMake now.
1
0
tim Rowledge uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-tpr.803.mcz
==================== Summary ====================
Name: VMMaker.oscog-tpr.803
Author: tpr
Time: 3 July 2014, 11:13:54.112 pm
UUID: c45ecb48-3e6b-469d-9cb6-463e70ef2cce
Ancestors: VMMaker.oscog-eem.802
Changes that get us to compiling primitive 3 and needing all the floating point ARM stuff worked on.
Correct enilopmart used in activateCoggedNewMethod: avoids stack imbalance failure.
Fix genPushRegisterArgsForNumArgs: to push the receiverresultreg even when there are no args, just like the ia32 does.
Change to pushingthe substitue return address rather than putting it in the LR and leaving it to get smashed later.
Correct genEnilopmartFor: [and: regArg2][ and: regArg3] called: to pop into the PC when appropriate. LR just doesn't do the job in this case.
=============== Diff against VMMaker.oscog-eem.802 ===============
Item was changed:
----- Method: CoInterpreter>>activateCoggedNewMethod: (in category 'message sending') -----
activateCoggedNewMethod: inInterpreter
"Activate newMethod when newMethod has been cogged, i.e. create a machine-code frame and (re)enter machine-code."
| methodHeader cogMethod rcvr numTemps errorCode switched |
<var: #cogMethod type: #'CogMethod *'>
methodHeader := self rawHeaderOf: newMethod.
self assert: (self isCogMethodReference: methodHeader).
cogMethod := self cCoerceSimple: methodHeader to: #'CogMethod *'.
methodHeader := cogMethod methodHeader.
rcvr := self stackValue: cogMethod cmNumArgs. "could new rcvr be set at point of send?"
self push: instructionPointer.
cogMethod stackCheckOffset = 0 ifTrue:
["frameless method; nothing to activate..."
cogit numRegArgs > 0 ifTrue: "dont use and: so as to get Slang to inline cogit numRegArgs > 0"
[cogMethod cmNumArgs <= cogit numRegArgs ifTrue:
[self callRegisterArgCogMethod: cogMethod at: cogit noCheckEntryOffset receiver: rcvr]].
self push: cogMethod asInteger + cogit noCheckEntryOffset.
self push: rcvr.
cogit ceCallCogCodePopReceiverReg.
self error: 'should not be reached'].
self push: framePointer.
framePointer := stackPointer.
self push: cogMethod asInteger.
self push: objectMemory nilObject. "FxThisContext field"
self push: rcvr.
"clear remaining temps to nil"
numTemps := self temporaryCountOfMethodHeader: methodHeader.
cogMethod cmNumArgs + 1 to: numTemps do:
[:i | self push: objectMemory nilObject].
(self methodHeaderHasPrimitive: methodHeader) ifTrue:
[| initialPC |
"Store the error code if the method starts with a long store temp. No instructionPointer skip because we're heading for machine code."
initialPC := (self initialPCForHeader: methodHeader method: newMethod) + (self sizeOfCallPrimitiveBytecode: methodHeader).
primFailCode ~= 0 ifTrue:
[(objectMemory byteAt: initialPC) = (self longStoreBytecodeForHeader: methodHeader) ifTrue:
[errorCode := self getErrorObjectFromPrimFailCode.
self stackTopPut: errorCode "nil if primFailCode == 1, or primFailCode"].
primFailCode := 0]].
"Now check for stack overflow or an event (interrupt, must scavenge, etc)."
stackPointer >= stackLimit ifTrue:
[self assert: cogMethod stackCheckOffset > cogit noCheckEntryOffset.
self push: cogMethod asInteger + cogMethod stackCheckOffset.
self push: rcvr.
+ cogit ceEnterCogCodePopReceiverReg.
- cogit ceCallCogCodePopReceiverReg.
self error: 'should not be reached'].
instructionPointer := cogMethod asInteger + cogMethod stackCheckOffset.
switched := self handleStackOverflowOrEventAllowContextSwitch: (self canContextSwitchIfActivating: newMethod header: methodHeader).
self returnToExecutive: inInterpreter postContextSwitch: switched!
Item was changed:
----- Method: CogARMCompiler>>genAlignCStackSavingRegisters:numArgs:wordAlignment: (in category 'abi') -----
genAlignCStackSavingRegisters: saveRegs numArgs: numArgs wordAlignment: alignment
"ARM needs 8 byte stack alignment but it's hard to be sure where the stack is at this
point due to the complexities of whether we push the return address or not. So do
a simple bitAnd to effectively round-down the SP - except the vagaries of the ARM
instruction set means we actually need a BIC sp, sp, $7"
- cogit gen: BICCqR operand: 2r111 operand: SPReg.
^0!
Item was changed:
----- Method: CogARMCompiler>>genPushRegisterArgsForNumArgs: (in category 'smalltalk calling convention') -----
genPushRegisterArgsForNumArgs: numArgs
"Ensure that the register args are pushed before the retpc for arity <= self numRegArgs."
"This is easy on a RISC like ARM because the return address is in the link register. Putting
the receiver and args above the return address means the CoInterpreter has a single
+ machine-code frame format which saves us a lot of work
+ NOTA BENE: we do NOT push the return address here, which means it must be dealt with later."
- machine-code frame format which saves us a lot of work."
numArgs <= cogit numRegArgs ifTrue:
[self assert: cogit numRegArgs <= 2.
+ cogit PushR: ReceiverResultReg.
+ numArgs > 0 ifTrue:
+ [cogit PushR: Arg0Reg.
- numArgs > 0 ifTrue:
- [cogit PushR: ReceiverResultReg.
- cogit PushR: Arg0Reg.
numArgs > 1 ifTrue:
[cogit PushR: Arg1Reg]]]!
Item was changed:
----- Method: CogARMCompiler>>genSubstituteReturnAddress: (in category 'abstract instructions') -----
genSubstituteReturnAddress: retpc
<inline: true>
<returnTypeC: #'AbstractInstruction *'>
+ "This code needs to be tightly correlated across:-
+ GdbARMAlien>simulateJumpCallOf:memory:
+ GdbARMAlien>simulateCallOf:nextpc:memory:
+ GdbARMAlien>simulateReturnIn:
+ GdbARMAlien>retpcIn:
+ CogARMCompiler>genSubstituteReturnAddress:
+ Getting any one of them doing something different will cause much pain"
+ ^cogit PushCw: retpc!
- ^cogit MoveCw: retpc R: LR!
Item was changed:
----- Method: CogARMCompilerTests>>testAdd (in category 'tests') -----
testAdd
"self new testAdd"
"the forms are valid, "
"test AddCqR"
self concreteCompilerClass registersWithNamesDo: [ :reg :regName |
#(0 16rF 16rFF) do:
[:n| | inst len |
inst := self gen: AddCqR operand: n operand: reg.
len := inst concretizeAt: 0.
self processor
disassembleInstructionAt: 0
In: inst machineCode object
into: [:str :sz| | plainJane herIntended |
plainJane := self strip: str.
herIntended := 'adds ', regName, ', ', regName, ', #', n asString.
self assert: (plainJane match: herIntended)]]].
"test AddCwR"
self concreteCompilerClass registersWithNamesDo: [ :reg :regName |
#(16rFFFFFFFF 16r88888888 0) do:
[:n| | inst len |
inst := self gen: AddCwR operand: n operand: reg.
len := inst concretizeAt: 0.
self processor
disassembleInstructionAt: 0
In: inst machineCode object
into: [:str :sz| | plainJane herIntended |
plainJane := self strip: str.
+ herIntended := 'mov sl, #', (n bitAnd: 16rFF << 24) asString.
- herIntended := 'mov sl, #', (n bitAnd: 16rFF << 8) asString.
self assert: (plainJane match: herIntended)].
self processor
disassembleInstructionAt: 4
In: inst machineCode object
into: [:str :sz| | plainJane herIntended |
plainJane := self strip: str.
herIntended := 'orr sl, sl, #', (n bitAnd: 16rFF << 16) asString.
self assert: (plainJane match: herIntended)].
self processor
disassembleInstructionAt: 8
In: inst machineCode object
into: [:str :sz| | plainJane herIntended |
plainJane := self strip: str.
+ herIntended := 'orr sl, sl, #', (n bitAnd: 16rFF << 8) signedIntFromLong asString.
- herIntended := 'orr sl, sl, #', (n bitAnd: 16rFF << 24) signedIntFromLong asString.
self assert: (plainJane match: herIntended)].
self processor
disassembleInstructionAt: 12
In: inst machineCode object
into: [:str :sz| | plainJane herIntended |
plainJane := self strip: str.
herIntended := 'orr sl, sl, #', (n bitAnd: 16rFF) asString.
self assert: (plainJane match: herIntended)].
self processor
disassembleInstructionAt: 16
In: inst machineCode object
into: [:str :sz| | plainJane herIntended |
plainJane := self strip: str.
herIntended := 'adds ', regName, ', ', regName, ', sl'.
self assert: (plainJane match: herIntended)]]]
!
Item was changed:
----- Method: Cogit>>compileAbort (in category 'compile abstract instructions') -----
compileAbort
"The start of a CogMethod has a call to a run-time abort routine that either
handles an in-line cache failure or a stack overflow. The routine selects the
path depending on ReceiverResultReg; if zero it takes the stack overflow
path; if nonzero the in-line cache miss path. Neither of these paths returns.
The abort routine must be called; In the callee the method is located by
adding the relevant offset to the return address of the call."
stackOverflowCall := self MoveCq: 0 R: ReceiverResultReg.
backEnd hasLinkRegister
ifTrue:
+ ["if we have a link register we will assume that it does not get automatically pushed onto the stack
+ and thus needs to be manually handled here"
+ sendMiss := self PushR: LinkReg.
- [sendMiss := self PushR: LinkReg.
sendMissCall := self Call: (self methodAbortTrampolineFor: methodOrBlockNumArgs)]
ifFalse:
[sendMiss :=
sendMissCall := self Call: (self methodAbortTrampolineFor: methodOrBlockNumArgs)]!
Item was changed:
----- Method: Cogit>>compilePICProlog: (in category 'in-line cacheing') -----
compilePICProlog: numArgs
"The start of a PIC has a call to a run-time abort routine that either handles
a dispatch to an interpreted method or a dispatch of an MNU case. The
routine selects the path depending on ClassReg; if zero it takes the MNU
path; if nonzero the dispatch to interpreter path. Neither of these paths
returns. The abort routine must be called; In the callee the PIC is located
by adding the relevant offset to the return address of the call."
mnuCall := self MoveCq: 0 R: ClassReg.
backEnd hasLinkRegister
ifTrue:
+ ["if we have a link register we will assume that it does not get automatically pushed onto the stack
+ and thus needs to be manually handled here"
+ interpretLabel := self PushR: LinkReg.
- [interpretLabel := self PushR: LinkReg.
interpretCall := self Call: (self picAbortTrampolineFor: numArgs)]
ifFalse:
[interpretLabel :=
interpretCall := self Call: (self picAbortTrampolineFor: numArgs)].
^0!
Item was changed:
----- Method: Cogit>>genCheckForInterruptsTrampoline (in category 'initialization') -----
genCheckForInterruptsTrampoline
opcodeIndex := 0.
+ "if we have a link register we will assume that it does not get automatically pushed onto the stack
+ and thus there is no need to pop it before saving to instructionPointerAddress"
backEnd hasLinkRegister
ifTrue:
[self MoveR: LinkReg Aw: coInterpreter instructionPointerAddress]
ifFalse:
[self PopR: TempReg. "instruction pointer"
self MoveR: TempReg Aw: coInterpreter instructionPointerAddress].
^self genTrampolineFor: #ceCheckForInterrupts
called: 'ceCheckForInterruptsTrampoline'
numArgs: 0
arg: nil
arg: nil
arg: nil
arg: nil
saveRegs: false
pushLinkReg: false
resultReg: nil
appendOpcodes: true!
Item was changed:
----- Method: Cogit>>genEnilopmartFor:and:and:called: (in category 'initialization') -----
genEnilopmartFor: regArg1 and: regArg2 and: regArg3 called: trampolineName
"An enilopmart (the reverse of a trampoline) is a piece of code that makes
the system-call-like transition from the C runtime into generated machine
code. The desired arguments and entry-point are pushed on a stackPage's
stack. The enilopmart pops off the values to be loaded into registers and
then executes a return instruction to pop off the entry-point and jump to it.
BEFORE AFTER (stacks grow down)
whatever stackPointer -> whatever
target address => reg1 = reg1val, etc
reg1val pc = target address
reg2val
stackPointer -> reg3val
C.F. genCallEnilopmartFor:and:and:called:"
<returnTypeC: 'void (*genEnilopmartForandandcalled(sqInt regArg1, sqInt regArg2, sqInt regArg3, char *trampolineName))(void)'>
| size endAddress enilopmart |
opcodeIndex := 0.
backEnd genLoadStackPointers.
self PopR: regArg3.
self PopR: regArg2.
self PopR: regArg1.
backEnd hasLinkRegister
ifTrue: [backEnd hasPCRegister
+ ifTrue: [self PopR: PCReg]
- ifTrue: [self PopR: LinkReg]
ifFalse: [self PopR: LinkReg; RetN: 0]]
ifFalse: [self RetN: 0].
self computeMaximumSizes.
size := self generateInstructionsAt: methodZoneBase.
endAddress := self outputInstructionsAt: methodZoneBase.
self assert: methodZoneBase + size = endAddress.
enilopmart := methodZoneBase.
methodZoneBase := self alignUptoRoutineBoundary: endAddress.
backEnd nopsFrom: endAddress to: methodZoneBase - 1.
self recordGeneratedRunTime: trampolineName address: enilopmart.
^self cCoerceSimple: enilopmart to: #'void (*)(void)'!
Item was changed:
----- Method: Cogit>>genEnilopmartFor:and:called: (in category 'initialization') -----
genEnilopmartFor: regArg1 and: regArg2 called: trampolineName
"An enilopmart (the reverse of a trampoline) is a piece of code that makes
the system-call-like transition from the C runtime into generated machine
code. The desired arguments and entry-point are pushed on a stackPage's
stack. The enilopmart pops off the values to be loaded into registers and
then executes a return instruction to pop off the entry-point and jump to it.
BEFORE AFTER (stacks grow down)
whatever stackPointer -> whatever
target address => reg1 = reg1val, etc
reg1val pc = target address
stackPointer -> reg2val
C.F. genCallEnilopmartFor:and:and:called:"
<returnTypeC: 'void (*genEnilopmartForandandcalled(sqInt regArg1, sqInt regArg2, char *trampolineName))(void)'>
| size endAddress enilopmart |
opcodeIndex := 0.
backEnd genLoadStackPointers.
self PopR: regArg2.
self PopR: regArg1.
backEnd hasLinkRegister
ifTrue: [backEnd hasPCRegister
+ ifTrue: [self PopR: PCReg]
- ifTrue: [self PopR: LinkReg]
ifFalse: [self PopR: LinkReg; RetN: 0]]
ifFalse: [self RetN: 0].
self computeMaximumSizes.
size := self generateInstructionsAt: methodZoneBase.
endAddress := self outputInstructionsAt: methodZoneBase.
self assert: methodZoneBase + size = endAddress.
enilopmart := methodZoneBase.
methodZoneBase := self alignUptoRoutineBoundary: endAddress.
backEnd nopsFrom: endAddress to: methodZoneBase - 1.
self recordGeneratedRunTime: trampolineName address: enilopmart.
^self cCoerceSimple: enilopmart to: #'void (*)(void)'!
Item was changed:
----- Method: Cogit>>genEnilopmartFor:called: (in category 'initialization') -----
genEnilopmartFor: regArg1 called: trampolineName
"An enilopmart (the reverse of a trampoline) is a piece of code that makes
the system-call-like transition from the C runtime into generated machine
code. The desired arguments and entry-point are pushed on a stackPage's
stack. The enilopmart pops off the values to be loaded into registers and
then executes a return instruction to pop off the entry-point and jump to it.
BEFORE AFTER (stacks grow down)
whatever stackPointer -> whatever
target address => reg1 = reg1val
stackPointer -> reg1val pc = target address
C.F. genCallEnilopmartFor:and:and:called:"
<returnTypeC: 'void (*genEnilopmartForandandcalled(sqInt regArg1, char *trampolineName))(void)'>
| size endAddress enilopmart |
opcodeIndex := 0.
backEnd genLoadStackPointers.
self PopR: regArg1.
backEnd hasLinkRegister
ifTrue: [backEnd hasPCRegister
+ ifTrue: [self PopR: PCReg]
- ifTrue: [self PopR: LinkReg]
ifFalse: [self PopR: LinkReg; RetN: 0]]
ifFalse: [self RetN: 0].
self computeMaximumSizes.
size := self generateInstructionsAt: methodZoneBase.
endAddress := self outputInstructionsAt: methodZoneBase.
self assert: methodZoneBase + size = endAddress.
enilopmart := methodZoneBase.
methodZoneBase := self alignUptoRoutineBoundary: endAddress.
backEnd nopsFrom: endAddress to: methodZoneBase - 1.
self recordGeneratedRunTime: trampolineName address: enilopmart.
^self cCoerceSimple: enilopmart to: #'void (*)(void)'!
1
0
Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-eem.802.mcz
==================== Summary ====================
Name: VMMaker.oscog-eem.802
Author: eem
Time: 3 July 2014, 5:33:01.026 pm
UUID: 54ee6cf7-485a-41d6-8749-9a94d6288e69
Ancestors: VMMaker.oscog-eem.801
Split the enilopmarts into those that are used in the context
of a call (entering code as if from a call) and those used in
other contexts (converting interpreted method to machine
code method in loops, returning form interpreter method
to machine code one, etc).
Implement the call enilopmarts correctly (we hope) for ARM
where pushed ret pc must be popped into LinkReg.
Add a PCReg abstract reg and use it to implement jumping
to popped top of stack by popping into PCReg (for ARM).
=============== Diff against VMMaker.oscog-eem.801 ===============
Item was changed:
----- Method: CoInterpreter>>activateCoggedNewMethod: (in category 'message sending') -----
activateCoggedNewMethod: inInterpreter
"Activate newMethod when newMethod has been cogged, i.e. create a machine-code frame and (re)enter machine-code."
| methodHeader cogMethod rcvr numTemps errorCode switched |
<var: #cogMethod type: #'CogMethod *'>
methodHeader := self rawHeaderOf: newMethod.
self assert: (self isCogMethodReference: methodHeader).
cogMethod := self cCoerceSimple: methodHeader to: #'CogMethod *'.
methodHeader := cogMethod methodHeader.
rcvr := self stackValue: cogMethod cmNumArgs. "could new rcvr be set at point of send?"
self push: instructionPointer.
cogMethod stackCheckOffset = 0 ifTrue:
["frameless method; nothing to activate..."
cogit numRegArgs > 0 ifTrue: "dont use and: so as to get Slang to inline cogit numRegArgs > 0"
[cogMethod cmNumArgs <= cogit numRegArgs ifTrue:
+ [self callRegisterArgCogMethod: cogMethod at: cogit noCheckEntryOffset receiver: rcvr]].
- [self enterRegisterArgCogMethod: cogMethod at: cogit noCheckEntryOffset receiver: rcvr]].
self push: cogMethod asInteger + cogit noCheckEntryOffset.
self push: rcvr.
+ cogit ceCallCogCodePopReceiverReg.
- cogit ceEnterCogCodePopReceiverReg.
self error: 'should not be reached'].
self push: framePointer.
framePointer := stackPointer.
self push: cogMethod asInteger.
self push: objectMemory nilObject. "FxThisContext field"
self push: rcvr.
"clear remaining temps to nil"
numTemps := self temporaryCountOfMethodHeader: methodHeader.
cogMethod cmNumArgs + 1 to: numTemps do:
[:i | self push: objectMemory nilObject].
(self methodHeaderHasPrimitive: methodHeader) ifTrue:
[| initialPC |
"Store the error code if the method starts with a long store temp. No instructionPointer skip because we're heading for machine code."
initialPC := (self initialPCForHeader: methodHeader method: newMethod) + (self sizeOfCallPrimitiveBytecode: methodHeader).
primFailCode ~= 0 ifTrue:
[(objectMemory byteAt: initialPC) = (self longStoreBytecodeForHeader: methodHeader) ifTrue:
[errorCode := self getErrorObjectFromPrimFailCode.
self stackTopPut: errorCode "nil if primFailCode == 1, or primFailCode"].
primFailCode := 0]].
"Now check for stack overflow or an event (interrupt, must scavenge, etc)."
stackPointer >= stackLimit ifTrue:
[self assert: cogMethod stackCheckOffset > cogit noCheckEntryOffset.
self push: cogMethod asInteger + cogMethod stackCheckOffset.
self push: rcvr.
+ cogit ceCallCogCodePopReceiverReg.
- cogit ceEnterCogCodePopReceiverReg.
self error: 'should not be reached'].
instructionPointer := cogMethod asInteger + cogMethod stackCheckOffset.
switched := self handleStackOverflowOrEventAllowContextSwitch: (self canContextSwitchIfActivating: newMethod header: methodHeader).
self returnToExecutive: inInterpreter postContextSwitch: switched!
Item was added:
+ ----- Method: CoInterpreter>>callRegisterArgCogMethod:at:receiver: (in category 'enilopmarts') -----
+ callRegisterArgCogMethod: cogMethod at: entryOffset receiver: rcvr
+ "convert
+ rcvr base
+ arg(s)
+ retpc <- sp
+ to
+ retpc base
+ entrypc
+ rcvr
+ arg(s) <- sp
+ and then enter at either the checked or the unchecked entry-point."
+ <var: #cogMethod type: #'CogMethod *'>
+ self assert: (cogit numRegArgs > 0 and: [cogit numRegArgs <= 2 and: [cogMethod cmNumArgs <= cogit numRegArgs]]).
+ cogMethod cmNumArgs = 2 ifTrue:
+ [self stackValue: 3 put: self stackTop. "retpc"
+ self push: (self stackValue: 1). "last arg"
+ self stackValue: 1 put: (self stackValue: 3). "first arg"
+ self stackValue: 2 put: rcvr.
+ self stackValue: 3 put: cogMethod asInteger + entryOffset.
+ cogit ceCallCogCodePopReceiverArg1Arg0Regs
+ "NOTREACHED"].
+ cogMethod cmNumArgs = 1 ifTrue:
+ [self stackValue: 2 put: self stackTop. "retpc"
+ self push: (self stackValue: 1). "arg"
+ self stackValue: 1 put: rcvr.
+ self stackValue: 2 put: cogMethod asInteger + entryOffset.
+ cogit ceCallCogCodePopReceiverArg0Regs
+ "NOTREACHED"].
+ self assert: cogMethod cmNumArgs = 0.
+ self stackValue: 1 put: self stackTop. "retpc"
+ self stackValue: 0 put: cogMethod asInteger + entryOffset.
+ self push: rcvr.
+ cogit ceCallCogCodePopReceiverReg
+ "NOTREACHED"!
Item was removed:
- ----- Method: CoInterpreter>>enterRegisterArgCogMethod:at:receiver: (in category 'enilopmarts') -----
- enterRegisterArgCogMethod: cogMethod at: entryOffset receiver: rcvr
- "convert
- rcvr base
- arg(s)
- retpc <- sp
- to
- retpc base
- entrypc
- rcvr
- arg(s) <- sp
- and then enter at either the checked or the unchecked entry-point."
- <var: #cogMethod type: #'CogMethod *'>
- self assert: (cogit numRegArgs > 0 and: [cogit numRegArgs <= 2 and: [cogMethod cmNumArgs <= cogit numRegArgs]]).
- cogMethod cmNumArgs = 2 ifTrue:
- [self stackValue: 3 put: self stackTop. "retpc"
- self push: (self stackValue: 1). "last arg"
- self stackValue: 1 put: (self stackValue: 3). "first arg"
- self stackValue: 2 put: rcvr.
- self stackValue: 3 put: cogMethod asInteger + entryOffset.
- cogit ceEnterCogCodePopReceiverArg1Arg0Regs
- "NOTREACHED"].
- cogMethod cmNumArgs = 1 ifTrue:
- [self stackValue: 2 put: self stackTop. "retpc"
- self push: (self stackValue: 1). "arg"
- self stackValue: 1 put: rcvr.
- self stackValue: 2 put: cogMethod asInteger + entryOffset.
- cogit ceEnterCogCodePopReceiverArg0Regs
- "NOTREACHED"].
- self assert: cogMethod cmNumArgs = 0.
- self stackValue: 1 put: self stackTop. "retpc"
- self stackValue: 0 put: cogMethod asInteger + entryOffset.
- self push: rcvr.
- cogit ceEnterCogCodePopReceiverReg
- "NOTREACHED"!
Item was changed:
----- Method: CoInterpreter>>executeCogBlock:closure:mayContextSwitch: (in category 'enilopmarts') -----
executeCogBlock: cogMethod closure: closure mayContextSwitch: mayContextSwitch
"Execute a block within a CogMethod. The caller has already pushed
the block and any arguments and the return pc. First push the
return-to-interpreter trampoline, then the entry-point and finally the
register argument(s). Then jump to the block entry by executing a
return instruction.
In the simple jit only the receiver gets passed in registers, so only the
receiver gets pushed."
<var: #cogMethod type: #'CogMethod *'>
cogit assertCStackWellAligned.
self assertValidExecutionPointe: instructionPointer r: framePointer s: stackPointer.
self ensurePushedInstructionPointer.
self push: cogMethod asInteger
+ (mayContextSwitch
ifTrue: [cogMethod blockEntryOffset]
ifFalse: [cogMethod blockEntryOffset - cogit noContextSwitchBlockEntryOffset]).
self push: closure.
+ cogit ceCallCogCodePopReceiverReg
- cogit ceEnterCogCodePopReceiverReg
"NOTREACHED"!
Item was changed:
----- Method: CoInterpreter>>executeCogMethod:fromLinkedSendWithReceiver: (in category 'enilopmarts') -----
executeCogMethod: cogMethod fromLinkedSendWithReceiver: rcvr
<api>
"Execute a CogMethod from a linked send. The receiver,
arguments and return address are on the Smalltalk stack. First
push the entry-point and finally the register argument(s). Then write
back the frame pointers and call the routine that will pop off the register
argument(s) and jump to the entry by executing a return instruction.
In the simple jit only the receiver gets passed in registers, so only the
receiver gets pushed."
<var: #cogMethod type: #'CogMethod *'>
cogit assertCStackWellAligned.
self assert: (self isMachineCodeFrame: framePointer).
self assertValidExecutionPointe: self stackTop r: framePointer s: stackPointer imbar: false line: #'__LINE__'.
cogit numRegArgs > 0 ifTrue: "dont use and: so as to get Slang to inline cogit numRegArgs > 0"
[cogMethod cmNumArgs <= cogit numRegArgs ifTrue:
+ [self callRegisterArgCogMethod: cogMethod at: cogit entryOffset receiver: rcvr]].
- [self enterRegisterArgCogMethod: cogMethod at: cogit entryOffset receiver: rcvr]].
self
push: cogMethod asInteger + cogit entryOffset;
push: rcvr.
+ cogit ceCallCogCodePopReceiverReg
- cogit ceEnterCogCodePopReceiverReg
"NOTREACHED"!
Item was changed:
----- Method: CoInterpreter>>executeCogMethod:fromLinkedSendWithReceiver:andCacheTag: (in category 'enilopmarts') -----
executeCogMethod: cogMethod fromLinkedSendWithReceiver: rcvr andCacheTag: cacheTag
<api>
"Execute a CogMethod from a linked send. The receiver,
arguments and return address are on the Smalltalk stack. First
push the entry-point and finally the register argument(s). Then write
back the frame pointers and call the routine that will pop off the register
argument(s) and jump to the entry by executing a return instruction.
In the simple jit only the receiver gets passed in registers, so only the
receiver gets pushed."
<var: #cogMethod type: #'CogMethod *'>
cogit assertCStackWellAligned.
self assert: (self isMachineCodeFrame: framePointer).
self assertValidExecutionPointe: self stackTop r: framePointer s: stackPointer imbar: false line: #'__LINE__'.
self push: cogMethod asInteger + cogit entryOffset.
cogit numRegArgs > 0 ifTrue:"dont use and: so as to get Slang to inline cogit numRegArgs > 0"
[cogMethod cmNumArgs <= cogit numRegArgs ifTrue:
[self push: cacheTag.
cogMethod cmNumArgs caseOf: {
+ [0] -> [cogit ceCall0ArgsPIC].
+ [1] -> [cogit ceCall1ArgsPIC].
+ [2] -> [cogit ceCall2ArgsPIC]
- [0] -> [cogit ceEnter0ArgsPIC].
- [1] -> [cogit ceEnter1ArgsPIC].
- [2] -> [cogit ceEnter2ArgsPIC]
}
otherwise: [].
self error: 'not reached']].
self
push: rcvr;
push: cacheTag.
+ cogit ceCallCogCodePopReceiverAndClassRegs
- cogit ceEnterCogCodePopReceiverAndClassRegs
"NOTREACHED"!
Item was changed:
----- Method: CoInterpreter>>executeCogMethod:fromUnlinkedSendWithReceiver: (in category 'enilopmarts') -----
executeCogMethod: cogMethod fromUnlinkedSendWithReceiver: rcvr
"Execute a CogMethod from an unlinked send. The receiver,
arguments and return address are on the Smalltalk stack. First
push the entry-point and finally the register argument(s). Then write
back the frame pointers and call the routine that will pop off the register
argument(s) and jump to the entry by executing a return instruction.
In the simple jit only the receiver gets passed in registers, so only the
receiver gets pushed."
<var: #cogMethod type: #'CogMethod *'>
cogit assertCStackWellAligned.
self assert: (self isMachineCodeFrame: framePointer).
self assertValidExecutionPointe: self stackTop r: framePointer s: stackPointer imbar: false line: #'__LINE__'.
cogit numRegArgs > 0 ifTrue: "dont use and: so as to get Slang to inline cogit numRegArgs > 0"
[cogMethod cmNumArgs <= cogit numRegArgs ifTrue:
+ [self callRegisterArgCogMethod: cogMethod at: cogit noCheckEntryOffset receiver: rcvr]].
- [self enterRegisterArgCogMethod: cogMethod at: cogit noCheckEntryOffset receiver: rcvr]].
self
push: cogMethod asInteger + cogit noCheckEntryOffset;
push: rcvr.
+ cogit ceCallCogCodePopReceiverReg
- cogit ceEnterCogCodePopReceiverReg
"NOTREACHED"!
Item was changed:
----- Method: CogARMCompiler>>concreteRegister: (in category 'encoding') -----
concreteRegister: registerIndex
"Map a possibly abstract register into a concrete one. Abstract registers
(defined in CogAbstractOpcodes) are all negative. If registerIndex is
+ negative assume it is an abstract register."
- negative assume it is an abstract register."
"N.B. According to BSABI, R0-R3 are caller-save, R4-R12 are callee save.
+ Note that R9 might be a special register for the implementation. In some slides
+ it is refered to as sb. R10 can contain the stack limit (sl), R11 the fp. R12 is an
+ intra-procedure scratch instruction pointer for link purposes. It can also be used.
+ R10 is used as temporary inside a single abstract opcode implementation"
+ "R0-R3 are used when calling back to the interpreter. Using them would require
+ saving and restoring their values, so they are omitted so far. R12 is the only
+ unused register at the moment.."
- Note that R9 might be a special register for the implementation. In some slides it is refered to as sb. R10 can contain the stack limit (sl), R11 the fp. R12 is an intra-procedure scratch instruction pointer for link purposes. It can also be used.
- R10 is used as temporary inside a single abstract opcode implementation"
- "R0-R3 are used when calling back to the interpreter. Using them would require saving and restoring their values, so they are omitted so far. R12 is the only unused register at the moment.."
^registerIndex
caseOf: {
[TempReg] -> [R7].
[ClassReg] -> [R8].
[ReceiverResultReg] -> [R9].
[SendNumArgsReg] -> [R6].
[SPReg] -> [SP].
[FPReg] -> [R11].
[Arg0Reg] -> [R4].
[Arg1Reg] -> [R5].
+ [LinkReg] -> [LR].
+ [PCReg] -> [PC] }
- [LinkReg] -> [LR]. }
otherwise:
[self assert: (registerIndex between: R0 and: PC).
registerIndex]!
Item was added:
+ ----- Method: CogARMCompiler>>hasPCRegister (in category 'testing') -----
+ hasPCRegister
+ "Answer if the processor has a generally addressable pc register, which ARM does."
+ ^true!
Item was added:
+ ----- Method: CogAbstractInstruction>>hasPCRegister (in category 'testing') -----
+ hasPCRegister
+ "Answer if the processor has a generally addressable pc register, such as the ARM.
+ On such processors we can execute jumping to pop top of stack by popping into
+ the pc register. Note that this is not a generic RISC feature. The PowerPC does not
+ allow one to pop into the pc for example. So by default, answer false."
+ ^false!
Item was changed:
----- Method: CogMethodZone>>freeMethod: (in category 'compaction') -----
freeMethod: cogMethod
<var: #cogMethod type: #'CogMethod *'>
<inline: false>
self assert: cogMethod cmType ~= CMFree.
self assert: (cogit cogMethodDoesntLookKosher: cogMethod) = 0.
cogMethod cmType = CMMethod ifTrue:
["For non-Newspeak there should ne a one-to-one mapping between bytecoded and
cog methods. For Newspeak not necessarily, but only for anonymous accessors."
"Only reset the original method's header if it is referring to this CogMethod."
(coInterpreter rawHeaderOf: cogMethod methodObject) asInteger = cogMethod asInteger
ifTrue:
[coInterpreter rawHeaderOf: cogMethod methodObject put: cogMethod methodHeader]
ifFalse:
[self assert: (cogit noAssertMethodClassAssociationOf: cogMethod methodObject) = objectMemory nilObject.
self cppIf: NewspeakVM ifTrue:
[self removeFromUnpairedMethodList: cogMethod]].
+ cogit maybeFreeCountersOf: cogMethod.
cogMethod cmRefersToYoung: false].
cogMethod cmType = CMOpenPIC ifTrue:
[self removeFromOpenPICList: cogMethod.
cogMethod cmRefersToYoung: false].
cogMethod cmType: CMFree.
methodBytesFreedSinceLastCompaction := methodBytesFreedSinceLastCompaction
+ cogMethod blockSize!
Item was changed:
SharedPool subclass: #CogRTLOpcodes
instanceVariableNames: ''
+ classVariableNames: 'AddCqR AddCwR AddRR AddRdRd AlignmentNops AndCqR AndCwR AndRR Arg0Reg Arg1Reg ArithmeticShiftRightCqR ArithmeticShiftRightRR Call ClassReg CmpCqR CmpCwR CmpRR CmpRdRd ConvertRRd DPFPReg0 DPFPReg1 DPFPReg2 DPFPReg3 DPFPReg4 DPFPReg5 DPFPReg6 DPFPReg7 DivRdRd FPReg Fill16 Fill32 Fill8 FillBytesFrom FillFromWord FirstJump FirstShortJump GPRegMax GPRegMin Jump JumpAbove JumpAboveOrEqual JumpBelow JumpBelowOrEqual JumpCarry JumpFPEqual JumpFPGreater JumpFPGreaterOrEqual JumpFPLess JumpFPLessOrEqual JumpFPNotEqual JumpFPOrdered JumpFPUnordered JumpGreater JumpGreaterOrEqual JumpLess JumpLessOrEqual JumpLong JumpLongNonZero JumpLongZero JumpNegative JumpNoCarry JumpNoOverflow JumpNonNegative JumpNonZero JumpOverflow JumpR JumpZero Label LastJump LastRTLCode LinkReg LoadEffectiveAddressMwrR LoadEffectiveAddressXowrR LogicalShiftLeftCqR LogicalShiftLeftRR LogicalShiftRightCqR LogicalShiftRightRR MoveAbR MoveAwR MoveC32R MoveC64R MoveCqR MoveCwR MoveM16rR MoveM32rR MoveM64rRd MoveMbrR MoveMwrR MoveRAw MoveRM16r MoveRM32r MoveRMbr MoveRMwr MoveRR MoveRX16rR MoveRX32rR MoveRXbrR MoveRXowr MoveRXwrR MoveRdM64r MoveRdRd MoveX16rRR MoveX32rRR MoveXbrRR MoveXowrR MoveXwrRR MulCqR MulCwR MulRR MulRdRd NegateR Nop OrCqR OrCwR OrRR PCReg PopR PrefetchAw PushCw PushR ReceiverResultReg RetN SPReg SendNumArgsReg SqrtRd SubCqR SubCwR SubRR SubRdRd TempReg XorCqR XorCwR XorRR'
- classVariableNames: 'AddCqR AddCwR AddRR AddRdRd AlignmentNops AndCqR AndCwR AndRR Arg0Reg Arg1Reg ArithmeticShiftRightCqR ArithmeticShiftRightRR Call ClassReg CmpCqR CmpCwR CmpRR CmpRdRd ConvertRRd DPFPReg0 DPFPReg1 DPFPReg2 DPFPReg3 DPFPReg4 DPFPReg5 DPFPReg6 DPFPReg7 DivRdRd FPReg Fill16 Fill32 Fill8 FillBytesFrom FillFromWord FirstJump FirstShortJump GPRegMax GPRegMin Jump JumpAbove JumpAboveOrEqual JumpBelow JumpBelowOrEqual JumpCarry JumpFPEqual JumpFPGreater JumpFPGreaterOrEqual JumpFPLess JumpFPLessOrEqual JumpFPNotEqual JumpFPOrdered JumpFPUnordered JumpGreater JumpGreaterOrEqual JumpLess JumpLessOrEqual JumpLong JumpLongNonZero JumpLongZero JumpNegative JumpNoCarry JumpNoOverflow JumpNonNegative JumpNonZero JumpOverflow JumpR JumpZero Label LastJump LastRTLCode LinkReg LoadEffectiveAddressMwrR LoadEffectiveAddressXowrR LogicalShiftLeftCqR LogicalShiftLeftRR LogicalShiftRightCqR LogicalShiftRightRR MoveAbR MoveAwR MoveC32R MoveC64R MoveCqR MoveCwR MoveM16rR MoveM32rR MoveM64rRd MoveMbrR MoveMwrR MoveRAw MoveRM16r MoveRM32r MoveRMbr MoveRMwr MoveRR MoveRX16rR MoveRX32rR MoveRXbrR MoveRXowr MoveRXwrR MoveRdM64r MoveRdRd MoveX16rRR MoveX32rRR MoveXbrRR MoveXowrR MoveXwrRR MulCqR MulCwR MulRR MulRdRd NegateR Nop OrCqR OrCwR OrRR PopR PrefetchAw PushCw PushR ReceiverResultReg RetN SPReg SendNumArgsReg SqrtRd SubCqR SubCwR SubRR SubRdRd TempReg XorCqR XorCwR XorRR'
poolDictionaries: ''
category: 'VMMaker-JIT'!
!CogRTLOpcodes commentStamp: '<historical>' prior: 0!
I am a pool for the Register-Transfer-Language to which Cog compiles. I define unique integer values for all RTL opcodes and abstract registers. See CogAbstractInstruction for instances of instructions with the opcodes that I define.!
Item was changed:
----- Method: CogRTLOpcodes class>>initialize (in category 'class initialization') -----
initialize
"Abstract opcodes are a compound of a one word operation specifier and zero or more operand type specifiers.
e.g. MoveRR is the Move opcode with two register operand specifiers and defines a move register to
register instruction from operand 0 to operand 1. The word and register size is assumed to be either 32-bits on
a 32-bit architecture or 64-bits on a 64-bit architecture.
The operand specifiers are
R - general purpose register
Rd - double-precision floating-point register
Cq - a quick constant that can be encoded in the minimum space possible.
Cw - a constant with word size where word is the default operand size for the Smalltalk VM, 32-bits
for a 32-bit VM, 64-bits for a 64-bit VM. The generated constant must occupy the default number
of bits. This allows e.g. a garbage collector to update the value without invalidating the code.
C32 - a constant with 32 bit size. The generated constant must occupy 32 bits.
C64 - a constant with 64 bit size. The generated constant must occupy 64 bits.
Aw - memory word with an absolute address
Ab - memory byte with an absolute address
Mwr - memory word whose address is at a constant offset from an address in a register
Mbr - memory byte whose address is at a constant offset from an address in a register
M16r - memory 16-bit halfword whose address is at a constant offset from an address in a register
M32r - memory 32-bit halfword whose address is at a constant offset from an address in a register
M64r - memory 64-bit doubleword whose address is at a constant offset from an address in a register
XbrR - memory word whose address is r * byte size away from an address in a register
X16rR - memory word whose address is r * (2 bytes size) away from an address in a register
XwrR - memory word whose address is r * word size away from an address in a register
XowrR - memory word whose address is (r * word size) + o away from an address in a register (scaled indexed)
An alternative would be to decouple opcodes from operands, e.g.
Move := 1. Add := 2. Sub := 3...
RegisterOperand := 1. ConstantQuickOperand := 2. ConstantWordOperand := 3...
But not all combinations make sense and even fewer are used so we stick with the simple compound approach.
The assumption is that comparison and arithmetic instructions set condition codes and that move instructions
leave the condition codes unaffected. In particular LoadEffectiveAddressMwrR does not set condition codes
although it can be used to do arithmetic.
Not all of the definitions in opcodeDefinitions below are implemented. In particular we do not implement the
XowrR scaled index addressing mode since it requires 4 operands.
Note that there are no generic division instructions defined, but a processor may define some."
| opcodeNames refs |
FPReg := -1.
SPReg := -2.
ReceiverResultReg := GPRegMax := -3.
TempReg := -4.
ClassReg := -5.
SendNumArgsReg := -6.
Arg0Reg := -7.
Arg1Reg := GPRegMin := -8.
DPFPReg0 := -9.
DPFPReg1 := -10.
DPFPReg2 := -11.
DPFPReg3 := -12.
DPFPReg4 := -13.
DPFPReg5 := -14.
DPFPReg6 := -15.
DPFPReg7 := -16.
LinkReg := -17.
+ PCReg := -18.
opcodeNames := #("Noops & Pseudo Ops"
Label
AlignmentNops
FillBytesFrom "output operand 0's worth of bytes from the address in operand 1"
Fill8 "output a byte's worth of bytes with operand 0"
Fill16 "output two byte's worth of bytes with operand 0"
Fill32 "output four byte's worth of bytes with operand 0"
FillFromWord "output BytesPerWord's worth of bytes with operand 0 + operand 1"
Nop
"Control"
Call
RetN
JumpR "Not a regular jump, i.e. not pc dependent."
"N.B. Jumps are contiguous. Long jumps are contigiuous within them. See FirstJump et al below"
JumpLong
JumpLongZero "a.k.a. JumpLongEqual"
JumpLongNonZero "a.k.a. JumpLongNotEqual"
Jump
JumpZero "a.k.a. JumpEqual"
JumpNonZero "a.k.a. JumpNotEqual"
JumpNegative
JumpNonNegative
JumpOverflow
JumpNoOverflow
JumpCarry
JumpNoCarry
JumpLess "signed"
JumpGreaterOrEqual
JumpGreater
JumpLessOrEqual
JumpBelow "unsigned"
JumpAboveOrEqual
JumpAbove
JumpBelowOrEqual
JumpFPEqual
JumpFPNotEqual
JumpFPLess
JumpFPLessOrEqual
JumpFPGreater
JumpFPGreaterOrEqual
JumpFPOrdered
JumpFPUnordered
"Data Movement; destination is always last operand"
MoveRR
MoveAwR
MoveRAw
MoveAbR
MoveMwrR MoveRMwr MoveXwrRR MoveRXwrR MoveXowrR MoveRXowr
MoveM16rR MoveRM16r MoveX16rRR MoveRX16rR
MoveM32rR MoveRM32r MoveX32rRR MoveRX32rR
MoveMbrR MoveRMbr MoveXbrRR MoveRXbrR
MoveCqR MoveCwR MoveC32R MoveC64R
MoveRdRd MoveM64rRd MoveRdM64r
PopR PushR PushCw
PrefetchAw
"Arithmetic; destination is always last operand except Cmp; CmpXR is SubRX with no update of result"
LoadEffectiveAddressMwrR LoadEffectiveAddressXowrR "Variants of add/multiply"
NegateR "2's complement negation"
ArithmeticShiftRightCqR ArithmeticShiftRightRR
LogicalShiftRightCqR LogicalShiftRightRR
LogicalShiftLeftCqR LogicalShiftLeftRR
CmpRR AddRR SubRR AndRR OrRR XorRR MulRR
CmpCqR AddCqR SubCqR AndCqR OrCqR XorCqR MulCqR
CmpCwR AddCwR SubCwR AndCwR OrCwR XorCwR MulCwR
CmpRdRd AddRdRd SubRdRd MulRdRd DivRdRd SqrtRd
"Conversion"
ConvertRRd
LastRTLCode).
"Magic auto declaration. Add to the classPool any new variables and nuke any obsolete ones, and assign values"
"Find the variables directly referenced by this method"
refs := (thisContext method literals select: [:l| l isVariableBinding and: [classPool includesKey: l key]]) collect:
[:ea| ea key].
"Move to Undeclared any opcodes in classPool not in opcodes or this method."
(classPool keys reject: [:k| (opcodeNames includes: k) or: [refs includes: k]]) do:
[:k|
Undeclared declare: k from: classPool].
"Declare as class variables and number elements of opcodeArray above"
opcodeNames withIndexDo:
[:classVarName :value|
self classPool
declare: classVarName from: Undeclared;
at: classVarName put: value].
"For CogAbstractInstruction>>isJump etc..."
FirstJump := JumpLong.
LastJump := JumpFPUnordered.
FirstShortJump := Jump.
"And now initialize the backends; they add their own opcodes and hence these must be reinitialized."
(Smalltalk classNamed: #CogAbstractInstruction) ifNotNil:
[:cogAbstractInstruction| cogAbstractInstruction allSubclasses do: [:sc| sc initialize]]!
Item was changed:
----- Method: CogRTLOpcodes class>>nameForRegister: (in category 'debug printing') -----
nameForRegister: reg "<Integer>"
^#(Arg0Reg Arg1Reg ClassReg FPReg ReceiverResultReg SPReg SendNumArgsReg TempReg
+ DPFPReg0 DPFPReg1 DPFPReg2 DPFPReg3 DPFPReg4 DPFPReg5 DPFPReg6 DPFPReg7 LinkReg PCReg)
- DPFPReg0 DPFPReg1 DPFPReg2 DPFPReg3 DPFPReg4 DPFPReg5 DPFPReg6 DPFPReg7 LinkReg)
detect: [:sym| (classPool at: sym) = reg]!
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 ceCallCogCodePopReceiverReg ceCallCogCodePopReceiverAndClassRegs cePrimReturnEnterCogCode cePrimReturnEnterCogCodeProfiling ceNonLocalReturnTrampoline ceFetchContextInstVarTrampoline ceStoreContextInstVarTrampoline ceImplicitReceiverTrampoline ceExplicitReceiverTrampoline ceCaptureCStackPointers ceFlushICache ceCheckFeaturesFunction ceTraceLinkedSendTrampoline ceTraceBlockActivationTrampoline ceTraceStoreTrampoline ceGetSP sendTrampolines superSendTrampolines dynamicSuperSendTrampolines firstSend lastSend realCEEnterCogCodePopReceiverReg realCECallCogCodePopReceiverReg realCECallCogCodePopReceiverAndClassRegs trampolineTableIndex trampolineAddresses objectReferencesInRuntime runtimeObjectRefIndex cFramePointerInUse debugPrimCallStackOffset ceTryLockVMOwner ceUnlockVMOwner cogMethodSurrogateClass cogBlockMethodSurrogateClass extA extB'
- 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'
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>>declareCVarsIn: (in category 'translation') -----
declareCVarsIn: aCCodeGenerator
#( 'coInterpreter' 'objectMemory' 'methodZone' 'objectRepresentation'
'cogBlockMethodSurrogateClass' 'cogMethodSurrogateClass'
'threadManager' 'processor' 'lastNInstructions' 'simulatedAddresses'
'simulatedTrampolines' 'simulatedVariableGetters' 'simulatedVariableSetters'
'printRegisters' 'printInstructions' 'clickConfirm' 'singleStep') do:
[:simulationVariableNotNeededForRealVM|
aCCodeGenerator removeVariable: simulationVariableNotNeededForRealVM].
NewspeakVM ifFalse:
[#( 'dynSuperEntry' 'dynSuperEntryAlignment' 'dynamicSuperSendTrampolines'
'ceImplicitReceiverTrampoline' 'ceExplicitReceiverTrampoline' 'cmDynSuperEntryOffset') do:
[:variableNotNeededInNormalVM|
aCCodeGenerator removeVariable: variableNotNeededInNormalVM]].
aCCodeGenerator removeConstant: #COGMTVM. "this should be defined at compile time"
aCCodeGenerator
addHeaderFile:'<stddef.h>'; "for e.g. offsetof"
addHeaderFile:'"sqCogStackAlignment.h"';
addHeaderFile:'"cogmethod.h"';
addHeaderFile:'#if COGMTVM';
addHeaderFile:'"cointerpmt.h"';
addHeaderFile:'#else';
addHeaderFile:'"cointerp.h"';
addHeaderFile:'#endif';
addHeaderFile:'"cogit.h"';
addHeaderFile:'"dispdbg.h"'.
aCCodeGenerator
var: #ceGetSP
declareC: 'unsigned long (*ceGetSP)(void)';
var: #ceCaptureCStackPointers
declareC: 'void (*ceCaptureCStackPointers)(void)';
var: #ceEnterCogCodePopReceiverReg
declareC: 'void (*ceEnterCogCodePopReceiverReg)(void)';
var: #realCEEnterCogCodePopReceiverReg
declareC: 'void (*realCEEnterCogCodePopReceiverReg)(void)';
+ var: #ceCallCogCodePopReceiverReg
+ declareC: 'void (*ceCallCogCodePopReceiverReg)(void)';
+ var: #realCECallCogCodePopReceiverReg
+ declareC: 'void (*realCECallCogCodePopReceiverReg)(void)';
+ var: #ceCallCogCodePopReceiverAndClassRegs
+ declareC: 'void (*ceCallCogCodePopReceiverAndClassRegs)(void)';
+ var: #realCECallCogCodePopReceiverAndClassRegs
+ declareC: 'void (*realCECallCogCodePopReceiverAndClassRegs)(void)';
- var: #ceEnterCogCodePopReceiverAndClassRegs
- declareC: 'void (*ceEnterCogCodePopReceiverAndClassRegs)(void)';
- var: #realCEEnterCogCodePopReceiverAndClassRegs
- declareC: 'void (*realCEEnterCogCodePopReceiverAndClassRegs)(void)';
var: #ceFlushICache
declareC: 'static void (*ceFlushICache)(unsigned long from, unsigned long to)';
var: #ceCheckFeaturesFunction
declareC: 'static unsigned long (*ceCheckFeaturesFunction)(void)';
var: #ceTryLockVMOwner
declareC: 'unsigned long (*ceTryLockVMOwner)(void)';
var: #ceUnlockVMOwner
declareC: 'void (*ceUnlockVMOwner)(void)';
var: #postCompileHook
declareC: 'void (*postCompileHook)(CogMethod *, void *)';
var: #openPICList declareC: 'CogMethod *openPICList = 0';
var: #maxMethodBefore type: #'CogBlockMethod *'.
aCCodeGenerator
declareVar: 'aMethodLabel' type: #'AbstractInstruction'; "Has to come lexicographically before backEnd & methodLabel"
var: #backEnd declareC: 'AbstractInstruction * const backEnd = &aMethodLabel';
var: #methodLabel declareC: 'AbstractInstruction * const methodLabel = &aMethodLabel';
var: #primInvokeLabel type: #'AbstractInstruction *'.
self declareC: #(abstractOpcodes stackCheckLabel
blockEntryLabel blockEntryNoContextSwitch
stackOverflowCall sendMiss sendMissCall entry noCheckEntry dynSuperEntry
mnuCall interpretCall interpretLabel endCPICCase0 endCPICCase1)
as: #'AbstractInstruction *'
in: aCCodeGenerator.
aCCodeGenerator
declareVar: #annotations type: #'InstructionAnnotation *';
declareVar: #blockStarts type: #'BlockStart *';
declareVar: #fixups type: #'BytecodeFixup *'.
aCCodeGenerator
var: #sendTrampolines
declareC: 'sqInt sendTrampolines[NumSendTrampolines]';
var: #superSendTrampolines
declareC: 'sqInt superSendTrampolines[NumSendTrampolines]';
var: #dynamicSuperSendTrampolines
declareC: 'sqInt dynamicSuperSendTrampolines[NumSendTrampolines]';
var: #trampolineAddresses
declareC: 'static char *trampolineAddresses[NumTrampolines*2]';
var: #objectReferencesInRuntime
declareC: 'static sqInt objectReferencesInRuntime[NumObjRefsInRuntime]';
var: #labelCounter
type: #int;
var: #traceFlags
declareC: 'int traceFlags = 8 /* prim trace log on by default */';
var: #cStackAlignment
declareC: 'const int cStackAlignment = STACK_ALIGN_BYTES'.
aCCodeGenerator
declareVar: #CFramePointer type: #'void *';
declareVar: #CStackPointer type: #'void *';
declareVar: #minValidCallAddress type: #'unsigned long';
declareVar: #debugPrimCallStackOffset type: #'unsigned long'.
aCCodeGenerator vmClass generatorTable ifNotNil:
[:bytecodeGenTable|
aCCodeGenerator
var: #generatorTable
declareC: 'BytecodeDescriptor generatorTable[', bytecodeGenTable size, ']',
(self tableInitializerFor: bytecodeGenTable
in: aCCodeGenerator);
var: #primitiveGeneratorTable
declareC: 'PrimitiveDescriptor primitiveGeneratorTable[MaxCompiledPrimitiveIndex+1]',
(self tableInitializerFor: aCCodeGenerator vmClass primitiveTable
in: aCCodeGenerator)].
"In C the abstract opcode names clash with the Smalltak generator syntactic sugar.
Most of the syntactic sugar is inlined, but alas some remains. Rename the syntactic
sugar to avoid the clash."
(self organization listAtCategoryNamed: #'abstract instructions') do:
[:s|
aCCodeGenerator addSelectorTranslation: s to: 'g', (aCCodeGenerator cFunctionNameFor: s)].
aCCodeGenerator addSelectorTranslation: #halt: to: 'haltmsg'!
Item was added:
+ ----- Method: Cogit>>callCogCodePopReceiver (in category 'debugging') -----
+ callCogCodePopReceiver
+ "This is a static version of ceCallCogCodePopReceiverReg
+ for break-pointing when debugging in C."
+ <api>
+ <inline: false>
+ "This exists only for break-pointing."
+ self cCode: [self realCECallCogCodePopReceiverReg]
+ inSmalltalk: [self ceCallCogCodePopReceiverReg].
+ "(and this exists only to reference Debug)"
+ Debug ifFalse: [self error: 'what??']!
Item was added:
+ ----- Method: Cogit>>callCogCodePopReceiverAndClassRegs (in category 'debugging') -----
+ callCogCodePopReceiverAndClassRegs
+ "This is a static version of ceCallCogCodePopReceiverAndClassRegs
+ for break-pointing when debugging in C."
+ <api>
+ <inline: false>
+ "This exists only for break-pointing."
+ self cCode: [self realCECallCogCodePopReceiverAndClassRegs]
+ inSmalltalk: [self ceCallCogCodePopReceiverAndClassRegs]!
Item was added:
+ ----- Method: Cogit>>ceCallCogCodePopReceiverAndClassRegs (in category 'simulation only') -----
+ ceCallCogCodePopReceiverAndClassRegs
+ <api: 'extern void (*ceCallCogCodePopReceiverAndClassRegs)()'>
+ <doNotGenerate>
+ self simulateEnilopmart: ceCallCogCodePopReceiverAndClassRegs numArgs: 2!
Item was added:
+ ----- Method: Cogit>>ceCallCogCodePopReceiverReg (in category 'simulation only') -----
+ ceCallCogCodePopReceiverReg
+ <api: 'extern void (*ceCallCogCodePopReceiverReg)()'>
+ <doNotGenerate>
+ self simulateEnilopmart: ceCallCogCodePopReceiverReg numArgs: 1!
Item was removed:
- ----- Method: Cogit>>ceEnterCogCodePopReceiverAndClassRegs (in category 'simulation only') -----
- ceEnterCogCodePopReceiverAndClassRegs
- <api: 'extern void (*ceEnterCogCodePopReceiverAndClassRegs)()'>
- <doNotGenerate>
- self simulateEnilopmart: ceEnterCogCodePopReceiverAndClassRegs numArgs: 2!
Item was removed:
- ----- Method: Cogit>>enterCogCodePopReceiverAndClassRegs (in category 'debugging') -----
- enterCogCodePopReceiverAndClassRegs
- "This is a static version of ceEnterCogCodePopReceiverAndClassRegs
- for break-pointing when debugging in C."
- <api>
- <inline: false>
- "This exists only for break-pointing."
- self cCode: [self realCEEnterCogCodePopReceiverAndClassRegs]
- inSmalltalk: [self ceEnterCogCodePopReceiverAndClassRegs]!
Item was added:
+ ----- Method: Cogit>>genCallEnilopmartFor:and:and:called: (in category 'initialization') -----
+ genCallEnilopmartFor: regArg1 and: regArg2 and: regArg3 called: trampolineName
+ "An enilopmart (the reverse of a trampoline) is a piece of code that makes
+ the system-call-like transition from the C runtime into generated machine
+ code. This version is for entering code as if from a call. The desired
+ arguments and entry-point are pushed on a stackPage's stack, and beneath
+ them is the call's return address. The enilopmart pops off the values to be
+ loaded into registers, and on CISCs then executes a return instruction to pop
+ off the entry-point and jump to it. On RISCs the enilopmart pops off the values
+ to be loaded into registers, pops the entry-point into a scratch register, pops
+ the return address into the LinkReg and then jumps to the entry point.
+
+ BEFORE AFTER (stacks grow down)
+ whatever stackPointer -> whatever
+ call return pc
+ target address =>
+ reg1val reg1 = reg1val, etc
+ reg2val LinkReg = call return pc
+ stackPointer -> reg3val pc = target address
+
+ C.F. genEnilopmartFor:and:and:called:"
+ <returnTypeC: 'void (*genCallEnilopmartForandandcalled(sqInt regArg1, sqInt regArg2, sqInt regArg3, char *trampolineName))(void)'>
+ | size endAddress enilopmart |
+ opcodeIndex := 0.
+ backEnd genLoadStackPointers.
+ self PopR: regArg3.
+ self PopR: regArg2.
+ self PopR: regArg1.
+ backEnd hasLinkRegister
+ ifTrue:
+ [self PopR: TempReg.
+ self PopR: LinkReg.
+ self JumpR: TempReg]
+ ifFalse:
+ [self RetN: 0].
+ self computeMaximumSizes.
+ size := self generateInstructionsAt: methodZoneBase.
+ endAddress := self outputInstructionsAt: methodZoneBase.
+ self assert: methodZoneBase + size = endAddress.
+ enilopmart := methodZoneBase.
+ methodZoneBase := self alignUptoRoutineBoundary: endAddress.
+ backEnd nopsFrom: endAddress to: methodZoneBase - 1.
+ self recordGeneratedRunTime: trampolineName address: enilopmart.
+ ^self cCoerceSimple: enilopmart to: #'void (*)(void)'!
Item was added:
+ ----- Method: Cogit>>genCallEnilopmartFor:and:called: (in category 'initialization') -----
+ genCallEnilopmartFor: regArg1 and: regArg2 called: trampolineName
+ "An enilopmart (the reverse of a trampoline) is a piece of code that makes
+ the system-call-like transition from the C runtime into generated machine
+ code. This version is for entering code as if from a call. The desired
+ arguments and entry-point are pushed on a stackPage's stack, and beneath
+ them is the call's return address. The enilopmart pops off the values to be
+ loaded into registers, and on CISCs then executes a return instruction to pop
+ off the entry-point and jump to it. On RISCs the enilopmart pops off the values
+ to be loaded into registers, pops the entry-point into a scratch register, pops
+ the return address into the LinkReg and then jumps to the entry point.
+
+ BEFORE AFTER (stacks grow down)
+ whatever stackPointer -> whatever
+ call return pc
+ target address => reg1 = reg1val, etc
+ reg1val LinkReg = call return pc
+ stackPointer -> reg2val pc = target address
+
+ C.F. genEnilopmartFor:and:and:called:"
+ <returnTypeC: 'void (*genCallEnilopmartForandandcalled(sqInt regArg1, sqInt regArg2, char *trampolineName))(void)'>
+ | size endAddress enilopmart |
+ opcodeIndex := 0.
+ backEnd genLoadStackPointers.
+ self PopR: regArg2.
+ self PopR: regArg1.
+ backEnd hasLinkRegister
+ ifTrue:
+ [self PopR: TempReg.
+ self PopR: LinkReg.
+ self JumpR: TempReg]
+ ifFalse:
+ [self RetN: 0].
+ self computeMaximumSizes.
+ size := self generateInstructionsAt: methodZoneBase.
+ endAddress := self outputInstructionsAt: methodZoneBase.
+ self assert: methodZoneBase + size = endAddress.
+ enilopmart := methodZoneBase.
+ methodZoneBase := self alignUptoRoutineBoundary: endAddress.
+ backEnd nopsFrom: endAddress to: methodZoneBase - 1.
+ self recordGeneratedRunTime: trampolineName address: enilopmart.
+ ^self cCoerceSimple: enilopmart to: #'void (*)(void)'!
Item was added:
+ ----- Method: Cogit>>genCallEnilopmartFor:called: (in category 'initialization') -----
+ genCallEnilopmartFor: regArg1 called: trampolineName
+ "An enilopmart (the reverse of a trampoline) is a piece of code that makes
+ the system-call-like transition from the C runtime into generated machine
+ code. This version is for entering code as if from a call. The desired
+ arguments and entry-point are pushed on a stackPage's stack, and beneath
+ them is the call's return address. The enilopmart pops off the values to be
+ loaded into registers, and on CISCs then executes a return instruction to pop
+ off the entry-point and jump to it. On RISCs the enilopmart pops off the values
+ to be loaded into registers, pops the entry-point into a scratch register, pops
+ the return address into the LinkReg and then jumps to the entry point.
+
+ BEFORE AFTER (stacks grow down)
+ whatever stackPointer -> whatever
+ call return pc reg1 = reg1val
+ target address => LinkReg = call return pc
+ stackPointer -> reg1val pc = target address
+
+ C.F. genEnilopmartFor:and:and:called:"
+ <returnTypeC: 'void (*genCallEnilopmartForandandcalled(sqInt regArg1, char *trampolineName))(void)'>
+ | size endAddress enilopmart |
+ opcodeIndex := 0.
+ backEnd genLoadStackPointers.
+ self PopR: regArg1.
+ backEnd hasLinkRegister
+ ifTrue:
+ [self PopR: TempReg.
+ self PopR: LinkReg.
+ self JumpR: TempReg]
+ ifFalse:
+ [self RetN: 0].
+ self computeMaximumSizes.
+ size := self generateInstructionsAt: methodZoneBase.
+ endAddress := self outputInstructionsAt: methodZoneBase.
+ self assert: methodZoneBase + size = endAddress.
+ enilopmart := methodZoneBase.
+ methodZoneBase := self alignUptoRoutineBoundary: endAddress.
+ backEnd nopsFrom: endAddress to: methodZoneBase - 1.
+ self recordGeneratedRunTime: trampolineName address: enilopmart.
+ ^self cCoerceSimple: enilopmart to: #'void (*)(void)'!
Item was changed:
----- Method: Cogit>>genEnilopmartFor:and:and:called: (in category 'initialization') -----
genEnilopmartFor: regArg1 and: regArg2 and: regArg3 called: trampolineName
"An enilopmart (the reverse of a trampoline) is a piece of code that makes
the system-call-like transition from the C runtime into generated machine
code. The desired arguments and entry-point are pushed on a stackPage's
stack. The enilopmart pops off the values to be loaded into registers and
+ then executes a return instruction to pop off the entry-point and jump to it.
+
+ BEFORE AFTER (stacks grow down)
+ whatever stackPointer -> whatever
+ target address => reg1 = reg1val, etc
+ reg1val pc = target address
+ reg2val
+ stackPointer -> reg3val
+
+ C.F. genCallEnilopmartFor:and:and:called:"
- then executes a return instruction to pop off the entry-point and jump to it."
<returnTypeC: 'void (*genEnilopmartForandandcalled(sqInt regArg1, sqInt regArg2, sqInt regArg3, char *trampolineName))(void)'>
| size endAddress enilopmart |
opcodeIndex := 0.
backEnd genLoadStackPointers.
self PopR: regArg3.
self PopR: regArg2.
self PopR: regArg1.
+ backEnd hasLinkRegister
+ ifTrue: [backEnd hasPCRegister
+ ifTrue: [self PopR: LinkReg]
+ ifFalse: [self PopR: LinkReg; RetN: 0]]
+ ifFalse: [self RetN: 0].
- backEnd hasLinkRegister ifTrue:
- [self PopR: LinkReg].
- self RetN: 0.
self computeMaximumSizes.
size := self generateInstructionsAt: methodZoneBase.
endAddress := self outputInstructionsAt: methodZoneBase.
self assert: methodZoneBase + size = endAddress.
enilopmart := methodZoneBase.
methodZoneBase := self alignUptoRoutineBoundary: endAddress.
backEnd nopsFrom: endAddress to: methodZoneBase - 1.
self recordGeneratedRunTime: trampolineName address: enilopmart.
^self cCoerceSimple: enilopmart to: #'void (*)(void)'!
Item was changed:
----- Method: Cogit>>genEnilopmartFor:and:called: (in category 'initialization') -----
genEnilopmartFor: regArg1 and: regArg2 called: trampolineName
"An enilopmart (the reverse of a trampoline) is a piece of code that makes
the system-call-like transition from the C runtime into generated machine
code. The desired arguments and entry-point are pushed on a stackPage's
stack. The enilopmart pops off the values to be loaded into registers and
+ then executes a return instruction to pop off the entry-point and jump to it.
+
+ BEFORE AFTER (stacks grow down)
+ whatever stackPointer -> whatever
+ target address => reg1 = reg1val, etc
+ reg1val pc = target address
+ stackPointer -> reg2val
+
+ C.F. genCallEnilopmartFor:and:and:called:"
+ <returnTypeC: 'void (*genEnilopmartForandandcalled(sqInt regArg1, sqInt regArg2, char *trampolineName))(void)'>
- then executes a return instruction to pop off the entry-point and jump to it."
- <returnTypeC: 'void (*genEnilopmartForandcalled(sqInt regArg1, sqInt regArg2, char *trampolineName))(void)'>
| size endAddress enilopmart |
opcodeIndex := 0.
backEnd genLoadStackPointers.
self PopR: regArg2.
self PopR: regArg1.
+ backEnd hasLinkRegister
+ ifTrue: [backEnd hasPCRegister
+ ifTrue: [self PopR: LinkReg]
+ ifFalse: [self PopR: LinkReg; RetN: 0]]
+ ifFalse: [self RetN: 0].
- backEnd hasLinkRegister ifTrue:
- [self PopR: LinkReg].
- self RetN: 0.
self computeMaximumSizes.
size := self generateInstructionsAt: methodZoneBase.
endAddress := self outputInstructionsAt: methodZoneBase.
self assert: methodZoneBase + size = endAddress.
enilopmart := methodZoneBase.
methodZoneBase := self alignUptoRoutineBoundary: endAddress.
backEnd nopsFrom: endAddress to: methodZoneBase - 1.
self recordGeneratedRunTime: trampolineName address: enilopmart.
^self cCoerceSimple: enilopmart to: #'void (*)(void)'!
Item was changed:
----- Method: Cogit>>genEnilopmartFor:called: (in category 'initialization') -----
+ genEnilopmartFor: regArg1 called: trampolineName
- genEnilopmartFor: regArg called: trampolineName
"An enilopmart (the reverse of a trampoline) is a piece of code that makes
the system-call-like transition from the C runtime into generated machine
code. The desired arguments and entry-point are pushed on a stackPage's
stack. The enilopmart pops off the values to be loaded into registers and
+ then executes a return instruction to pop off the entry-point and jump to it.
+
+ BEFORE AFTER (stacks grow down)
+ whatever stackPointer -> whatever
+ target address => reg1 = reg1val
+ stackPointer -> reg1val pc = target address
+
+ C.F. genCallEnilopmartFor:and:and:called:"
+ <returnTypeC: 'void (*genEnilopmartForandandcalled(sqInt regArg1, char *trampolineName))(void)'>
- then executes a return instruction to pop off the entry-point and jump to it."
- <returnTypeC: 'void (*genEnilopmartForcalled(sqInt regArg, char *trampolineName))(void)'>
| size endAddress enilopmart |
opcodeIndex := 0.
backEnd genLoadStackPointers.
+ self PopR: regArg1.
+ backEnd hasLinkRegister
+ ifTrue: [backEnd hasPCRegister
+ ifTrue: [self PopR: LinkReg]
+ ifFalse: [self PopR: LinkReg; RetN: 0]]
+ ifFalse: [self RetN: 0].
- self PopR: regArg.
- backEnd hasLinkRegister ifTrue:
- [self PopR: LinkReg].
- self RetN: 0.
self computeMaximumSizes.
size := self generateInstructionsAt: methodZoneBase.
endAddress := self outputInstructionsAt: methodZoneBase.
self assert: methodZoneBase + size = endAddress.
enilopmart := methodZoneBase.
methodZoneBase := self alignUptoRoutineBoundary: endAddress.
backEnd nopsFrom: endAddress to: methodZoneBase - 1.
self recordGeneratedRunTime: trampolineName address: enilopmart.
^self cCoerceSimple: enilopmart to: #'void (*)(void)'!
Item was changed:
----- Method: Cogit>>generateEnilopmarts (in category 'initialization') -----
generateEnilopmarts
"Enilopmarts transfer control from C into machine code (backwards trampolines)."
self cppIf: Debug
ifTrue:
[realCEEnterCogCodePopReceiverReg :=
self genEnilopmartFor: ReceiverResultReg
called: 'realCEEnterCogCodePopReceiverReg'.
ceEnterCogCodePopReceiverReg := #enterCogCodePopReceiver.
+ realCECallCogCodePopReceiverReg :=
+ self genCallEnilopmartFor: ReceiverResultReg
+ called: 'realCEEnterCogCodePopReceiverReg'.
+ ceEnterCogCodePopReceiverReg := #callCogCodePopReceiver.
+ realCECallCogCodePopReceiverAndClassRegs :=
+ self genCallEnilopmartFor: ReceiverResultReg
- realCEEnterCogCodePopReceiverAndClassRegs :=
- self genEnilopmartFor: ReceiverResultReg
and: ClassReg
+ called: 'realCECallCogCodePopReceiverAndClassRegs'.
+ ceCallCogCodePopReceiverAndClassRegs := #callCogCodePopReceiverAndClassRegs]
- called: 'realCEEnterCogCodePopReceiverAndClassRegs'.
- ceEnterCogCodePopReceiverAndClassRegs := #enterCogCodePopReceiverAndClassRegs]
ifFalse:
[ceEnterCogCodePopReceiverReg := self genEnilopmartFor: ReceiverResultReg
called: 'ceEnterCogCodePopReceiverReg'.
+ ceCallCogCodePopReceiverReg := self genCallEnilopmartFor: ReceiverResultReg
+ called: 'ceCallCogCodePopReceiverReg'.
+ ceCallCogCodePopReceiverAndClassRegs :=
+ self genCallEnilopmartFor: ReceiverResultReg
- ceEnterCogCodePopReceiverAndClassRegs :=
- self genEnilopmartFor: ReceiverResultReg
and: ClassReg
+ called: 'ceCallCogCodePopReceiverAndClassRegs'].
- called: 'ceEnterCogCodePopReceiverAndClassRegs'].
self genPrimReturnEnterCogCodeEnilopmart: false.
cePrimReturnEnterCogCode := methodZoneBase.
self outputInstructionsForGeneratedRuntimeAt: cePrimReturnEnterCogCode.
self recordGeneratedRunTime: 'cePrimReturnEnterCogCode' address: cePrimReturnEnterCogCode.
self genPrimReturnEnterCogCodeEnilopmart: true.
cePrimReturnEnterCogCodeProfiling := methodZoneBase.
self outputInstructionsForGeneratedRuntimeAt: cePrimReturnEnterCogCodeProfiling.
self recordGeneratedRunTime: 'cePrimReturnEnterCogCodeProfiling' address: cePrimReturnEnterCogCodeProfiling!
Item was added:
+ ----- Method: Cogit>>maybeFreeCountersOf: (in category 'compaction') -----
+ maybeFreeCountersOf: aCogMethod
+ "Sista allocates counters out-of-line that need to be freed later on.
+ This is the hook Sista uses. By default do nothing."
+ <inline: true>!
Item was added:
+ ----- Method: SistaStackToRegisterMappingCogit>>maybeFreeCountersOf: (in category 'compaction') -----
+ maybeFreeCountersOf: aCogMethod
+ "Free any counters in the method."
+ <inline: true>
+ self shouldBeImplemented!
Item was changed:
SimpleStackBasedCogit subclass: #StackToRegisterMappingCogit
+ instanceVariableNames: 'prevBCDescriptor isPushNilFunction pushNilSizeFunction methodOrBlockNumTemps regArgsHaveBeenPushed simSelf simStack simStackPtr simSpillBase optStatus ceEnterCogCodePopReceiverArg0Regs ceEnterCogCodePopReceiverArg1Arg0Regs ceCallCogCodePopReceiverArg0Regs ceCallCogCodePopReceiverArg1Arg0Regs methodAbortTrampolines picAbortTrampolines picMissTrampolines ceCall0ArgsPIC ceCall1ArgsPIC ceCall2ArgsPIC debugStackPointers debugFixupBreaks debugBytecodePointers realCECallCogCodePopReceiverArg0Regs realCECallCogCodePopReceiverArg1Arg0Regs deadCode'
- instanceVariableNames: 'prevBCDescriptor isPushNilFunction pushNilSizeFunction methodOrBlockNumTemps regArgsHaveBeenPushed simSelf simStack simStackPtr simSpillBase optStatus ceEnterCogCodePopReceiverArg0Regs ceEnterCogCodePopReceiverArg1Arg0Regs methodAbortTrampolines picAbortTrampolines picMissTrampolines ceEnter0ArgsPIC ceEnter1ArgsPIC ceEnter2ArgsPIC debugStackPointers debugFixupBreaks debugBytecodePointers realCEEnterCogCodePopReceiverArg0Regs realCEEnterCogCodePopReceiverArg1Arg0Regs deadCode'
classVariableNames: ''
poolDictionaries: 'CogCompilationConstants VMMethodCacheConstants VMObjectIndices VMStackFrameOffsets'
category: 'VMMaker-JIT'!
StackToRegisterMappingCogit class
instanceVariableNames: 'isPushNilFunction pushNilSizeFunction'!
!StackToRegisterMappingCogit commentStamp: 'eem 12/19/2010 18:12' prior: 0!
StackToRegisterMappingCogit is an optimizing code generator that eliminates a lot of stack operations and inlines some special selector arithmetic. It does so by a simple stack-to-register mapping scheme based on deferring the generation of code to produce operands until operand-consuming operations. The operations that consume operands are sends, stores and returns.
See methods in the class-side documentation protocol for more detail.
Instance Variables
callerSavedRegMask: <Integer>
ceEnter0ArgsPIC: <Integer>
ceEnter1ArgsPIC: <Integer>
ceEnter2ArgsPIC: <Integer>
ceEnterCogCodePopReceiverArg0Regs: <Integer>
ceEnterCogCodePopReceiverArg1Arg0Regs: <Integer>
debugBytecodePointers: <Set of Integer>
debugFixupBreaks: <Set of Integer>
debugStackPointers: <CArrayAccessor of (Integer|nil)>
methodAbortTrampolines: <CArrayAccessor of Integer>
methodOrBlockNumTemps: <Integer>
optStatus: <Integer>
picAbortTrampolines: <CArrayAccessor of Integer>
picMissTrampolines: <CArrayAccessor of Integer>
realCEEnterCogCodePopReceiverArg0Regs: <Integer>
realCEEnterCogCodePopReceiverArg1Arg0Regs: <Integer>
regArgsHaveBeenPushed: <Boolean>
simSelf: <CogSimStackEntry>
simSpillBase: <Integer>
simStack: <CArrayAccessor of CogSimStackEntry>
simStackPtr: <Integer>
traceSimStack: <Integer>
callerSavedRegMask
- the bitmask of the ABI's caller-saved registers
ceEnter0ArgsPIC ceEnter1ArgsPIC ceEnter2ArgsPIC
- the trampoline for entering an N-arg PIC
ceEnterCogCodePopReceiverArg0Regs ceEnterCogCodePopReceiverArg1Arg0Regs
- teh trampoline for entering a method with N register args
debugBytecodePointers
- a Set of bytecode pcs for setting breakpoints (simulation only)
debugFixupBreaks
- a Set of fixup indices for setting breakpoints (simulation only)
debugStackPointers
- an Array of stack depths for each bytecode for code verification
methodAbortTrampolines
- a CArrayAccessor of abort trampolines for 0, 1, 2 and N args
methodOrBlockNumTemps
- the number of method or block temps (including args) in the current compilation unit (method or block)
optStatus
- the variable used to track the status of ReceiverResultReg for avoiding reloading that register with self between adjacent inst var accesses
picAbortTrampolines
- a CArrayAccessor of abort trampolines for 0, 1, 2 and N args
picMissTrampolines
- a CArrayAccessor of abort trampolines for 0, 1, 2 and N args
realCEEnterCogCodePopReceiverArg0Regs realCEEnterCogCodePopReceiverArg1Arg0Regs
- the real trampolines for ebtering machine code with N reg args when in the Debug regime
regArgsHaveBeenPushed
- whether the register args have been pushed before frame build (e.g. when an interpreter primitive is called)
simSelf
- the simulation stack entry representing self in the current compilation unit
simSpillBase
- the variable tracking how much of the simulation stack has been spilled to the real stack
simStack
- the simulation stack itself
simStackPtr
- the pointer to the top of the simulation stack
!
StackToRegisterMappingCogit class
instanceVariableNames: 'isPushNilFunction pushNilSizeFunction'!
Item was changed:
----- Method: StackToRegisterMappingCogit class>>declareCVarsIn: (in category 'translation') -----
declareCVarsIn: aCodeGen
aCodeGen
var: #methodAbortTrampolines
declareC: 'sqInt methodAbortTrampolines[4]';
var: #picAbortTrampolines
declareC: 'sqInt picAbortTrampolines[4]';
var: #picMissTrampolines
declareC: 'sqInt picMissTrampolines[4]';
+ var: 'ceCall0ArgsPIC'
+ declareC: 'void (*ceCall0ArgsPIC)(void)';
+ var: 'ceCall1ArgsPIC'
+ declareC: 'void (*ceCall1ArgsPIC)(void)';
+ var: 'ceCall2ArgsPIC'
+ declareC: 'void (*ceCall2ArgsPIC)(void)';
+ var: #ceCallCogCodePopReceiverArg0Regs
+ declareC: 'void (*ceCallCogCodePopReceiverArg0Regs)(void)';
+ var: #realCECallCogCodePopReceiverArg0Regs
+ declareC: 'void (*realCECallCogCodePopReceiverArg0Regs)(void)';
+ var: #ceCallCogCodePopReceiverArg1Arg0Regs
+ declareC: 'void (*ceCallCogCodePopReceiverArg1Arg0Regs)(void)';
+ var: #realCECallCogCodePopReceiverArg1Arg0Regs
+ declareC: 'void (*realCECallCogCodePopReceiverArg1Arg0Regs)(void)';
- var: 'ceEnter0ArgsPIC'
- declareC: 'void (*ceEnter0ArgsPIC)(void)';
- var: 'ceEnter1ArgsPIC'
- declareC: 'void (*ceEnter1ArgsPIC)(void)';
- var: 'ceEnter2ArgsPIC'
- declareC: 'void (*ceEnter2ArgsPIC)(void)';
- var: #ceEnterCogCodePopReceiverArg0Regs
- declareC: 'void (*ceEnterCogCodePopReceiverArg0Regs)(void)';
- var: #realCEEnterCogCodePopReceiverArg0Regs
- declareC: 'void (*realCEEnterCogCodePopReceiverArg0Regs)(void)';
- var: #ceEnterCogCodePopReceiverArg1Arg0Regs
- declareC: 'void (*ceEnterCogCodePopReceiverArg1Arg0Regs)(void)';
- var: #realCEEnterCogCodePopReceiverArg1Arg0Regs
- declareC: 'void (*realCEEnterCogCodePopReceiverArg1Arg0Regs)(void)';
var: 'simStack'
declareC: 'CogSimStackEntry simStack[', ((CoInterpreter bindingOf: #LargeContextSize) value * 5 / 4 // BytesPerWord) asString, ']';
var: 'simSelf'
type: #CogSimStackEntry;
var: #optStatus
type: #CogSSOptStatus;
var: 'prevBCDescriptor'
type: #'BytecodeDescriptor *'.
self isPushNilFunction ifNotNil:
[aCodeGen
var: 'isPushNilFunction'
declareC: 'sqInt (* const isPushNilFunction)(struct _BytecodeDescriptor *,sqInt,sqInt,sqInt) = ', (aCodeGen cFunctionNameFor: self isPushNilFunction);
var: 'pushNilSizeFunction'
declareC: 'sqInt (* const pushNilSizeFunction)(sqInt) = ', (aCodeGen cFunctionNameFor: self pushNilSizeFunction)].
aCodeGen
addSelectorTranslation: #register to: (aCodeGen cFunctionNameFor: 'registerr');
addSelectorTranslation: #register: to: (aCodeGen cFunctionNameFor: 'registerr:')!
Item was added:
+ ----- Method: StackToRegisterMappingCogit>>callCogCodePopReceiverArg0Regs (in category 'debugging') -----
+ callCogCodePopReceiverArg0Regs
+ "This is a static version of ceCallCogCodePopReceiverArg0Regs
+ for break-pointing when debugging in C."
+ <api>
+ <inline: false>
+ "This exists only for break-pointing."
+ self cCode: [self realCECallCogCodePopReceiverArg0Regs]
+ inSmalltalk: [self ceCallCogCodePopReceiverArg0Regs]!
Item was added:
+ ----- Method: StackToRegisterMappingCogit>>callCogCodePopReceiverArg1Arg0Regs (in category 'debugging') -----
+ callCogCodePopReceiverArg1Arg0Regs
+ "This is a static version of ceCallCogCodePopReceiverArg1Arg0Regs
+ for break-pointing when debugging in C."
+ <api>
+ <inline: false>
+ "This exists only for break-pointing."
+ self cCode: [self realCECallCogCodePopReceiverArg1Arg0Regs]
+ inSmalltalk: [self ceCallCogCodePopReceiverArg1Arg0Regs]!
Item was added:
+ ----- Method: StackToRegisterMappingCogit>>ceCall0ArgsPIC (in category 'simulation only') -----
+ ceCall0ArgsPIC
+ <api: 'extern void (*ceCall0ArgsPIC)()'>
+ <doNotGenerate>
+ self simulateEnilopmart: ceCall0ArgsPIC numArgs: 1!
Item was added:
+ ----- Method: StackToRegisterMappingCogit>>ceCall1ArgsPIC (in category 'simulation only') -----
+ ceCall1ArgsPIC
+ <api: 'extern void (*ceCall1ArgsPIC)()'>
+ <doNotGenerate>
+ self simulateEnilopmart: ceCall1ArgsPIC numArgs: 1!
Item was added:
+ ----- Method: StackToRegisterMappingCogit>>ceCall2ArgsPIC (in category 'simulation only') -----
+ ceCall2ArgsPIC
+ <api: 'extern void (*ceCall2ArgsPIC)()'>
+ <doNotGenerate>
+ self simulateEnilopmart: ceCall2ArgsPIC numArgs: 1!
Item was added:
+ ----- Method: StackToRegisterMappingCogit>>ceCallCogCodePopReceiverArg0Regs (in category 'simulation only') -----
+ ceCallCogCodePopReceiverArg0Regs
+ <api: 'extern void (*ceCallCogCodePopReceiverArg0Regs)()'>
+ <doNotGenerate>
+ self simulateEnilopmart: ceCallCogCodePopReceiverArg0Regs numArgs: 2!
Item was added:
+ ----- Method: StackToRegisterMappingCogit>>ceCallCogCodePopReceiverArg1Arg0Regs (in category 'simulation only') -----
+ ceCallCogCodePopReceiverArg1Arg0Regs
+ <api: 'extern void (*ceCallCogCodePopReceiverArg1Arg0Regs)()'>
+ <doNotGenerate>
+ self simulateEnilopmart: ceCallCogCodePopReceiverArg1Arg0Regs numArgs: 3!
Item was removed:
- ----- Method: StackToRegisterMappingCogit>>ceEnter0ArgsPIC (in category 'simulation only') -----
- ceEnter0ArgsPIC
- <api: 'extern void (*ceEnter0ArgsPIC)()'>
- <doNotGenerate>
- self simulateEnilopmart: ceEnter0ArgsPIC numArgs: 1!
Item was removed:
- ----- Method: StackToRegisterMappingCogit>>ceEnter1ArgsPIC (in category 'simulation only') -----
- ceEnter1ArgsPIC
- <api: 'extern void (*ceEnter1ArgsPIC)()'>
- <doNotGenerate>
- self simulateEnilopmart: ceEnter1ArgsPIC numArgs: 1!
Item was removed:
- ----- Method: StackToRegisterMappingCogit>>ceEnter2ArgsPIC (in category 'simulation only') -----
- ceEnter2ArgsPIC
- <api: 'extern void (*ceEnter2ArgsPIC)()'>
- <doNotGenerate>
- self simulateEnilopmart: ceEnter2ArgsPIC numArgs: 1!
Item was added:
+ ----- Method: StackToRegisterMappingCogit>>genCallPICEnilopmartNumArgs: (in category 'initialization') -----
+ genCallPICEnilopmartNumArgs: numArgs
+ "Generate special versions of the ceCallCogCodePopReceiverAndClassRegs
+ enilopmart that also pop register args from the stack to undo the pushing of
+ register args in the abort/miss trampolines."
+ <returnTypeC: 'void (*genCallPICEnilopmartNumArgs(sqInt numArgs))(void)'>
+ | size endAddress enilopmart |
+ opcodeIndex := 0.
+ backEnd genLoadStackPointers.
+ self PopR: ClassReg. "cacheTag"
+ self PopR: TempReg. "entry-point"
+ self PopR: (backEnd hasLinkRegister ifTrue: [LinkReg] ifFalse: [SendNumArgsReg]). "retpc"
+ numArgs > 0 ifTrue:
+ [numArgs > 1 ifTrue:
+ [self PopR: Arg1Reg.
+ self assert: self numRegArgs = 2].
+ self PopR: Arg0Reg].
+ self PopR: ReceiverResultReg.
+ backEnd hasLinkRegister ifFalse: [self PushR: SendNumArgsReg]. "retpc"
+ self JumpR: TempReg.
+ self computeMaximumSizes.
+ size := self generateInstructionsAt: methodZoneBase.
+ endAddress := self outputInstructionsAt: methodZoneBase.
+ self assert: methodZoneBase + size = endAddress.
+ enilopmart := methodZoneBase.
+ methodZoneBase := self alignUptoRoutineBoundary: endAddress.
+ backEnd nopsFrom: endAddress to: methodZoneBase - 1.
+ self recordGeneratedRunTime: (self trampolineName: 'ceCallPIC' numArgs: numArgs) address: enilopmart.
+ ^self cCoerceSimple: enilopmart to: #'void (*)(void)'!
Item was removed:
- ----- Method: StackToRegisterMappingCogit>>genEnterPICEnilopmartNumArgs: (in category 'initialization') -----
- genEnterPICEnilopmartNumArgs: numArgs
- "Generate special versions of the ceEnterCogCodePopReceiverAndClassRegs
- enilopmart that also pop register args from the stack to undo the pushing of
- register args in the abort/miss trampolines."
- <returnTypeC: 'void (*genEnterPICEnilopmartNumArgs(sqInt numArgs))(void)'>
- | size endAddress enilopmart |
- opcodeIndex := 0.
- backEnd genLoadStackPointers.
- self PopR: ClassReg. "cacheTag"
- self PopR: TempReg. "entry-point"
- self PopR: SendNumArgsReg. "retpc"
- numArgs > 0 ifTrue:
- [numArgs > 1 ifTrue:
- [self PopR: Arg1Reg.
- self assert: self numRegArgs = 2].
- self PopR: Arg0Reg].
- self PopR: ReceiverResultReg.
- self PushR: SendNumArgsReg. "retpc"
- self JumpR: TempReg.
- self computeMaximumSizes.
- size := self generateInstructionsAt: methodZoneBase.
- endAddress := self outputInstructionsAt: methodZoneBase.
- self assert: methodZoneBase + size = endAddress.
- enilopmart := methodZoneBase.
- methodZoneBase := self alignUptoRoutineBoundary: endAddress.
- backEnd nopsFrom: endAddress to: methodZoneBase - 1.
- self recordGeneratedRunTime: (self trampolineName: 'ceEnterPIC' numArgs: numArgs) address: enilopmart.
- ^self cCoerceSimple: enilopmart to: #'void (*)(void)'!
Item was changed:
----- Method: StackToRegisterMappingCogit>>generateEnilopmarts (in category 'initialization') -----
generateEnilopmarts
"Enilopmarts transfer control from C into machine code (backwards trampolines).
Override to add version for generic and PIC-specific entry with reg args."
super generateEnilopmarts.
self cppIf: Debug
ifTrue:
+ [realCECallCogCodePopReceiverArg0Regs :=
- [realCEEnterCogCodePopReceiverArg0Regs :=
self genEnilopmartFor: ReceiverResultReg
and: Arg0Reg
+ called: 'realCECallCogCodePopReceiverArg0Regs'.
+ ceCallCogCodePopReceiverArg0Regs := #callCogCodePopReceiverArg0Regs.
+ realCECallCogCodePopReceiverArg1Arg0Regs :=
- called: 'realCEEnterCogCodePopReceiverArg0Regs'.
- ceEnterCogCodePopReceiverArg0Regs := #enterCogCodePopReceiverArg0Regs.
- realCEEnterCogCodePopReceiverArg1Arg0Regs :=
self genEnilopmartFor: ReceiverResultReg
and: Arg0Reg
and: Arg1Reg
+ called: 'realCECallCogCodePopReceiverArg1Arg0Regs'.
+ ceCallCogCodePopReceiverArg1Arg0Regs := #callCogCodePopReceiverArg1Arg0Regs]
- called: 'realCEEnterCogCodePopReceiverArg1Arg0Regs'.
- ceEnterCogCodePopReceiverArg1Arg0Regs := #enterCogCodePopReceiverArg1Arg0Regs]
ifFalse:
+ [ceCallCogCodePopReceiverArg0Regs :=
- [ceEnterCogCodePopReceiverArg0Regs :=
self genEnilopmartFor: ReceiverResultReg
and: Arg0Reg
+ called: 'ceCallCogCodePopReceiverArg0Regs'.
+ ceCallCogCodePopReceiverArg1Arg0Regs :=
- called: 'ceEnterCogCodePopReceiverArg0Regs'.
- ceEnterCogCodePopReceiverArg1Arg0Regs :=
self genEnilopmartFor: ReceiverResultReg
and: Arg0Reg
and: Arg1Reg
+ called: 'ceCallCogCodePopReceiverArg1Arg0Regs'].
- called: 'ceEnterCogCodePopReceiverArg1Arg0Regs'].
+ "These are special versions of the ceCallCogCodePopReceiverAndClassRegs enilopmart that also
+ pop register args from the stack to undo the pushing of register args in the abort/miss trampolines."
+ ceCall0ArgsPIC := self genCallPICEnilopmartNumArgs: 0.
- "These are special versions of the ceEnterCogCodePopReceiverAndClassRegs enilopmart that also
- pop register argsfrom the stack to undo the pushing of register args in the abort/miss trampolines."
- ceEnter0ArgsPIC := self genEnterPICEnilopmartNumArgs: 0.
self numRegArgs >= 1 ifTrue:
+ [ceCall1ArgsPIC := self genCallPICEnilopmartNumArgs: 1.
- [ceEnter1ArgsPIC := self genEnterPICEnilopmartNumArgs: 1.
self numRegArgs >= 2 ifTrue:
+ [ceCall2ArgsPIC := self genCallPICEnilopmartNumArgs: 2.
- [ceEnter2ArgsPIC := self genEnterPICEnilopmartNumArgs: 2.
self assert: self numRegArgs = 2]]!
1
0
Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker:
http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.82.mcz
==================== Summary ====================
Name: CMakeVMMakerSqueak-tty.82
Author: tty
Time: 3 July 2014, 2:18:36.148 pm
UUID: 270ad62e-f37b-4897-97be-7cf21a3d5f60
Ancestors: CMakeVMMakerSqueak-tty.81
fix extraPluginSettings(Build): aMaker on Linux32x86SqueakCogV3Config
Added standard buildType redirect infrastructure for extraPluginSettings.
Wrote test to make sure it is implemented on all executable configs.
Took a deep breath and, using a crow-bar, broke my frustration-induced death grip on the keyboard.
Next up.
build a squeak.stack.v3 from scratch and document creation steps.
=============== Diff against CMakeVMMakerSqueak-tty.81 ===============
Item was changed:
----- Method: CMakePluginGeneratorForSqueak>>generate (in category 'squeak compatibility') -----
generate
| name |
output := String new writeStream.
name := plugin moduleName.
#( vmGen config setGlobalOptions: self.
self
printHeader;
project: name;
"include directories generated for build"
include: '../directories.cmake'.
self set: 'CMAKE_CONFIGURATION_TYPES' to: 'Release'.
).
self message: (internal ifTrue: [ 'Adding internal plugin: '] ifFalse: ['Adding external plugin: ']) , name.
self
set: #pluginName toString: name;
set: #pluginSrc toString: '${srcPluginsDir}/', name;
set: #pluginCross toString: '${crossDir}/plugins/', name;
set: #pluginPlatform toString: '${targetPlatform}/plugins/', name.
"clear LINKLIBS variable"
self set: #LINKLIBS to: ''.
internal
ifTrue: [ self puts: 'add_definitions(-DSQUEAK_BUILTIN_PLUGIN)'].
self addSources: { name , '.c' } prefixed: '${pluginSrc}/'.
" default include directories for plugin "
self includeDirectories: '${pluginSrc} ${pluginCross} ${targetPlatform}/plugins/${pluginName}'.
"Not needed because there are already there (inherited from main configuration)"
"self addDefinitions: vmGen config compilerFlags."
" perform config's configureXYZ: message to apply per-plugin custom rules, if any "
vmGen config configurePlugin: plugin with: self.
extraRules ifNotNil: [ extraRules value: self ].
" generate a static lib for internal plugin, or shared for external"
internal ifTrue: [
self cmd: 'add_library' params: name , ' STATIC ${sources}'.
] ifFalse: [
self cmd: 'add_library' params: name , ' SHARED ${sources}'.
" self cmd: 'set_property' params: 'TARGET ' , name , ' PROPERTY LINK_FLAGS -bundle'"
].
vmGen config extraPluginSettings: self.
self isExternal ifTrue: [
self cmd: 'target_link_libraries'
params: self moduleName , ' ${LINKLIBS}'.
].
" see senders of #linkFlags "
self
cmd: 'set_property'
params: 'TARGET ', name, ' PROPERTY LINK_FLAGS "${linkFlags}"'.
"set dependencies"
self puts: 'IF (',self moduleName , '_dependencies)'.
self cmd: 'add_dependencies'
params: name , ' ${', self moduleName , '_dependencies}'.
self puts: 'ENDIF (',self moduleName , '_dependencies)'.
self saveFile.!
Item was changed:
+ ----- Method: CMakePluginGeneratorForSqueak>>isInternal (in category 'accessing') -----
- ----- Method: CMakePluginGeneratorForSqueak>>isInternal (in category 'as yet unclassified') -----
isInternal
^ internal!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>isInternal: (in category 'accessing') -----
+ isInternal: aBoolean
+ internal:= aBoolean!
Item was changed:
+ ----- Method: CMakePluginGeneratorForSqueak>>vmGenerator (in category 'accessing') -----
- ----- Method: CMakePluginGeneratorForSqueak>>vmGenerator (in category 'squeak compatibility') -----
vmGenerator
"Make it accessible from plugin generator side"
^ vmGen!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>vmGenerator: (in category 'accessing') -----
+ vmGenerator: aCMakeVMGeneratorForSqueak
+ "needed for tests"
+ vmGen := aCMakeVMGeneratorForSqueak!
Item was added:
+ ----- Method: CMakeVMMakerSqueakRedirectMethodsTest>>testExternalLibs (in category 'as yet unclassified') -----
+ testExternalLibs
+ #(#SqueakMacintoshConfig #SqueakUnixConfig #SqueakWindowsConfig )
+ do:[:each |
+ (Smalltalk at:each)
+ allSubclassesDo:[:configuration | | o buildTypes|
+ o:= configuration new.
+ (o excludeFromBuild not) & (configuration isAbstractBaseClass not)
+ ifTrue:[
+ buildTypes:=o availableBuildTypes copyWithoutAll:#(#buildNone).
+ buildTypes do:[:buildType |
+ o configureForBuildType: buildType.
+ self assert:(o externalLibs isKindOf: Collection).
+ ]]]].
+
+
+
+
+
+
+
+ !
Item was changed:
----- Method: CMakeVMMakerSqueakRedirectMethodsTest>>testLinkFlags (in category 'as yet unclassified') -----
testLinkFlags
#(#SqueakMacintoshConfig #SqueakUnixConfig #SqueakWindowsConfig )
do:[:each |
(Smalltalk at:each)
allSubclassesDo:[:configuration | | o buildTypes|
o:= configuration new.
(o excludeFromBuild not) & (configuration isAbstractBaseClass not)
ifTrue:[
buildTypes:=o availableBuildTypes copyWithoutAll:#(#buildNone).
buildTypes do:[:buildType |
o configureForBuildType: buildType.
+ self assert:(o linkFlags isString)]]]].!
- self assert:(o linkFlags isArray)]]]].!
Item was added:
+ ----- Method: CMakeVMMakerSqueakRedirectMethodsWithArgTest>>testExtraPluginSettings (in category 'as yet unclassified') -----
+ testExtraPluginSettings
+ self flag:'tty'. "Is the self shouldnt sufficient?"
+ #(#SqueakMacintoshConfig #SqueakUnixConfig #SqueakWindowsConfig )
+ do:[:each |
+ (Smalltalk at:each)
+ allSubclassesDo:[:configuration | | o buildTypes vmGenerator pluginGenerator|
+ 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).
+ pluginGenerator := CMakePluginGeneratorForSqueak new.
+ pluginGenerator vmGenerator: vmGenerator.
+ pluginGenerator isInternal: false.
+ pluginGenerator output:(String new writeStream).
+ self shouldnt: [o extraPluginSettings: pluginGenerator] raise: Error]]]].
+ !
Item was changed:
----- Method: CPlatformConfigForSqueak>>addDriver:sources:generator:externalLibs: (in category 'squeak compatability') -----
addDriver: name sources: aSources generator: cmakeGen externalLibs: extLibs
| 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';
includeDirectories: '${targetPlatform}/plugins/B3DAcceleratorPlugin';
includeDirectories: '${crossDir}/plugins/B3DAcceleratorPlugin';
set: 'LIBRARY_OUTPUT_PATH' toString: self outputDir fullName;
addExternalLibraries: extLibs;
cmd: 'target_link_libraries' params: name , ' ${LINKLIBS}';
cmd: 'set_target_properties' params: name , ' PROPERTIES PREFIX "" SUFFIX ""
LINK_FLAGS -m32'
].
(self buildDir / name) assureExistence.
self write: cfg toFile: name , '/', cmakeGen outputFileName.
cmakeGen addSubdirectory: name.
!
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>externalLibs (in category 'cmake buildType redirects') -----
+ externalLibs
+ "Route this message send to the message appropriate for my buildType "
+ |d |
+ d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy.
+ d
+ at: #build put: [self externalLibsBuild];
+ at: #buildAssert put: [self externalLibsBuildAssert];
+ at: #buildAssertITimerHeartbeat put: [self externalLibsBuildAssertITimerHeartbeat];
+ at:#buildDebug put: [self externalLibsBuildDebug];
+ at: #buildDebugITimerHeartbeat put: [self externalLibsBuildDebugITimerHeartbeat ];
+ at: #buildITimerHeartbeat put: [self externalLibsBuildITimerHeartbeat];
+ at: #buildMultiThreaded put: [self externalLibsBuildMultiThreaded];
+ at: #buildMultiThreadedAssert put: [self externalLibsBuildMultiThreadedAssert];
+ at: #buildMultiThreadedDebug put: [self externalLibsBuildMultiThreadedDebug ];
+ at: #buildNone put:[self externalLibsNoBuildType].
+ ^(d at: buildType) value!
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>externalLibsBuild (in category 'cmake buildType redirects') -----
+ externalLibsBuild
+ ""
+ self subclassResponsibility!
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>externalLibsBuildAssert (in category 'cmake buildType redirects') -----
+ externalLibsBuildAssert
+ ""
+ self subclassResponsibility!
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>externalLibsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') -----
+ externalLibsBuildAssertITimerHeartbeat
+ ""
+ self subclassResponsibility!
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>externalLibsBuildDebug (in category 'cmake buildType redirects') -----
+ externalLibsBuildDebug
+ ""
+ self subclassResponsibility!
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>externalLibsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') -----
+ externalLibsBuildDebugITimerHeartbeat
+ ""
+ self subclassResponsibility!
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>externalLibsBuildITimerHeartbeat (in category 'cmake buildType redirects') -----
+ externalLibsBuildITimerHeartbeat
+ ""
+ self subclassResponsibility!
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>externalLibsBuildMultiThreaded (in category 'cmake buildType redirects') -----
+ externalLibsBuildMultiThreaded
+ ""
+ self subclassResponsibility!
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>externalLibsBuildMultiThreadedAssert (in category 'cmake buildType redirects') -----
+ externalLibsBuildMultiThreadedAssert
+ ""
+ self subclassResponsibility!
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>externalLibsBuildMultiThreadedDebug (in category 'cmake buildType redirects') -----
+ externalLibsBuildMultiThreadedDebug
+ ""
+ self subclassResponsibility!
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>externalLibsNoBuildType (in category 'cmake buildType redirects') -----
+ externalLibsNoBuildType
+ "SHOULD NOT GET HERE"
+ self shouldNotImplement.
+ !
Item was changed:
+ ----- Method: CPlatformConfigForSqueak>>extraPluginSettings: (in category 'cmake buildType redirects') -----
+ extraPluginSettings: aMaker
+ "Route this message send to the message appropriate for my buildType "
+ |d |
+ d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy.
+ d
+ at: #build put: [self extraPluginSettingsBuild: aMaker];
+ at: #buildAssert put: [self extraPluginSettingsBuildAssert: aMaker];
+ at: #buildAssertITimerHeartbeat put: [self extraPluginSettingsBuildAssertITimerHeartbeat: aMaker];
+ at:#buildDebug put: [self extraPluginSettingsBuildDebug: aMaker];
+ at: #buildDebugITimerHeartbeat put: [self extraPluginSettingsBuildDebugITimerHeartbeat: aMaker ];
+ at: #buildITimerHeartbeat put: [self extraPluginSettingsBuildITimerHeartbeat: aMaker];
+ at: #buildMultiThreaded put: [self extraPluginSettingsBuildMultiThreaded: aMaker];
+ at: #buildMultiThreadedAssert put: [self extraPluginSettingsBuildMultiThreadedAssert: aMaker];
+ at: #buildMultiThreadedDebug put: [self extraPluginSettingsBuildMultiThreadedDebug: aMaker ];
+ at: #buildNone put:[self extraPluginSettingsNoBuildType: aMaker].
+ ^(d at: buildType) value!
- ----- Method: CPlatformConfigForSqueak>>extraPluginSettings: (in category 'plugins') -----
- extraPluginSettings: maker
- super extraPluginSettings: maker.
- " This is a very active method depending on Platform
-
- CPlatformConfig browse.
-
- "!
Item was changed:
----- Method: CPlatformConfigForSqueak>>extraPluginSettingsBuildAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssert: aMaker
+ "^self extraPluginSettingsBuild: aMaker'"
- extraPluginSettingsBuildAssert: maker
- "convenience method to customize plugin settings for this buildType.
- Most configurations do nothing.
- SystemNavigation default browseMethodsWhoseNamesContain: 'extraPluginSettings'
- "
self subclassResponsibility
!
Item was changed:
----- Method: CPlatformConfigForSqueak>>extraPluginSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssertITimerHeartbeat: aMaker
+ "^self extraPluginSettingsBuild: aMaker'"
- extraPluginSettingsBuildAssertITimerHeartbeat: maker
- "convenience method to customize plugin settings for this buildType.
- Most configurations do nothing.
- SystemNavigation default browseMethodsWhoseNamesContain: 'extraPluginSettings'
- "
self subclassResponsibility
!
Item was changed:
----- Method: CPlatformConfigForSqueak>>extraPluginSettingsBuildDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebug: aMaker
+ "^self extraPluginSettingsBuild: aMaker'"
- extraPluginSettingsBuildDebug: maker
- "convenience method to customize plugin settings for this buildType.
- Most configurations do nothing.
- SystemNavigation default browseMethodsWhoseNamesContain: 'extraPluginSettings'
- "
self subclassResponsibility
!
Item was changed:
----- Method: CPlatformConfigForSqueak>>extraPluginSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebugITimerHeartbeat: aMaker
+ "^self extraPluginSettingsBuild: aMaker'"
- extraPluginSettingsBuildDebugITimerHeartbeat: maker
- "convenience method to customize plugin settings for this buildType.
- Most configurations do nothing.
- SystemNavigation default browseMethodsWhoseNamesContain: 'extraPluginSettings'
- "
self subclassResponsibility
-
!
Item was changed:
----- Method: CPlatformConfigForSqueak>>extraPluginSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildITimerHeartbeat: aMaker
+ "^self extraPluginSettingsBuild: aMaker'"
- extraPluginSettingsBuildITimerHeartbeat: maker
- "convenience method to customize plugin settings for this buildType.
- Most configurations do nothing.
- SystemNavigation default browseMethodsWhoseNamesContain: 'extraPluginSettings'
- "
self subclassResponsibility
!
Item was changed:
----- Method: CPlatformConfigForSqueak>>extraPluginSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreaded: aMaker
+ "^self extraPluginSettingsBuild: aMaker'"
- extraPluginSettingsBuildMultiThreaded: maker
- "convenience method to customize plugin settings for this buildType.
- Most configurations do nothing.
- SystemNavigation default browseMethodsWhoseNamesContain: 'extraPluginSettings'
- "
self subclassResponsibility
-
!
Item was changed:
----- Method: CPlatformConfigForSqueak>>extraPluginSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedAssert: aMaker
+ "^self extraPluginSettingsBuild: aMaker'"
- extraPluginSettingsBuildMultiThreadedAssert: maker
- "convenience method to customize plugin settings for this buildType.
- Most configurations do nothing.
- SystemNavigation default browseMethodsWhoseNamesContain: 'extraPluginSettings'
- "
self subclassResponsibility
!
Item was changed:
----- Method: CPlatformConfigForSqueak>>extraPluginSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedDebug: aMaker
+ "^self extraPluginSettingsBuild: aMaker'"
- extraPluginSettingsBuildMultiThreadedDebug: maker
- "convenience method to customize plugin settings for this buildType.
- Most configurations do nothing.
- SystemNavigation default browseMethodsWhoseNamesContain: 'extraPluginSettings'
- "
self subclassResponsibility
-
!
Item was changed:
----- Method: CPlatformConfigForSqueak>>extraPluginSettingsNoBuildType: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsNoBuildType: aMaker
- extraPluginSettingsNoBuildType: maker
"SHOULD NOT GET HERE"
self shouldNotImplement.
!
Item was removed:
- ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>extraPluginSettings: (in category 'plugin extra rules') -----
- extraPluginSettings: maker
-
- maker isExternal ifTrue: [
- "copy lib to results dir "
- maker set: 'LIBRARY_OUTPUT_PATH' to: '${outputDir}'
- ].
-
- maker set: #linkFlags toString: '${linkFlags}'
- !
Item was added:
+ ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuild: maker
+
+ maker isExternal ifTrue: [
+ "copy lib to results dir "
+ maker set: 'LIBRARY_OUTPUT_PATH' to: '${outputDir}'
+ ].
+
+ maker set: #linkFlags toString: '${linkFlags}'
+ !
Item was removed:
- ----- Method: Linux32ARMv6StackV3RaspbianConfig>>extraPluginSettings: (in category 'plugin extra rules') -----
- extraPluginSettings: maker
-
- maker isExternal ifTrue: [
- "copy lib to results dir "
- maker set: 'LIBRARY_OUTPUT_PATH' to: '${outputDir}'
- ].
-
- maker set: #linkFlags toString: '${linkFlags}'
- !
Item was added:
+ ----- Method: Linux32ARMv6StackV3RaspbianConfig>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuild: aMaker
+
+ aMaker isExternal ifTrue: [
+ "copy lib to results dir "
+ aMaker set: 'LIBRARY_OUTPUT_PATH' to: '${outputDir}'
+ ].
+
+ aMaker set: #linkFlags toString: '${linkFlags}'
+ !
Item was changed:
----- 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 externalLibs);
- 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 removed:
- ----- Method: Linux32x86Config>>extraPluginSettings: (in category 'plugin extra rules') -----
- extraPluginSettings: maker
- super extraPluginSettings: maker.
- maker set: #linkFlags toString: '${linkFlags} -m32'!
Item was added:
+ ----- Method: Linux32x86Config>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuild: maker
+ maker isExternal ifTrue: [
+ "copy lib to results dir "
+ maker set: 'LIBRARY_OUTPUT_PATH' to: '${outputDir}'
+ ].
+ !
Item was added:
+ ----- Method: Linux32x86Config>>extraPluginSettingsBuildAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: Linux32x86Config>>extraPluginSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssertITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: Linux32x86Config>>extraPluginSettingsBuildDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: Linux32x86Config>>extraPluginSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebugITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: Linux32x86Config>>extraPluginSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: Linux32x86Config>>extraPluginSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreaded: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: Linux32x86Config>>extraPluginSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: Linux32x86Config>>extraPluginSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: Linux32x86SqueakCogV3Config>>externalLibsBuild (in category 'cmake buildType redirects') -----
+ externalLibsBuild
+ self flag:'tty'. "this is dependent on plugins? what if I don't have SqueakSSLPlugin?"
+ ^#(
+ 'uuid' ""
+ 'ssl' ""
+ 'crypto' ""
+ 'm' "C math library"
+ 'dl' "dynamic linking library"
+ 'pthread' "POSIX threads library"
+ 'SM' "session management library for X11"
+ 'ICE' "ICE is the Inter Client Exchange protocol, part of X11"
+ 'GL' "libGL implements the GLX interface as well as the main OpenGL API entrypoints"
+ 'X11'
+ 'nsl' "network services library"
+ ).
+
+
+ !
Item was added:
+ ----- Method: Linux32x86SqueakCogV3Config>>externalLibsBuildAssert (in category 'cmake buildType redirects') -----
+ externalLibsBuildAssert
+ ^ self externalLibsBuild
+ !
Item was added:
+ ----- Method: Linux32x86SqueakCogV3Config>>externalLibsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') -----
+ externalLibsBuildAssertITimerHeartbeat
+ ^ self externalLibsBuild
+ !
Item was added:
+ ----- Method: Linux32x86SqueakCogV3Config>>externalLibsBuildDebug (in category 'cmake buildType redirects') -----
+ externalLibsBuildDebug
+ ^ self externalLibsBuild
+ !
Item was added:
+ ----- Method: Linux32x86SqueakCogV3Config>>externalLibsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') -----
+ externalLibsBuildDebugITimerHeartbeat
+ ^ self externalLibsBuild
+ !
Item was added:
+ ----- Method: Linux32x86SqueakCogV3Config>>externalLibsBuildITimerHeartbeat (in category 'cmake buildType redirects') -----
+ externalLibsBuildITimerHeartbeat
+ ^ self externalLibsBuild
+ !
Item was added:
+ ----- Method: Linux32x86SqueakCogV3Config>>externalLibsBuildMultiThreaded (in category 'cmake buildType redirects') -----
+ externalLibsBuildMultiThreaded
+ ^ self externalLibsBuild
+ !
Item was added:
+ ----- Method: Linux32x86SqueakCogV3Config>>externalLibsBuildMultiThreadedAssert (in category 'cmake buildType redirects') -----
+ externalLibsBuildMultiThreadedAssert
+ ^ self externalLibsBuild
+ !
Item was added:
+ ----- Method: Linux32x86SqueakCogV3Config>>externalLibsBuildMultiThreadedDebug (in category 'cmake buildType redirects') -----
+ externalLibsBuildMultiThreadedDebug
+ ^ self externalLibsBuild
+ !
Item was changed:
----- 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 externalLibs);
- 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 removed:
- ----- 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 changed:
----- 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: (self externalLibs); "#( SM ICE GL X11 nsl dl); "
- 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 changed:
----- Method: Linux64x86w32BitConfig>>defaultExternalPlugins (in category 'plugins') -----
defaultExternalPlugins
+ ^ #(
+ B3DAcceleratorPlugin
+ ThreadedIA32FFIPlugin "SqueakFFIPrims"
+ "UUIDPlugin"
+ "UnixOSProcessPlugin ?? "
+ JPEGReaderPlugin
+ JPEGReadWriter2Plugin
+ RePlugin
+ InternetConfigPlugin
+ )
- " 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)
+ "debug"!
-
- "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: Linux64x86w32BitConfig>>defaultInternalPlugins (in category 'plugins') -----
defaultInternalPlugins
+ " took from unixbuild/bld/plugins.int"
- " tty 2014.06.10 cut-n-paste from Cog/build.linux32x86/newspeak.cog.spur/build/plugins.int
- N.B. moduleName->XYZ means XYZ appears in the GNU-Build's plugins.int/ext. However, Smalltalk requires the class name.
- XYZSmalltalkClass moduleName->XYZ as it appears in plugins.int/ext
- "
^ #(
+ ADPCMCodecPlugin
+ AsynchFilePlugin
+ BalloonEnginePlugin "B2DPlugin"
+ BitBltSimulation "BitBltPlugin"
+ BMPReadWriterPlugin
+ CroquetPlugin
+ DeflatePlugin "ZipPlugin"
+ DropPlugin
+ DSAPlugin "DSAPrims"
+ FFTPlugin
+ FileCopyPlugin
+ FilePlugin
+ FloatArrayPlugin
+ FloatMathPlugin
+ JoystickTabletPlugin
+ KlattSynthesizerPlugin "Klatt"
+ LargeIntegersPlugin "LargeIntegers"
+ Matrix2x3Plugin
+ MIDIPlugin
+ MiscPrimitivePlugin
+ Mpeg3Plugin
+ SecurityPlugin
+ SerialPlugin
+ SocketPlugin
+ SoundCodecPlugin "SoundCodecPrims"
+ SoundGenerationPlugin
+ SoundPlugin
+ StarSqueakPlugin
+ SurfacePlugin
+ LocalePlugin
+ )!
- ADPCMCodecPlugin
- AsynchFilePlugin
- BalloonEnginePlugin "moduleName -->B2DPlugin"
- BitBltSimulation "moduleName->BitBltPlugin"
- BMPReadWriterPlugin
- CroquetPlugin
- DeflatePlugin "moduleName->ZipPlugin"
- DropPlugin
- DSAPlugin "moduleName->DSAPrims"
- FFTPlugin
- FileCopyPlugin
- FilePlugin
- FloatArrayPlugin
- FloatMathPlugin
- IA32ABIPlugin "moduleName->IA32ABI"
- " InflatePlugin" "moduleName->ZipPlugin" "already included with the DeflatePlugin"
- JoystickTabletPlugin
- JPEGReaderPlugin
- JPEGReadWriter2Plugin
- KlattSynthesizerPlugin "moduleName->Klatt"
- LargeIntegersPlugin "moduleName->LargeIntegers"
- Matrix2x3Plugin
- MIDIPlugin
- MiscPrimitivePlugin
- Mpeg3Plugin
- RePlugin
- SecurityPlugin
- SerialPlugin
- SocketPlugin
- SoundCodecPlugin "moduleName->SoundCodecPrims"
- SoundGenerationPlugin
- SoundPlugin
- StarSqueakPlugin
- SurfacePlugin
- VMProfileLinuxSupportPlugin)!
Item was added:
+ ----- Method: Linux64x86w32BitConfig>>extraPluginSettings: (in category 'plugin extra rules') -----
+ extraPluginSettings: maker
+ super extraPluginSettings: maker.
+ maker set: #linkFlags toString: '${linkFlags} -m32'!
Item was added:
+ ----- Method: Linux64x86w32BitConfig>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuild: maker
+ self flag:'tty'. "this dumps the libs into the executable's directory. This breaks the distribution convention squeak has had for a while. However, we probably should handle that in a packaging/redistribution step and not worry about it now"
+ maker isExternal ifTrue: [
+ "copy lib to outputDir "
+ maker set: 'LIBRARY_OUTPUT_PATH' to: '${outputDir}'
+ ].
+ maker set: #linkFlags toString: '${linkFlags} -m32'!
Item was added:
+ ----- Method: Linux64x86w32BitConfig>>extraPluginSettingsBuildAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: Linux64x86w32BitConfig>>extraPluginSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssertITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: Linux64x86w32BitConfig>>extraPluginSettingsBuildDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: Linux64x86w32BitConfig>>extraPluginSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebugITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: Linux64x86w32BitConfig>>extraPluginSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: Linux64x86w32BitConfig>>extraPluginSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreaded: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: Linux64x86w32BitConfig>>extraPluginSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: Linux64x86w32BitConfig>>extraPluginSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was changed:
----- Method: Linux64x86w32BitConfig>>preferredIncludesBuild (in category 'source files') -----
preferredIncludesBuild
^ #( '${targetPlatform}/plugins/B3DAcceleratorPlugin')
"SystemNavigation default browseMethodsWhoseNamesContain: 'preferredIncludes'"
!
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 , '")'.
aMaker
cmd: 'set_source_files_properties'
params: ' ${targetPlatform}/vm/sqUnixHeartbeat.c PROPERTIES
COMPILE_FLAGS "' , self compilerFlags , '"'.
+ aMaker addExternalLibraries: (self externalLibs).
- 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>>setGlobalOptionsBuild: (in category 'cmake buildType redirects') -----
setGlobalOptionsBuild: aMaker
aMaker message: 'setGlobalOptionsBuild: aMaker'.
+ " aMaker linkDirectories: '/usr/lib'."
- aMaker linkDirectories: '/usr/lib'.
" SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions:' "!
Item was changed:
----- 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'
+ " . '-L/usr/lib'"
- . '-L/usr/lib'
}
!
Item was changed:
----- Method: Linux64x86w32BitSqueakCogV3Config>>defaultExternalPlugins (in category 'plugins') -----
defaultExternalPlugins
""
+ ^ #(
+
+ ThreadedFFIPlugin "SqueakFFIPrims"
+ "UUIDPlugin"
+ "UnixOSProcessPlugin ?? "
+ JPEGReaderPlugin
+ JPEGReadWriter2Plugin
+ RePlugin
+ )!
- ^ #()!
Item was removed:
- ----- Method: Linux64x86w32BitSqueakCogV3Config>>defaultInternalPlugins (in category 'plugins') -----
- defaultInternalPlugins
- ^super defaultInternalPlugins copyWithoutAll:#(#FloatMathPlugin)!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>externalLibsBuild (in category 'cmake buildType redirects') -----
+ externalLibsBuild
+ self flag:'tty'. "this is dependent on plugins? what if I don't have SqueakSSLPlugin?"
+ ^#(
+ 'uuid' ""
+ 'ssl' ""
+ 'crypto' ""
+ 'm' "C math library"
+ 'dl' "dynamic linking library"
+ 'pthread' "POSIX threads library"
+ 'SM' "session management library for X11"
+ 'ICE' "ICE is the Inter Client Exchange protocol, part of X11"
+ 'GL' "libGL implements the GLX interface as well as the main OpenGL API entrypoints"
+ 'X11'
+ 'nsl' "network services library"
+ ).
+
+
+ !
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>externalLibsBuildAssert (in category 'cmake buildType redirects') -----
+ externalLibsBuildAssert
+ ^ self externalLibsBuild
+ !
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>externalLibsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') -----
+ externalLibsBuildAssertITimerHeartbeat
+ ^ self externalLibsBuild
+ !
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>externalLibsBuildDebug (in category 'cmake buildType redirects') -----
+ externalLibsBuildDebug
+ ^ self externalLibsBuild
+ !
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>externalLibsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') -----
+ externalLibsBuildDebugITimerHeartbeat
+ ^ self externalLibsBuild
+ !
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>externalLibsBuildITimerHeartbeat (in category 'cmake buildType redirects') -----
+ externalLibsBuildITimerHeartbeat
+ ^ self externalLibsBuild
+ !
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>externalLibsBuildMultiThreaded (in category 'cmake buildType redirects') -----
+ externalLibsBuildMultiThreaded
+ ^ self externalLibsBuild
+ !
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>externalLibsBuildMultiThreadedAssert (in category 'cmake buildType redirects') -----
+ externalLibsBuildMultiThreadedAssert
+ ^ self externalLibsBuild
+ !
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>externalLibsBuildMultiThreadedDebug (in category 'cmake buildType redirects') -----
+ externalLibsBuildMultiThreadedDebug
+ ^ self externalLibsBuild
+ !
Item was changed:
----- Method: Linux64x86w32BitSqueakCogV3Config>>linkFlagsBuild (in category 'cmake buildType redirects') -----
linkFlagsBuild
"Answer array of libraries to link to"
^ { '-L/usr/lib'
. '-L/usr/lib/X11'
. '-luuid'
. 'lSM'
. '-lICE'
. '-ldl'
. '-lGL'
. '-lpthread'
. '-lm'
. '-lnsl'
. '-lX11'
+ }
- } addAll: (self lDFlagsBuild)
!
Item was added:
+ ----- Method: SqueakAndroidStackEvtConfig>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuild: maker
+ ^super extraPluginSettingsBuild: maker.
+ !
Item was added:
+ ----- Method: SqueakAndroidStackEvtConfig>>extraPluginSettingsBuildAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakAndroidStackEvtConfig>>extraPluginSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssertITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakAndroidStackEvtConfig>>extraPluginSettingsBuildDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakAndroidStackEvtConfig>>extraPluginSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebugITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakAndroidStackEvtConfig>>extraPluginSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakAndroidStackEvtConfig>>extraPluginSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreaded: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakAndroidStackEvtConfig>>extraPluginSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakAndroidStackEvtConfig>>extraPluginSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was changed:
----- 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 externalLibs);
- 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>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuild: maker
+ maker isExternal ifTrue: [
+ "copy lib to results dir "
+ maker set: 'LIBRARY_OUTPUT_PATH' to: '${outputDir}'
+ ].
+ !
Item was added:
+ ----- Method: SqueakBSDConfig>>extraPluginSettingsBuildAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakBSDConfig>>extraPluginSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssertITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakBSDConfig>>extraPluginSettingsBuildDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakBSDConfig>>extraPluginSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebugITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakBSDConfig>>extraPluginSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakBSDConfig>>extraPluginSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreaded: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakBSDConfig>>extraPluginSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakBSDConfig>>extraPluginSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was removed:
- ----- Method: SqueakCocoaIOSConfig>>extraPluginSettings: (in category 'plugin extra rules') -----
- extraPluginSettings: maker
- maker set: 'CMAKE_OSX_ARCHITECTURES' to: 'i386'.
-
- maker
- setTargetProperty: 'COMPILE_FLAGS'
- to: '"-include \"', (self buildDir / self prefixHeaderFileName) fullName, '\""'.
-
- maker isExternal ifTrue: [
- "copy result to results dir "
-
- maker set: 'LIBRARY_OUTPUT_PATH' toString: self outputDir fullName.
- maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName.
- maker puts: 'list(APPEND linkFlags "-undefined dynamic_lookup")' ].
-
- "maker addXCodeProperty: 'GCC_VERSION' value: '4.3'."
- maker addXCodeProperty: 'GCC_PREFIX_HEADER' value: '${buildDir}/' , self executableName , '_Prefix.pch'.
-
- !
Item was added:
+ ----- Method: SqueakIOSConfig>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuild: aMaker
+ aMaker set: 'CMAKE_OSX_ARCHITECTURES' to: 'i386'.
+
+ aMaker
+ setTargetProperty: 'COMPILE_FLAGS'
+ to: '"-include \"', (self buildDir / self prefixHeaderFileName) fullName, '\""'.
+
+ aMaker isExternal ifTrue: [
+ "copy result to results dir "
+
+ aMaker set: 'LIBRARY_OUTPUT_PATH' toString: self outputDir fullName.
+ aMaker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName.
+ aMaker puts: 'list(APPEND linkFlags "-undefined dynamic_lookup")' ].
+
+ "maker addXCodeProperty: 'GCC_VERSION' value: '4.3'."
+ aMaker addXCodeProperty: 'GCC_PREFIX_HEADER' value: '${buildDir}/' , self executableName , '_Prefix.pch'.
+
+ !
Item was added:
+ ----- Method: SqueakIOSConfig>>extraPluginSettingsBuildAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakIOSConfig>>extraPluginSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssertITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakIOSConfig>>extraPluginSettingsBuildDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakIOSConfig>>extraPluginSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebugITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakIOSConfig>>extraPluginSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakIOSConfig>>extraPluginSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreaded: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakIOSConfig>>extraPluginSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakIOSConfig>>extraPluginSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was removed:
- ----- Method: SqueakIPhoneSqueakStackV3Config>>extraPluginSettings: (in category 'plugin extra rules') -----
- extraPluginSettings: maker
- self architecture
- ifNotNil: [ :arch | maker set: 'CMAKE_OSX_ARCHITECTURES' toString: arch ].
-
- self setCommonProperties: maker.
-
- maker
- setTargetProperty: 'COMPILE_FLAGS'
- to: '"-include \"', (self buildDir / self prefixHeaderFileName) fullName, '\""'.
-
- maker isExternal ifTrue: [
- "copy result to results dir "
- maker set: 'LIBRARY_OUTPUT_PATH' toString: self outputDir.
- maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir.
- maker puts: 'list(APPEND linkFlags "-undefined dynamic_lookup")' ].
-
- "maker addXCodeProperty: 'GCC_VERSION' value: '4.3'."
- maker addXCodeProperty: 'GCC_PREFIX_HEADER' value: '${buildDir}/' , self executableName , '_Prefix.pch'.
-
- !
Item was added:
+ ----- Method: SqueakIPhoneSqueakStackV3Config>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuild: aMaker
+ self architecture
+ ifNotNil: [ :arch | aMaker set: 'CMAKE_OSX_ARCHITECTURES' toString: arch ].
+
+ self setCommonProperties: aMaker.
+
+ aMaker
+ setTargetProperty: 'COMPILE_FLAGS'
+ to: '"-include \"', (self buildDir / self prefixHeaderFileName) fullName, '\""'.
+
+ aMaker isExternal ifTrue: [
+ "copy result to results dir "
+ aMaker set: 'LIBRARY_OUTPUT_PATH' toString: self outputDir.
+ aMaker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir.
+ aMaker puts: 'list(APPEND linkFlags "-undefined dynamic_lookup")' ].
+
+ "maker addXCodeProperty: 'GCC_VERSION' value: '4.3'."
+ aMaker addXCodeProperty: 'GCC_PREFIX_HEADER' value: '${buildDir}/' , self executableName , '_Prefix.pch'.
+
+ !
Item was added:
+ ----- Method: SqueakMacOSX32x86Config>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuild: aMaker
+ "Cog currently runs only in 32 bit mode"
+ self flag: 'tty'. "cut-n-paste from pharo code. I have no idea if this is appropriate for this platform"
+ aMaker set: 'CMAKE_OSX_ARCHITECTURES' to: 'i386'!
Item was added:
+ ----- Method: SqueakMacOSX32x86Config>>extraPluginSettingsBuildAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakMacOSX32x86Config>>extraPluginSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssertITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakMacOSX32x86Config>>extraPluginSettingsBuildDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakMacOSX32x86Config>>extraPluginSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebugITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakMacOSX32x86Config>>extraPluginSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakMacOSX32x86Config>>extraPluginSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreaded: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakMacOSX32x86Config>>extraPluginSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakMacOSX32x86Config>>extraPluginSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuild: aMaker
+ "default browseMethodsWhoseNamesContain: 'extraPluginSettingsBuild' "
+ self subclassResponsibility.!
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>extraPluginSettingsBuildAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>extraPluginSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssertITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>extraPluginSettingsBuildDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>extraPluginSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebugITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>extraPluginSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>extraPluginSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreaded: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>extraPluginSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>extraPluginSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was changed:
----- 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 externalLibs);
- 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>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuild: aMaker
+ "default browseMethodsWhoseNamesContain: 'extraPluginSettingsBuild' "
+ self subclassResponsibility.!
Item was added:
+ ----- Method: SqueakSunOS32x86Config>>extraPluginSettingsBuildAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakSunOS32x86Config>>extraPluginSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssertITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakSunOS32x86Config>>extraPluginSettingsBuildDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakSunOS32x86Config>>extraPluginSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebugITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakSunOS32x86Config>>extraPluginSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakSunOS32x86Config>>extraPluginSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreaded: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakSunOS32x86Config>>extraPluginSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakSunOS32x86Config>>extraPluginSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was removed:
- ----- Method: SqueakUnixConfig>>extraPluginSettings: (in category 'plugin extra rules') -----
- extraPluginSettings: maker
-
- maker isExternal ifTrue: [
- "copy lib to results dir "
- maker set: 'LIBRARY_OUTPUT_PATH' to: '${outputDir}'
- ].
- !
Item was added:
+ ----- Method: SqueakWin32x86Config>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuild: aMaker
+
+ self flag:'tty'. "cut-n-paste from pharo code in CogWindowsConfig. caveat emptor"
+ self subclassResponsibility.
+ "
+ aMaker isExternal ifTrue: [
+ aMaker set: 'LIBRARY_OUTPUT_PATH' toString: '${outputDir}'.
+
+ aMaker cmd: 'set_target_properties' params: aMaker moduleName , ' PROPERTIES PREFIX "" '
+ ]"!
Item was added:
+ ----- Method: SqueakWin32x86Config>>extraPluginSettingsBuildAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakWin32x86Config>>extraPluginSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssertITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakWin32x86Config>>extraPluginSettingsBuildDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakWin32x86Config>>extraPluginSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebugITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakWin32x86Config>>extraPluginSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakWin32x86Config>>extraPluginSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreaded: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakWin32x86Config>>extraPluginSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakWin32x86Config>>extraPluginSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
1
0
Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-eem.801.mcz
==================== Summary ====================
Name: VMMaker.oscog-eem.801
Author: eem
Time: 3 July 2014, 7:17:37.563 am
UUID: 9f41072d-884c-46b9-88d2-284f1f839881
Ancestors: VMMaker.oscog-eem.800
Fix slip in creating the codeGeneratorToComputeAccessorDepth
=============== Diff against VMMaker.oscog-eem.800 ===============
Item was changed:
----- Method: StackInterpreter>>codeGeneratorToComputeAccessorDepth (in category 'primitive support') -----
codeGeneratorToComputeAccessorDepth
^VMMaker new
+ buildCodeGeneratorForInterpreter: self class primitivesClass
- buildCodeGeneratorForInterpreter: self primitivesClass
includeAPIMethods: false
initializeClasses: false!
1
0
03 Jul '14
Revision: 3031
Author: eliot
Date: 2014-07-03 06:49:59 -0700 (Thu, 03 Jul 2014)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.800
Sort VM methods by class first, selector second, to group by coarse
functionality (e.g. scavenger methods) for the benefit of the VMProfiler.
Access missOffset via a macro (very minor speedup).
Modified Paths:
--------------
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/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/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/vm/cogit.c
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.c 2014-07-03 12:46:14 UTC (rev 3030)
+++ branches/Cog/nscogsrc/vm/cogit.c 2014-07-03 13:49:59 UTC (rev 3031)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06
+ CCodeGenerator VMMaker.oscog-eem.798 uuid: f47e2c22-fea0-4762-b689-8b295a59d8ac
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06
+ StackToRegisterMappingCogit VMMaker.oscog-eem.798 uuid: f47e2c22-fea0-4762-b689-8b295a59d8ac
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.795 uuid: d77a504d-28ea-407a-9df0-097e6dbaaf06 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.798 uuid: f47e2c22-fea0-4762-b689-8b295a59d8ac " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -368,111 +368,39 @@
# define NoDbgRegParms /*empty*/
#endif
-static AbstractInstruction * gAndCqR(sqInt quickConstant, sqInt reg) NoDbgRegParms;
-static AbstractInstruction * gArithmeticShiftRightRR(sqInt reg1, sqInt reg2) NoDbgRegParms;
-sqInt abortOffset(void);
-static sqInt abstractInstructionfollows(AbstractInstruction *theAbstractInstruction, AbstractInstruction *anAbstractInstruction) NoDbgRegParms;
static sqInt abstractRegisterForConcreteRegister(AbstractInstruction * self_in_abstractRegisterForConcreteRegister, sqInt reg) NoDbgRegParms;
-static BlockStart * addBlockStartAtnumArgsnumCopiedspan(sqInt bytecodepc, sqInt numArgs, sqInt numCopied, sqInt span) NoDbgRegParms;
-static void addCleanBlockStarts(void);
-void addCogMethodsToHeapMap(void);
static AbstractInstruction * addDependent(AbstractInstruction * self_in_addDependent, AbstractInstruction *anInstruction) NoDbgRegParms;
-static sqInt addressIsInFixups(AbstractInstruction *address) NoDbgRegParms;
-static sqInt addressIsInInstructions(AbstractInstruction *address) NoDbgRegParms;
-static sqInt addressOfEndOfCaseinCPIC(sqInt n, CogMethod *cPIC) NoDbgRegParms;
-static void addToOpenPICList(CogMethod *anOpenPIC) NoDbgRegParms;
-static void addToUnpairedMethodList(CogMethod *aCogMethod) NoDbgRegParms;
-static void addToYoungReferrers(CogMethod *cogMethod) NoDbgRegParms;
-static sqInt alignUptoRoutineBoundary(sqInt anAddress) NoDbgRegParms;
-static sqInt allMachineCodeObjectReferencesValid(void);
-static sqInt allMethodsHaveCorrectHeader(void);
-static sqInt allocate(sqInt numBytes) NoDbgRegParms;
-static sqInt allYoungObjectsAgeInFullGC(void);
-static AbstractInstruction * annotateAbsolutePCRef(AbstractInstruction *abstractInstruction) NoDbgRegParms;
-static void annotateBytecodeIfAnnotated(CogSimStackEntry *aSimStackEntry) NoDbgRegParms;
-static AbstractInstruction * annotateBytecode(AbstractInstruction *abstractInstruction) NoDbgRegParms;
-static AbstractInstruction * annotateobjRef(AbstractInstruction *abstractInstruction, sqInt anOop) NoDbgRegParms;
-static AbstractInstruction * annotatewith(AbstractInstruction *abstractInstruction, sqInt annotationFlag) NoDbgRegParms;
-static sqInt anyReferencesToRegisterinTopNItems(sqInt reg, sqInt n) NoDbgRegParms;
-static void assertSaneJumpTarget(AbstractInstruction *jumpTarget) NoDbgRegParms;
-static sqInt blockCreationBytecodeSizeForHeader(sqInt methodHeader) NoDbgRegParms;
-static sqInt blockDispatchTargetsForperformarg(CogMethod *cogMethod, usqInt (*binaryFunction)(sqInt mcpc, sqInt arg), sqInt arg) NoDbgRegParms;
-sqInt bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod);
-static AbstractInstruction * CallNewspeakSend(sqInt callTarget) NoDbgRegParms;
-static AbstractInstruction * CallRT(sqInt callTarget) NoDbgRegParms;
-static AbstractInstruction * CallRTregistersToBeSavedMask(sqInt callTarget, sqInt registersToBeSaved) NoDbgRegParms;
-static AbstractInstruction * CallSend(sqInt callTarget) NoDbgRegParms;
-static AbstractInstruction * gCall(sqInt callTarget) NoDbgRegParms;
-static AbstractInstruction * gCmpCqR(sqInt quickConstant, sqInt reg) NoDbgRegParms;
-static AbstractInstruction * gCmpCwR(sqInt wordConstant, sqInt reg) NoDbgRegParms;
-static sqInt cacheTagIsMarked(sqInt cacheTag) NoDbgRegParms;
+static sqInt computeJumpTargetOffsetPlus(AbstractInstruction * self_in_computeJumpTargetOffsetPlus, sqInt anPCOffset) NoDbgRegParms;
+static sqInt concretizeLabel(AbstractInstruction * self_in_concretizeLabel) NoDbgRegParms;
+static sqInt genAlignCStackSavingRegistersnumArgswordAlignment(AbstractInstruction * self_in_genAlignCStackSavingRegistersnumArgswordAlignment, sqInt saveRegs, sqInt numArgs, sqInt alignment) NoDbgRegParms;
+static AbstractInstruction * generateICacheFlush(AbstractInstruction * self_in_generateICacheFlush) NoDbgRegParms;
+static AbstractInstruction * genJumpFPGreaterOrEqual(AbstractInstruction * self_in_genJumpFPGreaterOrEqual, void *jumpTarget) NoDbgRegParms;
+static AbstractInstruction * genJumpFPGreater(AbstractInstruction * self_in_genJumpFPGreater, void *jumpTarget) NoDbgRegParms;
+static AbstractInstruction * genJumpFPLessOrEqual(AbstractInstruction * self_in_genJumpFPLessOrEqual, void *jumpTarget) NoDbgRegParms;
+static AbstractInstruction * genJumpFPLess(AbstractInstruction * self_in_genJumpFPLess, void *jumpTarget) NoDbgRegParms;
+static AbstractInstruction * genWriteCResultIntoReg(AbstractInstruction * self_in_genWriteCResultIntoReg, sqInt abstractRegister) NoDbgRegParms;
+static AbstractInstruction * getJmpTarget(AbstractInstruction * self_in_getJmpTarget) NoDbgRegParms;
+static sqInt isAFixup(AbstractInstruction * self_in_isAFixup, void *fixupOrAddress) NoDbgRegParms;
+static sqInt isAnInstruction(AbstractInstruction * self_in_isAnInstruction, AbstractInstruction *addressOrInstruction) NoDbgRegParms;
+static sqInt isJump(AbstractInstruction * self_in_isJump) NoDbgRegParms;
+static sqInt isLongJump(AbstractInstruction * self_in_isLongJump) NoDbgRegParms;
+static AbstractInstruction * jumpTargetAddress(AbstractInstruction * self_in_jumpTargetAddress) NoDbgRegParms;
+static sqInt labelOffset(AbstractInstruction * self_in_labelOffset) NoDbgRegParms;
+static AbstractInstruction * longJumpTargetAddress(AbstractInstruction * self_in_longJumpTargetAddress) NoDbgRegParms;
+static sqInt numICacheFlushOpcodes(AbstractInstruction * self_in_numICacheFlushOpcodes) NoDbgRegParms;
+static AbstractInstruction * resolveJumpTarget(AbstractInstruction * self_in_resolveJumpTarget) NoDbgRegParms;
+static sqInt setLabelOffset(AbstractInstruction * self_in_setLabelOffset, sqInt aValue) NoDbgRegParms;
+static AbstractInstruction * updateLabel(AbstractInstruction * self_in_updateLabel, AbstractInstruction *labelInstruction) NoDbgRegParms;
+static CogMethod * cmHomeMethod(CogBlockMethod * self_in_cmHomeMethod) NoDbgRegParms;
+static sqInt isBranch(BytecodeDescriptor * self_in_isBranch) NoDbgRegParms;
+static sqInt isUnconditionalBranch(BytecodeDescriptor * self_in_isUnconditionalBranch) NoDbgRegParms;
static sqInt callerSavedRegisterMask(AbstractInstruction * self_in_callerSavedRegisterMask) NoDbgRegParms;
static sqInt callInstructionByteSize(AbstractInstruction * self_in_callInstructionByteSize) NoDbgRegParms;
-static sqInt callPrimitiveBytecode(void);
static sqInt callsAreRelative(AbstractInstruction * self_in_callsAreRelative) NoDbgRegParms;
static sqInt callTargetFromReturnAddress(AbstractInstruction * self_in_callTargetFromReturnAddress, sqInt callSiteReturnAddress) NoDbgRegParms;
static sqInt canDivQuoRem(AbstractInstruction * self_in_canDivQuoRem) NoDbgRegParms;
-sqInt canLinkToYoungClasses(void);
static sqInt canMulRR(AbstractInstruction * self_in_canMulRR) NoDbgRegParms;
-static sqInt ceClosureCopyDescriptor(sqInt descriptor) NoDbgRegParms;
-sqInt ceCPICMissreceiver(CogMethod *cPIC, sqInt receiver);
-static sqInt ceImplicitReceiverForreceiverclass(sqInt selector, sqInt receiver, sqInt rcvrClass) NoDbgRegParms;
-sqInt ceSICMiss(sqInt receiver);
-void checkAssertsEnabledInCogit(void);
-static sqInt checkIfValidOopRefAndTargetpccogMethod(sqInt annotation, char *mcpc, sqInt cogMethod) NoDbgRegParms;
-static sqInt checkIfValidOopRefpccogMethod(sqInt annotation, char *mcpc, sqInt cogMethod) NoDbgRegParms;
-sqInt checkIntegrityOfObjectReferencesInCode(sqInt fullGCFlag);
-static sqInt checkMaybeObjRefAt(sqInt mcpc) NoDbgRegParms;
-static void checkPrimitiveTableEnablers(void);
-static sqInt checkValidInlineCacheTag(sqInt cacheTag) NoDbgRegParms;
-static sqInt checkValidObjectReferencesInClosedPIC(CogMethod *cPIC) NoDbgRegParms;
-static sqInt checkValidObjectReference(sqInt anOop) NoDbgRegParms;
-static sqInt checkValidOopReference(sqInt anOop) NoDbgRegParms;
-static void clearCogCompiledCode(void);
-static sqInt closedPICRefersToUnmarkedObject(CogMethod *cPIC) NoDbgRegParms;
-static CogMethod * cmHomeMethod(CogBlockMethod * self_in_cmHomeMethod) NoDbgRegParms;
-char * codeEntryFor(char *address);
-char * codeEntryNameFor(char *address);
-sqInt cogCodeBase(void);
-sqInt cogCodeConstituents(void);
-static sqInt cogExtendPICCaseNMethodtagisMNUCase(CogMethod *cPIC, sqInt caseNMethod, sqInt caseNTag, sqInt isMNUCase) NoDbgRegParms;
-void cogitPostGCAction(sqInt gcMode);
-sqInt cogMethodDoesntLookKosher(CogMethod *cogMethod);
-CogMethod * cogMNUPICSelectormethodOperandnumArgs(sqInt selector, sqInt methodOperand, sqInt numArgs);
-static CogMethod * cogOpenPICSelectornumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms;
-static CogMethod * cogPICSelectornumArgsCase0MethodCase1MethodtagisMNUCase(sqInt selector, sqInt numArgs, CogMethod *case0CogMethod, sqInt case1MethodOrNil, sqInt case1Tag, sqInt isMNUCase) NoDbgRegParms;
-CogMethod * cogselector(sqInt aMethodObj, sqInt aSelectorOop);
-void compactCogCompiledCode(void);
-static void compactCompiledCode(void);
-static void compileAbort(void);
-static sqInt compileAbstractInstructionsFromthrough(sqInt start, sqInt end) NoDbgRegParms;
-static sqInt compileBlockBodies(void);
-static sqInt compileBlockDispatch(void);
-static sqInt compileBlockDispatchFromto(sqInt lowBlockStartIndex, sqInt highBlockStartIndex) NoDbgRegParms;
-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);
-static sqInt compileCPICCase0Case1MethodtagisMNUCasenumArgs(CogMethod *cPIC, CogMethod *case0CogMethod, sqInt case1Method, sqInt case1Tag, sqInt isMNUCase, sqInt numArgs) NoDbgRegParms;
-static sqInt compileEntireMethod(void);
-static void compileEntry(void);
-static sqInt compileFallbackToInterpreterPrimitive(void);
-static sqInt compileFrameBuild(void);
-static void compileGetErrorCode(void);
-static sqInt compileInterpreterPrimitive(void (*primitiveRoutine)(void)) NoDbgRegParms;
-static sqInt compileMethodBody(void);
-static sqInt compileMNUCPICmethodOperandnumArgs(CogMethod *cPIC, sqInt methodOperand, sqInt numArgs) NoDbgRegParms;
-static void compileOpenPICnumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms;
-static sqInt compilePICProlog(sqInt numArgs) NoDbgRegParms;
-static sqInt compilePrimitive(void);
-static void compileTrampolineFornumArgsargargargargsaveRegspushLinkRegresultReg(void *aRoutine, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt saveRegs, sqInt pushLinkReg, sqInt resultRegOrNil) NoDbgRegParms;
-static void computeEntryOffsets(void);
-static sqInt computeJumpTargetOffsetPlus(AbstractInstruction * self_in_computeJumpTargetOffsetPlus, sqInt anPCOffset) NoDbgRegParms;
static sqInt computeMaximumSize(AbstractInstruction * self_in_computeMaximumSize) NoDbgRegParms;
-static void computeMaximumSizes(void);
static sqInt computeShiftRRSize(AbstractInstruction * self_in_computeShiftRRSize) NoDbgRegParms;
static sqInt concreteDPFPRegister(AbstractInstruction * self_in_concreteDPFPRegister, sqInt registerIndex) NoDbgRegParms;
static sqInt concreteRegister(AbstractInstruction * self_in_concreteRegister, sqInt registerIndex) NoDbgRegParms;
@@ -506,7 +434,6 @@
static sqInt concretizeJump(AbstractInstruction * self_in_concretizeJump) NoDbgRegParms;
static sqInt concretizeJumpLong(AbstractInstruction * self_in_concretizeJumpLong) NoDbgRegParms;
static sqInt concretizeJumpR(AbstractInstruction * self_in_concretizeJumpR) NoDbgRegParms;
-static sqInt concretizeLabel(AbstractInstruction * self_in_concretizeLabel) NoDbgRegParms;
static sqInt concretizeLOCK(AbstractInstruction * self_in_concretizeLOCK) NoDbgRegParms;
static sqInt concretizeLoadEffectiveAddressMwrR(AbstractInstruction * self_in_concretizeLoadEffectiveAddressMwrR) NoDbgRegParms;
static sqInt concretizeLogicalShiftLeftCqR(AbstractInstruction * self_in_concretizeLogicalShiftLeftCqR) NoDbgRegParms;
@@ -549,32 +476,148 @@
static sqInt concretizeXCHGRR(AbstractInstruction * self_in_concretizeXCHGRR) NoDbgRegParms;
static sqInt concretizeXorCwR(AbstractInstruction * self_in_concretizeXorCwR) NoDbgRegParms;
static sqInt concretizeXorRR(AbstractInstruction * self_in_concretizeXorRR) NoDbgRegParms;
-static sqInt couldBeObject(sqInt oop) NoDbgRegParms;
static sqInt counterTargetFromFollowingAddress(AbstractInstruction * self_in_counterTargetFromFollowingAddress, sqInt nextInstructionAddress) NoDbgRegParms;
+static sqInt cResultRegister(AbstractInstruction * self_in_cResultRegister) NoDbgRegParms;
+static void dispatchConcretize(AbstractInstruction * self_in_dispatchConcretize) NoDbgRegParms;
+static AbstractInstruction * genDivRRQuoRem(AbstractInstruction * self_in_genDivRRQuoRem, sqInt abstractRegDivisor, sqInt abstractRegDividend, sqInt abstractRegQuotient, sqInt abstractRegRemainder) NoDbgRegParms;
+static AbstractInstruction * generateCheckFeatures(AbstractInstruction * self_in_generateCheckFeatures) NoDbgRegParms;
+static AbstractInstruction * generateLowLevelTryLock(AbstractInstruction * self_in_generateLowLevelTryLock, sqInt vmOwnerLockAddress) NoDbgRegParms;
+static AbstractInstruction * generateLowLevelUnlock(AbstractInstruction * self_in_generateLowLevelUnlock, sqInt vmOwnerLockAddress) NoDbgRegParms;
+static AbstractInstruction * genGetLeafCallStackPointerFunction(AbstractInstruction * self_in_genGetLeafCallStackPointerFunction) NoDbgRegParms;
+static AbstractInstruction * genJumpFPEqual(AbstractInstruction * self_in_genJumpFPEqual, void *jumpTarget) NoDbgRegParms;
+static AbstractInstruction * genJumpFPNotEqual(AbstractInstruction * self_in_genJumpFPNotEqual, void *jumpTarget) NoDbgRegParms;
+static sqInt genLoadCStackPointer(AbstractInstruction * self_in_genLoadCStackPointer) NoDbgRegParms;
+static sqInt genLoadCStackPointers(AbstractInstruction * self_in_genLoadCStackPointers) NoDbgRegParms;
+static sqInt genLoadStackPointers(AbstractInstruction * self_in_genLoadStackPointers) NoDbgRegParms;
+static AbstractInstruction * genMulRR(AbstractInstruction * self_in_genMulRR, sqInt regSource, sqInt regDest) NoDbgRegParms;
+static sqInt genPassConstasArgument(AbstractInstruction * self_in_genPassConstasArgument, sqInt constant, sqInt zeroRelativeArgIndex) NoDbgRegParms;
+static sqInt genPassRegasArgument(AbstractInstruction * self_in_genPassRegasArgument, sqInt abstractRegister, sqInt zeroRelativeArgIndex) NoDbgRegParms;
+static AbstractInstruction * genPushRegisterArgsForAbortMissNumArgs(AbstractInstruction * self_in_genPushRegisterArgsForAbortMissNumArgs, sqInt numArgs) NoDbgRegParms;
+static AbstractInstruction * genPushRegisterArgsForNumArgs(AbstractInstruction * self_in_genPushRegisterArgsForNumArgs, sqInt numArgs) NoDbgRegParms;
+static sqInt genRemoveNArgsFromStack(AbstractInstruction * self_in_genRemoveNArgsFromStack, sqInt n) NoDbgRegParms;
+static sqInt genRestoreRegs(AbstractInstruction * self_in_genRestoreRegs) NoDbgRegParms;
+static sqInt genRestoreRegsExcept(AbstractInstruction * self_in_genRestoreRegsExcept, sqInt abstractReg) NoDbgRegParms;
+static sqInt genSaveRegisters(AbstractInstruction * self_in_genSaveRegisters) NoDbgRegParms;
+static sqInt genSaveStackPointers(AbstractInstruction * self_in_genSaveStackPointers) NoDbgRegParms;
+static AbstractInstruction * genSubstituteReturnAddress(AbstractInstruction * self_in_genSubstituteReturnAddress, sqInt retpc) NoDbgRegParms;
+static sqInt hasDoublePrecisionFloatingPointSupport(AbstractInstruction * self_in_hasDoublePrecisionFloatingPointSupport) NoDbgRegParms;
+static sqInt hasLinkRegister(AbstractInstruction * self_in_hasLinkRegister) NoDbgRegParms;
+static sqInt hasPCDependentInstructions(AbstractInstruction * self_in_hasPCDependentInstructions) NoDbgRegParms;
+static sqInt hasSSE2Instructions(AbstractInstruction * self_in_hasSSE2Instructions) NoDbgRegParms;
+static sqInt hasSSEInstructions(AbstractInstruction * self_in_hasSSEInstructions) NoDbgRegParms;
+static sqInt inlineCacheTagAt(AbstractInstruction * self_in_inlineCacheTagAt, sqInt callSiteReturnAddress) NoDbgRegParms;
+static sqInt instructionSizeAt(AbstractInstruction * self_in_instructionSizeAt, sqInt pc) NoDbgRegParms;
+static sqInt isBigEndian(AbstractInstruction * self_in_isBigEndian) NoDbgRegParms;
+static sqInt isCallPreceedingReturnPC(AbstractInstruction * self_in_isCallPreceedingReturnPC, sqInt mcpc) NoDbgRegParms;
+static sqInt isJumpAt(AbstractInstruction * self_in_isJumpAt, sqInt pc) NoDbgRegParms;
+static sqInt isPCDependent(AbstractInstruction * self_in_isPCDependent) NoDbgRegParms;
+static sqInt isQuick(AbstractInstruction * self_in_isQuick, unsigned long operand) NoDbgRegParms;
+static AbstractInstruction * jmpTarget(AbstractInstruction * self_in_jmpTarget, AbstractInstruction *anAbstractInstruction) NoDbgRegParms;
+static sqInt jumpLongByteSize(AbstractInstruction * self_in_jumpLongByteSize) NoDbgRegParms;
+static sqInt jumpLongConditionalByteSize(AbstractInstruction * self_in_jumpLongConditionalByteSize) NoDbgRegParms;
+static sqInt jumpLongTargetBeforeFollowingAddress(AbstractInstruction * self_in_jumpLongTargetBeforeFollowingAddress, sqInt mcpc) NoDbgRegParms;
+static sqInt jumpShortByteSize(AbstractInstruction * self_in_jumpShortByteSize) NoDbgRegParms;
+static sqInt jumpTargetPCAt(AbstractInstruction * self_in_jumpTargetPCAt, sqInt pc) NoDbgRegParms;
+static sqInt leafCallStackPointerDelta(AbstractInstruction * self_in_leafCallStackPointerDelta) NoDbgRegParms;
+static sqInt literalBeforeFollowingAddress(AbstractInstruction * self_in_literalBeforeFollowingAddress, sqInt followingAddress) NoDbgRegParms;
+static sqInt loadLiteralByteSize(AbstractInstruction * self_in_loadLiteralByteSize) NoDbgRegParms;
+static sqInt machineCodeBytes(AbstractInstruction * self_in_machineCodeBytes) NoDbgRegParms;
+static sqInt modRMRO(AbstractInstruction * self_in_modRMRO, sqInt mod, sqInt regMode, sqInt regOpcode) NoDbgRegParms;
+static AbstractInstruction * nopsFromto(AbstractInstruction * self_in_nopsFromto, sqInt startAddr, sqInt endAddr) NoDbgRegParms;
+static sqInt numCheckFeaturesOpcodes(AbstractInstruction * self_in_numCheckFeaturesOpcodes) NoDbgRegParms;
+static sqInt numLowLevelLockOpcodes(AbstractInstruction * self_in_numLowLevelLockOpcodes) NoDbgRegParms;
+static AbstractInstruction * padIfPossibleWithNopsFromto(AbstractInstruction * self_in_padIfPossibleWithNopsFromto, sqInt startAddr, sqInt endAddr) NoDbgRegParms;
+static AbstractInstruction * relocateCallBeforeReturnPCby(AbstractInstruction * self_in_relocateCallBeforeReturnPCby, sqInt retpc, sqInt delta) NoDbgRegParms;
+static AbstractInstruction * relocateJumpBeforeFollowingAddressby(AbstractInstruction * self_in_relocateJumpBeforeFollowingAddressby, sqInt pc, sqInt delta) NoDbgRegParms;
+static AbstractInstruction * relocateMethodReferenceBeforeAddressby(AbstractInstruction * self_in_relocateMethodReferenceBeforeAddressby, sqInt pc, sqInt delta) NoDbgRegParms;
+static sqInt rewriteCallAttarget(AbstractInstruction * self_in_rewriteCallAttarget, usqInt callSiteReturnAddress, usqInt callTargetAddress) NoDbgRegParms;
+static sqInt rewriteInlineCacheAttagtarget(AbstractInstruction * self_in_rewriteInlineCacheAttagtarget, usqInt callSiteReturnAddress, sqInt cacheTag, usqInt callTargetAddress) NoDbgRegParms;
+static AbstractInstruction * rewriteInlineCacheTagat(AbstractInstruction * self_in_rewriteInlineCacheTagat, sqInt cacheTag, sqInt callSiteReturnAddress) NoDbgRegParms;
+static sqInt rewriteJumpLongAttarget(AbstractInstruction * self_in_rewriteJumpLongAttarget, sqInt callSiteReturnAddress, sqInt callTargetAddress) NoDbgRegParms;
+static sqInt setsConditionCodesFor(AbstractInstruction * self_in_setsConditionCodesFor, sqInt aConditionalJumpOpcode) NoDbgRegParms;
+static sqInt shiftSetsConditionCodesFor(AbstractInstruction * self_in_shiftSetsConditionCodesFor, sqInt aConditionalJumpOpcode) NoDbgRegParms;
+static sqInt sizeHasModrmat(AbstractInstruction * self_in_sizeHasModrmat, sqInt op, sqInt pc) NoDbgRegParms;
+static sqInt sizeImmediateGroup1at(AbstractInstruction * self_in_sizeImmediateGroup1at, sqInt op, sqInt pc) NoDbgRegParms;
+static sqInt sizePCDependentInstructionAt(AbstractInstruction * self_in_sizePCDependentInstructionAt, sqInt eventualAbsoluteAddress) NoDbgRegParms;
+static sqInt stackBytesForNumArgs(AbstractInstruction * self_in_stackBytesForNumArgs, sqInt numArgs) NoDbgRegParms;
+static sqInt stackPageInterruptHeadroomBytes(AbstractInstruction * self_in_stackPageInterruptHeadroomBytes) NoDbgRegParms;
+static AbstractInstruction * storeLiteralbeforeFollowingAddress(AbstractInstruction * self_in_storeLiteralbeforeFollowingAddress, sqInt literal, sqInt followingAddress) NoDbgRegParms;
+static sqInt sib(AbstractInstruction * self_in_sib, sqInt scale, sqInt indexReg, sqInt baseReg) NoDbgRegParms;
+static sqInt twoByteInstructionSizeAt(AbstractInstruction * self_in_twoByteInstructionSizeAt, sqInt pc) NoDbgRegParms;
+static sqInt unsignedShortAt(AbstractInstruction * self_in_unsignedShortAt, sqInt byteAddress) NoDbgRegParms;
+static AbstractInstruction * gAndCqR(sqInt quickConstant, sqInt reg) NoDbgRegParms;
+static AbstractInstruction * gArithmeticShiftRightRR(sqInt reg1, sqInt reg2) NoDbgRegParms;
+sqInt abortOffset(void);
+static sqInt abstractInstructionfollows(AbstractInstruction *theAbstractInstruction, AbstractInstruction *anAbstractInstruction) NoDbgRegParms;
+static void addCleanBlockStarts(void);
+void addCogMethodsToHeapMap(void);
+static sqInt addressIsInFixups(AbstractInstruction *address) NoDbgRegParms;
+static sqInt addressIsInInstructions(AbstractInstruction *address) NoDbgRegParms;
+static sqInt addressOfEndOfCaseinCPIC(sqInt n, CogMethod *cPIC) NoDbgRegParms;
+static sqInt alignUptoRoutineBoundary(sqInt anAddress) NoDbgRegParms;
+static sqInt allMachineCodeObjectReferencesValid(void);
+static sqInt allMethodsHaveCorrectHeader(void);
+static AbstractInstruction * annotateAbsolutePCRef(AbstractInstruction *abstractInstruction) NoDbgRegParms;
+static AbstractInstruction * annotateBytecode(AbstractInstruction *abstractInstruction) NoDbgRegParms;
+static AbstractInstruction * annotateobjRef(AbstractInstruction *abstractInstruction, sqInt anOop) NoDbgRegParms;
+static AbstractInstruction * annotatewith(AbstractInstruction *abstractInstruction, sqInt annotationFlag) NoDbgRegParms;
+static void assertSaneJumpTarget(AbstractInstruction *jumpTarget) NoDbgRegParms;
+static sqInt blockCreationBytecodeSizeForHeader(sqInt methodHeader) NoDbgRegParms;
+static sqInt blockDispatchTargetsForperformarg(CogMethod *cogMethod, usqInt (*binaryFunction)(sqInt mcpc, sqInt arg), sqInt arg) NoDbgRegParms;
+sqInt bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod);
+static AbstractInstruction * CallNewspeakSend(sqInt callTarget) NoDbgRegParms;
+static AbstractInstruction * CallRT(sqInt callTarget) NoDbgRegParms;
+static AbstractInstruction * CallRTregistersToBeSavedMask(sqInt callTarget, sqInt registersToBeSaved) NoDbgRegParms;
+static AbstractInstruction * CallSend(sqInt callTarget) NoDbgRegParms;
+static AbstractInstruction * gCall(sqInt callTarget) NoDbgRegParms;
+static AbstractInstruction * gCmpCqR(sqInt quickConstant, sqInt reg) NoDbgRegParms;
+static AbstractInstruction * gCmpCwR(sqInt wordConstant, sqInt reg) NoDbgRegParms;
+sqInt ceCPICMissreceiver(CogMethod *cPIC, sqInt receiver);
+static sqInt ceImplicitReceiverForreceiverclass(sqInt selector, sqInt receiver, sqInt rcvrClass) NoDbgRegParms;
+sqInt ceSICMiss(sqInt receiver);
+void checkAssertsEnabledInCogit(void);
+static sqInt checkIfValidOopRefAndTargetpccogMethod(sqInt annotation, char *mcpc, sqInt cogMethod) NoDbgRegParms;
+static sqInt checkIfValidOopRefpccogMethod(sqInt annotation, char *mcpc, sqInt cogMethod) NoDbgRegParms;
+sqInt checkIntegrityOfObjectReferencesInCode(sqInt fullGCFlag);
+static sqInt checkMaybeObjRefAt(sqInt mcpc) NoDbgRegParms;
+static void checkPrimitiveTableEnablers(void);
+static sqInt checkValidObjectReferencesInClosedPIC(CogMethod *cPIC) NoDbgRegParms;
+static sqInt closedPICRefersToUnmarkedObject(CogMethod *cPIC) NoDbgRegParms;
+char * codeEntryFor(char *address);
+char * codeEntryNameFor(char *address);
+sqInt cogCodeBase(void);
+sqInt cogCodeConstituents(void);
+static sqInt cogExtendPICCaseNMethodtagisMNUCase(CogMethod *cPIC, sqInt caseNMethod, sqInt caseNTag, sqInt isMNUCase) NoDbgRegParms;
+void cogitPostGCAction(sqInt gcMode);
+sqInt cogMethodDoesntLookKosher(CogMethod *cogMethod);
+CogMethod * cogMNUPICSelectormethodOperandnumArgs(sqInt selector, sqInt methodOperand, sqInt numArgs);
+static CogMethod * cogOpenPICSelectornumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms;
+static CogMethod * cogPICSelectornumArgsCase0MethodCase1MethodtagisMNUCase(sqInt selector, sqInt numArgs, CogMethod *case0CogMethod, sqInt case1MethodOrNil, sqInt case1Tag, sqInt isMNUCase) NoDbgRegParms;
+CogMethod * cogselector(sqInt aMethodObj, sqInt aSelectorOop);
+void compactCogCompiledCode(void);
+static void compileAbort(void);
+static sqInt compileBlockDispatchFromto(sqInt lowBlockStartIndex, sqInt highBlockStartIndex) NoDbgRegParms;
+static void compileBlockEntry(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 AbstractInstruction * compileCPICEntry(void);
+static sqInt compileCPICCase0Case1MethodtagisMNUCasenumArgs(CogMethod *cPIC, CogMethod *case0CogMethod, sqInt case1Method, sqInt case1Tag, sqInt isMNUCase, sqInt numArgs) NoDbgRegParms;
+static void compileEntry(void);
+static sqInt compileMethodBody(void);
+static sqInt compileMNUCPICmethodOperandnumArgs(CogMethod *cPIC, sqInt methodOperand, sqInt numArgs) NoDbgRegParms;
+static sqInt compilePICProlog(sqInt numArgs) NoDbgRegParms;
+static sqInt compilePrimitive(void);
+static void compileTrampolineFornumArgsargargargargsaveRegspushLinkRegresultReg(void *aRoutine, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt saveRegs, sqInt pushLinkReg, sqInt resultRegOrNil) NoDbgRegParms;
+static void computeEntryOffsets(void);
+static void computeMaximumSizes(void);
static sqInt cPICHasFreedTargets(CogMethod *cPIC) NoDbgRegParms;
-static sqInt cPICMissTrampolineFor(sqInt numArgs) NoDbgRegParms;
static sqInt cPICHasTarget(CogMethod *cPIC, CogMethod *targetMethod) NoDbgRegParms;
-static sqInt cResultRegister(AbstractInstruction * self_in_cResultRegister) NoDbgRegParms;
-static sqInt createsClosuresInline(void);
static AbstractInstruction * gDivRRQuoRem(sqInt rDivisor, sqInt rDividend, sqInt rQuotient, sqInt rRemainder) NoDbgRegParms;
-static void dispatchConcretize(AbstractInstruction * self_in_dispatchConcretize) NoDbgRegParms;
-static sqInt doubleExtendedDoAnythingBytecode(void);
-static sqInt duplicateTopBytecode(void);
static sqInt endPCOf(sqInt aMethod) NoDbgRegParms;
-static BytecodeFixup * ensureFixupAt(sqInt targetIndex) NoDbgRegParms;
-static BytecodeFixup * ensureNonMergeFixupAt(sqInt targetIndex) NoDbgRegParms;
-static void ensureReceiverResultRegContainsSelf(void);
-static CogSimStackEntry * ensureSpilledAtfrom(CogSimStackEntry * self_in_ensureSpilledAtfrom, sqInt baseOffset, sqInt baseRegister) NoDbgRegParms;
void enterCogCodePopReceiver(void);
void enterCogCodePopReceiverAndClassRegs(void);
-void enterCogCodePopReceiverArg0Regs(void);
-void enterCogCodePopReceiverArg1Arg0Regs(void);
-static void evaluateat(BytecodeDescriptor *descriptor, sqInt pc) NoDbgRegParms;
static sqInt extABytecode(void);
static sqInt extBBytecode(void);
-static sqInt extendedPushBytecode(void);
-static sqInt extendedStoreAndPopBytecode(void);
-static sqInt extendedStoreBytecode(void);
static sqInt fillInBlockHeadersAt(sqInt startAddress) NoDbgRegParms;
static CogMethod * fillInCPICHeadersizenumArgsnumCaseshasMNUCaseselector(CogMethod *pic, sqInt size, sqInt numArgs, sqInt numCases, sqInt hasMNUCase, sqInt selector) NoDbgRegParms;
static CogMethod * fillInMethodHeadersizeselector(CogMethod *method, sqInt size, sqInt selector) NoDbgRegParms;
@@ -582,323 +625,53 @@
static usqInt findBlockMethodWithEntrystartBcpc(sqInt blockEntryMcpc, sqInt startBcpc) NoDbgRegParms;
static sqInt findMapLocationForMcpcinMethod(sqInt targetMcpc, CogMethod *cogMethod) NoDbgRegParms;
CogBlockMethod * findMethodForStartBcpcinHomeMethod(sqInt startbcpc, CogMethod *cogMethod);
-static CogMethod * findPreviouslyCompiledVersionOfwith(sqInt aMethodObj, sqInt aSelectorOop) NoDbgRegParms;
static sqInt findIsBackwardBranchMcpcBcpcMatchingMcpc(BytecodeDescriptor *descriptor, sqInt isBackwardBranch, char *mcpc, sqInt bcpc, void *targetMcpc) NoDbgRegParms;
-static sqInt frameOffsetOfTemporary(sqInt index) NoDbgRegParms;
-static void freeMethod(CogMethod *cogMethod) NoDbgRegParms;
-static void freeOlderMethodsForCompaction(void);
static void freePICsWithFreedTargets(void);
void freeUnmarkedMachineCode(void);
-static sqInt genActiveContextTrampoline(void);
-static sqInt genAddSmallIntegerTagsTo(sqInt aRegister) NoDbgRegParms;
-static sqInt genAlignCStackSavingRegistersnumArgswordAlignment(AbstractInstruction * self_in_genAlignCStackSavingRegistersnumArgswordAlignment, sqInt saveRegs, sqInt numArgs, sqInt alignment) NoDbgRegParms;
-static AbstractInstruction * genAllocFloatValueintoscratchRegscratchReg(sqInt dpreg, sqInt resultReg, sqInt scratch1, sqInt scratch2) NoDbgRegParms;
static sqInt genCheckForInterruptsTrampoline(void);
-static sqInt genConvertIntegerToSmallIntegerInReg(sqInt reg) NoDbgRegParms;
-static sqInt genConvertIntegerToSmallIntegerInScratchReg(sqInt scratchReg) NoDbgRegParms;
-static sqInt genConvertSmallIntegerToIntegerInReg(sqInt reg) NoDbgRegParms;
-static sqInt genCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(sqInt bcpc, sqInt numArgs, sqInt numCopied, sqInt ctxtNumArgs, sqInt isLargeCtxt, sqInt isInBlock) NoDbgRegParms;
-static AbstractInstruction * genDivRRQuoRem(AbstractInstruction * self_in_genDivRRQuoRem, sqInt abstractRegDivisor, sqInt abstractRegDividend, sqInt abstractRegQuotient, sqInt abstractRegRemainder) NoDbgRegParms;
-static sqInt genDoubleArithmeticpreOpCheck(sqInt arithmeticOperator, AbstractInstruction *(*preOpCheckOrNil)(int rcvrReg, int argReg)) NoDbgRegParms;
-static sqInt genDoubleComparisoninvert(AbstractInstruction *(*jumpOpcodeGenerator)(void *), sqInt invertComparison) NoDbgRegParms;
-static AbstractInstruction * genDoubleFailIfZeroArgRcvrarg(sqInt rcvrReg, sqInt argReg) NoDbgRegParms;
-static sqInt genDynamicSuperSendBytecode(void);
static void (*genEnilopmartForandandcalled(sqInt regArg1, sqInt regArg2, sqInt regArg3, char *trampolineName))(void) NoDbgRegParms;
static void (*genEnilopmartForandcalled(sqInt regArg1, sqInt regArg2, char *trampolineName))(void) NoDbgRegParms;
static void (*genEnilopmartForcalled(sqInt regArg, char *trampolineName))(void) NoDbgRegParms;
-static sqInt genEnsureObjInRegNotForwardedscratchReg(sqInt reg, sqInt scratch) NoDbgRegParms;
-static sqInt genEnsureOopInRegNotForwardedscratchReg(sqInt reg, sqInt scratch) NoDbgRegParms;
-static void (*genEnterPICEnilopmartNumArgs(sqInt numArgs))(void) NoDbgRegParms;
-static sqInt genExtendedSendBytecode(void);
-static sqInt genExtendedSuperBytecode(void);
-static sqInt genExternalizePointersForPrimitiveCall(void);
-static sqInt genExtJumpIfFalse(void);
-static sqInt genExtJumpIfTrue(void);
-static sqInt genExtNopBytecode(void);
-static sqInt genExtPushClosureBytecode(void);
-static sqInt genExtPushIntegerBytecode(void);
-static sqInt genExtPushLiteralBytecode(void);
-static sqInt genExtPushLiteralVariableBytecode(void);
-static sqInt genExtPushPseudoVariableOrOuterBytecode(void);
-static sqInt genExtPushReceiverVariableBytecode(void);
-static sqInt genExtReturnTopFromBlock(void);
-static sqInt genExtSendAbsentDynamicSuperBytecode(void);
-static sqInt genExtSendAbsentImplicitBytecode(void);
-static sqInt genExtSendBytecode(void);
-static sqInt genExtSendSuperBytecode(void);
-static sqInt genExtStoreAndPopLiteralVariableBytecode(void);
-static sqInt genExtStoreAndPopReceiverVariableBytecode(void);
-static sqInt genExtStoreLiteralVariableBytecode(void);
-static sqInt genExtStoreReceiverVariableBytecode(void);
-static sqInt genExtUnconditionalJump(void);
static void generateCaptureCStackPointers(sqInt captureFramePointer) NoDbgRegParms;
-static AbstractInstruction * generateCheckFeatures(AbstractInstruction * self_in_generateCheckFeatures) NoDbgRegParms;
static void generateClosedPICPrototype(void);
static CogMethod * generateCogMethod(sqInt selector) NoDbgRegParms;
-static void generateEnilopmarts(void);
-static AbstractInstruction * generateICacheFlush(AbstractInstruction * self_in_generateICacheFlush) NoDbgRegParms;
static sqInt generateInstructionsAt(sqInt eventualAbsoluteAddress) NoDbgRegParms;
-static AbstractInstruction * generateLowLevelTryLock(AbstractInstruction * self_in_generateLowLevelTryLock, sqInt vmOwnerLockAddress) NoDbgRegParms;
-static AbstractInstruction * generateLowLevelUnlock(AbstractInstruction * self_in_generateLowLevelUnlock, sqInt vmOwnerLockAddress) NoDbgRegParms;
static sqInt generateMapAtstart(sqInt addressOrNull, sqInt startAddress) NoDbgRegParms;
-static void generateMissAbortTrampolines(void);
static void generateNewspeakRuntime(void);
-static void generateObjectRepresentationTrampolines(void);
static void generateOpenPICPrototype(void);
static void generateRunTimeTrampolines(void);
-static void generateSendTrampolines(void);
static void generateStackPointerCapture(void);
-static void generateTracingTrampolines(void);
static void generateTrampolines(void);
static void generateVMOwnerLockFunctions(void);
-static sqInt genFastPrimFail(void);
-static void genFastPrimTraceUsingand(sqInt r1, sqInt r2) NoDbgRegParms;
-static sqInt genFetchIndexRegisterfrominto(sqInt indexReg, sqInt tableObj, sqInt destReg) NoDbgRegParms;
-static sqInt genFramelessStorePopReceiverVariable(sqInt popBoolean, sqInt slotIndex) NoDbgRegParms;
-static void genGetActiveContextNumArgslargeinBlock(sqInt numArgs, sqInt isLargeContext, sqInt isInBlock) NoDbgRegParms;
-static sqInt genGetClassFormatOfNonIntintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg) NoDbgRegParms;
-static sqInt genGetClassObjectOfintoscratchReginstRegIsReceiver(sqInt instReg, sqInt destReg, sqInt scratchReg, sqInt instRegIsReceiver) NoDbgRegParms;
-static AbstractInstruction * genGetClassTagOfintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg) NoDbgRegParms;
-static sqInt genGetCompactClassIndexNonImmOfinto(sqInt instReg, sqInt destReg) NoDbgRegParms;
-static sqInt genGetDoubleValueOfinto(sqInt srcReg, sqInt destFPReg) NoDbgRegParms;
-static sqInt genGetFixedFieldsOfPointerNonIntintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg) NoDbgRegParms;
-static sqInt genGetHashFieldNonImmOfasSmallIntegerInto(sqInt instReg, sqInt destReg) NoDbgRegParms;
-static sqInt genGetImplicitReceiverForforPush(sqInt selector, sqInt forPushSendBar) NoDbgRegParms;
static sqInt genGetLeafCallStackPointer(void);
-static AbstractInstruction * genGetLeafCallStackPointerFunction(AbstractInstruction * self_in_genGetLeafCallStackPointerFunction) NoDbgRegParms;
static sqInt genInnerPICAbortTrampoline(char *name) NoDbgRegParms;
-static sqInt genInnerPrimitiveAsCharacterinReg(sqInt retNOffset, sqInt reg) NoDbgRegParms;
-static sqInt genInnerPrimitiveAtPut(sqInt retNoffset) NoDbgRegParms;
-static sqInt genInnerPrimitiveAt(sqInt retNoffset) NoDbgRegParms;
-static sqInt genInnerPrimitiveCharacterValue(sqInt retNOffset) NoDbgRegParms;
-static sqInt genInnerPrimitiveIdenticalorNotIf(sqInt retNoffset, sqInt orNot) NoDbgRegParms;
-static sqInt genInnerPrimitiveIdentityHash(sqInt retNOffset) NoDbgRegParms;
-static sqInt genInnerPrimitiveMirrorNewWithArg(sqInt retNoffset) NoDbgRegParms;
-static sqInt genInnerPrimitiveMirrorNew(sqInt retNoffset) NoDbgRegParms;
-static sqInt genInnerPrimitiveNewMethod(sqInt retNoffset) NoDbgRegParms;
-static sqInt genInnerPrimitiveNewWithArg(sqInt retNoffset) NoDbgRegParms;
-static sqInt genInnerPrimitiveNew(sqInt retNoffset) NoDbgRegParms;
-static sqInt genInnerPrimitiveSize(sqInt retNoffset) NoDbgRegParms;
-static sqInt genInnerPrimitiveStringAtPut(sqInt retNoffset) NoDbgRegParms;
-static sqInt genInnerPrimitiveStringAt(sqInt retNOffset) NoDbgRegParms;
-static sqInt genJumpBackTo(sqInt targetBytecodePC) NoDbgRegParms;
-static AbstractInstruction * genJumpFPEqual(AbstractInstruction * self_in_genJumpFPEqual, void *jumpTarget) NoDbgRegParms;
-static AbstractInstruction * genJumpFPGreaterOrEqual(AbstractInstruction * self_in_genJumpFPGreaterOrEqual, void *jumpTarget) NoDbgRegParms;
-static AbstractInstruction * genJumpFPGreater(AbstractInstruction * self_in_genJumpFPGreater, void *jumpTarget) NoDbgRegParms;
-static AbstractInstruction * genJumpFPLessOrEqual(AbstractInstruction * self_in_genJumpFPLessOrEqual, void *jumpTarget) NoDbgRegParms;
-static AbstractInstruction * genJumpFPLess(AbstractInstruction * self_in_genJumpFPLess, void *jumpTarget) NoDbgRegParms;
-static AbstractInstruction * genJumpFPNotEqual(AbstractInstruction * self_in_genJumpFPNotEqual, void *jumpTarget) NoDbgRegParms;
-static sqInt genJumpIfto(sqInt boolean, sqInt targetBytecodePC) NoDbgRegParms;
-static AbstractInstruction * genJumpImmediateInScratchReg(sqInt aRegister) NoDbgRegParms;
-static AbstractInstruction * genJumpNotSmallIntegerInScratchReg(sqInt aRegister) NoDbgRegParms;
-static AbstractInstruction * genJumpSmallIntegerInScratchReg(sqInt aRegister) NoDbgRegParms;
-static sqInt genJumpTo(sqInt targetBytecodePC) NoDbgRegParms;
-static sqInt genLoadCStackPointer(AbstractInstruction * self_in_genLoadCStackPointer) NoDbgRegParms;
-static sqInt genLoadCStackPointers(AbstractInstruction * self_in_genLoadCStackPointers) NoDbgRegParms;
static sqInt genLoadCStackPointersForPrimCall(void);
-static sqInt genLoadSlotsourceRegdestReg(sqInt index, sqInt sourceReg, sqInt destReg) NoDbgRegParms;
-static sqInt genLoadStackPointers(AbstractInstruction * self_in_genLoadStackPointers) NoDbgRegParms;
-static sqInt genLongJumpIfFalse(void);
-static sqInt genLongJumpIfTrue(void);
-static sqInt genLongPushTemporaryVariableBytecode(void);
-static sqInt genLongStoreAndPopTemporaryVariableBytecode(void);
-static sqInt genLongStoreTemporaryVariableBytecode(void);
-static sqInt genLongUnconditionalBackwardJump(void);
-static sqInt genLongUnconditionalForwardJump(void);
-static sqInt genMarshalledSendDynamicSupernumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms;
-static sqInt genMarshalledSendSupernumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms;
-static sqInt genMarshalledSendnumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms;
-static sqInt genMethodAbortTrampolineFor(sqInt numArgs) NoDbgRegParms;
-static AbstractInstruction * genMulRR(AbstractInstruction * self_in_genMulRR, sqInt regSource, sqInt regDest) NoDbgRegParms;
-static sqInt genMustBeBooleanTrampolineForcalled(sqInt boolean, char *trampolineName) NoDbgRegParms;
-static void genNewArrayOfSizeinitialized(sqInt size, sqInt initialized) NoDbgRegParms;
static sqInt genNonLocalReturnTrampoline(void);
-static sqInt genPassConstasArgument(AbstractInstruction * self_in_genPassConstasArgument, sqInt constant, sqInt zeroRelativeArgIndex) NoDbgRegParms;
-static sqInt genPassRegasArgument(AbstractInstruction * self_in_genPassRegasArgument, sqInt abstractRegister, sqInt zeroRelativeArgIndex) NoDbgRegParms;
-static sqInt genPICAbortTrampolineFor(sqInt numArgs) NoDbgRegParms;
-static sqInt genPICMissTrampolineFor(sqInt numArgs) NoDbgRegParms;
-static sqInt genPopStackBytecode(void);
-static sqInt genPrimitiveAdd(void);
-static sqInt genPrimitiveAsCharacter(void);
-static sqInt genPrimitiveAsFloat(void);
-static sqInt genPrimitiveAt(void);
-static sqInt genPrimitiveAtPut(void);
-static sqInt genPrimitiveBitAnd(void);
-static sqInt genPrimitiveBitOr(void);
-static sqInt genPrimitiveBitShift(void);
-static sqInt genPrimitiveBitXor(void);
-static sqInt genPrimitiveCharacterValue(void);
-static sqInt genPrimitiveClass(void);
-static sqInt genPrimitiveClosureValue(void);
-static sqInt genPrimitiveDiv(void);
-static sqInt genPrimitiveDivide(void);
-static sqInt genPrimitiveEqual(void);
-static sqInt genPrimitiveFloatAdd(void);
-static sqInt genPrimitiveFloatDivide(void);
-static sqInt genPrimitiveFloatEqual(void);
-static sqInt genPrimitiveFloatGreaterOrEqual(void);
-static sqInt genPrimitiveFloatGreaterThan(void);
-static sqInt genPrimitiveFloatLessOrEqual(void);
-static sqInt genPrimitiveFloatLessThan(void);
-static sqInt genPrimitiveFloatMultiply(void);
-static sqInt genPrimitiveFloatNotEqual(void);
-static sqInt genPrimitiveFloatSquareRoot(void);
-static sqInt genPrimitiveFloatSubtract(void);
-static sqInt genPrimitiveGreaterOrEqual(void);
-static sqInt genPrimitiveGreaterThan(void);
-static sqInt genPrimitiveIdentical(void);
-static sqInt genPrimitiveIdentityHash(void);
-static sqInt genPrimitiveLessOrEqual(void);
-static sqInt genPrimitiveLessThan(void);
-static sqInt genPrimitiveMod(void);
-static sqInt genPrimitiveMultiply(void);
-static sqInt genPrimitiveNew(void);
-static sqInt genPrimitiveNewMethod(void);
-static sqInt genPrimitiveNewWithArg(void);
-static sqInt genPrimitiveNotEqual(void);
-static sqInt genPrimitiveNotIdentical(void);
-static sqInt genPrimitiveQuo(void);
-static sqInt genPrimitiveSize(void);
-static sqInt genPrimitiveStringAt(void);
-static sqInt genPrimitiveStringAtPut(void);
-static sqInt genPrimitiveSubtract(void);
-static void genPrimReturnEnterCogCodeEnilopmart(sqInt profiling) NoDbgRegParms;
-static sqInt genPushActiveContextBytecode(void);
-static sqInt genPushClosureCopyCopiedValuesBytecode(void);
-static sqInt genPushConstantFalseBytecode(void);
-static sqInt genPushConstantNilBytecode(void);
-static sqInt genPushConstantOneBytecode(void);
-static sqInt genPushConstantTrueBytecode(void);
-static sqInt genPushConstantZeroBytecode(void);
-static sqInt genPushExplicitOuterReceiverBytecode(void);
-static sqInt genPushExplicitOuterReceiver(sqInt level) NoDbgRegParms;
-static sqInt genPushImplicitReceiverBytecode(void);
-static sqInt genPushLiteralConstantBytecode(void);
-static sqInt genPushLiteralIndex(sqInt literalIndex) NoDbgRegParms;
-static sqInt genPushLiteralVariable16CasesBytecode(void);
-static sqInt genPushLiteralVariableBytecode(void);
-static sqInt genPushLiteralVariable(sqInt literalIndex) NoDbgRegParms;
-static sqInt genPushLiteral(sqInt literal) NoDbgRegParms;
-static sqInt genPushMaybeContextReceiverVariable(sqInt slotIndex) NoDbgRegParms;
-static sqInt genPushNewArrayBytecode(void);
-static sqInt genPushQuickIntegerConstantBytecode(void);
-static sqInt genPushReceiverBytecode(void);
-static sqInt genPushReceiverVariableBytecode(void);
-static sqInt genPushReceiverVariable(sqInt index) NoDbgRegParms;
-static void genPushRegisterArgs(void);
-static AbstractInstruction * genPushRegisterArgsForAbortMissNumArgs(AbstractInstruction * self_in_genPushRegisterArgsForAbortMissNumArgs, sqInt numArgs) NoDbgRegParms;
-static AbstractInstruction * genPushRegisterArgsForNumArgs(AbstractInstruction * self_in_genPushRegisterArgsForNumArgs, sqInt numArgs) NoDbgRegParms;
-static sqInt genPushRemoteTempLongBytecode(void);
-static sqInt genPushTemporaryVariableBytecode(void);
-static sqInt genPushTemporaryVariable(sqInt index) NoDbgRegParms;
-sqInt genQuickReturnConst(void);
-sqInt genQuickReturnInstVar(void);
-sqInt genQuickReturnSelf(void);
-static sqInt genRemoveNArgsFromStack(AbstractInstruction * self_in_genRemoveNArgsFromStack, sqInt n) NoDbgRegParms;
-static sqInt genRemoveSmallIntegerTagsInScratchReg(sqInt scratchReg) NoDbgRegParms;
-static sqInt genRestoreRegs(AbstractInstruction * self_in_genRestoreRegs) NoDbgRegParms;
-static sqInt genRestoreRegsExcept(AbstractInstruction * self_in_genRestoreRegsExcept, sqInt abstractReg) NoDbgRegParms;
-static sqInt genReturnFalse(void);
-static sqInt genReturnNil(void);
-static sqInt genReturnReceiver(void);
-static sqInt genReturnTopFromBlock(void);
-static sqInt genReturnTopFromMethod(void);
-static sqInt genReturnTrue(void);
static sqInt genSafeTrampolineForcalledarg(void *aRoutine, char *aString, sqInt regOrConst0) NoDbgRegParms;
static sqInt genSafeTrampolineForcalledargarg(void *aRoutine, char *aString, sqInt regOrConst0, sqInt regOrConst1) NoDbgRegParms;
-static sqInt genSaveRegisters(AbstractInstruction * self_in_genSaveRegisters) NoDbgRegParms;
-static sqInt genSaveStackPointers(AbstractInstruction * self_in_genSaveStackPointers) NoDbgRegParms;
-static sqInt genSecondExtendedSendBytecode(void);
-static sqInt genSendAbsentDynamicSupernumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms;
-static sqInt genSendAbsentImplicit0ArgsBytecode(void);
-static sqInt genSendAbsentImplicitnumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms;
-static sqInt genSendDynamicSupernumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms;
-static sqInt genSendLiteralSelector0ArgsBytecode(void);
-static sqInt genSendLiteralSelector1ArgBytecode(void);
-static sqInt genSendLiteralSelector2ArgsBytecode(void);
-static sqInt genSendSupernumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms;
-static sqInt genSendTrampolineFornumArgscalledargargarg(void *aRoutine, sqInt numArgs, char *aString, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2) NoDbgRegParms;
-static sqInt genSendTrampolineFornumArgscalledargargargarg(void *aRoutine, sqInt numArgs, char *aString, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3) NoDbgRegParms;
-static sqInt genSendnumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms;
-static sqInt genSetSmallIntegerTagsIn(sqInt scratchReg) NoDbgRegParms;
-static sqInt genShiftAwaySmallIntegerTagsInScratchReg(sqInt scratchReg) NoDbgRegParms;
-static sqInt genShortJumpIfFalse(void);
-static sqInt genShortJumpIfTrue(void);
-static sqInt genShortUnconditionalJump(void);
-static sqInt genSmallIntegerComparisonorDoubleComparison(sqInt jumpOpcode, AbstractInstruction *(*jumpFPOpcodeGenerator)(void *)) NoDbgRegParms;
static sqInt genSmalltalkToCStackSwitch(void);
-static sqInt genSpecialSelectorArithmetic(void);
-static sqInt genSpecialSelectorClass(void);
-static sqInt genSpecialSelectorComparison(void);
-static sqInt genSpecialSelectorEqualsEquals(void);
-static sqInt genSpecialSelectorSend(void);
-static sqInt genStoreAndPopReceiverVariableBytecode(void);
-static sqInt genStoreAndPopRemoteTempLongBytecode(void);
-static sqInt genStoreAndPopTemporaryVariableBytecode(void);
-static sqInt genStoreImmediateInSourceRegslotIndexdestReg(sqInt sourceReg, sqInt index, sqInt destReg) NoDbgRegParms;
-static sqInt genStorePopLiteralVariable(sqInt popBoolean, sqInt litVarIndex) NoDbgRegParms;
-static sqInt genStorePopMaybeContextReceiverVariable(sqInt popBoolean, sqInt slotIndex) NoDbgRegParms;
-static sqInt genStorePopReceiverVariable(sqInt popBoolean, sqInt slotIndex) NoDbgRegParms;
-static sqInt genStorePopRemoteTempAt(sqInt popBoolean, sqInt slotIndex, sqInt remoteTempIndex) NoDbgRegParms;
-static sqInt genStorePopTemporaryVariable(sqInt popBoolean, sqInt tempIndex) NoDbgRegParms;
-static sqInt genStoreRemoteTempLongBytecode(void);
-static sqInt genStoreSourceRegslotIndexdestRegscratchReg(sqInt sourceReg, sqInt index, sqInt destReg, sqInt scratchReg) NoDbgRegParms;
-static sqInt genStoreSourceRegslotIndexintoNewObjectInDestReg(sqInt sourceReg, sqInt index, sqInt destReg) NoDbgRegParms;
-static AbstractInstruction * genSubstituteReturnAddress(AbstractInstruction * self_in_genSubstituteReturnAddress, sqInt retpc) NoDbgRegParms;
static sqInt genTrampolineForcalled(void *aRoutine, char *aString) NoDbgRegParms;
static sqInt genTrampolineForcalledarg(void *aRoutine, char *aString, sqInt regOrConst0) NoDbgRegParms;
static sqInt genTrampolineForcalledargargargresult(void *aRoutine, char *aString, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt resultReg) NoDbgRegParms;
static sqInt genTrampolineForcalledargargresult(void *aRoutine, char *aString, sqInt regOrConst0, sqInt regOrConst1, sqInt resultReg) NoDbgRegParms;
static sqInt genTrampolineForcalledargresult(void *aRoutine, char *aString, sqInt regOrConst0, sqInt resultReg) NoDbgRegParms;
static sqInt genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(void *aRoutine, char *trampolineName, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt saveRegs, sqInt pushLinkReg, sqInt resultRegOrNil, sqInt appendBoolean) NoDbgRegParms;
-static sqInt genUpArrowReturn(void);
-static AbstractInstruction * genWriteCResultIntoReg(AbstractInstruction * self_in_genWriteCResultIntoReg, sqInt abstractRegister) NoDbgRegParms;
static AbstractInstruction * gen(sqInt opcode) NoDbgRegParms;
static AbstractInstruction * genoperand(sqInt opcode, sqInt operand) NoDbgRegParms;
static AbstractInstruction * genoperandoperand(sqInt opcode, sqInt operandOne, sqInt operandTwo) NoDbgRegParms;
@@ 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.800.mcz
==================== Summary ====================
Name: VMMaker.oscog-eem.800
Author: eem
Time: 3 July 2014, 6:43:14.066 am
UUID: 33fd7d74-ad59-446d-ac56-1e9c2eb4c089
Ancestors: VMMaker.oscog-eem.799
Fix a minor inlining typing bug.
=============== Diff against VMMaker.oscog-eem.799 ===============
Item was changed:
----- Method: NewObjectMemory>>printMemField:name:size: (in category 'debug printing') -----
printMemField: memField name: name size: length
<var: #memField type: #usqInt>
<var: #name type: #'char *'>
+ self print: name; tab; printHexPtr: memField asVoidPointer;
+ printChar: $/; printNum: memField;
- self print: name; tab; printHexPtr: memField;
- printChar: $/; printNum: (self oopForPointer: memField);
print: ' sz: '; printHex: length.
length ~= 0 ifTrue:
[self printChar: $/; printNum: length].
self cr!
1
0