04 Jun '15
Revision: 3370
Author: eliot
Date: 2015-06-04 13:15:11 -0700 (Thu, 04 Jun 2015)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.1339
Spur Cogit:
Fix Spur block performance now that we follow forwarded receivers in blocks; see
VMMaker.oscog-eem.1334. Scan blocks for inst var usage, only unforwarding in
the prologue of blocks that actually refer to inst vars. In a test Spur Squeak
image only 12.5% of blocks do refer to inst vars. So this is definitely a win.
Add a special purpose store check trampoline to store check the updated
receiver. Make sure it's only called if the eceiuver is updated.
Add state to CogBytecodeDescriptor, CogBlockStart
and CogBlockMethod to track block inst var usage.
Sista:
Fix the bug where rcvrReg was nil in genEqualsEqualsnoBranch.
Modified Paths:
--------------
branches/Cog/nsspursrc/vm/cogit.h
branches/Cog/nsspursrc/vm/cogitARMv5.c
branches/Cog/nsspursrc/vm/cogitIA32.c
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/spursistasrc/vm/cogit.h
branches/Cog/spursistasrc/vm/cogitARMv5.c
branches/Cog/spursistasrc/vm/cogitIA32.c
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/spursrc/vm/cogit.h
branches/Cog/spursrc/vm/cogitARMv5.c
branches/Cog/spursrc/vm/cogitIA32.c
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/src/vm/cogit.h
branches/Cog/src/vm/cogitARMv5.c
branches/Cog/src/vm/cogitIA32.c
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
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nsspursrc/vm/cogit.h
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.h 2015-06-04 05:47:13 UTC (rev 3369)
+++ branches/Cog/nsspursrc/vm/cogit.h 2015-06-04 20:15:11 UTC (rev 3370)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
+ CCodeGenerator VMMaker.oscog-eem.1339 uuid: 022ddfcc-a8f6-422b-8a81-edffae18ebe6
*/
Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c
===================================================================
--- branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-06-04 05:47:13 UTC (rev 3369)
+++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-06-04 20:15:11 UTC (rev 3370)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
+ CCodeGenerator VMMaker.oscog-eem.1339 uuid: 022ddfcc-a8f6-422b-8a81-edffae18ebe6
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1339 uuid: 022ddfcc-a8f6-422b-8a81-edffae18ebe6
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1339 uuid: 022ddfcc-a8f6-422b-8a81-edffae18ebe6 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -45,6 +45,7 @@
AbstractInstruction *entryLabel;
AbstractInstruction *stackCheckLabel;
sqInt span;
+ sqInt hasInstVarRef;
} BlockStart;
#define CogBlockStart BlockStart
@@ -64,6 +65,7 @@
unsigned isMapped : 1;
unsigned isMappedInBlock : 1;
unsigned isExtension : 1;
+ unsigned isInstVarRef : 1;
unsigned hasIRC : 1;
} BytecodeDescriptor;
@@ -313,7 +315,7 @@
#define NumObjRefsInRuntime 0
#define NumOopsPerNSC 6
#define NumSendTrampolines 4
-#define NumTrampolines 70
+#define NumTrampolines 72
#define OrCqR 98
#define OrCwR 105
#define OrOpcode 12
@@ -869,6 +871,7 @@
static sqInt genEnsureOopInRegNotForwardedscratchReg(sqInt reg, sqInt scratch) NoDbgRegParms;
static sqInt genEnsureOopInRegNotForwardedscratchRegjumpBackTo(sqInt reg, sqInt scratch, AbstractInstruction *instruction) NoDbgRegParms;
static sqInt genEnsureOopInRegNotForwardedscratchRegupdatingMwr(sqInt reg, sqInt scratch, sqInt offset, sqInt baseReg) NoDbgRegParms;
+static sqInt genEnsureOopInRegNotForwardedscratchRegupdatingSlotin(sqInt reg, sqInt scratch, sqInt index, sqInt objReg) NoDbgRegParms;
static void generateObjectRepresentationTrampolines(void);
static sqInt genGetActiveContextNumArgslargeinBlock(sqInt numArgs, sqInt isLargeContext, sqInt isInBlock) NoDbgRegParms;
static sqInt genGetBitsofFormatByteOfintobaseHeaderIntoScratch(sqInt mask, sqInt sourceReg, sqInt destReg, sqInt scratchReg) NoDbgRegParms;
@@ -886,6 +889,7 @@
static sqInt genInnerPrimitiveSize(sqInt retNoffset) NoDbgRegParms;
static AbstractInstruction * genJumpImmediate(sqInt aRegister) NoDbgRegParms;
static AbstractInstruction * genJumpNotCharacterInScratchReg(sqInt reg) NoDbgRegParms;
+static sqInt genStoreCheckContextReceiverTrampoline(void);
static sqInt genStoreCheckReceiverRegvalueRegscratchReginFrame(sqInt destReg, sqInt valueReg, sqInt scratchReg, sqInt inFrame) NoDbgRegParms;
static sqInt genStoreImmediateInSourceRegslotIndexdestReg(sqInt sourceReg, sqInt index, sqInt destReg) NoDbgRegParms;
static sqInt genStoreSourceRegslotIndexdestRegscratchReginFrame(sqInt sourceReg, sqInt index, sqInt destReg, sqInt scratchReg, sqInt inFrame) NoDbgRegParms;
@@ -1235,6 +1239,7 @@
static sqInt ceSendMustBeBooleanAddTrueTrampoline;
static sqInt ceSmallActiveContextInBlockTrampoline;
static sqInt ceSmallActiveContextInMethodTrampoline;
+static sqInt ceStoreCheckContextReceiverTrampoline;
static sqInt ceStoreCheckTrampoline;
static sqInt ceStoreContextInstVarTrampoline;
static sqInt ceTraceBlockActivationTrampoline;
@@ -1272,518 +1277,518 @@
static sqInt firstSend;
static BytecodeFixup * fixups;
static BytecodeDescriptor generatorTable[512] = {
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopReceiverVariableBytecode, 0, needsFrameNever, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopReceiverVariableBytecode, 0, needsFrameNever, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopReceiverVariableBytecode, 0, needsFrameNever, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopReceiverVariableBytecode, 0, needsFrameNever, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopReceiverVariableBytecode, 0, needsFrameNever, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopReceiverVariableBytecode, 0, needsFrameNever, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopReceiverVariableBytecode, 0, needsFrameNever, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopReceiverVariableBytecode, 0, needsFrameNever, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopTemporaryVariableBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopTemporaryVariableBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopTemporaryVariableBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopTemporaryVariableBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopTemporaryVariableBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopTemporaryVariableBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopTemporaryVariableBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopTemporaryVariableBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushConstantTrueBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushConstantFalseBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushConstantNilBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushQuickIntegerConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushQuickIntegerConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushQuickIntegerConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushQuickIntegerConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genReturnReceiver, 0, needsFrameIfInBlock, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0 },
- { genReturnTrue, 0, needsFrameIfInBlock, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0 },
- { genReturnFalse, 0, needsFrameIfInBlock, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0 },
- { genReturnNil, 0, needsFrameIfInBlock, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0 },
- { genReturnTopFromMethod, 0, needsFrameIfInBlock, -1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0 },
- { genReturnTopFromBlock, 0, needsFrameNever, -1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0 },
- { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 },
- { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 },
- { extendedPushBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 },
- { extendedStoreBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 },
- { extendedStoreAndPopBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genExtendedSendBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0, 0 },
- { doubleExtendedDoAnythingBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genExtendedSuperBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSecondExtendedSendBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genPopStackBytecode, 0, needsFrameNever, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { duplicateTopBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushActiveContextBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushNewArrayBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genCallPrimitiveBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushRemoteTempLongBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreRemoteTempLongBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopRemoteTempLongBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushClosureCopyCopiedValuesBytecode, v3BlockCodeSize, 0, 0, 0, 4, 0, 0, 0, 1, 0, 0, 0, 0 },
- { genShortUnconditionalJump, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genShortUnconditionalJump, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genShortUnconditionalJump, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genShortUnconditionalJump, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genShortUnconditionalJump, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genShortUnconditionalJump, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genShortUnconditionalJump, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genShortUnconditionalJump, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genShortJumpIfFalse, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0 },
- { genShortJumpIfFalse, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0 },
- { genShortJumpIfFalse, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0 },
- { genShortJumpIfFalse, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0 },
- { genShortJumpIfFalse, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0 },
- { genShortJumpIfFalse, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0 },
- { genShortJumpIfFalse, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0 },
- { genShortJumpIfFalse, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0 },
- { genLongUnconditionalBackwardJump, v3LongBranchDistance, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genLongUnconditionalBackwardJump, v3LongBranchDistance, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genLongUnconditionalBackwardJump, v3LongBranchDistance, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genLongUnconditionalBackwardJump, v3LongBranchDistance, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genLongUnconditionalForwardJump, v3LongBranchDistance, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genLongUnconditionalForwardJump, v3LongBranchDistance, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genLongUnconditionalForwardJump, v3LongBranchDistance, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genLongUnconditionalForwardJump, v3LongBranchDistance, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genLongJumpIfTrue, v3LongForwardBranchDistance, 0, 0, 0, 2, 1, 0, 0, 0, 1, 0, 0, 0 },
- { genLongJumpIfTrue, v3LongForwardBranchDistance, 0, 0, 0, 2, 1, 0, 0, 0, 1, 0, 0, 0 },
- { genLongJumpIfTrue, v3LongForwardBranchDistance, 0, 0, 0, 2, 1, 0, 0, 0, 1, 0, 0, 0 },
- { genLongJumpIfTrue, v3LongForwardBranchDistance, 0, 0, 0, 2, 1, 0, 0, 0, 1, 0, 0, 0 },
- { genLongJumpIfFalse, v3LongForwardBranchDistance, 0, 0, 0, 2, 0, 1, 0, 0, 1, 0, 0, 0 },
- { genLongJumpIfFalse, v3LongForwardBranchDistance, 0, 0, 0, 2, 0, 1, 0, 0, 1, 0, 0, 0 },
- { genLongJumpIfFalse, v3LongForwardBranchDistance, 0, 0, 0, 2, 0, 1, 0, 0, 1, 0, 0, 0 },
- { genLongJumpIfFalse, v3LongForwardBranchDistance, 0, 0, 0, 2, 0, 1, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorArithmetic, 0, 0, 0, AddRR, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorArithmetic, 0, 0, 0, SubRR, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorComparison, 0, 0, 0, JumpLess, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorComparison, 0, 0, 0, JumpGreater, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorComparison, 0, 0, 0, JumpLessOrEqual, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorComparison, 0, 0, 0, JumpGreaterOrEqual, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorComparison, 0, 0, 0, JumpZero, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorComparison, 0, 0, 0, JumpNonZero, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorArithmetic, 0, 0, 0, AndRR, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorArithmetic, 0, 0, 0, OrRR, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorEqualsEquals, 0, needsFrameNever, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genSpecialSelectorClass, 0, needsFrameIfStackGreaterThanOne, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariable16CasesBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariable16CasesBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariable16CasesBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariable16CasesBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariable16CasesBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariable16CasesBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariable16CasesBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariable16CasesBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariable16CasesBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariable16CasesBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariable16CasesBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariable16CasesBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariable16CasesBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariable16CasesBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariable16CasesBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralVariable16CasesBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushLiteralConstantBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushReceiverBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genExtPushPseudoVariableOrOuterBytecode, 0, needsFrameIfExtBGT2, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushConstantZeroBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushConstantOneBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genSpecialSelectorArithmetic, 0, 0, 0, AddRR, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorArithmetic, 0, 0, 0, SubRR, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorComparison, 0, 0, 0, JumpLess, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorComparison, 0, 0, 0, JumpGreater, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorComparison, 0, 0, 0, JumpLessOrEqual, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorComparison, 0, 0, 0, JumpGreaterOrEqual, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorComparison, 0, 0, 0, JumpZero, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorComparison, 0, 0, 0, JumpNonZero, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorArithmetic, 0, 0, 0, AndRR, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorArithmetic, 0, 0, 0, OrRR, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorEqualsEquals, 0, needsFrameNever, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genSpecialSelectorClass, 0, needsFrameIfStackGreaterThanOne, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector1ArgBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendLiteralSelector2ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genSendAbsentImplicit0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1 },
- { genSendAbsentImplicit0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1 },
- { genSendAbsentImplicit0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1 },
- { genSendAbsentImplicit0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1 },
- { genSendAbsentImplicit0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1 },
- { genSendAbsentImplicit0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1 },
- { genSendAbsentImplicit0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1 },
- { genSendAbsentImplicit0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1 },
- { genSendAbsentImplicit0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1 },
- { genSendAbsentImplicit0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1 },
- { genSendAbsentImplicit0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1 },
- { genSendAbsentImplicit0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1 },
- { genSendAbsentImplicit0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1 },
- { genSendAbsentImplicit0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1 },
- { genSendAbsentImplicit0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1 },
- { genSendAbsentImplicit0ArgsBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1 },
- { genStoreAndPopReceiverVariableBytecode, 0, needsFrameNever, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopReceiverVariableBytecode, 0, needsFrameNever, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopReceiverVariableBytecode, 0, needsFrameNever, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopReceiverVariableBytecode, 0, needsFrameNever, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopReceiverVariableBytecode, 0, needsFrameNever, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopReceiverVariableBytecode, 0, needsFrameNever, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopReceiverVariableBytecode, 0, needsFrameNever, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopReceiverVariableBytecode, 0, needsFrameNever, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopTemporaryVariableBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopTemporaryVariableBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopTemporaryVariableBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopTemporaryVariableBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopTemporaryVariableBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopTemporaryVariableBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopTemporaryVariableBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopTemporaryVariableBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genShortUnconditionalJump, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genShortUnconditionalJump, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genShortUnconditionalJump, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genShortUnconditionalJump, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genShortUnconditionalJump, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genShortUnconditionalJump, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genShortUnconditionalJump, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genShortUnconditionalJump, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genShortJumpIfTrue, v3ShortForwardBranchDistance, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0 },
- { genShortJumpIfTrue, v3ShortForwardBranchDistance, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0 },
- { genShortJumpIfTrue, v3ShortForwardBranchDistance, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0 },
- { genShortJumpIfTrue, v3ShortForwardBranchDistance, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0 },
- { genShortJumpIfTrue, v3ShortForwardBranchDistance, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0 },
- { genShortJumpIfTrue, v3ShortForwardBranchDistance, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0 },
- { genShortJumpIfTrue, v3ShortForwardBranchDistance, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0 },
- { genShortJumpIfTrue, v3ShortForwardBranchDistance, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0 },
- { genShortJumpIfFalse, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0 },
- { genShortJumpIfFalse, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0 },
- { genShortJumpIfFalse, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0 },
- { genShortJumpIfFalse, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0 },
- { genShortJumpIfFalse, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0 },
- { genShortJumpIfFalse, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0 },
- { genShortJumpIfFalse, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0 },
- { genShortJumpIfFalse, v3ShortForwardBranchDistance, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0 },
- { genReturnReceiver, 0, needsFrameIfInBlock, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0 },
- { genReturnTopFromMethod, 0, needsFrameIfInBlock, -1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0 },
- { genExtReturnTopFromBlock, 0, needsFrameNever, -1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0 },
- { duplicateTopBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPopStackBytecode, 0, needsFrameNever, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genExtNopBytecode, 0, needsFrameNever, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
- { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 },
- { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 },
- { extABytecode, 0, needsFrameNever, 0, 0, 2, 0, 0, 0, 0, 0, 0, 1, 0 },
- { extBBytecode, 0, needsFrameNever, 0, 0, 2, 0, 0, 0, 0, 0, 0, 1, 0 },
- { genExtPushReceiverVariableBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genExtPushLiteralVariableBytecode, 0, needsFrameNever, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genExtPushLiteralBytecode, 0, needsFrameNever, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genExtPushIntegerBytecode, 0, needsFrameNever, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genLongPushTemporaryVariableBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushNewArrayBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genExtStoreReceiverVariableBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genExtStoreLiteralVariableBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genLongStoreTemporaryVariableBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genExtStoreAndPopReceiverVariableBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genExtStoreAndPopLiteralVariableBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genLongStoreAndPopTemporaryVariableBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genExtSendBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genExtSendSuperBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genExtSendAbsentImplicitBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0, 1 },
- { genExtSendAbsentDynamicSuperBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genExtUnconditionalJump, v4LongBranchDistance, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0, 0 },
- { genExtJumpIfTrue, v4LongBranchDistance, 0, 0, 0, 2, 1, 0, 0, 0, 1, 0, 0, 0 },
- { genExtJumpIfFalse, v4LongBranchDistance, 0, 0, 0, 2, 0, 1, 0, 0, 1, 0, 0, 0 },
- { genExtSendAbsentSelfBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0, 0 },
- { unknownBytecode, 0, 0, 0, Nop, 2, 0, 0, 0, 0, 0, 0, 1, 0 },
- { unknownBytecode, 0, 0, 0, Nop, 2, 0, 0, 0, 0, 0, 0, 1, 0 },
- { unknownBytecode, 0, 0, 0, Nop, 2, 0, 0, 0, 0, 0, 0, 1, 0 },
- { genCallPrimitiveBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genPushRemoteTempLongBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreRemoteTempLongBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genStoreAndPopRemoteTempLongBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 },
- { genExtPushClosureBytecode, v4BlockCodeSize, 0, 0, 0, 3, 0, 0, 0, 1, 0, 0, 0, 0 },
- { genExtSendAbsentOuterBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 1, 0, 0, 1 },
- { unknownBytecode, 0, 0, 0, Nop, 3, 0, 0, 0, 0, 0, 0, 1, 0 }
+ { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
+ { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
+ { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
+ { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
+ { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
+ { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
+ { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
+ { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
+ { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
+ { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
+ { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
+ { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
+ { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
+ { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
+ { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
+ { genPushReceiverVariableBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
+ { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+ { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+ { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+ { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
@@ 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.1339.mcz
==================== Summary ====================
Name: VMMaker.oscog-eem.1339
Author: eem
Time: 4 June 2015, 12:58:10.572 pm
UUID: 022ddfcc-a8f6-422b-8a81-edffae18ebe6
Ancestors: VMMaker.oscog-cb.1338
Spur Cogit:
Fix Spur block performance now that we follow
forwarded receivers in blocks. Scan blocks for
inst var usage, only unforwarding in the prologue of
blocks that actually refer to inst vars. In a test Spur
Squeak image only 12.5% of blocks do refer to
inst vars. So this is definitely a win.
Add a special purpose store check trampoline to
store check the updated receiver. Make sure it's
only called if the eceiuver is updated.
Rationalize computing the number of trampolines.
Add state to CogBytecodeDescriptor, CogBlockStart
and CogBlockMethod to track block inst var usage.
=============== Diff against VMMaker.oscog-cb.1338 ===============
Item was changed:
VMStructType subclass: #CogBlockMethod
+ instanceVariableNames: 'objectHeader homeOffset startpc padToWord cmNumArgs cmType cmRefersToYoung cpicHasMNUCase cmUsageCount cmUsesPenultimateLit cbUsesInstVars cmUnusedFlags stackCheckOffset'
- instanceVariableNames: 'objectHeader homeOffset startpc padToWord cmNumArgs cmType cmRefersToYoung cpicHasMNUCase cmUsageCount cmUsesPenultimateLit cmUnusedFlags stackCheckOffset'
classVariableNames: ''
poolDictionaries: 'CogMethodConstants VMBasicConstants'
category: 'VMMaker-JIT'!
+ !CogBlockMethod commentStamp: 'eem 6/4/2015 09:06' prior: 0!
- !CogBlockMethod commentStamp: 'eem 8/19/2014 17:07' prior: 0!
I am the rump method header for a block method embedded in a full CogMethod. I am the superclass of CogMethod, which is a Cog method header proper. Instances of both classes have the same second word. The homeOffset and startpc fields are overlaid on the objectHeader in a CogMethod. See Cogit class>>structureOfACogMethod for more information. In C I look like
typedef struct {
unsigned short homeOffset;
unsigned short startpc;
+ #if SpurVM
+ unsigned int padToWord;
+ #endif
-
unsigned cmNumArgs : 8;
unsigned cmType : 3;
unsigned cmRefersToYoung : 1;
+ unsigned cpicHasMNUCase : 1;
- unsigned cmIsUnlinked : 1;
unsigned cmUsageCount : 3;
+ unsigned cmUsesPenultimateLit : 1;
+ unsigned cbUsesInstVars : 1;
+ unsigned cmUnusedFlags : 2;
+ unsigned stackCheckOffset : 12;
+ } CogBlockMethod;
- unsigned stackCheckOffset : 16;
- } CogBlockMethod;
+ My instances are not actually used. The methods exist only as input to Slang. The simulator uses my surrogates (CogBlockMethodSurrogate32 and CogBlockMethodSurrogate64) to reference CogBlockMethod and CogMethod structures in the code zone.
+
+ cbUsesInstVars
+ - a flag set to true in blocks that refer to instance variables.
+
+ cmNumArgs
+ - the byte containing the block or method arg count
+
+ cmRefersToYoung
+ - a flag set to true in methods which contain a reference to an object in new space
+
+ cmType
+ - one of CMFree, CMMethod, CMBlock, CMClosedPIC, CMOpenPIC
+
+ cmUnusedFlags
+ - as yet unused bits
+
+ cmUsageCount
+ - a count used to identify older methods in code compaction. The count decays over time, and compaction frees methods with lower usage counts
+
+ cmUsesPenultimateLit
+ - a flag that states whether the penultimate literal in the corresponding bytecode method is used. This in turn is used to check that a become of a method does not alter its bytecode.
+
+ cpicHasMNUCase
+ - a flag that states whether a CMClosedPIC contains one or more MNU cases which are PIC dispatches used to speed-up MNU processing
+
+ homeOffset
+ - the distance a CMBlock header is away from its enclosing CMMethod header
+
+ objectHeader
+ - an object header used to fool the garbage collector into thinking that a CMMethod is a normal bits object, so that the first field (the header word) of a bytecoded method can refer directly to a CMMethod without special casing the garbage collector's method scanning code more than it already is.
+
+ padToWord
+ - a pad that may be necessary to make the homeOffset, startpc, padToWord triple as large as a CMMethod's objectHeader field
+
+ stackCheckOffset
+ - the distance from the header to the stack limit check in a frame building method or block, used to reenter execution in methods or blocks that have checked for events at what is effectively the first bytecode
+
+ startpc
+ - the bytecode pc of the start of a CMBlock's bytecode in the bytecode method!
- My instances are not actually used. The methods exist only as input to Slang. The simulator uses my surrogates (CogBlockMethodSurrogate32 and CogBlockMethodSurrogate64.!
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"
['cmType'] -> [#(unsigned ' : 3')].
['cmRefersToYoung'] -> [#(unsigned #Boolean ' : 1')].
['cpicHasMNUCase'] -> [#(unsigned #Boolean ' : 1')].
['cmUsageCount'] -> [#(unsigned ' : 3')]. "See CMMaxUsageCount in initialize"
['cmUsesPenultimateLit'] -> [#(unsigned #Boolean ' : 1')].
+ ['cbUsesInstVars'] -> [#(unsigned #Boolean ' : 1')].
+ ['cmUnusedFlags'] -> [#(unsigned ' : 2')].
- ['cmUnusedFlags'] -> [#(unsigned ' : 3')].
['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"
otherwise:
[#sqInt])]]!
Item was added:
+ ----- Method: CogBlockMethod>>cbUsesInstVars (in category 'accessing') -----
+ cbUsesInstVars
+
+ ^cbUsesInstVars!
Item was added:
+ ----- Method: CogBlockMethod>>cbUsesInstVars: (in category 'accessing') -----
+ cbUsesInstVars: anObject
+
+ ^cbUsesInstVars := anObject!
Item was added:
+ ----- Method: CogBlockMethodSurrogate32>>cbUsesInstVars (in category 'accessing') -----
+ cbUsesInstVars
+ ^(((memory unsignedByteAt: address + 3 + baseHeaderSize) bitShift: -1) bitAnd: 16r1) ~= 0!
Item was added:
+ ----- Method: CogBlockMethodSurrogate32>>cbUsesInstVars: (in category 'accessing') -----
+ cbUsesInstVars: aValue
+ memory
+ unsignedByteAt: address + baseHeaderSize + 3
+ put: (((memory unsignedByteAt: address + baseHeaderSize + 3) bitAnd: 16rFD) + ((aValue ifTrue: [1] ifFalse: [0]) bitShift: 1)).
+ ^aValue!
Item was added:
+ ----- Method: CogBlockMethodSurrogate64>>cbUsesInstVars (in category 'accessing') -----
+ cbUsesInstVars
+ ^(((memory unsignedByteAt: address + 3 + baseHeaderSize) bitShift: -1) bitAnd: 16r1) ~= 0!
Item was added:
+ ----- Method: CogBlockMethodSurrogate64>>cbUsesInstVars: (in category 'accessing') -----
+ cbUsesInstVars: aValue
+ memory
+ unsignedByteAt: address + baseHeaderSize + 3
+ put: (((memory unsignedByteAt: address + baseHeaderSize + 3) bitAnd: 16rFD) + ((aValue ifTrue: [1] ifFalse: [0]) bitShift: 1)).
+ ^aValue!
Item was changed:
VMStructType subclass: #CogBlockStart
+ instanceVariableNames: 'fakeHeader fillInstruction numArgs numCopied numInitialNils startpc entryLabel stackCheckLabel span hasInstVarRef'
- instanceVariableNames: 'fakeHeader fillInstruction numArgs numCopied numInitialNils startpc entryLabel stackCheckLabel span'
classVariableNames: ''
poolDictionaries: ''
category: 'VMMaker-JIT'!
!CogBlockStart commentStamp: '<historical>' prior: 0!
I am a record of a block, the address of the fake header, the association between the bytecode startpc and the machine code start label, and the block's relevant metrics.!
Item was added:
+ ----- Method: CogBlockStart>>hasInstVarRef (in category 'accessing') -----
+ hasInstVarRef
+
+ ^ hasInstVarRef!
Item was added:
+ ----- Method: CogBlockStart>>hasInstVarRef: (in category 'accessing') -----
+ hasInstVarRef: anObject
+
+ ^hasInstVarRef := anObject!
Item was changed:
----- Method: CogBlockStart>>printStateOn: (in category 'printing') -----
printStateOn: aStream
<doNotGenerate> "Smalltalk-side only"
aStream
space; nextPut: $(;
nextPutAll: 'numArgs: '; print: numArgs;
nextPutAll: ' numCopied: '; print: numCopied;
nextPutAll: ' numInitialNils: '; print: numInitialNils;
+ nextPutAll: ' hasInstVarRef: '; print: hasInstVarRef;
nextPutAll: ' startpc: '; print: startpc;
nextPutAll: ' span: '; print: span;
nextPut: $)!
Item was changed:
VMStructType subclass: #CogBytecodeDescriptor
+ instanceVariableNames: 'generator spanFunction needsFrameFunction stackDelta opcode numBytes isBranchTrue isBranchFalse isReturn isBlockCreation isMapped isMappedInBlock isExtension isInstVarRef hasIRC'
- instanceVariableNames: 'generator spanFunction needsFrameFunction stackDelta opcode numBytes isBranchTrue isBranchFalse isReturn isBlockCreation isMapped isMappedInBlock isExtension hasIRC'
classVariableNames: ''
poolDictionaries: ''
category: 'VMMaker-JIT'!
!CogBytecodeDescriptor commentStamp: 'eem 11/18/2010 06:32' prior: 0!
I am an entry in the Cogit's dispatch table for bytecodes. I hold the routine to call to generate code for the partcular bytecode I represent and the number of bytes the bytecode has. For eliminating temps in frameless blocks I maintain a stack delta for bytecodes that are valid in a frameless block. The order of my instance variables is chosen for compact struct packing.!
Item was changed:
----- Method: CogBytecodeDescriptor class>>instVarNamesAndTypesForTranslationDo: (in category 'translation') -----
instVarNamesAndTypesForTranslationDo: aBinaryBlock
"enumerate aBinaryBlock with the names and C type strings for the inst vars to include in a BytecodeDescriptor struct."
+ "With hasIRC there are 9 flag bits. Excluding hasIRC in non-Newspeak VMs keeps the descriptor compact."
+ (NewspeakVM
+ ifTrue: [self instVarNames]
+ ifFalse: [self instVarNames copyWithout: 'hasIRC']) do:
- self instVarNames do:
[:ivn|
aBinaryBlock
value: ivn
value: (ivn caseOf: {
['generator'] -> [#('sqInt (*' ')(void)')].
['spanFunction'] -> [#('sqInt (*' ')(struct _BytecodeDescriptor *,sqInt,sqInt,sqInt)')].
['needsFrameFunction'] -> [#('sqInt (*' ')(sqInt)')].
['numBytes'] -> ['unsigned char'].
['stackDelta'] -> ['signed char'].
['opcode'] -> ['unsigned char'] }
otherwise: [#('unsigned' ' : 1')])]!
Item was added:
+ ----- Method: CogBytecodeDescriptor>>isInstVarRef (in category 'accessing') -----
+ isInstVarRef
+ "Answer the value of isInstVarRef"
+
+ ^ isInstVarRef!
Item was added:
+ ----- Method: CogBytecodeDescriptor>>isInstVarRef: (in category 'accessing') -----
+ isInstVarRef: anObject
+ "Set the value of isInstVarRef"
+
+ ^isInstVarRef := anObject!
Item was added:
+ ----- Method: CogObjectRepresentation class>>numTrampolines (in category 'accessing') -----
+ numTrampolines
+ ^1!
Item was changed:
----- Method: CogObjectRepresentation>>genEnsureOopInRegNotForwarded:scratchReg:updatingSlot:in: (in category 'compile abstract instructions') -----
genEnsureOopInRegNotForwarded: reg scratchReg: scratch updatingSlot: index in: objReg
"Make sure that the oop in reg is not forwarded, updating the slot in objReg with the value."
<inline: true>
+ self flag: 'not safe unless there''s also a store check!!!!'.
+ self assert: false.
^self genEnsureOopInRegNotForwarded: reg
scratchReg: scratch
updatingMw: index * objectMemory wordSize + objectMemory baseHeaderSize
r: objReg!
Item was added:
+ ----- Method: CogObjectRepresentation>>maybeNoteDescriptor:blockStart: (in category 'compilation') -----
+ maybeNoteDescriptor: descriptor blockStart: blockStart
+ "A hook for the object representation to set state in a blockStart during scanBlock:.
+ By default do nothing. Subclasses that need to do something special will override."
+ <var: #blockStart type: #'BlockStart *'>
+ <var: #descriptor type: #'BytecodeDescriptor *'>
+ <inline: true>!
Item was changed:
CogObjectRepresentation subclass: #CogObjectRepresentationForSpur
+ instanceVariableNames: 'ceScheduleScavengeTrampoline ceSmallActiveContextInMethodTrampoline ceSmallActiveContextInBlockTrampoline ceLargeActiveContextInMethodTrampoline ceLargeActiveContextInBlockTrampoline ceStoreCheckContextReceiverTrampoline'
- instanceVariableNames: 'ceScheduleScavengeTrampoline ceSmallActiveContextInMethodTrampoline ceSmallActiveContextInBlockTrampoline ceLargeActiveContextInMethodTrampoline ceLargeActiveContextInBlockTrampoline'
classVariableNames: ''
poolDictionaries: 'VMBytecodeConstants VMSqueakClassIndices'
category: 'VMMaker-JIT'!
Item was added:
+ ----- Method: CogObjectRepresentationForSpur class>>numTrampolines (in category 'accessing') -----
+ numTrampolines
+ ^super numTrampolines + 6!
Item was changed:
----- Method: CogObjectRepresentationForSpur>>genEnsureOopInRegNotForwarded:scratchReg:updatingMw:r: (in category 'compile abstract instructions') -----
genEnsureOopInRegNotForwarded: reg scratchReg: scratch updatingMw: offset r: baseReg
"Make sure that the oop in reg is not forwarded, and the field reg[offset] is updated
if the object in reg is forwarded. Use the fact that isForwardedObjectClassIndexPun is
a power of two to save an instruction."
| loop imm ok |
<var: #ok type: #'AbstractInstruction *'>
<var: #imm type: #'AbstractInstruction *'>
<var: #loop type: #'AbstractInstruction *'>
+ self assert: (reg ~= scratch and: [baseReg ~= scratch]).
- self assert: reg ~= scratch.
loop := cogit Label.
imm := self genJumpImmediate: reg.
"notionally
self genGetClassIndexOfNonImm: reg into: scratch.
cogit CmpCq: objectMemory isForwardedObjectClassIndexPun R: TempReg.
but the following is an instruction shorter:"
cogit MoveMw: 0 r: reg R: scratch.
cogit
AndCq: objectMemory classIndexMask - objectMemory isForwardedObjectClassIndexPun
R: scratch.
ok := cogit JumpNonZero: 0.
self genLoadSlot: 0 sourceReg: reg destReg: reg.
cogit MoveR: reg Mw: offset r: baseReg.
cogit Jump: loop.
ok jmpTarget: (imm jmpTarget: cogit Label).
^0!
Item was added:
+ ----- Method: CogObjectRepresentationForSpur>>genEnsureOopInRegNotForwarded:scratchReg:updatingSlot:in: (in category 'compile abstract instructions') -----
+ genEnsureOopInRegNotForwarded: reg scratchReg: scratch updatingSlot: index in: objReg
+ "Make sure that the oop in reg is not forwarded, updating the slot in objReg with the value."
+ | loop imm ok |
+ <var: #ok type: #'AbstractInstruction *'>
+ <var: #imm type: #'AbstractInstruction *'>
+ <var: #loop type: #'AbstractInstruction *'>
+ "Open-code
+ self genEnsureOopInRegNotForwarded: reg
+ scratchReg: scratch
+ updatingMw: index * objectMemory wordSize + objectMemory baseHeaderSize
+ r: objReg.
+ to avoid calling the store check unless the receiver is forwarded."
+ self assert: (reg ~= scratch and: [objReg ~= scratch]).
+ loop := cogit Label.
+ imm := self genJumpImmediate: reg.
+ "notionally
+ self genGetClassIndexOfNonImm: reg into: scratch.
+ cogit CmpCq: objectMemory isForwardedObjectClassIndexPun R: TempReg.
+ but the following is an instruction shorter:"
+ cogit MoveMw: 0 r: reg R: scratch.
+ cogit
+ AndCq: objectMemory classIndexMask - objectMemory isForwardedObjectClassIndexPun
+ R: scratch.
+ ok := cogit JumpNonZero: 0.
+ self genLoadSlot: 0 sourceReg: reg destReg: reg.
+ cogit MoveR: reg Mw: index * objectMemory wordSize + objectMemory baseHeaderSize r: objReg.
+
+ "Check that we're meeting the contract of ceStoreCheckContextReceiverTrampoline."
+ self assert: (reg = Arg0Reg and: [scratch = TempReg and: [objReg = ReceiverResultReg]]).
+ cogit CallRT: ceStoreCheckContextReceiverTrampoline.
+
+ cogit Jump: loop.
+ ok jmpTarget: (imm jmpTarget: cogit Label).
+ ^0!
Item was added:
+ ----- Method: CogObjectRepresentationForSpur>>genStoreCheckContextReceiverTrampoline (in category 'initialization') -----
+ genStoreCheckContextReceiverTrampoline
+ <var: #aString type: #'char *'>
+ "Create a trampoline to store-check the update of the receiver in a closure's
+ outerContext in compileBlockFrameBuild:."
+ | startAddress |
+ startAddress := cogit methodZoneBase.
+ cogit zeroOpcodeIndex.
+ self genStoreCheckReceiverReg: ReceiverResultReg valueReg: Arg0Reg scratchReg: TempReg inFrame: false.
+ cogit RetN: 0.
+ cogit outputInstructionsForGeneratedRuntimeAt: startAddress.
+ cogit recordGeneratedRunTime: 'ceStoreCheckContextReceiver' address: startAddress.
+ cogit recordRunTimeObjectReferences.
+ ^startAddress!
Item was changed:
----- Method: CogObjectRepresentationForSpur>>generateObjectRepresentationTrampolines (in category 'initialization') -----
generateObjectRepresentationTrampolines
"Do the store check. Answer the argument for the benefit of the code generator;
ReceiverResultReg may be caller-saved and hence smashed by this call. Answering
it allows the code generator to reload ReceiverResultReg cheaply.
In Spur the only thing we leave to the run-time is adding the receiver to the
remembered set and setting its isRemembered bit."
ceStoreCheckTrampoline := cogit
genTrampolineFor: #remember:
called: 'ceStoreCheckTrampoline'
arg: ReceiverResultReg
result: cogit returnRegForStoreCheck.
+ ceStoreCheckContextReceiverTrampoline := self genStoreCheckContextReceiverTrampoline.
ceScheduleScavengeTrampoline := cogit
genSafeTrampolineFor: #ceScheduleScavenge
called: 'ceScheduleScavengeTrampoline'.
ceSmallActiveContextInMethodTrampoline := self genActiveContextTrampolineLarge: false inBlock: false called: 'ceSmallMethodContext'.
ceSmallActiveContextInBlockTrampoline := self genActiveContextTrampolineLarge: false inBlock: true called: 'ceSmallBlockContext'.
ceLargeActiveContextInMethodTrampoline := self genActiveContextTrampolineLarge: true inBlock: false called: 'ceLargeMethodContext'.
ceLargeActiveContextInBlockTrampoline := self genActiveContextTrampolineLarge: true inBlock: true called: 'ceLargeBlockContext'!
Item was added:
+ ----- Method: CogObjectRepresentationForSpur>>maybeNoteDescriptor:blockStart: (in category 'compilation') -----
+ maybeNoteDescriptor: descriptor blockStart: blockStart
+ "Override to note inst var refs in blocks. Used to avoid checking
+ for forwarded receivers in blocks that don't refer to inst vars."
+ <var: #blockStart type: #'BlockStart *'>
+ <var: #descriptor type: #'BytecodeDescriptor *'>
+ <inline: true>
+ descriptor isInstVarRef ifTrue:
+ [blockStart hasInstVarRef: true]!
Item was added:
+ ----- Method: CogObjectRepresentationForSqueakV3 class>>numTrampolines (in category 'accessing') -----
+ numTrampolines
+ ^super numTrampolines + 4!
Item was changed:
----- Method: Cogit class>>generatorTableFrom: (in category 'class initialization') -----
generatorTableFrom: anArray
| blockCreationBytecodeSize |
generatorTable := CArrayAccessor on: (Array new: 256).
anArray do:
[:tuple| | descriptor |
(descriptor := CogBytecodeDescriptor new)
numBytes: tuple first;
generator: tuple fourth;
isReturn: (tuple includes: #return);
isMapped: (tuple includes: #isMapped);
isMappedInBlock: (tuple includes: #isMappedInBlock);
isBlockCreation: (tuple includes: #block);
spanFunction: (((tuple includes: #block) or: [(tuple includes: #branch)]) ifTrue:
[tuple detect: [:thing| thing isSymbol and: [thing numArgs = 4]]]);
isBranchTrue: (tuple includes: #isBranchTrue);
isBranchFalse: (tuple includes: #isBranchFalse);
isExtension: (tuple includes: #extension);
+ isInstVarRef: (tuple includes: #isInstVarRef); "for Spur"
+ hasIRC: (tuple includes: #hasIRC); "for Newspeak"
- hasIRC: (tuple includes: #hasIRC);
yourself.
+ "As a hack to cut down on descriptor flags, use opcode to tag unusedBytecode for scanning.
+ Currently descriptors are exactly 16 bytes with all 8 flag bits used (in Newspeak at least 17 bytes,
+ 9 flag bits). As another hack to eliminate a test in scanMethod mark unknowns as extensions."
- "As a hack to cut down on descriptor flags, use opcode to tag unusedBytecode for
- scanning. Currently descriptors are exactly 16 bytes with all 8 flag bits used. As
- another hack to eliminate a test in scanMethod mark unknows as extensions."
descriptor generator == #unknownBytecode ifTrue:
[descriptor opcode: Nop; isExtension: true].
descriptor isBlockCreation ifTrue:
[blockCreationBytecodeSize
ifNil: [blockCreationBytecodeSize := descriptor numBytes]
ifNotNil: [self assert: blockCreationBytecodeSize = descriptor numBytes]].
tuple do:
[:thing|
thing isSymbol ifTrue:
[(thing beginsWith: #needsFrame) ifTrue:
[descriptor needsFrameFunction: thing].
(CogRTLOpcodes classPool at: thing ifAbsent: []) ifNotNil:
[:opcode| descriptor opcode: opcode]]].
tuple last isInteger
ifTrue: [descriptor stackDelta: tuple last]
ifFalse:
[descriptor needsFrameFunction ifNotNil:
[self error: 'frameless block bytecodes must specify a stack delta']].
tuple second to: tuple third do:
[:index|
generatorTable at: index put: descriptor]].
BlockCreationBytecodeSize := blockCreationBytecodeSize.
^generatorTable!
Item was added:
+ ----- Method: Cogit class>>initializeNumTrampolines (in category 'class initialization') -----
+ initializeNumTrampolines
+ NumTrampolines := self numTrampolines
+ + self objectRepresentationClass numTrampolines
+ + (NewspeakVM ifTrue: [18] ifFalse: [0])
+ + (BytecodeSetHasDirectedSuperSend ifTrue: [4] ifFalse: [0])!
Item was added:
+ ----- Method: Cogit class>>numTrampolines (in category 'accessing') -----
+ numTrampolines
+ ^35 "27 + 4 each for self and super sends"
+
+ "self withAllSubclasses collect: [:c| {c. (c instVarNames select: [:ea| ea beginsWith: 'ce']) size}]"!
Item was changed:
----- Method: Cogit class>>structureOfACogMethod (in category 'tests') -----
structureOfACogMethod
"A CogMethod is the machine code for executable code in the Cog VM, and in the simulator these are
instances of CogMethod. In actuality they are structures in memory in the CogMethodZone.. There
are four real kinds, defined by the cmType field, free space: CMFree, methods: CMMethod, closed
PICs: CMClosedPIC (finite polymorphic inline caches with up to 6 entries), and open PICs: CMOpenPIC
(infinite megamorphicinline caches that probe the first-level method lookup cache). There is a fifth
kind of method, which is merely a header, for blocks: CMBlock, one which exists only within CMMethods,
and exist only to allow block activations to refer to something that looks like a CogMethod.
The blockSize field in a CogMethod is the size in bytes of the entire method, including the header.
Methods are aligned to an 8 byte boundary in the CogMethodZone. The size is used to iterate over
the methods in the zone.
Follwing the header is the abort and entry code. Starting immediately after the header is the call to
the abort routine called when either a send fails or a stack limit check fails. Following that is the
checked entry point that checks the receiver is of the right class, and this code ends in the unchecked
entry point. Following this is either primitive code, followed by frame building code, or frame-building
code, or, for frameless methods, the code for the frameless method. Following that is the code for the
+ method. If the method contains blocks then followng the method code will be a CMBlock header,
- method. If the mehtrod contains blocks then followng the method code will be a CMBlock header,
followed by code for the block, for each block, and following this will be the block dispatch code,
+ which is indexed by the blockEntryOffset field in the CogMethod.
- which is pointed to by the blockEntryOffset field in the CogMethod.
+ Following either the return in the method, or the block dispatch, is the method map, the meta data which
+ identifies interesting points in the machine code. The map starts at the end of the structure and is read
+ backwards towards the last instruftion of the method, and is terminated by a null byte. So the blockSize
+ is used to find the start of the map. The map reveals where object references, sends and pc-mapping
+ points exist in the machine code. The map is parsed when garbage collecting to find and update object
+ references, and when unlinking sends for method cache flushing, and to convert between bytecode and
+ machine code pcs by scanning both bytecode and machine code looking for matching points in the map."!
- Following either the return in the method, or the block dispatch, is the meta data which identifies
- intersting points in the machine code. This meta data starts at the end of the structure and is read
- backwards towards the start of the method, and is terminated by a null byte. So the blockSize is
- used to find the start of the metadata. The metadata reveals where object references, sends and
- pc-mapping points exist in the machine code. The metadata is parsed when garbage collecting to
- find and update object references, and when unlinking sends for method cache flushing.."
- !
Item was changed:
----- Method: Cogit>>addBlockStartAt:numArgs:numCopied:span: (in category 'compile abstract instructions') -----
addBlockStartAt: bcpc numArgs: numArgs numCopied: numCopied span: span
"Add a blockStart for an embedded block. For a binary tree walk block dispatch
blocks must be compiled in pc/depth-first order but are scanned in breadth-first
order, so do an insertion sort (which of course is really a bubble sort because we
have to move everything higher to make room)."
<returnTypeC: #'BlockStart *'>
| i blockStart |
<var: #blockStart type: #'BlockStart *'>
blockCount > 0
ifTrue:
[i := blockCount - 1.
[blockStart := self addressOf: (blockStarts at: i).
blockStart startpc > bcpc
and: [i > 0]] whileTrue:
[i := i - 1].
blockCount to: i + 1 by: -1 do:
[:j|
blockStarts at: j put: (blockStarts at: j - 1)].
blockStart := self cCode: [self addressOf: (blockStarts at: i + 1)]
inSmalltalk: [blockStarts at: i + 1 put: CogBlockStart new]]
ifFalse:
[blockStart := self cCode: [self addressOf: (blockStarts at: blockCount)]
inSmalltalk: [blockStarts at: blockCount put: CogBlockStart new]].
blockCount := blockCount + 1.
blockStart
startpc: bcpc;
numArgs: numArgs;
numCopied: numCopied;
stackCheckLabel: nil;
+ hasInstVarRef: false;
span: span.
^blockStart!
Item was removed:
- ----- Method: Cogit>>compileBlockFrameBuild: (in category 'compile abstract instructions') -----
- compileBlockFrameBuild: blockStart
- self subclassResponsibility!
Item was changed:
----- Method: Cogit>>fillInBlockHeadersAt: (in category 'generate machine code') -----
fillInBlockHeadersAt: startAddress
"Fill in the block headers now we know the exact layout of the code."
| blockStart blockHeader |
<var: #blockStart type: #'BlockStart *'>
<var: #blockHeader type: #'CogBlockMethod *'>
(needsFrame and: [blockCount > 0]) ifFalse:
[^nil].
blockNoContextSwitchOffset = nil
ifTrue: [blockNoContextSwitchOffset := blockEntryLabel address - blockEntryNoContextSwitch address]
ifFalse: [self assert: blockNoContextSwitchOffset = (blockEntryLabel address - blockEntryNoContextSwitch address)].
0 to: blockCount - 1 do:
[:i|
blockStart := self blockStartAt: i.
blockHeader := self cCoerceSimple: blockStart fakeHeader address
to: #'CogBlockMethod *'.
blockHeader
homeOffset: (blockStart fakeHeader address - startAddress);
startpc: blockStart startpc;
cmType: CMBlock;
cmNumArgs: blockStart numArgs;
+ cbUsesInstVars: blockStart hasInstVarRef;
stackCheckOffset: (blockStart stackCheckLabel = nil
ifTrue: [0]
ifFalse: [blockStart stackCheckLabel address - blockStart fakeHeader address])]!
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: 'cbUsesInstVars ';
+ nextPutAll: (cogMethod cbUsesInstVars ifTrue: ['yes'] ifFalse: ['no'])]
+ ifFalse:
+ [aStream
+ crtab;
+ nextPutAll: 'cmRefersToYoung: ';
+ nextPutAll: (cogMethod cmRefersToYoung ifTrue: ['yes'] ifFalse: ['no'])].
- cogMethod cmType ~= CMBlock ifTrue:
- [aStream
- crtab;
- nextPutAll: 'cmRefersToYoung: ';
- nextPutAll: (cogMethod cmRefersToYoung ifTrue: ['yes'] ifFalse: ['no'])].
cogMethod cmType = CMMethod ifTrue:
[([cogMethod nextMethodOrIRCs] on: MessageNotUnderstood do: [:ex| nil]) ifNotNil:
[:nmoircs| aStream crtab; nextPutAll: 'nextMethodOrIRCs: '.
nmoircs = 0 ifTrue: [aStream print: nmoircs] ifFalse: [coInterpreter printHex: nmoircs]].
([cogMethod counters] on: MessageNotUnderstood do: [:ex| nil]) ifNotNil:
[:cntrs| aStream crtab; nextPutAll: 'counters: '.
cntrs = 0 ifTrue: [aStream print: cntrs] ifFalse: [coInterpreter printHex: cntrs]]]].
aStream cr; flush!
Item was changed:
----- Method: Cogit>>scanBlock: (in category 'compile abstract instructions') -----
scanBlock: blockStart
"Scan the block to determine if the block needs a frame or not"
| descriptor pc end framelessStackDelta nExts |
<var: #blockStart type: #'BlockStart *'>
<var: #descriptor type: #'BytecodeDescriptor *'>
needsFrame := false.
methodOrBlockNumArgs := blockStart numArgs.
inBlock := true.
pc := blockStart startpc.
end := blockStart startpc + blockStart span.
framelessStackDelta := nExts := extA := extB := 0.
[pc < end] whileTrue:
[byte0 := (objectMemory fetchByte: pc ofObject: methodObj) + bytecodeSetOffset.
descriptor := self generatorAt: byte0.
descriptor isExtension ifTrue:
[self loadSubsequentBytesForDescriptor: descriptor at: pc.
self perform: descriptor generator].
needsFrame ifFalse:
[(descriptor needsFrameFunction isNil
or: [self perform: descriptor needsFrameFunction with: framelessStackDelta])
ifTrue: [needsFrame := true]
ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]].
+ objectRepresentation maybeNoteDescriptor: descriptor blockStart: blockStart.
pc := self nextBytecodePCFor: descriptor at: pc exts: nExts in: methodObj.
descriptor isExtension
ifTrue: [nExts := nExts + 1]
ifFalse: [nExts := extA := extB := 0]].
needsFrame ifFalse:
[framelessStackDelta < 0 ifTrue:
[self error: 'negative stack delta in block; block contains bogus code or internal error'].
[framelessStackDelta > 0] whileTrue:
[descriptor := self generatorAt: (objectMemory fetchByte: blockStart startpc ofObject: methodObj) + bytecodeSetOffset.
descriptor generator ~~ #genPushConstantNilBytecode ifTrue:
[self error: 'frameless block doesn''t start with enough pushNils'].
blockStart
startpc: blockStart startpc + descriptor numBytes;
span: blockStart span - descriptor numBytes.
framelessStackDelta := framelessStackDelta - 1]]!
Item was changed:
----- Method: SimpleStackBasedCogit class>>initializeBytecodeTableForNewspeakV4 (in category 'class initialization') -----
initializeBytecodeTableForNewspeakV4
"SimpleStackBasedCogit initializeBytecodeTableForNewspeakV4"
NSSendIsPCAnnotated := false. "IsNSSendCall used by SendAbsentImplicit"
FirstSpecialSelector := 80.
self flag:
'Special selector send class must be inlined to agree with the interpreter, which
inlines class. If class is sent to e.g. a general instance of ProtoObject then unless
class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit
have identical semantics. We get away with not hardwiring the other special
selectors either because in the Cointerpreter they are not inlined or because they
are inlined only to instances of classes for which there will always be a method.'.
self generatorTableFrom: #(
"1 byte bytecodes"
+ (1 0 15 genPushReceiverVariableBytecode isInstVarRef)
- (1 0 15 genPushReceiverVariableBytecode)
(1 16 31 genPushLiteralVariable16CasesBytecode needsFrameNever: 1)
(1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1)
(1 64 75 genPushTemporaryVariableBytecode)
(1 76 76 genPushReceiverBytecode)
(1 77 77 genExtPushPseudoVariableOrOuterBytecode)
(1 78 78 genPushConstantZeroBytecode)
(1 79 79 genPushConstantOneBytecode)
(1 80 101 genSpecialSelectorSend isMapped) "#+ #- #< #> #<= #>= #= #~= #* #/ #\\ #@ #bitShift: #// #bitAnd: #bitOr: #at: #at:put: #size #next #nextPut: #atEnd"
(1 102 102 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)"
(1 103 103 genSpecialSelectorClass needsFrameNever: notMapped 0) "not mapped because it is directly inlined (for now)"
(1 104 111 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y"
(1 112 127 genSendLiteralSelector0ArgsBytecode isMapped)
(1 128 143 genSendLiteralSelector1ArgBytecode isMapped)
(1 144 159 genSendLiteralSelector2ArgsBytecode isMapped)
(1 160 175 genSendAbsentImplicit0ArgsBytecode isMapped hasIRC)
+ (1 176 183 genStoreAndPopReceiverVariableBytecode isInstVarRef needsFrameNever: -1) "N.B. not frameless if immutability"
- (1 176 183 genStoreAndPopReceiverVariableBytecode needsFrameNever: -1) "N.B. not frameless if immutability"
(1 184 191 genStoreAndPopTemporaryVariableBytecode)
(1 192 199 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:)
(1 200 207 genShortJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean"
v3:ShortForward:Branch:Distance:)
(1 208 215 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean"
v3:ShortForward:Branch:Distance:)
(1 216 216 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0)
(1 217 217 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1)
(1 218 218 genExtReturnTopFromBlock return needsFrameNever: -1)
(1 219 219 duplicateTopBytecode needsFrameNever: 1)
(1 220 220 genPopStackBytecode needsFrameNever: -1)
(1 221 221 genExtNopBytecode needsFrameNever: 0)
(1 222 223 unknownBytecode)
"2 byte bytecodes"
(2 224 224 extABytecode extension)
(2 225 225 extBBytecode extension)
+ (2 226 226 genExtPushReceiverVariableBytecode isInstVarRef)
- (2 226 226 genExtPushReceiverVariableBytecode)
(2 227 227 genExtPushLiteralVariableBytecode needsFrameNever: 1)
(2 228 228 genExtPushLiteralBytecode needsFrameNever: 1)
(2 229 229 genExtPushIntegerBytecode needsFrameNever: 1)
(2 230 230 genLongPushTemporaryVariableBytecode)
(2 231 231 genPushNewArrayBytecode)
+ (2 232 232 genExtStoreReceiverVariableBytecode isInstVarRef)
- (2 232 232 genExtStoreReceiverVariableBytecode)
(2 233 233 genExtStoreLiteralVariableBytecode)
(2 234 234 genLongStoreTemporaryVariableBytecode)
+ (2 235 235 genExtStoreAndPopReceiverVariableBytecode isInstVarRef)
- (2 235 235 genExtStoreAndPopReceiverVariableBytecode)
(2 236 236 genExtStoreAndPopLiteralVariableBytecode)
(2 237 237 genLongStoreAndPopTemporaryVariableBytecode)
(2 238 238 genExtSendBytecode isMapped)
(2 239 239 genExtSendSuperBytecode isMapped)
(2 240 240 genExtSendAbsentImplicitBytecode isMapped hasIRC)
(2 241 241 genExtSendAbsentDynamicSuperBytecode isMapped)
(2 242 242 genExtUnconditionalJump branch isMapped "because of interrupt check" v4:Long:Branch:Distance:)
(2 243 243 genExtJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:)
(2 244 244 genExtJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:)
(2 245 245 genExtSendAbsentSelfBytecode isMapped)
(2 246 248 unknownBytecode)
"3 byte bytecodes"
(3 249 249 genCallPrimitiveBytecode)
(3 250 250 genPushRemoteTempLongBytecode)
(3 251 251 genStoreRemoteTempLongBytecode)
(3 252 252 genStoreAndPopRemoteTempLongBytecode)
(3 253 253 genExtPushClosureBytecode block v4:Block:Code:Size:)
(3 254 254 genExtSendAbsentOuterBytecode isMapped hasIRC)
(3 255 255 unknownBytecode))!
Item was changed:
----- Method: SimpleStackBasedCogit class>>initializeBytecodeTableForSistaV1 (in category 'class initialization') -----
initializeBytecodeTableForSistaV1
"SimpleStackBasedCogit initializeBytecodeTableForSistaV1"
BytecodeSetHasDirectedSuperSend := true.
FirstSpecialSelector := 96.
self flag:
'Special selector send class must be inlined to agree with the interpreter, which
inlines class. If class is sent to e.g. a general instance of ProtoObject then unless
class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit
have identical semantics. We get away with not hardwiring the other special
selectors either because in the Cointerpreter they are not inlined or because they
are inlined only to instances of classes for which there will always be a method.'.
self generatorTableFrom: #(
"1 byte bytecodes"
"pushes"
+ (1 0 15 genPushReceiverVariableBytecode isInstVarRef)
- (1 0 15 genPushReceiverVariableBytecode)
(1 16 31 genPushLiteralVariable16CasesBytecode needsFrameNever: 1)
(1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1)
(1 64 75 genPushTemporaryVariableBytecode)
(1 76 76 genPushReceiverBytecode)
(1 77 77 genPushConstantTrueBytecode needsFrameNever: 1)
(1 78 78 genPushConstantFalseBytecode needsFrameNever: 1)
(1 79 79 genPushConstantNilBytecode needsFrameNever: 1)
(1 80 80 genPushConstantZeroBytecode needsFrameNever: 1)
(1 81 81 genPushConstantOneBytecode needsFrameNever: 1)
(1 82 82 genExtPushPseudoVariable)
(1 83 83 duplicateTopBytecode needsFrameNever: 1)
(1 84 87 unknownBytecode)
"returns"
(1 88 88 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0)
(1 89 89 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0)
(1 90 90 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0)
(1 91 91 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0)
(1 92 92 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1)
(1 93 93 genReturnNilFromBlock return needsFrameNever: -1)
(1 94 94 genReturnTopFromBlock return needsFrameNever: -1)
(1 95 95 genExtNopBytecode needsFrameNever: 0)
"sends"
(1 96 117 genSpecialSelectorSend isMapped) "#+ #- #< #> #<= #>= #= #~= #* #/ #\\ #@ #bitShift: #// #bitAnd: #bitOr: #at: #at:put: #size #next #nextPut: #atEnd"
(1 118 118 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)"
(1 119 119 genSpecialSelectorClass needsFrameNever: notMapped 0) "not mapped because it is directly inlined (for now)"
(1 120 127 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y"
(1 128 143 genSendLiteralSelector0ArgsBytecode isMapped)
(1 144 159 genSendLiteralSelector1ArgBytecode isMapped)
(1 160 175 genSendLiteralSelector2ArgsBytecode isMapped)
"jumps"
(1 176 183 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:)
(1 184 191 genShortJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean"
v3:ShortForward:Branch:Distance:)
(1 192 199 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean"
v3:ShortForward:Branch:Distance:)
"stores"
+ (1 200 207 genStoreAndPopReceiverVariableBytecode isInstVarRef needsFrameNever: -1) "N.B. not frameless if immutability"
- (1 200 207 genStoreAndPopReceiverVariableBytecode needsFrameNever: -1) "N.B. not frameless if immutability"
(1 208 215 genStoreAndPopTemporaryVariableBytecode)
(1 216 216 genPopStackBytecode needsFrameNever: -1)
(1 217 217 genUnconditionalTrapBytecode isMapped)
(1 218 223 unknownBytecode)
"2 byte bytecodes"
(2 224 224 extABytecode extension)
(2 225 225 extBBytecode extension)
"pushes"
+ (2 226 226 genExtPushReceiverVariableBytecode isInstVarRef) "Needs a frame for context inst var access"
- (2 226 226 genExtPushReceiverVariableBytecode) "Needs a frame for context inst var access"
(2 227 227 genExtPushLiteralVariableBytecode needsFrameNever: 1)
(2 228 228 genExtPushLiteralBytecode needsFrameNever: 1)
(2 229 229 genLongPushTemporaryVariableBytecode)
(2 230 230 genPushClosureTempsBytecode)
(2 231 231 genPushNewArrayBytecode)
(2 232 232 genExtPushIntegerBytecode needsFrameNever: 1)
(2 233 233 genExtPushCharacterBytecode needsFrameNever: 1)
"returns"
"sends"
(2 234 234 genExtSendBytecode isMapped)
(2 235 235 genExtSendSuperBytecode isMapped)
"sista bytecodes"
(2 236 236 unknownBytecode)
"jumps"
(2 237 237 genExtUnconditionalJump branch isMapped "because of interrupt check" v4:Long:Branch:Distance:)
(2 238 238 genExtJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:)
(2 239 239 genExtJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:)
"stores"
+ (2 240 240 genExtStoreAndPopReceiverVariableBytecode isInstVarRef)
- (2 240 240 genExtStoreAndPopReceiverVariableBytecode)
(2 241 241 genExtStoreAndPopLiteralVariableBytecode)
(2 242 242 genLongStoreAndPopTemporaryVariableBytecode)
+ (2 243 243 genExtStoreReceiverVariableBytecode isInstVarRef)
- (2 243 243 genExtStoreReceiverVariableBytecode)
(2 244 244 genExtStoreLiteralVariableBytecode)
(2 245 245 genLongStoreTemporaryVariableBytecode)
(2 246 247 unknownBytecode)
"3 byte bytecodes"
(3 248 248 genCallPrimitiveBytecode)
(3 249 249 unknownBytecode) "reserved for Push Float"
(3 250 250 genExtPushClosureBytecode block v4:Block:Code:Size:)
(3 251 251 genPushRemoteTempLongBytecode)
(3 252 252 genStoreRemoteTempLongBytecode)
(3 253 253 genStoreAndPopRemoteTempLongBytecode)
(3 254 254 genExtJumpIfNotInstanceOfBehaviorsOrPopBytecode)
(3 255 255 unknownBytecode))!
Item was changed:
----- Method: SimpleStackBasedCogit class>>initializeBytecodeTableForSqueakV3PlusClosures (in category 'class initialization') -----
initializeBytecodeTableForSqueakV3PlusClosures
"SimpleStackBasedCogit initializeBytecodeTableForSqueakV3PlusClosures"
FirstSpecialSelector := 176.
self flag:
'Special selector send class must be inlined to agree with the interpreter, which
inlines class. If class is sent to e.g. a general instance of ProtoObject then unless
class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit
have identical semantics. We get away with not hardwiring the other special
selectors either because in the Cointerpreter they are not inlined or because they
are inlined only to instances of classes for which there will always be a method.'.
self generatorTableFrom: #(
+ (1 0 15 genPushReceiverVariableBytecode isInstVarRef)
- (1 0 15 genPushReceiverVariableBytecode)
(1 16 31 genPushTemporaryVariableBytecode)
(1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1)
(1 64 95 genPushLiteralVariableBytecode needsFrameNever: 1)
+ (1 96 103 genStoreAndPopReceiverVariableBytecode isInstVarRef needsFrameNever: -1) "N.B. not frameless if immutability"
- (1 96 103 genStoreAndPopReceiverVariableBytecode needsFrameNever: -1) "N.B. not frameless if immutability"
(1 104 111 genStoreAndPopTemporaryVariableBytecode)
(1 112 112 genPushReceiverBytecode)
(1 113 113 genPushConstantTrueBytecode needsFrameNever: 1)
(1 114 114 genPushConstantFalseBytecode needsFrameNever: 1)
(1 115 115 genPushConstantNilBytecode needsFrameNever: 1)
(1 116 119 genPushQuickIntegerConstantBytecode needsFrameNever: 1)
"method returns in blocks need a frame because of nonlocalReturn:through:"
(1 120 120 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0)
(1 121 121 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0)
(1 122 122 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0)
(1 123 123 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0)
(1 124 124 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1)
(1 125 125 genReturnTopFromBlock return needsFrameNever: -1)
(1 126 127 unknownBytecode)
+ (2 128 128 extendedPushBytecode isInstVarRef) "well, maybe inst var ref"
+ (2 129 129 extendedStoreBytecode isInstVarRef) "well, maybe inst var ref"
+ (2 130 130 extendedStoreAndPopBytecode isInstVarRef) "well, maybe inst var ref"
- (2 128 128 extendedPushBytecode)
- (2 129 129 extendedStoreBytecode)
- (2 130 130 extendedStoreAndPopBytecode)
(2 131 131 genExtendedSendBytecode isMapped)
+ (3 132 132 doubleExtendedDoAnythingBytecode isInstVarRef isMapped) "well, maybe inst var ref"
- (3 132 132 doubleExtendedDoAnythingBytecode isMapped)
(2 133 133 genExtendedSuperBytecode isMapped)
(2 134 134 genSecondExtendedSendBytecode isMapped)
(1 135 135 genPopStackBytecode needsFrameNever: -1)
(1 136 136 duplicateTopBytecode needsFrameNever: 1)
(1 137 137 genPushActiveContextBytecode)
(2 138 138 genPushNewArrayBytecode)),
((initializationOptions at: #SpurObjectMemory ifAbsent: [false])
ifTrue: [#((3 139 139 genCallPrimitiveBytecode))]
ifFalse: [#((1 139 139 unknownBytecode))]),
#(
(3 140 140 genPushRemoteTempLongBytecode)
(3 141 141 genStoreRemoteTempLongBytecode)
(3 142 142 genStoreAndPopRemoteTempLongBytecode)
(4 143 143 genPushClosureCopyCopiedValuesBytecode block v3:Block:Code:Size:)
(1 144 151 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:)
(1 152 159 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean"
v3:ShortForward:Branch:Distance:)
(2 160 163 genLongUnconditionalBackwardJump branch isMapped "because of interrupt check"
v3:Long:Branch:Distance:)
(2 164 167 genLongUnconditionalForwardJump branch v3:Long:Branch:Distance:)
(2 168 171 genLongJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean"
v3:LongForward:Branch:Distance:)
(2 172 175 genLongJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean"
v3:LongForward:Branch:Distance:)
(1 176 197 genSpecialSelectorSend isMapped)
(1 198 198 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)"
(1 199 199 genSpecialSelectorClass needsFrameNever: notMapped 0) "not mapped because it is directly inlined (for now)"
(1 200 207 genSpecialSelectorSend isMapped)
(1 208 223 genSendLiteralSelector0ArgsBytecode isMapped)
(1 224 239 genSendLiteralSelector1ArgBytecode isMapped)
(1 240 255 genSendLiteralSelector2ArgsBytecode isMapped))!
Item was removed:
- ----- Method: SimpleStackBasedCogit class>>initializeNumTrampolines (in category 'class initialization') -----
- initializeNumTrampolines
- NumTrampolines := 42
- + (NewspeakVM ifTrue: [18] ifFalse: [0])
- + (BytecodeSetHasDirectedSuperSend ifTrue: [4] ifFalse: [0])!
Item was changed:
----- Method: SimpleStackBasedCogit>>compileBlockFrameBuild: (in category 'compile abstract instructions') -----
compileBlockFrameBuild: blockStart
"Build a frame for a block activation. See CoInterpreter class>>initializeFrameIndices.
closure (in ReceiverResultReg)
arg0
...
argN
caller's saved ip/this stackPage (for a base frame)
fp-> saved fp
method
context (uninitialized?)
receiver
first temp
...
sp-> Nth temp
Avoid use of SendNumArgsReg which is the flag determining whether
context switch is allowed on stack-overflow."
<var: #blockStart type: #'BlockStart *'>
<inline: false>
self annotateBytecode: self Label.
backEnd hasLinkRegister ifTrue:
[self PushR: LinkReg].
self PushR: FPReg.
self MoveR: SPReg R: FPReg.
+ "Think of ClassReg as ClosureReg"
+ self MoveR: ReceiverResultReg R: ClassReg.
"The block method field must have its MFMethodFlagIsBlockFlag bit set.
We arrange this using a labelOffset. A hack, but it works."
blockStart fakeHeader
addDependent: (self annotateAbsolutePCRef:
(self PushCw: blockStart fakeHeader asInteger)); "method"
setLabelOffset: MFMethodFlagIsBlockFlag.
self annotate: (self PushCw: objectMemory nilObject) "context"
objRef: objectMemory nilObject.
+ "Fetch home receiver from outer context. closure is on stack and initially in ReceiverResultReg.
+ It is safe to use Arg0Reg because reg args are pushed by the value primitives if there are any.".
+ blockStart hasInstVarRef
+ ifTrue: "Use ReceiverResultReg for Context to agree with store check trampoline"
+ [objectRepresentation
+ genLoadSlot: ClosureOuterContextIndex
+ sourceReg: ClassReg
+ destReg: ReceiverResultReg;
+ genLoadSlot: ReceiverIndex
+ sourceReg: ReceiverResultReg
+ destReg: Arg0Reg.
+ objectRepresentation
+ genEnsureOopInRegNotForwarded: Arg0Reg scratchReg: TempReg updatingSlot: ReceiverIndex in: ReceiverResultReg.
+ self MoveR: Arg0Reg R: ReceiverResultReg]
+ ifFalse:
+ [objectRepresentation
+ genLoadSlot: ClosureOuterContextIndex
+ sourceReg: ClassReg
+ destReg: Arg0Reg;
+ genLoadSlot: ReceiverIndex
+ sourceReg: Arg0Reg
+ destReg: ReceiverResultReg].
+ self PushR: ReceiverResultReg. "home receiver"
- "fetch home receiver from outer context. closure is on stack and initially in ReceiverResultReg"
- objectRepresentation
- genLoadSlot: ClosureOuterContextIndex
- sourceReg: ReceiverResultReg
- destReg: TempReg;
- genLoadSlot: ReceiverIndex
- sourceReg: TempReg
- destReg: ClassReg.
- self PushR: ClassReg. "home receiver"
"Push copied values; bytecode initializes temporaries"
0 to: blockStart numCopied - 1 do:
[:i|
objectRepresentation
genLoadSlot: i + ClosureFirstCopiedValueIndex
+ sourceReg: ClassReg
- sourceReg: ReceiverResultReg
destReg: TempReg.
self PushR: TempReg].
- self MoveR: ClassReg R: ReceiverResultReg.
self MoveAw: coInterpreter stackLimitAddress R: TempReg.
self CmpR: TempReg R: SPReg. "N.B. FLAGS := SPReg - TempReg"
self JumpBelow: stackOverflowCall.
blockStart stackCheckLabel: (self annotateBytecode: self Label)!
Item was changed:
----- Method: SimpleStackBasedCogit>>genPrimitiveClosureValue (in category 'primitive generators') -----
genPrimitiveClosureValue
"Check the argument count. Fail if wrong.
Get the method from the outerContext and see if it is cogged. If so, jump to the
block entry or the no-context-switch entry, as appropriate, and we're done. If not,
invoke the interpreter primitive."
| jumpFailNArgs jumpFail1 jumpFail2 jumpFail3 jumpFail4 jumpBCMethod primitiveRoutine result |
+ <var: #jumpFail1 type: #'AbstractInstruction *'>
- <var: #jumpFail5 type: #'AbstractInstruction *'>
<var: #jumpFail2 type: #'AbstractInstruction *'>
<var: #jumpFail3 type: #'AbstractInstruction *'>
<var: #jumpFail4 type: #'AbstractInstruction *'>
<var: #jumpFailNArgs type: #'AbstractInstruction *'>
<var: #jumpBCMethod type: #'AbstractInstruction *'>
<var: #primitiveRoutine declareC: 'void (*primitiveRoutine)()'>
objectRepresentation genLoadSlot: ClosureNumArgsIndex sourceReg: ReceiverResultReg destReg: TempReg.
self CmpCq: (objectMemory integerObjectOf: methodOrBlockNumArgs) R: TempReg.
jumpFailNArgs := self JumpNonZero: 0.
objectRepresentation genLoadSlot: ClosureOuterContextIndex sourceReg: ReceiverResultReg destReg: ClassReg.
jumpFail1 := objectRepresentation genJumpImmediate: ClassReg.
objectRepresentation genGetCompactClassIndexNonImmOf: ClassReg into: TempReg.
objectRepresentation genCmpClassMethodContextCompactIndexR: TempReg.
jumpFail2 := self JumpNonZero: 0.
+ "We defer unforwarding the receiver to the prologue; scanning blocks
+ for inst var refs and only unforwarding if the block refers to inst vars."
+ (false
+ and: [objectRepresentation hasSpurMemoryManagerAPI]) ifTrue:
- "This could be deferred to the prologue (compileBlockFrameBuild:) if blocks were
- scanned to see if they referred to the receiver. But for now this is safe if slow."
- objectRepresentation hasSpurMemoryManagerAPI ifTrue:
[objectRepresentation
genLoadSlot: ReceiverIndex sourceReg: ClassReg destReg: SendNumArgsReg;
genEnsureOopInRegNotForwarded: SendNumArgsReg
scratchReg: TempReg
updatingSlot: ReceiverIndex
in: ClassReg].
objectRepresentation genLoadSlot: MethodIndex sourceReg: ClassReg destReg: SendNumArgsReg.
jumpFail3 := objectRepresentation genJumpImmediate: SendNumArgsReg.
objectRepresentation genGetFormatOf: SendNumArgsReg into: TempReg.
self CmpCq: objectMemory firstCompiledMethodFormat R: TempReg.
jumpFail4 := self JumpLess: 0.
objectRepresentation genLoadSlot: HeaderIndex sourceReg: SendNumArgsReg destReg: ClassReg.
jumpBCMethod := objectRepresentation genJumpSmallInteger: ClassReg.
self MoveM16: (self offset: CogMethod of: #blockEntryOffset) r: ClassReg R: TempReg.
self AddR: ClassReg R: TempReg.
primitiveRoutine := coInterpreter
functionPointerForCompiledMethod: methodObj
primitiveIndex: primitiveIndex.
primitiveRoutine = #primitiveClosureValueNoContextSwitch ifTrue:
[blockNoContextSwitchOffset = nil ifTrue:
[^NotFullyInitialized].
self SubCq: blockNoContextSwitchOffset R: TempReg].
self JumpR: TempReg.
jumpBCMethod jmpTarget: (jumpFail1 jmpTarget: (jumpFail2 jmpTarget: (jumpFail3 jmpTarget: (jumpFail4 jmpTarget: self Label)))).
(result := self compileInterpreterPrimitive: primitiveRoutine) < 0 ifTrue:
[^result].
jumpFailNArgs jmpTarget: self Label.
^0!
Item was removed:
- ----- Method: SistaStackToRegisterMappingCogit class>>initializeNumTrampolines (in category 'class initialization') -----
- initializeNumTrampolines
- NumTrampolines := 53
- + (NewspeakVM ifTrue: [18] ifFalse: [0])
- + (BytecodeSetHasDirectedSuperSend ifTrue: [4] ifFalse: [0])!
Item was added:
+ ----- Method: SistaStackToRegisterMappingCogit class>>numTrampolines (in category 'accessing') -----
+ numTrampolines
+ ^super numTrampolines + 1
+
+ "Cogit withAllSubclasses collect: [:c| {c. (c instVarNames select: [:ea| ea beginsWith: 'ce']) size}]"
+ "self instVarNames select: [:ea| ea beginsWith: 'ce']"!
Item was changed:
----- Method: StackToRegisterMappingCogit class>>initializeBytecodeTableForNewspeakV4 (in category 'class initialization') -----
initializeBytecodeTableForNewspeakV4
"StackToRegisterMappingCogit initializeBytecodeTableForNewspeakV4"
numPushNilsFunction := #v4:Num:Push:Nils:.
pushNilSizeFunction := #v4PushNilSize:numInitialNils:.
NSSendIsPCAnnotated := true. "IsNSSendCall used by SendAbsentImplicit"
FirstSpecialSelector := 80.
self flag:
'Special selector send class must be inlined to agree with the interpreter, which
inlines class. If class is sent to e.g. a general instance of ProtoObject then unless
class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit
have identical semantics. We get away with not hardwiring the other special
selectors either because in the Cointerpreter they are not inlined or because they
are inlined only to instances of classes for which there will always be a method.'.
self generatorTableFrom: #(
"1 byte bytecodes"
+ (1 0 15 genPushReceiverVariableBytecode isInstVarRef needsFrameNever: 1)
- (1 0 15 genPushReceiverVariableBytecode needsFrameNever: 1)
(1 16 31 genPushLiteralVariable16CasesBytecode needsFrameNever: 1)
(1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1)
(1 64 75 genPushTemporaryVariableBytecode needsFrameIfMod16GENumArgs: 1)
(1 76 76 genPushReceiverBytecode needsFrameNever: 1)
(1 77 77 genExtPushPseudoVariableOrOuterBytecode needsFrameIfExtBGT2: 1)
(1 78 78 genPushConstantZeroBytecode needsFrameNever: 1)
(1 79 79 genPushConstantOneBytecode needsFrameNever: 1)
(1 80 80 genSpecialSelectorArithmetic isMapped AddRR)
(1 81 81 genSpecialSelectorArithmetic isMapped SubRR)
(1 82 82 genSpecialSelectorComparison isMapped JumpLess)
(1 83 83 genSpecialSelectorComparison isMapped JumpGreater)
(1 84 84 genSpecialSelectorComparison isMapped JumpLessOrEqual)
(1 85 85 genSpecialSelectorComparison isMapped JumpGreaterOrEqual)
(1 86 86 genSpecialSelectorComparison isMapped JumpZero)
(1 87 87 genSpecialSelectorComparison isMapped JumpNonZero)
(1 88 93 genSpecialSelectorSend isMapped) " #* #/ #\\ #@ #bitShift: //"
(1 94 94 genSpecialSelectorArithmetic isMapped AndRR)
(1 95 95 genSpecialSelectorArithmetic isMapped OrRR)
(1 96 101 genSpecialSelectorSend isMapped) "#at: #at:put: #size #next #nextPut: #atEnd"
(1 102 102 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)"
(1 103 103 genSpecialSelectorClass needsFrameIfStackGreaterThanOne: notMapped 0) "not mapped because it is directly inlined (for now)"
(1 104 111 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y"
(1 112 127 genSendLiteralSelector0ArgsBytecode isMapped)
(1 128 143 genSendLiteralSelector1ArgBytecode isMapped)
(1 144 159 genSendLiteralSelector2ArgsBytecode isMapped)
(1 160 175 genSendAbsentImplicit0ArgsBytecode isMapped hasIRC)
+ (1 176 183 genStoreAndPopReceiverVariableBytecode isInstVarRef needsFrameNever: -1) "N.B. not frameless if immutability"
- (1 176 183 genStoreAndPopReceiverVariableBytecode needsFrameNever: -1) "N.B. not frameless if immutability"
(1 184 191 genStoreAndPopTemporaryVariableBytecode)
(1 192 199 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:)
(1 200 207 genShortJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean"
v3:ShortForward:Branch:Distance:)
(1 208 215 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean"
v3:ShortForward:Branch:Distance:)
(1 216 216 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0)
(1 217 217 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1)
(1 218 218 genExtReturnTopFromBlock return needsFrameNever: -1)
(1 219 219 duplicateTopBytecode needsFrameNever: 1)
(1 220 220 genPopStackBytecode needsFrameNever: -1)
(1 221 221 genExtNopBytecode needsFrameNever: 0)
(1 222 223 unknownBytecode)
"2 byte bytecodes"
(2 224 224 extABytecode extension needsFrameNever: 0)
(2 225 225 extBBytecode extension needsFrameNever: 0)
+ (2 226 226 genExtPushReceiverVariableBytecode isInstVarRef)
- (2 226 226 genExtPushReceiverVariableBytecode)
(2 227 227 genExtPushLiteralVariableBytecode needsFrameNever: 1)
(2 228 228 genExtPushLiteralBytecode needsFrameNever: 1)
(2 229 229 genExtPushIntegerBytecode needsFrameNever: 1)
(2 230 230 genLongPushTemporaryVariableBytecode)
(2 231 231 genPushNewArrayBytecode)
+ (2 232 232 genExtStoreReceiverVariableBytecode isInstVarRef)
- (2 232 232 genExtStoreReceiverVariableBytecode)
(2 233 233 genExtStoreLiteralVariableBytecode)
(2 234 234 genLongStoreTemporaryVariableBytecode)
+ (2 235 235 genExtStoreAndPopReceiverVariableBytecode isInstVarRef)
- (2 235 235 genExtStoreAndPopReceiverVariableBytecode)
(2 236 236 genExtStoreAndPopLiteralVariableBytecode)
(2 237 237 genLongStoreAndPopTemporaryVariableBytecode)
(2 238 238 genExtSendBytecode isMapped)
(2 239 239 genExtSendSuperBytecode isMapped)
(2 240 240 genExtSendAbsentImplicitBytecode isMapped hasIRC)
(2 241 241 genExtSendAbsentDynamicSuperBytecode isMapped)
(2 242 242 genExtUnconditionalJump branch isMapped "because of interrupt check" v4:Long:Branch:Distance:)
(2 243 243 genExtJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:)
(2 244 244 genExtJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:)
(2 245 245 genExtSendAbsentSelfBytecode isMapped)
(2 246 248 unknownBytecode)
"3 byte bytecodes"
(3 249 249 genCallPrimitiveBytecode)
(3 250 250 genPushRemoteTempLongBytecode)
(3 251 251 genStoreRemoteTempLongBytecode)
(3 252 252 genStoreAndPopRemoteTempLongBytecode)
(3 253 253 genExtPushClosureBytecode block v4:Block:Code:Size:)
(3 254 254 genExtSendAbsentOuterBytecode isMapped hasIRC)
(3 255 255 unknownBytecode))!
Item was changed:
----- Method: StackToRegisterMappingCogit class>>initializeBytecodeTableForSistaV1 (in category 'class initialization') -----
initializeBytecodeTableForSistaV1
"StackToRegisterMappingCogit initializeBytecodeTableForSistaV1"
numPushNilsFunction := #sistaV1:Num:Push:Nils:.
pushNilSizeFunction := #sistaV1PushNilSize:numInitialNils:.
BytecodeSetHasDirectedSuperSend := true.
FirstSpecialSelector := 96.
self flag:
'Special selector send class must be inlined to agree with the interpreter, which
inlines class. If class is sent to e.g. a general instance of ProtoObject then unless
class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit
have identical semantics. We get away with not hardwiring the other special
selectors either because in the Cointerpreter they are not inlined or because they
are inlined only to instances of classes for which there will always be a method.'.
self generatorTableFrom: #(
"1 byte bytecodes"
"pushes"
+ (1 0 15 genPushReceiverVariableBytecode isInstVarRef needsFrameNever: 1)
+ (1 16 31 genPushLitVarDirSup16CasesBytecode needsFrameNever: 1)
+ (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1)
+ (1 64 75 genPushTemporaryVariableBytecode needsFrameIfMod16GENumArgs: 1)
+ (1 76 76 genPushReceiverBytecode needsFrameNever: 1)
+ (1 77 77 genPushConstantTrueBytecode needsFrameNever: 1)
+ (1 78 78 genPushConstantFalseBytecode needsFrameNever: 1)
+ (1 79 79 genPushConstantNilBytecode needsFrameNever: 1)
+ (1 80 80 genPushConstantZeroBytecode needsFrameNever: 1)
+ (1 81 81 genPushConstantOneBytecode needsFrameNever: 1)
- (1 0 15 genPushReceiverVariableBytecode needsFrameNever: 1)
- (1 16 31 genPushLitVarDirSup16CasesBytecode needsFrameNever: 1)
- (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1)
- (1 64 75 genPushTemporaryVariableBytecode needsFrameIfMod16GENumArgs: 1)
- (1 76 76 genPushReceiverBytecode needsFrameNever: 1)
- (1 77 77 genPushConstantTrueBytecode needsFrameNever: 1)
- (1 78 78 genPushConstantFalseBytecode needsFrameNever: 1)
- (1 79 79 genPushConstantNilBytecode needsFrameNever: 1)
- (1 80 80 genPushConstantZeroBytecode needsFrameNever: 1)
- (1 81 81 genPushConstantOneBytecode needsFrameNever: 1)
(1 82 82 genExtPushPseudoVariable)
+ (1 83 83 duplicateTopBytecode needsFrameNever: 1)
- (1 83 83 duplicateTopBytecode needsFrameNever: 1)
(1 84 87 unknownBytecode)
"returns"
(1 88 88 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0)
(1 89 89 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0)
(1 90 90 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0)
(1 91 91 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0)
(1 92 92 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1)
(1 93 93 genReturnNilFromBlock return needsFrameNever: -1)
(1 94 94 genReturnTopFromBlock return needsFrameNever: -1)
(1 95 95 genExtNopBytecode needsFrameNever: 0)
"sends"
(1 96 96 genSpecialSelectorArithmetic isMapped AddRR)
(1 97 97 genSpecialSelectorArithmetic isMapped SubRR)
(1 98 98 genSpecialSelectorComparison isMapped JumpLess)
(1 99 99 genSpecialSelectorComparison isMapped JumpGreater)
(1 100 100 genSpecialSelectorComparison isMapped JumpLessOrEqual)
(1 101 101 genSpecialSelectorComparison isMapped JumpGreaterOrEqual)
(1 102 102 genSpecialSelectorComparison isMapped JumpZero)
(1 103 103 genSpecialSelectorComparison isMapped JumpNonZero)
(1 104 109 genSpecialSelectorSend isMapped) " #* #/ #\\ #@ #bitShift: //"
(1 110 110 genSpecialSelectorArithmetic isMapped AndRR)
(1 111 111 genSpecialSelectorArithmetic isMapped OrRR)
(1 112 117 genSpecialSelectorSend isMapped) "#at: #at:put: #size #next #nextPut: #atEnd"
(1 118 118 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)"
(1 119 119 genSpecialSelectorClass needsFrameIfStackGreaterThanOne: notMapped 0) "not mapped because it is directly inlined (for now)"
(1 120 127 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y"
(1 128 143 genSendLiteralSelector0ArgsBytecode isMapped)
(1 144 159 genSendLiteralSelector1ArgBytecode isMapped)
(1 160 175 genSendLiteralSelector2ArgsBytecode isMapped)
"jumps"
(1 176 183 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:)
(1 184 191 genShortJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean"
v3:ShortForward:Branch:Distance:)
(1 192 199 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean"
v3:ShortForward:Branch:Distance:)
"stores"
+ (1 200 207 genStoreAndPopReceiverVariableBytecode isInstVarRef needsFrameNever: -1) "N.B. not frameless if immutability"
- (1 200 207 genStoreAndPopReceiverVariableBytecode needsFrameNever: -1) "N.B. not frameless if immutability"
(1 208 215 genStoreAndPopTemporaryVariableBytecode)
(1 216 216 genPopStackBytecode needsFrameNever: -1)
(1 217 217 genUnconditionalTrapBytecode isMapped)
(1 218 223 unknownBytecode)
"2 byte bytecodes"
(2 224 224 extABytecode extension)
(2 225 225 extBBytecode extension)
"pushes"
+ (2 226 226 genExtPushReceiverVariableBytecode isInstVarRef) "Needs a frame for context inst var access"
- (2 226 226 genExtPushReceiverVariableBytecode) "Needs a frame for context inst var access"
(2 227 227 genExtPushLitVarDirSupBytecode needsFrameNever: 1)
(2 228 228 genExtPushLiteralBytecode needsFrameNever: 1)
(2 229 229 genLongPushTemporaryVariableBytecode)
(2 230 230 genPushClosureTempsBytecode)
(2 231 231 genPushNewArrayBytecode)
(2 232 232 genExtPushIntegerBytecode needsFrameNever: 1)
(2 233 233 genExtPushCharacterBytecode needsFrameNever: 1)
"returns"
"sends"
(2 234 234 genExtSendBytecode isMapped)
(2 235 235 genExtSendSuperBytecode isMapped)
"sista bytecodes"
(2 236 236 unknownBytecode)
"jumps"
(2 237 237 genExtUnconditionalJump branch isMapped "because of interrupt check" v4:Long:Branch:Distance:)
(2 238 238 genExtJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:)
(2 239 239 genExtJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:)
"stores"
+ (2 240 240 genExtStoreAndPopReceiverVariableBytecode isInstVarRef)
- (2 240 240 genExtStoreAndPopReceiverVariableBytecode)
(2 241 241 genExtStoreAndPopLiteralVariableBytecode)
(2 242 242 genLongStoreAndPopTemporaryVariableBytecode)
+ (2 243 243 genExtStoreReceiverVariableBytecode isInstVarRef)
- (2 243 243 genExtStoreReceiverVariableBytecode)
(2 244 244 genExtStoreLiteralVariableBytecode)
(2 245 245 genLongStoreTemporaryVariableBytecode)
(2 246 247 unknownBytecode)
"3 byte bytecodes"
(3 248 248 genCallPrimitiveBytecode)
(3 249 249 unknownBytecode) "reserved for Push Float"
(3 250 250 genExtPushClosureBytecode block v4:Block:Code:Size:)
(3 251 251 genPushRemoteTempLongBytecode)
(3 252 252 genStoreRemoteTempLongBytecode)
(3 253 253 genStoreAndPopRemoteTempLongBytecode)
(3 254 254 genExtJumpIfNotInstanceOfBehaviorsOrPopBytecode)
(3 255 255 unknownBytecode))!
Item was changed:
----- Method: StackToRegisterMappingCogit class>>initializeBytecodeTableForSqueakV3PlusClosures (in category 'class initialization') -----
initializeBytecodeTableForSqueakV3PlusClosures
"StackToRegisterMappingCogit initializeBytecodeTableForSqueakV3PlusClosures"
numPushNilsFunction := #v3:Num:Push:Nils:.
pushNilSizeFunction := #v3PushNilSize:numInitialNils:.
FirstSpecialSelector := 176.
self flag:
'Special selector send class must be inlined to agree with the interpreter, which
inlines class. If class is sent to e.g. a general instance of ProtoObject then unless
class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit
have identical semantics. We get away with not hardwiring the other special
selectors either because in the Cointerpreter they are not inlined or because they
are inlined only to instances of classes for which there will always be a method.'.
self generatorTableFrom: #(
+ (1 0 15 genPushReceiverVariableBytecode isInstVarRef needsFrameNever: 1)
- (1 0 15 genPushReceiverVariableBytecode needsFrameNever: 1)
(1 16 31 genPushTemporaryVariableBytecode needsFrameIfMod16GENumArgs: 1)
(1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1)
(1 64 95 genPushLiteralVariableBytecode needsFrameNever: 1)
+ (1 96 103 genStoreAndPopReceiverVariableBytecode isInstVarRef needsFrameNever: -1) "N.B. not frameless if immutability"
- (1 96 103 genStoreAndPopReceiverVariableBytecode needsFrameNever: -1) "N.B. not frameless if immutability"
(1 104 111 genStoreAndPopTemporaryVariableBytecode)
(1 112 112 genPushReceiverBytecode needsFrameNever: 1)
(1 113 113 genPushConstantTrueBytecode needsFrameNever: 1)
(1 114 114 genPushConstantFalseBytecode needsFrameNever: 1)
(1 115 115 genPushConstantNilBytecode needsFrameNever: 1)
(1 116 119 genPushQuickIntegerConstantBytecode needsFrameNever: 1)
"method returns in blocks need a frame because of nonlocalReturn:through:"
(1 120 120 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0)
(1 121 121 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0)
(1 122 122 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0)
(1 123 123 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0)
(1 124 124 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1)
(1 125 125 genReturnTopFromBlock return needsFrameNever: -1)
(1 126 127 unknownBytecode)
+ (2 128 128 extendedPushBytecode isInstVarRef) "well, maybe inst var ref"
+ (2 129 129 extendedStoreBytecode isInstVarRef) "well, maybe inst var ref"
+ (2 130 130 extendedStoreAndPopBytecode isInstVarRef) "well, maybe inst var ref"
- (2 128 128 extendedPushBytecode)
- (2 129 129 extendedStoreBytecode)
- (2 130 130 extendedStoreAndPopBytecode)
(2 131 131 genExtendedSendBytecode isMapped)
+ (3 132 132 doubleExtendedDoAnythingBytecode isMapped) "well, maybe inst var ref"
+ (2 133 133 genExtendedSuperBytecode isInstVarRef isMapped)
- (3 132 132 doubleExtendedDoAnythingBytecode isMapped)
- (2 133 133 genExtendedSuperBytecode isMapped)
(2 134 134 genSecondExtendedSendBytecode isMapped)
(1 135 135 genPopStackBytecode needsFrameNever: -1)
(1 136 136 duplicateTopBytecode needsFrameNever: 1)
(1 137 137 genPushActiveContextBytecode)
(2 138 138 genPushNewArrayBytecode)),
((initializationOptions at: #SpurObjectMemory ifAbsent: [false])
ifTrue: [#((3 139 139 genCallPrimitiveBytecode))]
ifFalse: [#((1 139 139 unknownBytecode))]),
#(
(3 140 140 genPushRemoteTempLongBytecode)
(3 141 141 genStoreRemoteTempLongBytecode)
(3 142 142 genStoreAndPopRemoteTempLongBytecode)
(4 143 143 genPushClosureCopyCopiedValuesBytecode block v3:Block:Code:Size:)
(1 144 151 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:)
(1 152 159 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean"
v3:ShortForward:Branch:Distance:)
(2 160 163 genLongUnconditionalBackwardJump branch isMapped "because of interrupt check"
v3:Long:Branch:Distance:)
(2 164 167 genLongUnconditionalForwardJump branch v3:Long:Branch:Distance:)
(2 168 171 genLongJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean"
v3:LongForward:Branch:Distance:)
(2 172 175 genLongJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean"
v3:LongForward:Branch:Distance:)
(1 176 176 genSpecialSelectorArithmetic isMapped AddRR)
(1 177 177 genSpecialSelectorArithmetic isMapped SubRR)
(1 178 178 genSpecialSelectorComparison isMapped JumpLess)
(1 179 179 genSpecialSelectorComparison isMapped JumpGreater)
(1 180 180 genSpecialSelectorComparison isMapped JumpLessOrEqual)
(1 181 181 genSpecialSelectorComparison isMapped JumpGreaterOrEqual)
(1 182 182 genSpecialSelectorComparison isMapped JumpZero)
(1 183 183 genSpecialSelectorComparison isMapped JumpNonZero)
(1 184 189 genSpecialSelectorSend isMapped) " #* #/ #\\ #@ #bitShift: //"
(1 190 190 genSpecialSelectorArithmetic isMapped AndRR)
(1 191 191 genSpecialSelectorArithmetic isMapped OrRR)
(1 192 197 genSpecialSelectorSend isMapped) "#at: #at:put: #size #next #nextPut: #atEnd"
(1 198 198 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)"
(1 199 199 genSpecialSelectorClass needsFrameIfStackGreaterThanOne: notMapped 0) "not mapped because it is directly inlined (for now)"
(1 200 207 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y"
(1 208 223 genSendLiteralSelector0ArgsBytecode isMapped)
(1 224 239 genSendLiteralSelector1ArgBytecode isMapped)
(1 240 255 genSendLiteralSelector2ArgsBytecode isMapped))!
Item was removed:
- ----- Method: StackToRegisterMappingCogit class>>initializeNumTrampolines (in category 'class initialization') -----
- initializeNumTrampolines
- NumTrampolines := 52
- + (NewspeakVM ifTrue: [18] ifFalse: [0])
- + (BytecodeSetHasDirectedSuperSend ifTrue: [4] ifFalse: [0])!
Item was added:
+ ----- Method: StackToRegisterMappingCogit class>>numTrampolines (in category 'accessing') -----
+ numTrampolines
+ ^super numTrampolines + 12 "includes register args aborts"
+
+ "Cogit withAllSubclasses collect: [:c| {c. (c instVarNames select: [:ea| ea beginsWith: 'ce']) size}]"
+ "self instVarNames select: [:ea| ea beginsWith: 'ce']"!
Item was changed:
----- Method: StackToRegisterMappingCogit>>addBlockStartAt:numArgs:numCopied:span: (in category 'compile abstract instructions') -----
addBlockStartAt: bytecodepc numArgs: numArgs numCopied: numCopied span: span
"Add a blockStart for an embedded block. For a binary tree walk block dispatch
blocks must be compiled in pc/depth-first order but are scanned in breadth-first
order, so do an insertion sort (which of course is really a bubble sort because we
have to move everything higher to make room)."
<returnTypeC: #'BlockStart *'>
| i blockStart |
<var: #blockStart type: #'BlockStart *'>
"Transcript ensureCr; nextPutAll: 'addBlockStartAt: '; print: bytecodepc; cr; flush."
blockCount > 0
ifTrue:
[i := blockCount - 1.
[blockStart := self addressOf: (blockStarts at: i).
"check for repeat addition during recompilation due to initialNil miscount."
blockStart startpc = bytecodepc ifTrue:
[^blockStart].
blockStart startpc > bytecodepc
and: [i > 0]] whileTrue:
[i := i - 1].
blockCount to: i + 1 by: -1 do:
[:j|
blockStarts at: j put: (blockStarts at: j - 1)].
blockStart := self cCode: [self addressOf: (blockStarts at: i + 1)]
inSmalltalk: [blockStarts at: i + 1 put: CogBlockStart new]]
ifFalse:
[blockStart := self cCode: [self addressOf: (blockStarts at: blockCount)]
inSmalltalk: [blockStarts at: blockCount put: CogBlockStart new]].
blockCount := blockCount + 1.
blockStart
startpc: bytecodepc;
numArgs: numArgs;
numCopied: numCopied;
numInitialNils: 0;
stackCheckLabel: nil;
+ hasInstVarRef: false;
span: span.
^blockStart!
Item was changed:
----- Method: StackToRegisterMappingCogit>>scanBlock: (in category 'compile abstract instructions') -----
scanBlock: blockStart
"Scan the block to determine if the block needs a frame or not"
| descriptor pc end framelessStackDelta nExts pushingNils numPushNils |
<var: #blockStart type: #'BlockStart *'>
<var: #descriptor type: #'BytecodeDescriptor *'>
needsFrame := false.
prevBCDescriptor := nil.
methodOrBlockNumArgs := blockStart numArgs.
inBlock := true.
pc := blockStart startpc.
end := blockStart startpc + blockStart span.
framelessStackDelta := nExts := extA := extB := 0.
pushingNils := true.
[pc < end] whileTrue:
[byte0 := (objectMemory fetchByte: pc ofObject: methodObj) + bytecodeSetOffset.
descriptor := self generatorAt: byte0.
descriptor isExtension ifTrue:
[self loadSubsequentBytesForDescriptor: descriptor at: pc.
self perform: descriptor generator].
needsFrame ifFalse:
[(descriptor needsFrameFunction isNil
or: [self perform: descriptor needsFrameFunction with: framelessStackDelta])
ifTrue: [needsFrame := true]
ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]].
+ objectRepresentation maybeNoteDescriptor: descriptor blockStart: blockStart.
(pushingNils
and: [descriptor isExtension not]) ifTrue:
["Count the initial number of pushed nils acting as temp initializers. We can't tell
whether an initial pushNil is an operand reference or a temp initializer, except
when the pushNil is a jump target (has a fixup), which never happens:
self systemNavigation browseAllSelect:
[:m| | ebc |
(ebc := m embeddedBlockClosures
select: [:ea| ea decompile statements first isMessage]
thenCollect: [:ea| ea decompile statements first selector]) notEmpty
and: [(#(whileTrue whileFalse whileTrue: whileFalse:) intersection: ebc) notEmpty]]
or if the bytecode set has a push multiple nils bytecode. We simply count initial nils.
Rarely we may end up over-estimating. We will correct by checking the stack depth
at the end of the block in compileBlockBodies."
(numPushNils := self numPushNils: descriptor pc: pc nExts: nExts method: methodObj) > 0
ifTrue:
[self assert: (descriptor numBytes = 1
or: [descriptor generator == #genPushClosureTempsBytecode]).
blockStart numInitialNils: blockStart numInitialNils + numPushNils]
ifFalse:
[pushingNils := false]].
pc := self nextBytecodePCFor: descriptor at: pc exts: nExts in: methodObj.
descriptor isExtension
ifTrue: [nExts := nExts + 1]
ifFalse: [nExts := extA := extB := 0].
prevBCDescriptor := descriptor].
"It would be nice of this wasn't necessary but alas we need to do the eager
scan for frameless methods so that we don't end up popping too much off
the simulated stack, e.g. for pushNil; returnTopFromBlock methods."
needsFrame ifFalse:
[self assert: (framelessStackDelta >= 0 and: [blockStart numInitialNils >= framelessStackDelta]).
blockStart numInitialNils: blockStart numInitialNils - framelessStackDelta]!
1
0
Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1338.mcz
==================== Summary ====================
Name: VMMaker.oscog-cb.1338
Author: cb
Time: 4 June 2015, 4:28:00.954 pm
UUID: 25cd5227-7a5f-466c-8e83-eb3533ccee1a
Ancestors: VMMaker.oscog-eem.1337
Fix the bug eliot reported where rcvrReg was nil in genEqualsEqualsnoBranch.
=============== Diff against VMMaker.oscog-eem.1337 ===============
Item was changed:
----- Method: StackToRegisterMappingCogit>>genEqualsEqualsNoBranchArgIsConstant:rcvrIsConstant:argReg:rcvrReg: (in category 'bytecode generator support') -----
genEqualsEqualsNoBranchArgIsConstant: argIsConstant rcvrIsConstant: rcvrIsConstant argReg: argReg rcvrReg: rcvrReg
"Generates the machine code for #== in the case where the instruction is not followed by a branch"
+ | label jumpEqual jumpNotEqual resultReg |
- | label jumpEqual jumpNotEqual |
<var: #label type: #'AbstractInstruction *'>
<var: #jumpEqual type: #'AbstractInstruction *'>
<var: #jumpNotEqual type: #'AbstractInstruction *'>
label := self Label.
self genEqualsEqualsComparisonArgIsConstant: argIsConstant rcvrIsConstant: rcvrIsConstant argReg: argReg rcvrReg: rcvrReg.
self ssPop: 2.
+ resultReg := rcvrReg ifNil: [argReg ].
jumpEqual := self JumpZero: 0.
argIsConstant ifFalse: [ objectRepresentation genEnsureOopInRegNotForwarded: argReg scratchReg: TempReg jumpBackTo: label ].
rcvrIsConstant ifFalse: [ objectRepresentation genEnsureOopInRegNotForwarded: rcvrReg scratchReg: TempReg jumpBackTo: label ].
+ self genMoveFalseR: resultReg.
- self genMoveFalseR: rcvrReg.
jumpNotEqual := self Jump: 0.
+ jumpEqual jmpTarget: (self genMoveTrueR: resultReg).
- jumpEqual jmpTarget: (self genMoveTrueR: rcvrReg).
jumpNotEqual jmpTarget: self Label.
+ self ssPushRegister: resultReg.
- self ssPushRegister: rcvrReg.
^0!
1
0
04 Jun '15
Revision: 3369
Author: eliot
Date: 2015-06-03 22:47:13 -0700 (Wed, 03 Jun 2015)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.1337
Fix defaultCogCodeSize to avoid exporting AbstractInstruction through cogit.h.
Modified Paths:
--------------
branches/Cog/nsspursrc/vm/cogit.h
branches/Cog/nsspursrc/vm/cogitARMv5.c
branches/Cog/nsspursrc/vm/cogitIA32.c
branches/Cog/spursistasrc/vm/cogit.h
branches/Cog/spursistasrc/vm/cogitARMv5.c
branches/Cog/spursistasrc/vm/cogitIA32.c
branches/Cog/spursrc/vm/cogit.h
branches/Cog/spursrc/vm/cogitARMv5.c
branches/Cog/spursrc/vm/cogitIA32.c
branches/Cog/src/vm/cogit.h
branches/Cog/src/vm/cogitARMv5.c
branches/Cog/src/vm/cogitIA32.c
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nsspursrc/vm/cogit.h
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.h 2015-06-04 05:19:31 UTC (rev 3368)
+++ branches/Cog/nsspursrc/vm/cogit.h 2015-06-04 05:47:13 UTC (rev 3369)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ CCodeGenerator VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
*/
@@ -20,7 +20,6 @@
# define NeverInline /*empty*/
#endif
-sqInt defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize);
sqInt abortOffset(void);
void addCogMethodsToHeapMap(void);
sqInt bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod);
@@ -39,6 +38,7 @@
CogMethod * cogMNUPICSelectorreceivermethodOperandnumArgs(sqInt selector, sqInt rcvr, sqInt methodOperand, sqInt numArgs);
CogMethod * cogselector(sqInt aMethodObj, sqInt aSelectorOop);
void compactCogCompiledCode(void);
+sqInt defaultCogCodeSize(void);
void enterCogCodePopReceiver(void);
CogBlockMethod * findMethodForStartBcpcinHomeMethod(sqInt startbcpc, CogMethod *cogMethod);
void followForwardedLiteralsIn(CogMethod *cogMethod);
Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c
===================================================================
--- branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-06-04 05:19:31 UTC (rev 3368)
+++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-06-04 05:47:13 UTC (rev 3369)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ CCodeGenerator VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -450,7 +450,6 @@
static AbstractInstruction * concretizeSubRdRd(AbstractInstruction * self_in_concretizeSubRdRd) NoDbgRegParms;
static sqInt cResultRegister(AbstractInstruction * self_in_cResultRegister) NoDbgRegParms;
static sqInt dataOpTyperdrnrmlsr(AbstractInstruction * self_in_dataOpTyperdrnrmlsr, sqInt armOpcode, sqInt destReg, sqInt srcReg, sqInt addReg, sqInt shft) NoDbgRegParms;
-sqInt defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize);
static void dispatchConcretize(AbstractInstruction * self_in_dispatchConcretize) NoDbgRegParms;
static sqInt extract32BitOperandFrom4InstructionsPreceeding(AbstractInstruction * self_in_extract32BitOperandFrom4InstructionsPreceeding, sqInt addr) NoDbgRegParms;
static sqInt fullCallsAreRelative(AbstractInstruction * self_in_fullCallsAreRelative) NoDbgRegParms;
@@ -617,6 +616,7 @@
static sqInt cPICHasFreedTargets(CogMethod *cPIC) NoDbgRegParms;
static sqInt cPICHasTarget(CogMethod *cPIC, CogMethod *targetMethod) NoDbgRegParms;
static AbstractInstruction * gDivRRQuoRem(sqInt rDivisor, sqInt rDividend, sqInt rQuotient, sqInt rRemainder) NoDbgRegParms;
+sqInt defaultCogCodeSize(void);
static sqInt endPCOf(sqInt aMethod) NoDbgRegParms;
void enterCogCodePopReceiver(void);
static sqInt extABytecode(void);
@@ -2959,18 +2959,6 @@
}
-/* Return the default number of bytes to allocate for native code at startup.
- The actual value can be set via vmParameterAt: and/or a preference in the
- ini file. */
-
- /* CogARMCompiler>>#defaultCogCodeSize */
-sqInt
-defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize)
-{
- return 1024 * 1400;
-}
-
-
/* Attempt to generate concrete machine code for the instruction at address.
This is the inner dispatch of concretizeAt: actualAddress which exists
only to get around the branch size limits in the SqueakV3 (blue book
@@ -9926,7 +9914,7 @@
{
sqInt classIndex;
sqInt i;
- usqInt pc;
+ sqInt pc;
pc = (((((usqInt)cPIC)) + firstCPICCaseOffset) + cPICCaseSize) - (jumpLongConditionalByteSize(backEnd));
for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) {
@@ -9999,6 +9987,18 @@
return abstractInstructionAt(opcodeIndex - 1);
}
+
+/* Return the default number of bytes to allocate for native code at startup.
+ The actual value can be set via vmParameterAt: and/or a preference in the
+ ini file. */
+
+ /* Cogit>>#defaultCogCodeSize */
+sqInt
+defaultCogCodeSize(void)
+{
+ return 1024 * 1400;
+}
+
/* Cogit>>#endPCOf: */
static sqInt
endPCOf(sqInt aMethod)
Modified: branches/Cog/nsspursrc/vm/cogitIA32.c
===================================================================
--- branches/Cog/nsspursrc/vm/cogitIA32.c 2015-06-04 05:19:31 UTC (rev 3368)
+++ branches/Cog/nsspursrc/vm/cogitIA32.c 2015-06-04 05:47:13 UTC (rev 3369)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ CCodeGenerator VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -394,7 +394,6 @@
static sqInt abstractRegisterForConcreteRegister(AbstractInstruction * self_in_abstractRegisterForConcreteRegister, sqInt reg) NoDbgRegParms;
static AbstractInstruction * addDependent(AbstractInstruction * self_in_addDependent, AbstractInstruction *anInstruction) NoDbgRegParms;
static sqInt availableRegisterOrNilFor(AbstractInstruction * self_in_availableRegisterOrNilFor, sqInt liveRegsMask) NoDbgRegParms;
-sqInt defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize);
static sqInt genAlignCStackSavingRegistersnumArgswordAlignment(AbstractInstruction * self_in_genAlignCStackSavingRegistersnumArgswordAlignment, sqInt saveRegs, sqInt numArgs, sqInt alignment) NoDbgRegParms;
static AbstractInstruction * generateICacheFlush(AbstractInstruction * self_in_generateICacheFlush) NoDbgRegParms;
static AbstractInstruction * genWriteCResultIntoReg(AbstractInstruction * self_in_genWriteCResultIntoReg, sqInt abstractRegister) NoDbgRegParms;
@@ -561,6 +560,7 @@
static sqInt cPICHasFreedTargets(CogMethod *cPIC) NoDbgRegParms;
static sqInt cPICHasTarget(CogMethod *cPIC, CogMethod *targetMethod) NoDbgRegParms;
static AbstractInstruction * gDivRRQuoRem(sqInt rDivisor, sqInt rDividend, sqInt rQuotient, sqInt rRemainder) NoDbgRegParms;
+sqInt defaultCogCodeSize(void);
static sqInt endPCOf(sqInt aMethod) NoDbgRegParms;
void enterCogCodePopReceiver(void);
static sqInt extABytecode(void);
@@ -1966,18 +1966,6 @@
return null;
}
-
-/* Return the default number of bytes to allocate for native code at startup.
- The actual value can be set via vmParameterAt: and/or a preference in the
- ini file. */
-
- /* CogAbstractInstruction>>#defaultCogCodeSize */
-sqInt
-defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize)
-{
- return 1024 * 1024;
-}
-
/* CogAbstractInstruction>>#genAlignCStackSavingRegisters:numArgs:wordAlignment: */
static sqInt
genAlignCStackSavingRegistersnumArgswordAlignment(AbstractInstruction * self_in_genAlignCStackSavingRegistersnumArgswordAlignment, sqInt saveRegs, sqInt numArgs, sqInt alignment)
@@ -8772,6 +8760,18 @@
return abstractInstructionAt(opcodeIndex - 1);
}
+
+/* Return the default number of bytes to allocate for native code at startup.
+ The actual value can be set via vmParameterAt: and/or a preference in the
+ ini file. */
+
+ /* Cogit>>#defaultCogCodeSize */
+sqInt
+defaultCogCodeSize(void)
+{
+ return 1024 * 1024;
+}
+
/* Cogit>>#endPCOf: */
static sqInt
endPCOf(sqInt aMethod)
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Wed Jun 3 22:15:54 PDT 2015
+ Wed Jun 3 22:45:36 PDT 2015
Modified: branches/Cog/spursistasrc/vm/cogit.h
===================================================================
--- branches/Cog/spursistasrc/vm/cogit.h 2015-06-04 05:19:31 UTC (rev 3368)
+++ branches/Cog/spursistasrc/vm/cogit.h 2015-06-04 05:47:13 UTC (rev 3369)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ CCodeGenerator VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
*/
@@ -20,7 +20,6 @@
# define NeverInline /*empty*/
#endif
-sqInt defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize);
sqInt abortOffset(void);
void addCogMethodsToHeapMap(void);
sqInt bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod);
@@ -39,6 +38,7 @@
CogMethod * cogMNUPICSelectorreceivermethodOperandnumArgs(sqInt selector, sqInt rcvr, sqInt methodOperand, sqInt numArgs);
CogMethod * cogselector(sqInt aMethodObj, sqInt aSelectorOop);
void compactCogCompiledCode(void);
+sqInt defaultCogCodeSize(void);
void enterCogCodePopReceiver(void);
CogBlockMethod * findMethodForStartBcpcinHomeMethod(sqInt startbcpc, CogMethod *cogMethod);
void followForwardedLiteralsIn(CogMethod *cogMethod);
Modified: branches/Cog/spursistasrc/vm/cogitARMv5.c
===================================================================
--- branches/Cog/spursistasrc/vm/cogitARMv5.c 2015-06-04 05:19:31 UTC (rev 3368)
+++ branches/Cog/spursistasrc/vm/cogitARMv5.c 2015-06-04 05:47:13 UTC (rev 3369)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ CCodeGenerator VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
from
- SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
*/
-static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a " __DATE__ ;
+static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -448,7 +448,6 @@
static AbstractInstruction * concretizeSubRdRd(AbstractInstruction * self_in_concretizeSubRdRd) NoDbgRegParms;
static sqInt cResultRegister(AbstractInstruction * self_in_cResultRegister) NoDbgRegParms;
static sqInt dataOpTyperdrnrmlsr(AbstractInstruction * self_in_dataOpTyperdrnrmlsr, sqInt armOpcode, sqInt destReg, sqInt srcReg, sqInt addReg, sqInt shft) NoDbgRegParms;
-sqInt defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize);
static void dispatchConcretize(AbstractInstruction * self_in_dispatchConcretize) NoDbgRegParms;
static sqInt extract32BitOperandFrom4InstructionsPreceeding(AbstractInstruction * self_in_extract32BitOperandFrom4InstructionsPreceeding, sqInt addr) NoDbgRegParms;
static sqInt fullCallsAreRelative(AbstractInstruction * self_in_fullCallsAreRelative) NoDbgRegParms;
@@ -616,6 +615,7 @@
static sqInt cPICHasFreedTargets(CogMethod *cPIC) NoDbgRegParms;
static sqInt cPICHasTarget(CogMethod *cPIC, CogMethod *targetMethod) NoDbgRegParms;
static AbstractInstruction * gDivRRQuoRem(sqInt rDivisor, sqInt rDividend, sqInt rQuotient, sqInt rRemainder) NoDbgRegParms;
+sqInt defaultCogCodeSize(void);
static sqInt endPCOf(sqInt aMethod) NoDbgRegParms;
void enterCogCodePopReceiver(void);
static sqInt extABytecode(void);
@@ -2963,18 +2963,6 @@
}
-/* Return the default number of bytes to allocate for native code at startup.
- The actual value can be set via vmParameterAt: and/or a preference in the
- ini file. */
-
- /* CogARMCompiler>>#defaultCogCodeSize */
-sqInt
-defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize)
-{
- return 1024 * 1400;
-}
-
-
/* Attempt to generate concrete machine code for the instruction at address.
This is the inner dispatch of concretizeAt: actualAddress which exists
only to get around the branch size limits in the SqueakV3 (blue book
@@ -9839,7 +9827,7 @@
{
sqInt classIndex;
sqInt i;
- usqInt pc;
+ sqInt pc;
pc = (((((usqInt)cPIC)) + firstCPICCaseOffset) + cPICCaseSize) - (jumpLongConditionalByteSize(backEnd));
for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) {
@@ -9912,6 +9900,18 @@
return abstractInstructionAt(opcodeIndex - 1);
}
+
+/* Return the default number of bytes to allocate for native code at startup.
+ The actual value can be set via vmParameterAt: and/or a preference in the
+ ini file. */
+
+ /* Cogit>>#defaultCogCodeSize */
+sqInt
+defaultCogCodeSize(void)
+{
+ return 1024 * 1400;
+}
+
/* Cogit>>#endPCOf: */
static sqInt
endPCOf(sqInt aMethod)
Modified: branches/Cog/spursistasrc/vm/cogitIA32.c
===================================================================
--- branches/Cog/spursistasrc/vm/cogitIA32.c 2015-06-04 05:19:31 UTC (rev 3368)
+++ branches/Cog/spursistasrc/vm/cogitIA32.c 2015-06-04 05:47:13 UTC (rev 3369)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ CCodeGenerator VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
from
- SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
*/
-static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a " __DATE__ ;
+static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -392,7 +392,6 @@
static sqInt abstractRegisterForConcreteRegister(AbstractInstruction * self_in_abstractRegisterForConcreteRegister, sqInt reg) NoDbgRegParms;
static AbstractInstruction * addDependent(AbstractInstruction * self_in_addDependent, AbstractInstruction *anInstruction) NoDbgRegParms;
static sqInt availableRegisterOrNilFor(AbstractInstruction * self_in_availableRegisterOrNilFor, sqInt liveRegsMask) NoDbgRegParms;
-sqInt defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize);
static sqInt genAlignCStackSavingRegistersnumArgswordAlignment(AbstractInstruction * self_in_genAlignCStackSavingRegistersnumArgswordAlignment, sqInt saveRegs, sqInt numArgs, sqInt alignment) NoDbgRegParms;
static AbstractInstruction * generateICacheFlush(AbstractInstruction * self_in_generateICacheFlush) NoDbgRegParms;
static AbstractInstruction * genWriteCResultIntoReg(AbstractInstruction * self_in_genWriteCResultIntoReg, sqInt abstractRegister) NoDbgRegParms;
@@ -559,6 +558,7 @@
static sqInt cPICHasFreedTargets(CogMethod *cPIC) NoDbgRegParms;
static sqInt cPICHasTarget(CogMethod *cPIC, CogMethod *targetMethod) NoDbgRegParms;
static AbstractInstruction * gDivRRQuoRem(sqInt rDivisor, sqInt rDividend, sqInt rQuotient, sqInt rRemainder) NoDbgRegParms;
+sqInt defaultCogCodeSize(void);
static sqInt endPCOf(sqInt aMethod) NoDbgRegParms;
void enterCogCodePopReceiver(void);
static sqInt extABytecode(void);
@@ -1969,18 +1969,6 @@
return null;
}
-
-/* Return the default number of bytes to allocate for native code at startup.
- The actual value can be set via vmParameterAt: and/or a preference in the
- ini file. */
-
- /* CogAbstractInstruction>>#defaultCogCodeSize */
-sqInt
-defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize)
-{
- return 1024 * 1024;
-}
-
/* CogAbstractInstruction>>#genAlignCStackSavingRegisters:numArgs:wordAlignment: */
static sqInt
genAlignCStackSavingRegistersnumArgswordAlignment(AbstractInstruction * self_in_genAlignCStackSavingRegistersnumArgswordAlignment, sqInt saveRegs, sqInt numArgs, sqInt alignment)
@@ -8673,6 +8661,18 @@
return abstractInstructionAt(opcodeIndex - 1);
}
+
+/* Return the default number of bytes to allocate for native code at startup.
+ The actual value can be set via vmParameterAt: and/or a preference in the
+ ini file. */
+
+ /* Cogit>>#defaultCogCodeSize */
+sqInt
+defaultCogCodeSize(void)
+{
+ return 1024 * 1024;
+}
+
/* Cogit>>#endPCOf: */
static sqInt
endPCOf(sqInt aMethod)
Modified: branches/Cog/spursrc/vm/cogit.h
===================================================================
--- branches/Cog/spursrc/vm/cogit.h 2015-06-04 05:19:31 UTC (rev 3368)
+++ branches/Cog/spursrc/vm/cogit.h 2015-06-04 05:47:13 UTC (rev 3369)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ CCodeGenerator VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
*/
@@ -20,7 +20,6 @@
# define NeverInline /*empty*/
#endif
-sqInt defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize);
sqInt abortOffset(void);
void addCogMethodsToHeapMap(void);
sqInt bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod);
@@ -39,6 +38,7 @@
CogMethod * cogMNUPICSelectorreceivermethodOperandnumArgs(sqInt selector, sqInt rcvr, sqInt methodOperand, sqInt numArgs);
CogMethod * cogselector(sqInt aMethodObj, sqInt aSelectorOop);
void compactCogCompiledCode(void);
+sqInt defaultCogCodeSize(void);
void enterCogCodePopReceiver(void);
CogBlockMethod * findMethodForStartBcpcinHomeMethod(sqInt startbcpc, CogMethod *cogMethod);
void followForwardedLiteralsIn(CogMethod *cogMethod);
Modified: branches/Cog/spursrc/vm/cogitARMv5.c
===================================================================
--- branches/Cog/spursrc/vm/cogitARMv5.c 2015-06-04 05:19:31 UTC (rev 3368)
+++ branches/Cog/spursrc/vm/cogitARMv5.c 2015-06-04 05:47:13 UTC (rev 3369)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ CCodeGenerator VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -445,7 +445,6 @@
static AbstractInstruction * concretizeSubRdRd(AbstractInstruction * self_in_concretizeSubRdRd) NoDbgRegParms;
static sqInt cResultRegister(AbstractInstruction * self_in_cResultRegister) NoDbgRegParms;
static sqInt dataOpTyperdrnrmlsr(AbstractInstruction * self_in_dataOpTyperdrnrmlsr, sqInt armOpcode, sqInt destReg, sqInt srcReg, sqInt addReg, sqInt shft) NoDbgRegParms;
-sqInt defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize);
static void dispatchConcretize(AbstractInstruction * self_in_dispatchConcretize) NoDbgRegParms;
static sqInt extract32BitOperandFrom4InstructionsPreceeding(AbstractInstruction * self_in_extract32BitOperandFrom4InstructionsPreceeding, sqInt addr) NoDbgRegParms;
static sqInt fullCallsAreRelative(AbstractInstruction * self_in_fullCallsAreRelative) NoDbgRegParms;
@@ -611,6 +610,7 @@
static sqInt cPICHasFreedTargets(CogMethod *cPIC) NoDbgRegParms;
static sqInt cPICHasTarget(CogMethod *cPIC, CogMethod *targetMethod) NoDbgRegParms;
static AbstractInstruction * gDivRRQuoRem(sqInt rDivisor, sqInt rDividend, sqInt rQuotient, sqInt rRemainder) NoDbgRegParms;
+sqInt defaultCogCodeSize(void);
static sqInt endPCOf(sqInt aMethod) NoDbgRegParms;
void enterCogCodePopReceiver(void);
static sqInt fillInBlockHeadersAt(sqInt startAddress) NoDbgRegParms;
@@ -2635,18 +2635,6 @@
}
-/* Return the default number of bytes to allocate for native code at startup.
- The actual value can be set via vmParameterAt: and/or a preference in the
- ini file. */
-
- /* CogARMCompiler>>#defaultCogCodeSize */
-sqInt
-defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize)
-{
- return 1024 * 1400;
-}
-
-
/* Attempt to generate concrete machine code for the instruction at address.
This is the inner dispatch of concretizeAt: actualAddress which exists
only to get around the branch size limits in the SqueakV3 (blue book
@@ -9463,7 +9451,7 @@
{
sqInt classIndex;
sqInt i;
- sqInt pc;
+ usqInt pc;
pc = (((((usqInt)cPIC)) + firstCPICCaseOffset) + cPICCaseSize) - (jumpLongConditionalByteSize(backEnd));
for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) {
@@ -9536,6 +9524,18 @@
return abstractInstructionAt(opcodeIndex - 1);
}
+
+/* Return the default number of bytes to allocate for native code at startup.
+ The actual value can be set via vmParameterAt: and/or a preference in the
+ ini file. */
+
+ /* Cogit>>#defaultCogCodeSize */
+sqInt
+defaultCogCodeSize(void)
+{
+ return 1024 * 1400;
+}
+
/* Cogit>>#endPCOf: */
static sqInt
endPCOf(sqInt aMethod)
Modified: branches/Cog/spursrc/vm/cogitIA32.c
===================================================================
--- branches/Cog/spursrc/vm/cogitIA32.c 2015-06-04 05:19:31 UTC (rev 3368)
+++ branches/Cog/spursrc/vm/cogitIA32.c 2015-06-04 05:47:13 UTC (rev 3369)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ CCodeGenerator VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -389,7 +389,6 @@
static sqInt abstractRegisterForConcreteRegister(AbstractInstruction * self_in_abstractRegisterForConcreteRegister, sqInt reg) NoDbgRegParms;
static AbstractInstruction * addDependent(AbstractInstruction * self_in_addDependent, AbstractInstruction *anInstruction) NoDbgRegParms;
static sqInt availableRegisterOrNilFor(AbstractInstruction * self_in_availableRegisterOrNilFor, sqInt liveRegsMask) NoDbgRegParms;
-sqInt defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize);
static sqInt genAlignCStackSavingRegistersnumArgswordAlignment(AbstractInstruction * self_in_genAlignCStackSavingRegistersnumArgswordAlignment, sqInt saveRegs, sqInt numArgs, sqInt alignment) NoDbgRegParms;
static AbstractInstruction * generateICacheFlush(AbstractInstruction * self_in_generateICacheFlush) NoDbgRegParms;
static AbstractInstruction * genWriteCResultIntoReg(AbstractInstruction * self_in_genWriteCResultIntoReg, sqInt abstractRegister) NoDbgRegParms;
@@ -554,6 +553,7 @@
static sqInt cPICHasFreedTargets(CogMethod *cPIC) NoDbgRegParms;
static sqInt cPICHasTarget(CogMethod *cPIC, CogMethod *targetMethod) NoDbgRegParms;
static AbstractInstruction * gDivRRQuoRem(sqInt rDivisor, sqInt rDividend, sqInt rQuotient, sqInt rRemainder) NoDbgRegParms;
+sqInt defaultCogCodeSize(void);
static sqInt endPCOf(sqInt aMethod) NoDbgRegParms;
void enterCogCodePopReceiver(void);
static sqInt fillInBlockHeadersAt(sqInt startAddress) NoDbgRegParms;
@@ -1641,18 +1641,6 @@
return null;
}
-
-/* Return the default number of bytes to allocate for native code at startup.
- The actual value can be set via vmParameterAt: and/or a preference in the
- ini file. */
-
- /* CogAbstractInstruction>>#defaultCogCodeSize */
-sqInt
-defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize)
-{
- return 1024 * 1024;
-}
-
/* CogAbstractInstruction>>#genAlignCStackSavingRegisters:numArgs:wordAlignment: */
static sqInt
genAlignCStackSavingRegistersnumArgswordAlignment(AbstractInstruction * self_in_genAlignCStackSavingRegistersnumArgswordAlignment, sqInt saveRegs, sqInt numArgs, sqInt alignment)
@@ -8297,6 +8285,18 @@
return abstractInstructionAt(opcodeIndex - 1);
}
+
+/* Return the default number of bytes to allocate for native code at startup.
+ The actual value can be set via vmParameterAt: and/or a preference in the
+ ini file. */
+
+ /* Cogit>>#defaultCogCodeSize */
+sqInt
+defaultCogCodeSize(void)
+{
+ return 1024 * 1024;
+}
+
/* Cogit>>#endPCOf: */
static sqInt
endPCOf(sqInt aMethod)
Modified: branches/Cog/src/vm/cogit.h
===================================================================
--- branches/Cog/src/vm/cogit.h 2015-06-04 05:19:31 UTC (rev 3368)
+++ branches/Cog/src/vm/cogit.h 2015-06-04 05:47:13 UTC (rev 3369)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ CCodeGenerator VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
*/
@@ -20,7 +20,6 @@
# define NeverInline /*empty*/
#endif
-sqInt defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize);
sqInt abortOffset(void);
void addCogMethodsToHeapMap(void);
sqInt bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod);
@@ -39,6 +38,7 @@
CogMethod * cogMNUPICSelectorreceivermethodOperandnumArgs(sqInt selector, sqInt rcvr, sqInt methodOperand, sqInt numArgs);
CogMethod * cogselector(sqInt aMethodObj, sqInt aSelectorOop);
void compactCogCompiledCode(void);
+sqInt defaultCogCodeSize(void);
void enterCogCodePopReceiver(void);
CogBlockMethod * findMethodForStartBcpcinHomeMethod(sqInt startbcpc, CogMethod *cogMethod);
void initializeCodeZoneFromupTo(sqInt startAddress, sqInt endAddress);
Modified: branches/Cog/src/vm/cogitARMv5.c
===================================================================
--- branches/Cog/src/vm/cogitARMv5.c 2015-06-04 05:19:31 UTC (rev 3368)
+++ branches/Cog/src/vm/cogitARMv5.c 2015-06-04 05:47:13 UTC (rev 3369)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ CCodeGenerator VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -450,7 +450,6 @@
static AbstractInstruction * concretizeSubRdRd(AbstractInstruction * self_in_concretizeSubRdRd) NoDbgRegParms;
static sqInt cResultRegister(AbstractInstruction * self_in_cResultRegister) NoDbgRegParms;
static sqInt dataOpTyperdrnrmlsr(AbstractInstruction * self_in_dataOpTyperdrnrmlsr, sqInt armOpcode, sqInt destReg, sqInt srcReg, sqInt addReg, sqInt shft) NoDbgRegParms;
-sqInt defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize);
static void dispatchConcretize(AbstractInstruction * self_in_dispatchConcretize) NoDbgRegParms;
static sqInt extract32BitOperandFrom4InstructionsPreceeding(AbstractInstruction * self_in_extract32BitOperandFrom4InstructionsPreceeding, sqInt addr) NoDbgRegParms;
static sqInt fullCallsAreRelative(AbstractInstruction * self_in_fullCallsAreRelative) NoDbgRegParms;
@@ -615,6 +614,7 @@
static sqInt cPICHasFreedTargets(CogMethod *cPIC) NoDbgRegParms;
static sqInt cPICHasTarget(CogMethod *cPIC, CogMethod *targetMethod) NoDbgRegParms;
static AbstractInstruction * gDivRRQuoRem(sqInt rDivisor, sqInt rDividend, sqInt rQuotient, sqInt rRemainder) NoDbgRegParms;
+sqInt defaultCogCodeSize(void);
static sqInt endPCOf(sqInt aMethod) NoDbgRegParms;
void enterCogCodePopReceiver(void);
static sqInt fillInBlockHeadersAt(sqInt startAddress) NoDbgRegParms;
@@ -2598,18 +2598,6 @@
}
-/* Return the default number of bytes to allocate for native code at startup.
- The actual value can be set via vmParameterAt: and/or a preference in the
- ini file. */
-
- /* CogARMCompiler>>#defaultCogCodeSize */
-sqInt
-defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize)
-{
- return 1024 * 1400;
-}
-
-
/* Attempt to generate concrete machine code for the instruction at address.
This is the inner dispatch of concretizeAt: actualAddress which exists
only to get around the branch size limits in the SqueakV3 (blue book
@@ -9501,6 +9489,18 @@
return abstractInstructionAt(opcodeIndex - 1);
}
+
+/* Return the default number of bytes to allocate for native code at startup.
+ The actual value can be set via vmParameterAt: and/or a preference in the
+ ini file. */
+
+ /* Cogit>>#defaultCogCodeSize */
+sqInt
+defaultCogCodeSize(void)
+{
+ return 1024 * 1400;
+}
+
/* Cogit>>#endPCOf: */
static sqInt
endPCOf(sqInt aMethod)
Modified: branches/Cog/src/vm/cogitIA32.c
===================================================================
--- branches/Cog/src/vm/cogitIA32.c 2015-06-04 05:19:31 UTC (rev 3368)
+++ branches/Cog/src/vm/cogitIA32.c 2015-06-04 05:47:13 UTC (rev 3369)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ CCodeGenerator VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -393,7 +393,6 @@
static sqInt abstractRegisterForConcreteRegister(AbstractInstruction * self_in_abstractRegisterForConcreteRegister, sqInt reg) NoDbgRegParms;
static AbstractInstruction * addDependent(AbstractInstruction * self_in_addDependent, AbstractInstruction *anInstruction) NoDbgRegParms;
static sqInt availableRegisterOrNilFor(AbstractInstruction * self_in_availableRegisterOrNilFor, sqInt liveRegsMask) NoDbgRegParms;
-sqInt defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize);
static sqInt genAlignCStackSavingRegistersnumArgswordAlignment(AbstractInstruction * self_in_genAlignCStackSavingRegistersnumArgswordAlignment, sqInt saveRegs, sqInt numArgs, sqInt alignment) NoDbgRegParms;
static AbstractInstruction * generateICacheFlush(AbstractInstruction * self_in_generateICacheFlush) NoDbgRegParms;
static AbstractInstruction * genWriteCResultIntoReg(AbstractInstruction * self_in_genWriteCResultIntoReg, sqInt abstractRegister) NoDbgRegParms;
@@ -557,6 +556,7 @@
static sqInt cPICHasFreedTargets(CogMethod *cPIC) NoDbgRegParms;
static sqInt cPICHasTarget(CogMethod *cPIC, CogMethod *targetMethod) NoDbgRegParms;
static AbstractInstruction * gDivRRQuoRem(sqInt rDivisor, sqInt rDividend, sqInt rQuotient, sqInt rRemainder) NoDbgRegParms;
+sqInt defaultCogCodeSize(void);
static sqInt endPCOf(sqInt aMethod) NoDbgRegParms;
void enterCogCodePopReceiver(void);
static sqInt fillInBlockHeadersAt(sqInt startAddress) NoDbgRegParms;
@@ -1603,18 +1603,6 @@
return null;
}
-
-/* Return the default number of bytes to allocate for native code at startup.
- The actual value can be set via vmParameterAt: and/or a preference in the
- ini file. */
-
- /* CogAbstractInstruction>>#defaultCogCodeSize */
-sqInt
-defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize)
-{
- return 1024 * 1024;
-}
-
/* CogAbstractInstruction>>#genAlignCStackSavingRegisters:numArgs:wordAlignment: */
static sqInt
genAlignCStackSavingRegistersnumArgswordAlignment(AbstractInstruction * self_in_genAlignCStackSavingRegistersnumArgswordAlignment, sqInt saveRegs, sqInt numArgs, sqInt alignment)
@@ -8261,6 +8249,18 @@
return abstractInstructionAt(opcodeIndex - 1);
}
+
+/* Return the default number of bytes to allocate for native code at startup.
+ The actual value can be set via vmParameterAt: and/or a preference in the
+ ini file. */
+
+ /* Cogit>>#defaultCogCodeSize */
+sqInt
+defaultCogCodeSize(void)
+{
+ return 1024 * 1024;
+}
+
/* Cogit>>#endPCOf: */
static sqInt
endPCOf(sqInt aMethod)
1
0
Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1337.mcz
==================== Summary ====================
Name: VMMaker.oscog-eem.1337
Author: eem
Time: 3 June 2015, 10:42:04.417 pm
UUID: bbb568f4-b2c8-4711-9d7a-7ad42d103182
Ancestors: VMMaker.oscog-eem.1336
Fix defaultCogCodeSize to avoid exporting the AbstractInstruction type
=============== Diff against VMMaker.oscog-eem.1336 ===============
Item was removed:
- ----- Method: CogARMCompiler>>defaultCogCodeSize (in category 'accessing') -----
- defaultCogCodeSize
- "Return the default number of bytes to allocate for native code at startup.
- The actual value can be set via vmParameterAt: and/or a preference in the ini file."
- <api>
- ^1024 * 1400!
Item was added:
+ ----- Method: CogARMCompiler>>getDefaultCogCodeSize (in category 'accessing') -----
+ getDefaultCogCodeSize
+ "Return the default number of bytes to allocate for native code at startup.
+ The actual value can be set via vmParameterAt: and/or a preference in the ini file."
+ <inline: true>
+ ^1024 * 1400!
Item was removed:
- ----- Method: CogAbstractInstruction>>defaultCogCodeSize (in category 'accessing') -----
- defaultCogCodeSize
- "Return the default number of bytes to allocate for native code at startup.
- The actual value can be set via vmParameterAt: and/or a preference in the ini file."
- <api>
- ^1024 * 1024!
Item was added:
+ ----- Method: CogAbstractInstruction>>getDefaultCogCodeSize (in category 'accessing') -----
+ getDefaultCogCodeSize
+ "Return the default number of bytes to allocate for native code at startup.
+ The actual value can be set via vmParameterAt: and/or a preference in the ini file."
+ <inline: true>
+ ^1024 * 1024!
Item was changed:
----- Method: Cogit>>defaultCogCodeSize (in category 'accessing') -----
defaultCogCodeSize
"Return the default number of bytes to allocate for native code at startup.
The actual value can be set via vmParameterAt: and/or a preference in the ini file."
+ <api>
+ ^backEnd getDefaultCogCodeSize!
- <doNotGenerate>
- ^backEnd defaultCogCodeSize!
1
0
04 Jun '15
Revision: 3368
Author: eliot
Date: 2015-06-03 22:19:31 -0700 (Wed, 03 Jun 2015)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.1336.
Fix the hack introduced in VMMaker.oscog-eem.1199 for Sista which merely stopped
reclaiming closed PICs. In non-Sista VMs do the usual thing of decaying usage
counts on PICs, as with methods, and reclaiming those least used. In Sista,
retain PICs until the next cycle, identifying unused PICs as part of the
compaction scan, reminiscent of tri-colour incremental GC.
Move defaultCogCodeSize into the CogAbstractInstruction hierarchy so that
e.g. CogARMCompiler can specify a larger default code zone.
Merge with VMMaker.oscog-tpr.1335, keeping the -1's
in the cache flush extent calculations.
Enable the magic MULL instruction on ARM. Clean up flushICache usage
Spur:
Since the invariant is that the receiver is never forwarded, Spur must check for
forwarding on block activation. A become between closure creation and closure
evaluation can forward the receiver, and it must be unforwarded. Here we do so
by checking for a forwarded receiver in the value[:] primitives. This is a
major blow to block performance; e.g. the nfib block
b := [:n| n <= 1
ifTrue: [1]
ifFalse: [1 + (b value: n - 1) + (b value: n - 2)]].
slows down by 11%. So we can and will do better. We should scan for receiver
usage in the JIT and optionally compile unforwarding code in the prolog
depending on whether self is used or not.
Cogit:
Use the Tst-based generators for immediate and SmallInteger tests more widely
to save a few more instructions.
Modified Paths:
--------------
branches/Cog/nsspursrc/vm/cogit.h
branches/Cog/nsspursrc/vm/cogitARMv5.c
branches/Cog/nsspursrc/vm/cogitIA32.c
branches/Cog/nsspursrc/vm/cointerp.c
branches/Cog/nsspursrc/vm/cointerp.h
branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
branches/Cog/nsspurstack64src/vm/gcc3x-interp.c
branches/Cog/nsspurstack64src/vm/interp.c
branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
branches/Cog/nsspurstacksrc/vm/interp.c
branches/Cog/spursistasrc/vm/cogit.h
branches/Cog/spursistasrc/vm/cogitARMv5.c
branches/Cog/spursistasrc/vm/cogitIA32.c
branches/Cog/spursistasrc/vm/cointerp.c
branches/Cog/spursistasrc/vm/cointerp.h
branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
branches/Cog/spursrc/vm/cogit.h
branches/Cog/spursrc/vm/cogitARMv5.c
branches/Cog/spursrc/vm/cogitIA32.c
branches/Cog/spursrc/vm/cointerp.c
branches/Cog/spursrc/vm/cointerp.h
branches/Cog/spursrc/vm/gcc3x-cointerp.c
branches/Cog/spurstack64src/vm/gcc3x-interp.c
branches/Cog/spurstack64src/vm/interp.c
branches/Cog/spurstacksrc/vm/gcc3x-interp.c
branches/Cog/spurstacksrc/vm/interp.c
branches/Cog/src/vm/cogit.h
branches/Cog/src/vm/cogitARMv5.c
branches/Cog/src/vm/cogitIA32.c
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/stacksrc/vm/gcc3x-interp.c
branches/Cog/stacksrc/vm/interp.c
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nsspursrc/vm/cogit.h
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.h 2015-06-03 16:00:39 UTC (rev 3367)
+++ branches/Cog/nsspursrc/vm/cogit.h 2015-06-04 05:19:31 UTC (rev 3368)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1333 uuid: bc9001c2-8816-4b4e-bf91-8e11cad6ed6b
+ CCodeGenerator VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
*/
@@ -20,6 +20,7 @@
# define NeverInline /*empty*/
#endif
+sqInt defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize);
sqInt abortOffset(void);
void addCogMethodsToHeapMap(void);
sqInt bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod);
Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c
===================================================================
--- branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-06-03 16:00:39 UTC (rev 3367)
+++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-06-04 05:19:31 UTC (rev 3368)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1333 uuid: bc9001c2-8816-4b4e-bf91-8e11cad6ed6b
+ CCodeGenerator VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1333 uuid: bc9001c2-8816-4b4e-bf91-8e11cad6ed6b
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1333 uuid: bc9001c2-8816-4b4e-bf91-8e11cad6ed6b " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -450,6 +450,7 @@
static AbstractInstruction * concretizeSubRdRd(AbstractInstruction * self_in_concretizeSubRdRd) NoDbgRegParms;
static sqInt cResultRegister(AbstractInstruction * self_in_cResultRegister) NoDbgRegParms;
static sqInt dataOpTyperdrnrmlsr(AbstractInstruction * self_in_dataOpTyperdrnrmlsr, sqInt armOpcode, sqInt destReg, sqInt srcReg, sqInt addReg, sqInt shft) NoDbgRegParms;
+sqInt defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize);
static void dispatchConcretize(AbstractInstruction * self_in_dispatchConcretize) NoDbgRegParms;
static sqInt extract32BitOperandFrom4InstructionsPreceeding(AbstractInstruction * self_in_extract32BitOperandFrom4InstructionsPreceeding, sqInt addr) NoDbgRegParms;
static sqInt fullCallsAreRelative(AbstractInstruction * self_in_fullCallsAreRelative) NoDbgRegParms;
@@ -751,7 +752,6 @@
static void relocateCallsAndSelfReferencesInMethod(CogMethod *cogMethod) NoDbgRegParms;
static void relocateCallsInClosedPIC(CogMethod *cPIC) NoDbgRegParms;
static sqInt relocateIfCallOrMethodReferencemcpcdelta(sqInt annotation, char *mcpc, sqInt delta) NoDbgRegParms;
-static sqInt relocateMethodsPreCompaction(void);
static sqInt remapIfObjectRefpchasYoung(sqInt annotation, char *mcpc, sqInt hasYoungPtr) NoDbgRegParms;
static AbstractInstruction * gSubCwR(sqInt wordConstant, sqInt reg) NoDbgRegParms;
static sqInt scanForCleanBlocks(void);
@@ -805,6 +805,7 @@
void printOpenPICList(void);
static sqInt pruneYoungReferrers(void);
static sqInt relocateAndPruneYoungReferrers(void);
+static sqInt relocateMethodsPreCompaction(void);
static sqInt removeFromOpenPICList(CogMethod *anOpenPIC) NoDbgRegParms;
static sqInt removeFromUnpairedMethodList(CogMethod *aCogMethod) NoDbgRegParms;
static void voidYoungReferrersPostTenureAll(void);
@@ -813,6 +814,8 @@
static AbstractInstruction * genCmpClassFloatCompactIndexR(sqInt reg) NoDbgRegParms;
static AbstractInstruction * genCmpClassMethodContextCompactIndexR(sqInt reg) NoDbgRegParms;
static sqInt genInnerPrimitiveNewMethod(sqInt retNoffset) NoDbgRegParms;
+static AbstractInstruction * genJumpNotSmallIntegerscratchReg(sqInt aRegister, sqInt scratch) NoDbgRegParms;
+static sqInt genLoadSlotsourceRegdestReg(sqInt index, sqInt sourceReg, sqInt destReg) NoDbgRegParms;
static sqInt isUnannotatableConstant(CogSimStackEntry *simStackEntry) NoDbgRegParms;
static sqInt genAddSmallIntegerTagsTo(sqInt aRegister) NoDbgRegParms;
static void genConvertCharacterToSmallIntegerInReg(sqInt reg) NoDbgRegParms;
@@ -840,7 +843,6 @@
static sqInt genInnerPrimitiveStringAt(sqInt retNoffset) NoDbgRegParms;
static AbstractInstruction * genJumpNotSmallIntegerInScratchReg(sqInt aRegister) NoDbgRegParms;
static AbstractInstruction * genJumpNotSmallInteger(sqInt aRegister) NoDbgRegParms;
-static AbstractInstruction * genJumpSmallIntegerInScratchReg(sqInt aRegister) NoDbgRegParms;
static AbstractInstruction * genJumpSmallInteger(sqInt aRegister) NoDbgRegParms;
static sqInt genNewArrayOfSizeinitialized(sqInt size, sqInt initialized) NoDbgRegParms;
static sqInt genNoPopCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(sqInt bcpc, sqInt numArgs, sqInt numCopied, sqInt ctxtNumArgs, sqInt isLargeCtxt, sqInt isInBlock) NoDbgRegParms;
@@ -864,9 +866,9 @@
static sqInt genConvertCharacterToCodeInReg(sqInt reg) NoDbgRegParms;
static sqInt genConvertIntegerToCharacterInReg(sqInt reg) NoDbgRegParms;
static sqInt genEnsureObjInRegNotForwardedscratchReg(sqInt reg, sqInt scratch) NoDbgRegParms;
-static sqInt genEnsureObjInRegNotForwardedscratchRegupdatingMwr(sqInt reg, sqInt scratch, sqInt offset, sqInt baseReg) NoDbgRegParms;
static sqInt genEnsureOopInRegNotForwardedscratchReg(sqInt reg, sqInt scratch) NoDbgRegParms;
static sqInt genEnsureOopInRegNotForwardedscratchRegjumpBackTo(sqInt reg, sqInt scratch, AbstractInstruction *instruction) NoDbgRegParms;
+static sqInt genEnsureOopInRegNotForwardedscratchRegupdatingMwr(sqInt reg, sqInt scratch, sqInt offset, sqInt baseReg) NoDbgRegParms;
static void generateObjectRepresentationTrampolines(void);
static sqInt genGetActiveContextNumArgslargeinBlock(sqInt numArgs, sqInt isLargeContext, sqInt isInBlock) NoDbgRegParms;
static sqInt genGetBitsofFormatByteOfintobaseHeaderIntoScratch(sqInt mask, sqInt sourceReg, sqInt destReg, sqInt scratchReg) NoDbgRegParms;
@@ -882,10 +884,8 @@
static sqInt genInnerPrimitiveCharacterValue(sqInt retNOffset) NoDbgRegParms;
static sqInt genInnerPrimitiveIdenticalorNotIf(sqInt retNoffset, sqInt orNot) NoDbgRegParms;
static sqInt genInnerPrimitiveSize(sqInt retNoffset) NoDbgRegParms;
-static AbstractInstruction * genJumpImmediateInScratchReg(sqInt aRegister) NoDbgRegParms;
static AbstractInstruction * genJumpImmediate(sqInt aRegister) NoDbgRegParms;
static AbstractInstruction * genJumpNotCharacterInScratchReg(sqInt reg) NoDbgRegParms;
-static sqInt genLoadSlotsourceRegdestReg(sqInt index, sqInt sourceReg, sqInt destReg) NoDbgRegParms;
static sqInt genStoreCheckReceiverRegvalueRegscratchReginFrame(sqInt destReg, sqInt valueReg, sqInt scratchReg, sqInt inFrame) NoDbgRegParms;
static sqInt genStoreImmediateInSourceRegslotIndexdestReg(sqInt sourceReg, sqInt index, sqInt destReg) NoDbgRegParms;
static sqInt genStoreSourceRegslotIndexdestRegscratchReginFrame(sqInt sourceReg, sqInt index, sqInt destReg, sqInt scratchReg, sqInt inFrame) NoDbgRegParms;
@@ -2959,6 +2959,18 @@
}
+/* Return the default number of bytes to allocate for native code at startup.
+ The actual value can be set via vmParameterAt: and/or a preference in the
+ ini file. */
+
+ /* CogARMCompiler>>#defaultCogCodeSize */
+sqInt
+defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize)
+{
+ return 1024 * 1400;
+}
+
+
/* Attempt to generate concrete machine code for the instruction at address.
This is the inner dispatch of concretizeAt: actualAddress which exists
only to get around the branch size limits in the SqueakV3 (blue book
@@ -8350,12 +8362,12 @@
}
return ceSendFromInLineCacheMiss(targetMethod);
}
- flushICacheFromto(processor, ((sqInt)pic), (((sqInt)pic)) + closedPICSize);
+ flushICacheFromto(processor, ((usqInt)pic), (((usqInt)pic)) + closedPICSize);
}
extent = (((pic->cmType)) == CMOpenPIC
? rewriteInlineCacheAttagtarget(backEnd, outerReturn, (targetMethod->selector), (((sqInt)pic)) + cmEntryOffset)
: rewriteCallAttarget(backEnd, outerReturn, (((sqInt)pic)) + cmEntryOffset));
- flushICacheFromto(processor, (outerReturn - 1) - extent, outerReturn - 1);
+ flushICacheFromto(processor, ((((usqInt)outerReturn)) - 1) - extent, (((usqInt)outerReturn)) - 1);
executeCogPICfromLinkedSendWithReceiverandCacheTag(pic, receiver, inlineCacheTagAt(backEnd, outerReturn));
return null;
}
@@ -9020,7 +9032,7 @@
address = addressOfEndOfCaseinCPIC(((cPIC->cPICNumCases)) - 1, cPIC);
size = generateInstructionsAt(address);
end = outputInstructionsAt(address);
- flushICacheFromto(processor, ((sqInt)cPIC), (((sqInt)cPIC)) + closedPICSize);
+ flushICacheFromto(processor, ((usqInt)cPIC), (((usqInt)cPIC)) + closedPICSize);
(cPIC->cPICNumCases = ((cPIC->cPICNumCases)) + 1);
return 0;
}
@@ -9367,7 +9379,7 @@
compactCompiledCode();
assert(allMethodsHaveCorrectHeader());
assert(kosherYoungReferrers());
- flushICacheFromto(processor, methodZoneBase, freeStart());
+ flushICacheFromto(processor, ((usqInt)methodZoneBase), ((usqInt)(freeStart())));
}
@@ -9914,7 +9926,7 @@
{
sqInt classIndex;
sqInt i;
- sqInt pc;
+ usqInt pc;
pc = (((((usqInt)cPIC)) + firstCPICCaseOffset) + cPICCaseSize) - (jumpLongConditionalByteSize(backEnd));
for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) {
@@ -10582,7 +10594,7 @@
/* begin RetN: */
genoperand(RetN, 0);
outputInstructionsForGeneratedRuntimeAt(startAddress);
- flushICacheFromto(processor, startAddress, methodZoneBase);
+ flushICacheFromto(processor, ((usqInt)startAddress), ((usqInt)methodZoneBase));
recordGeneratedRunTimeaddress("ceCaptureCStackPointers", startAddress);
ceCaptureCStackPointers = ((void (*)(void)) startAddress);
}
@@ -10931,7 +10943,7 @@
generateEnilopmarts();
generateTracingTrampolines();
recordGeneratedRunTimeaddress("methodZoneBase", methodZoneBase);
- flushICacheFromto(processor, methodZoneStart, methodZoneBase);
+ flushICacheFromto(processor, ((usqInt)methodZoneStart), ((usqInt)methodZoneBase));
}
/* Cogit>>#generateVMOwnerLockFunctions */
@@ -11116,7 +11128,7 @@
/* begin JumpR: */
genoperand(JumpR, TempReg);
jmpTarget(jumpMiss, gLabel());
- genEnsureObjInRegNotForwardedscratchRegupdatingMwr(ReceiverResultReg, TempReg, FoxMFReceiver, FPReg);
+ genEnsureOopInRegNotForwardedscratchRegupdatingMwr(ReceiverResultReg, TempReg, FoxMFReceiver, FPReg);
genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, TempReg);
return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(aRoutine, aString, 2, SendNumArgsReg, ReceiverResultReg, null, null, 0, 1, ReceiverResultReg, 1);
@@ -11744,7 +11756,7 @@
address = (((sqInt)targetMethod)) + theEntryOffset;
extent = rewriteInlineCacheAttagtarget(backEnd, callSiteReturnAddress, inlineCacheTag, address);
- flushICacheFromto(processor, (callSiteReturnAddress - 1) - extent, callSiteReturnAddress - 1);
+ flushICacheFromto(processor, ((((usqInt)callSiteReturnAddress)) - 1) - extent, (((usqInt)callSiteReturnAddress)) - 1);
}
/* Cogit>>#loadSubsequentBytesForDescriptor:at: */
@@ -12038,7 +12050,7 @@
/* After updating oops in inline caches we need to flush the icache. */
- flushICacheFromto(processor, codeBase, ((sqInt)(limitZony())));
+ flushICacheFromto(processor, ((usqInt)codeBase), ((usqInt)(limitZony())));
}
}
@@ -12113,7 +12125,7 @@
/* After updating oops in inline caches we need to flush the icache. */
- flushICacheFromto(processor, codeBase, ((sqInt)(limitZony())));
+ flushICacheFromto(processor, ((usqInt)codeBase), ((usqInt)(limitZony())));
}
}
@@ -12212,7 +12224,7 @@
/* After updating oops in inline caches we need to flush the icache. */
- flushICacheFromto(processor, methodZoneBase, ((sqInt)(limitZony())));
+ flushICacheFromto(processor, ((usqInt)methodZoneBase), ((usqInt)(limitZony())));
}
}
@@ -12380,7 +12392,7 @@
/* After updating oops in inline caches we need to flush the icache. */
- flushICacheFromto(processor, methodZoneBase, ((sqInt)(limitZony())));
+ flushICacheFromto(processor, ((usqInt)methodZoneBase), ((usqInt)(limitZony())));
}
}
@@ -13309,8 +13321,8 @@
}
}
extent = rewriteInlineCacheAttagtarget(backEnd, outerReturn, selector, (((sqInt)oPIC)) + cmEntryOffset);
- flushICacheFromto(processor, (outerReturn - 1) - extent, outerReturn - 1);
- flushICacheFromto(processor, ((sqInt)oPIC), (((sqInt)oPIC)) + openPICSize);
+ flushICacheFromto(processor, ((((usqInt)outerReturn)) - 1) - extent, (((usqInt)outerReturn)) - 1);
+ flushICacheFromto(processor, ((usqInt)oPIC), (((usqInt)oPIC)) + openPICSize);
executeCogMethodfromLinkedSendWithReceiver(oPIC, receiver);
return 1;
}
@@ -13649,14 +13661,14 @@
static sqInt
processorHasMultiplyAndMClassIsSmallInteger(sqInt ignoredPrimIndex)
{
- return 0;
+ return mclassIsSmallInteger(ignoredPrimIndex);
}
/* Cogit>>#processorHasMultiply: */
static sqInt
processorHasMultiply(sqInt ignoredPrimIndex)
{
- return 0;
+ return 1;
}
/* Cogit>>#RetN: */
@@ -13904,11 +13916,12 @@
}
targetMethod = ((CogMethod *) (entryPoint - offset1));
- if (((targetMethod->cmType)) == CMMethod) {
+ if (((targetMethod->cmType)) != CMFree) {
/* send target not freed; just relocate. */
relocateCallBeforeReturnPCby(backEnd, ((sqInt)mcpc), -(delta - ((targetMethod->objectHeader))));
+
return 0;
}
unlinkedRoutine = sendTable1[((((targetMethod->cmNumArgs)) < (NumSendTrampolines - 1)) ? ((targetMethod->cmNumArgs)) : (NumSendTrampolines - 1))];
@@ -13927,34 +13940,6 @@
return 0;
}
-
-/* All surviving methods have had the amount they are going to relocate by
- stored in their objectHeader fields. Relocate all relative calls so that
- after the compaction of both the method containing each call and the call
- target the calls invoke the same target. */
-
- /* Cogit>>#relocateMethodsPreCompaction */
-static sqInt
-relocateMethodsPreCompaction(void)
-{
- CogMethod *cogMethod;
-
- cogMethod = ((CogMethod *) methodZoneBase);
- while (cogMethod < (limitZony())) {
- if (((cogMethod->cmType)) != CMFree) {
- if (((cogMethod->cmType)) == CMClosedPIC) {
- relocateCallsInClosedPIC(cogMethod);
- }
- else {
- relocateCallsAndSelfReferencesInMethod(cogMethod);
- }
- }
- cogMethod = ((CogMethod *) (roundUpLength((((sqInt)cogMethod)) + ((cogMethod->blockSize)))));
- }
- relocateAndPruneYoungReferrers();
- return 1;
-}
-
/* Cogit>>#remapIfObjectRef:pc:hasYoung: */
static sqInt
remapIfObjectRefpchasYoung(sqInt annotation, char *mcpc, sqInt hasYoungPtr)
@@ -14289,7 +14274,7 @@
}
cogMethod = ((CogMethod *) (roundUpLength((((sqInt)cogMethod)) + ((cogMethod->blockSize)))));
}
- flushICacheFromto(processor, methodZoneBase, ((sqInt)(limitZony())));
+ flushICacheFromto(processor, ((usqInt)methodZoneBase), ((usqInt)(limitZony())));
}
/* Cogit>>#unlinkIfFreeOrLinkedSend:pc:of: */
@@ -14749,7 +14734,7 @@
/* After possibly updating inline caches we need to flush the icache. */
- flushICacheFromto(processor, methodZoneBase, ((sqInt)(limitZony())));
+ flushICacheFromto(processor, ((usqInt)methodZoneBase), ((usqInt)(limitZony())));
}
}
}
@@ -14853,7 +14838,7 @@
/* After possibly updating inline caches we need to flush the icache. */
- flushICacheFromto(processor, methodZoneBase, ((sqInt)(limitZony())));
+ flushICacheFromto(processor, ((usqInt)methodZoneBase), ((usqInt)(limitZony())));
}
}
@@ -14919,7 +14904,7 @@
/* After possibly updating inline caches we need to flush the icache. */
- flushICacheFromto(processor, methodZoneBase, ((sqInt)(limitZony())));
+ flushICacheFromto(processor, ((usqInt)methodZoneBase), ((usqInt)(limitZony())));
}
}
@@ -15003,7 +14988,7 @@
/* After possibly updating inline caches we need to flush the icache. */
- flushICacheFromto(processor, methodZoneBase, ((sqInt)(limitZony())));
+ flushICacheFromto(processor, ((usqInt)methodZoneBase), ((usqInt)(limitZony())));
}
}
}
@@ -15173,6 +15158,7 @@
unpairedMethodList = ((usqInt)source);
}
+
if (((source->cmType)) == CMOpenPIC) {
(source->nextOpenPIC = ((usqInt)openPICList));
openPICList = source;
@@ -15209,6 +15195,7 @@
}
}
else {
+ ;
if (((dest->cmType)) == CMOpenPIC) {
(dest->nextOpenPIC = ((usqInt)openPICList));
openPICList = dest;
@@ -15320,7 +15307,7 @@
/* Free methods, preferring older methods for compaction, up to some
- fraction.
+ fraction, currently a quarter.
*/
/* CogMethodZone>>#freeOlderMethodsForCompaction */
@@ -15349,7 +15336,7 @@
cogMethod = ((CogMethod *) baseAddress);
while (((((usqInt)cogMethod)) < mzFreeStart)
&& (freedSoFar < amountToFree)) {
- if ((((cogMethod->cmType)) == CMMethod)
+ if ((((cogMethod->cmType)) != CMFree)
&& (((cogMethod->cmUsageCount)) <= freeableUsage)) {
freeMethod(cogMethod);
freedSoFar += (cogMethod->blockSize);
@@ -15486,9 +15473,20 @@
}
-/* Some metods have been freed. Compute how much each survivor needs to
+/* Some methods have been freed. Compute how much each survivor needs to
move during the ensuing compaction and record it in the objectHeader
- field. */
+ field.
+ For Sista, where we want PICs to last so they can be observed, we need to
+ keep PICs unless
+ they are definitely unused. So we need to identify unused PICs. So in
+ planCompact, zero the
+ usage counts of all PICs, saving the actual usage count in
+ blockEntryOffset. Then in
+ relocateMethodsPreCompaction (actually in
+ relocateIfCallOrMethodReference:mcpc:delta:) restore the usage counts of
+ used PICs. Finally in compactCompiledCode, clear the blockEntryOffset
+ of the unused PICs; they will then have a zero count and be reclaimed in
+ the next code compaction. */
/* CogMethodZone>>#planCompaction */
static void
@@ -15506,6 +15504,7 @@
else {
assert((cogMethodDoesntLookKosher(cogMethod)) == 0);
(cogMethod->objectHeader = delta);
+
}
cogMethod = ((CogMethod *) (roundUpLength((((sqInt)cogMethod)) + ((cogMethod->blockSize)))));
}
@@ -15698,6 +15697,34 @@
youngReferrers = dest;
}
+
+/* All surviving methods have had the amount they are going to relocate by
+ stored in their objectHeader fields. Relocate all relative calls so that
+ after the compaction of both the method containing each call and the call
+ target the calls invoke the same target. */
+
+ /* CogMethodZone>>#relocateMethodsPreCompaction */
+static sqInt
+relocateMethodsPreCompaction(void)
+{
+ CogMethod *cogMethod;
+
+ cogMethod = ((CogMethod *) baseAddress);
+ while (cogMethod < mzFreeStart) {
+ if (((cogMethod->cmType)) != CMFree) {
+ if (((cogMethod->cmType)) == CMClosedPIC) {
+ relocateCallsInClosedPIC(cogMethod);
+ }
+ else {
+ relocateCallsAndSelfReferencesInMethod(cogMethod);
+ }
+ }
+ cogMethod = ((CogMethod *) (roundUpLength((((sqInt)cogMethod)) + ((cogMethod->blockSize)))));
+ }
+ relocateAndPruneYoungReferrers();
+ return 1;
+}
+
/* CogMethodZone>>#removeFromOpenPICList: */
static sqInt
removeFromOpenPICList(CogMethod *anOpenPIC)
@@ -15820,6 +15847,27 @@
return unimplementedPrimitive();
}
+
+/* Generate a compare and branch to test if aRegister contains other than a
+ SmallInteger. Answer the jump. Use scratch if required. Subclasses will
+ override if scratch is needed. */
+
+ /* CogObjectRepresentation>>#genJumpNotSmallInteger:scratchReg: */
+static AbstractInstruction *
+genJumpNotSmallIntegerscratchReg(sqInt aRegister, sqInt scratch)
+{
+ return genJumpNotSmallInteger(aRegister);
+}
+
+ /* CogObjectRepresentation>>#genLoadSlot:sourceReg:destReg: */
+static sqInt
+genLoadSlotsourceRegdestReg(sqInt index, sqInt sourceReg, sqInt destReg)
+{
+ /* begin MoveMw:r:R: */
+ genoperandoperandoperand(MoveMwrR, (index * BytesPerWord) + BaseHeaderSize, sourceReg, destReg);
+ return 0;
+}
+
/* CogObjectRepresentation>>#isUnannotatableConstant: */
static sqInt
isUnannotatableConstant(CogSimStackEntry *simStackEntry)
@@ -16405,7 +16453,7 @@
/* c.f. StackInterpreter>>stSizeOf: SpurMemoryManager>>lengthOf:format: fixedFieldsOf:format:length: */
jumpImmediate = genJumpImmediate(ReceiverResultReg);
- jumpBadIndex = genJumpNotSmallInteger(Arg0Reg);
+ jumpBadIndex = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg);
genConvertSmallIntegerToIntegerInReg(Arg0Reg);
/* begin SubCq:R: */
genoperandoperand(SubCqR, 1, Arg0Reg);
@@ -16471,9 +16519,7 @@
jmpTarget(jumpNotPointers, gCmpCqR(firstCompiledMethodFormat(), formatReg));
/* begin JumpAboveOrEqual: */
jumpIsCompiledMethod = genoperand(JumpAboveOrEqual, ((sqInt)0));
- /* begin MoveR:R: */
- genoperandoperand(MoveRR, Arg1Reg, TempReg);
- jumpNonSmallIntegerValue = genJumpNotSmallIntegerInScratchReg(TempReg);
+ jumpNonSmallIntegerValue = genJumpNotSmallIntegerscratchReg(Arg1Reg, TempReg);
/* begin CmpCq:R: */
quickConstant3 = firstByteFormat();
genoperandoperand(CmpCqR, quickConstant3, formatReg);
@@ -16797,15 +16843,11 @@
/* check size and fail if not a +ve integer */
maxSlots = (numSlotsMask()) - 1;
- /* begin MoveR:R: */
- genoperandoperand(MoveRR, Arg1Reg, TempReg);
/* Is the class arg pointers with at least 3 fields? */
- jumpNElementsNonInt = genJumpNotSmallIntegerInScratchReg(TempReg);
- /* begin MoveR:R: */
- genoperandoperand(MoveRR, Arg0Reg, TempReg);
- jumpImmediate = genJumpImmediateInScratchReg(TempReg);
+ jumpNElementsNonInt = genJumpNotSmallIntegerscratchReg(Arg1Reg, TempReg);
+ jumpImmediate = genJumpImmediate(Arg0Reg);
genGetFormatOfintoleastSignificantHalfOfBaseHeaderIntoScratch(Arg0Reg, TempReg, null);
/* begin CmpCq:R: */
quickConstant = nonIndexablePointerFormat();
@@ -17025,12 +17067,10 @@
/* begin MoveAw:R: */
address = freeStartAddress();
genoperandoperand(MoveAwR, address, Arg1Reg);
- /* begin MoveR:R: */
- genoperandoperand(MoveRR, Arg0Reg, TempReg);
/* Is the class arg pointers with at least 3 fields? */
- jumpImmediate = genJumpImmediateInScratchReg(TempReg);
+ jumpImmediate = genJumpImmediate(Arg0Reg);
genGetFormatOfintoleastSignificantHalfOfBaseHeaderIntoScratch(Arg0Reg, TempReg, null);
/* begin CmpCq:R: */
quickConstant = nonIndexablePointerFormat();
@@ -17046,10 +17086,10 @@
/* begin JumpZero: */
jumpUnhashed = genoperand(JumpZero, ((sqInt)0));
genLoadSlotsourceRegdestReg(InstanceSpecificationIndex, Arg0Reg, instSpecReg);
+ jumpBadFormat = genJumpNotSmallIntegerscratchReg(instSpecReg, TempReg);
+ genConvertSmallIntegerToIntegerInReg(instSpecReg);
/* begin MoveR:R: */
genoperandoperand(MoveRR, instSpecReg, TempReg);
- jumpBadFormat = genJumpNotSmallIntegerInScratchReg(TempReg);
- genConvertSmallIntegerToIntegerInReg(instSpecReg);
/* begin LogicalShiftRightCq:R: */
quickConstant1 = fixedFieldsFieldWidth();
genoperandoperand(LogicalShiftRightCqR, quickConstant1, TempReg);
@@ -17695,16 +17735,6 @@
return genoperand(JumpZero, ((sqInt)0));
}
- /* CogObjectRepresentationFor32BitSpur>>#genJumpSmallIntegerInScratchReg: */
-static AbstractInstruction *
-genJumpSmallIntegerInScratchReg(sqInt aRegister)
-{
- /* begin AndCq:R: */
- genoperandoperand(AndCqR, 1, aRegister);
- /* begin JumpNonZero: */
- return genoperand(JumpNonZero, ((sqInt)0));
-}
-
/* CogObjectRepresentationFor32BitSpur>>#genJumpSmallInteger: */
static AbstractInstruction *
genJumpSmallInteger(sqInt aRegister)
@@ -18119,34 +18149,31 @@
return 0;
}
+ /* CogObjectRepresentationForSpur>>#genEnsureOopInRegNotForwarded:scratchReg: */
+static sqInt
+genEnsureOopInRegNotForwardedscratchReg(sqInt reg, sqInt scratch)
+{
+ return genEnsureOopInRegNotForwardedscratchRegjumpBackTo(reg, scratch, gLabel());
+}
-/* Make sure that the object in reg is not forwarded, and the field
- reg[offset] is updated
- if the object in reg is forwarded. Use the fact that
- isForwardedObjectClassIndexPun is
- a power of two to save an instruction. */
-
- /* CogObjectRepresentationForSpur>>#genEnsureObjInRegNotForwarded:scratchReg:updatingMw:r: */
+ /* CogObjectRepresentationForSpur>>#genEnsureOopInRegNotForwarded:scratchReg:jumpBackTo: */
static sqInt
-genEnsureObjInRegNotForwardedscratchRegupdatingMwr(sqInt reg, sqInt scratch, sqInt offset, sqInt baseReg)
+genEnsureOopInRegNotForwardedscratchRegjumpBackTo(sqInt reg, sqInt scratch, AbstractInstruction *instruction)
{
+ AbstractInstruction *finished;
AbstractInstruction *imm;
- AbstractInstruction *loop;
AbstractInstruction *ok;
sqInt quickConstant;
+ /* begin genEnsureOopInRegNotForwarded:scratchReg:ifForwarder:ifNotForwarder: */
assert(reg != scratch);
- /* begin Label */
- loop = genoperandoperand(Label, (labelCounter += 1), bytecodePC);
- /* begin MoveR:R: */
- genoperandoperand(MoveRR, reg, scratch);
/* notionally
self genGetClassIndexOfNonImm: reg into: scratch.
cogit CmpCq: objectMemory isForwardedObjectClassIndexPun R: TempReg.
but the following is an instruction shorter: */
- imm = genJumpImmediateInScratchReg(scratch);
+ imm = genJumpImmediate(reg);
/* begin MoveMw:r:R: */
genoperandoperandoperand(MoveMwrR, 0, reg, scratch);
/* begin AndCq:R: */
@@ -18155,41 +18182,41 @@
/* begin JumpNonZero: */
ok = genoperand(JumpNonZero, ((sqInt)0));
genLoadSlotsourceRegdestReg(0, reg, reg);
- /* begin MoveR:Mw:r: */
- genoperandoperandoperand(MoveRMwr, reg, offset, baseReg);
/* begin Jump: */
- genoperand(Jump, ((sqInt)loop));
- jmpTarget(ok, jmpTarget(imm, gLabel()));
+ genoperand(Jump, ((sqInt)(((void *) instruction))));
+ /* begin Label */
+ finished = genoperandoperand(Label, (labelCounter += 1), bytecodePC);
+
+ jmpTarget(imm, jmpTarget(ok, finished));
return 0;
}
- /* CogObjectRepresentationForSpur>>#genEnsureOopInRegNotForwarded:scratchReg: */
-static sqInt
-genEnsureOopInRegNotForwardedscratchReg(sqInt reg, sqInt scratch)
-{
- return genEnsureOopInRegNotForwardedscratchRegjumpBackTo(reg, scratch, gLabel());
-}
- /* CogObjectRepresentationForSpur>>#genEnsureOopInRegNotForwarded:scratchReg:jumpBackTo: */
+/* Make sure that the oop in reg is not forwarded, and the field reg[offset]
+ is updated
+ if the object in reg is forwarded. Use the fact that
+ isForwardedObjectClassIndexPun is
+ a power of two to save an instruction. */
+
+ /* CogObjectRepresentationForSpur>>#genEnsureOopInRegNotForwarded:scratchReg:updatingMw:r: */
static sqInt
-genEnsureOopInRegNotForwardedscratchRegjumpBackTo(sqInt reg, sqInt scratch, AbstractInstruction *instruction)
+genEnsureOopInRegNotForwardedscratchRegupdatingMwr(sqInt reg, sqInt scratch, sqInt offset, sqInt baseReg)
{
- AbstractInstruction *finished;
+ AbstractInstruction *imm;
+ AbstractInstruction *loop;
AbstractInstruction *ok;
sqInt quickConstant;
- AbstractInstruction *skip;
- /* begin genEnsureOopInRegNotForwarded:scratchReg:ifForwarder:ifNotForwarder: */
assert(reg != scratch);
- /* begin MoveR:R: */
- genoperandoperand(MoveRR, reg, scratch);
+ /* begin Label */
+ loop = genoperandoperand(Label, (labelCounter += 1), bytecodePC);
/* notionally
self genGetClassIndexOfNonImm: reg into: scratch.
cogit CmpCq: objectMemory isForwardedObjectClassIndexPun R: TempReg.
but the following is an instruction shorter: */
- skip = genJumpImmediateInScratchReg(scratch);
+ imm = genJumpImmediate(reg);
/* begin MoveMw:r:R: */
genoperandoperandoperand(MoveMwrR, 0, reg, scratch);
/* begin AndCq:R: */
@@ -18198,12 +18225,11 @@
/* begin JumpNonZero: */
ok = genoperand(JumpNonZero, ((sqInt)0));
genLoadSlotsourceRegdestReg(0, reg, reg);
+ /* begin MoveR:Mw:r: */
+ genoperandoperandoperand(MoveRMwr, reg, offset, baseReg);
/* begin Jump: */
- genoperand(Jump, ((sqInt)(((void *) instruction))));
- /* begin Label */
- finished = genoperandoperand(Label, (labelCounter += 1), bytecodePC);
-
- jmpTarget(skip, jmpTarget(ok, finished));
+ genoperand(Jump, ((sqInt)loop));
+ jmpTarget(ok, jmpTarget(imm, gLabel()));
return 0;
}
@@ -18656,19 +18682,6 @@
return 0;
}
- /* CogObjectRepresentationForSpur>>#genJumpImmediateInScratchReg: */
-static AbstractInstruction *
-genJumpImmediateInScratchReg(sqInt aRegister)
-{
- sqInt quickConstant;
-
- /* begin AndCq:R: */
- quickConstant = tagMask();
- genoperandoperand(AndCqR, quickConstant, aRegister);
- /* begin JumpNonZero: */
- return genoperand(JumpNonZero, ((sqInt)0));
-}
-
/* CogObjectRepresentationForSpur>>#genJumpImmediate: */
static AbstractInstruction *
genJumpImmediate(sqInt aRegister)
@@ -18699,16 +18712,7 @@
return genoperand(JumpNonZero, ((sqInt)0));
}
- /* CogObjectRepresentationForSpur>>#genLoadSlot:sourceReg:destReg: */
-static sqInt
-genLoadSlotsourceRegdestReg(sqInt index, sqInt sourceReg, sqInt destReg)
-{
- /* begin MoveMw:r:R: */
- genoperandoperandoperand(MoveMwrR, (index * BytesPerWord) + BaseHeaderSize, sourceReg, destReg);
- return 0;
-}
-
/* Generate the code for a store check of valueReg into destReg. */
/* CogObjectRepresentationForSpur>>#genStoreCheckReceiverReg:valueReg:scratchReg:inFrame: */
@@ -20920,7 +20924,7 @@
address = (((usqInt)cogMethod)) + (externalPrimCallOffsets[(cogMethod->cmNumArgs)]);
extent = rewriteFullTransferAttargetexpectedInstruction(backEnd, address, ((usqInt)primFunctionPointer), 3778019132UL);
}
- flushICacheFromto(processor, address, address + extent);
+ flushICacheFromto(processor, ((usqInt)address), (((usqInt)address)) + extent);
}
/* SimpleStackBasedCogit>>#v3:Block:Code:Size: */
@@ -21802,10 +21806,8 @@
/* begin MoveMw:r:R: */
offset2 = (((usqInt)(methodCacheAddress()))) + (MethodCacheMethod << (shiftForWord()));
genoperandoperandoperand(MoveMwrR, offset2, ClassReg, SendNumArgsReg);
- genLoadSlotsourceRegdestReg(HeaderIndex, SendNumArgsReg, TempReg);
- /* begin MoveR:R: */
- genoperandoperand(MoveRR, TempReg, ClassReg);
- jumpBCMethod = genJumpSmallIntegerInScratchReg(TempReg);
+ genLoadSlotsourceRegdestReg(HeaderIndex, SendNumArgsReg, ClassReg);
+ jumpBCMethod = genJumpImmediate(ClassReg);
jmpTarget(jumpBCMethod, picInterpretAbort);
/* begin AddCq:R: */
genoperandoperand(AddCqR, cmNoCheckEntryOffset, ClassReg);
@@ -22598,12 +22600,10 @@
AbstractInstruction *jumpImmediate;
AbstractInstruction *jumpNonInt;
- /* begin MoveR:R: */
- genoperandoperand(MoveRR, Arg0Reg, TempReg);
genGetDoubleValueOfinto(ReceiverResultReg, DPFPReg0);
/* begin MoveR:R: */
genoperandoperand(MoveRR, Arg0Reg, ClassReg);
- jumpImmediate = genJumpImmediateInScratchReg(TempReg);
+ jumpImmediate = genJumpImmediate(Arg0Reg);
genGetCompactClassIndexNonImmOfinto(Arg0Reg, SendNumArgsReg);
genCmpClassFloatCompactIndexR(SendNumArgsReg);
/* begin JumpNonZero: */
@@ -22629,7 +22629,7 @@
/* begin Jump: */
jumpFailClass = genoperand(Jump, ((sqInt)0));
jmpTarget(jumpImmediate, gLabel());
- jumpNonInt = genJumpNotSmallIntegerInScratchReg(TempReg);
+ jumpNonInt = genJumpNotSmallInteger(Arg0Reg);
genConvertSmallIntegerToIntegerInReg(ClassReg);
/* begin ConvertR:Rd: */
@@ -22660,10 +22660,8 @@
AbstractInstruction *jumpImmediate;
AbstractInstruction *jumpNonInt;
- /* begin MoveR:R: */
- genoperandoperand(MoveRR, Arg0Reg, TempReg);
genGetDoubleValueOfinto(ReceiverResultReg, DPFPReg0);
- jumpImmediate = genJumpImmediateInScratchReg(TempReg);
+ jumpImmediate = genJumpImmediate(Arg0Reg);
genGetCompactClassIndexNonImmOfinto(Arg0Reg, SendNumArgsReg);
genCmpClassFloatCompactIndexR(SendNumArgsReg);
/* begin JumpNonZero: */
@@ -22700,7 +22698,7 @@
/* begin RetN: */
genoperand(RetN, 0);
jmpTarget(jumpImmediate, gLabel());
- jumpNonInt = genJumpNotSmallIntegerInScratchReg(TempReg);
+ jumpNonInt = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg);
genConvertSmallIntegerToIntegerInReg(Arg0Reg);
/* begin ConvertR:Rd: */
@@ -23313,10 +23311,8 @@
AbstractInstruction *jumpOvfl;
/* begin MoveR:R: */
- genoperandoperand(MoveRR, Arg0Reg, TempReg);
- /* begin MoveR:R: */
genoperandoperand(MoveRR, Arg0Reg, ClassReg);
- jumpNotSI = genJumpNotSmallIntegerInScratchReg(TempReg);
+ jumpNotSI = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg);
genRemoveSmallIntegerTagsInScratchReg(ClassReg);
/* begin AddR:R: */
genoperandoperand(AddRR, ReceiverResultReg, ClassReg);
@@ -23400,12 +23396,10 @@
{
AbstractInstruction *jumpNotSI;
- /* begin MoveR:R: */
- genoperandoperand(MoveRR, Arg0Reg, TempReg);
/* Whether the SmallInteger tags are zero or non-zero, oring them together will preserve them. */
- jumpNotSI = genJumpNotSmallIntegerInScratchReg(TempReg);
+ jumpNotSI = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg);
/* begin AndR:R: */
genoperandoperand(AndRR, Arg0Reg, ReceiverResultReg);
/* begin RetN: */
@@ -23420,12 +23414,10 @@
{
AbstractInstruction *jumpNotSI;
- /* begin MoveR:R: */
- genoperandoperand(MoveRR, Arg0Reg, TempReg);
/* Whether the SmallInteger tags are zero or non-zero, oring them together will preserve them. */
- jumpNotSI = genJumpNotSmallIntegerInScratchReg(TempReg);
+ jumpNotSI = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg);
/* begin OrR:R: */
genoperandoperand(OrRR, Arg0Reg, ReceiverResultReg);
/* begin RetN: */
@@ -23487,10 +23479,8 @@
assert((numRegArgs()) >= 1);
/* begin MoveR:R: */
- genoperandoperand(MoveRR, Arg0Reg, TempReg);
- /* begin MoveR:R: */
genoperandoperand(MoveRR, Arg0Reg, ClassReg);
- jumpNotSI = genJumpNotSmallIntegerInScratchReg(TempReg);
+ jumpNotSI = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg);
genConvertSmallIntegerToIntegerInReg(ClassReg);
if (!(setsConditionCodesFor(lastOpcode(), JumpNegative))) {
/* begin CmpCq:R: */
@@ -23542,12 +23532,10 @@
{
AbstractInstruction *jumpNotSI;
- /* begin MoveR:R: */
- genoperandoperand(MoveRR, Arg0Reg, TempReg);
/* Clear one or the other tag so that xoring will preserve them. */
- jumpNotSI = genJumpNotSmallIntegerInScratchReg(TempReg);
+ jumpNotSI = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg);
genRemoveSmallIntegerTagsInScratchReg(Arg0Reg);
/* begin XorR:R: */
genoperandoperand(XorRR, Arg0Reg, ReceiverResultReg);
@@ -23641,6 +23629,9 @@
genCmpClassMethodContextCompactIndexR(TempReg);
/* begin JumpNonZero: */
jumpFail2 = genoperand(JumpNonZero, ((sqInt)0));
+ genLoadSlotsourceRegdestReg(ReceiverIndex, ClassReg, SendNumArgsReg);
+ genEnsureOopInRegNotForwardedscratchRegupdatingMwr(SendNumArgsReg, TempReg, (ReceiverIndex * BytesPerWord) + BaseHeaderSize, ClassReg);
+
genLoadSlotsourceRegdestReg(MethodIndex, ClassReg, SendNumArgsReg);
jumpFail3 = genJumpImmediate(SendNumArgsReg);
genGetFormatOfinto(SendNumArgsReg, TempReg);
@@ -23685,8 +23676,6 @@
AbstractInstruction *jumpZero;
/* begin MoveR:R: */
- genoperandoperand(MoveRR, Arg0Reg, TempReg);
- /* begin MoveR:R: */
genoperandoperand(MoveRR, Arg0Reg, ClassReg);
/* begin MoveR:R: */
genoperandoperand(MoveRR, Arg0Reg, Arg1Reg);
@@ -23694,7 +23683,7 @@
/* We must shift away the tags, not just subtract them, so that the
overflow case doesn't actually overflow the machine instruction. */
- jumpNotSI = genJumpNotSmallIntegerInScratchReg(TempReg);
+ jumpNotSI = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg);
genShiftAwaySmallIntegerTagsInScratchReg(ClassReg);
if (!(setsConditionCodesFor(lastOpcode(), JumpZero))) {
/* begin CmpCq:R: */
@@ -23744,14 +23733,12 @@
sqInt quickConstant;
/* begin MoveR:R: */
- genoperandoperand(MoveRR, Arg0Reg, TempReg);
- /* begin MoveR:R: */
genoperandoperand(MoveRR, Arg0Reg, ClassReg);
/* We must shift away the tags, not just subtract them, so that the
overflow case doesn't actually overflow the machine instruction. */
- jumpNotSI = genJumpNotSmallIntegerInScratchReg(TempReg);
+ jumpNotSI = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg);
genShiftAwaySmallIntegerTagsInScratchReg(ClassReg);
/* begin JumpZero: */
jumpZero = genoperand(JumpZero, ((sqInt)0));
@@ -23829,10 +23816,8 @@
AbstractInstruction *jumpZero;
/* begin MoveR:R: */
- genoperandoperand(MoveRR, Arg0Reg, TempReg);
- /* begin MoveR:R: */
genoperandoperand(MoveRR, Arg0Reg, ClassReg);
- jumpNotSI = genJumpNotSmallIntegerInScratchReg(TempReg);
+ jumpNotSI = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg);
genRemoveSmallIntegerTagsInScratchReg(ClassReg);
/* begin JumpZero: */
jumpZero = genoperand(JumpZero, ((sqInt)0));
@@ -23876,12 +23861,10 @@
AbstractInstruction *jumpOvfl;
/* begin MoveR:R: */
- genoperandoperand(MoveRR, Arg0Reg, TempReg);
- /* begin MoveR:R: */
genoperandoperand(MoveRR, Arg0Reg, ClassReg);
/* begin MoveR:R: */
genoperandoperand(MoveRR, ReceiverResultReg, Arg1Reg);
- jumpNotSI = genJumpNotSmallIntegerInScratchReg(TempReg);
+ jumpNotSI = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg);
genShiftAwaySmallIntegerTagsInScratchReg(ClassReg);
genRemoveSmallIntegerTagsInScratchReg(Arg1Reg);
gMulRR(Arg1Reg, ClassReg);
@@ -23979,14 +23962,12 @@
sqInt quickConstant;
/* begin MoveR:R: */
- genoperandoperand(MoveRR, Arg0Reg, TempReg);
- /* begin MoveR:R: */
genoperandoperand(MoveRR, Arg0Reg, ClassReg);
/* We must shift away the tags, not just subtract them, so that the
overflow case doesn't actually overflow the machine instruction. */
- jumpNotSI = genJumpNotSmallIntegerInScratchReg(TempReg);
+ jumpNotSI = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg);
genShiftAwaySmallIntegerTagsInScratchReg(ClassReg);
if (!(setsConditionCodesFor(lastOpcode(), JumpZero))) {
/* begin CmpCq:R: */
@@ -24057,10 +24038,8 @@
AbstractInstruction *jumpNotSI;
AbstractInstruction *jumpOvfl;
+ jumpNotSI = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg);
/* begin MoveR:R: */
- genoperandoperand(MoveRR, Arg0Reg, TempReg);
- jumpNotSI = genJumpNotSmallIntegerInScratchReg(TempReg);
- /* begin MoveR:R: */
genoperandoperand(MoveRR, ReceiverResultReg, TempReg);
/* begin SubR:R: */
genoperandoperand(SubRR, Arg0Reg, TempReg);
@@ -24485,9 +24464,7 @@
AbstractInstruction *jumpFail;
AbstractInstruction *jumpTrue;
- /* begin MoveR:R: */
- genoperandoperand(MoveRR, Arg0Reg, TempReg);
- jumpFail = genJumpNotSmallIntegerInScratchReg(TempReg);
+ jumpFail = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg);
/* begin CmpR:R: */
genoperandoperand(CmpRR, Arg0Reg, ReceiverResultReg);
jumpTrue = gen(jumpOpcode);
@@ -24528,9 +24505,7 @@
return genSmallIntegerComparison(jumpOpcode);
- /* begin MoveR:R: */
- genoperandoperand(MoveRR, Arg0Reg, TempReg);
- jumpDouble = genJumpNotSmallIntegerInScratchReg(TempReg);
+ jumpDouble = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg);
/* begin CmpR:R: */
genoperandoperand(CmpRR, Arg0Reg, ReceiverResultReg);
jumpTrue = gen(jumpOpcode);
@@ -24550,9 +24525,7 @@
/* begin RetN: */
genoperand(RetN, 0);
jmpTarget(jumpDouble, gLabel());
- /* begin MoveR:R: */
- genoperandoperand(MoveRR, ClassReg, TempReg);
- jumpNonInt = genJumpImmediateInScratchReg(TempReg);
+ jumpNonInt = genJumpImmediate(Arg0Reg);
genGetCompactClassIndexNonImmOfinto(Arg0Reg, SendNumArgsReg);
genCmpClassFloatCompactIndexR(SendNumArgsReg);
@@ -24981,6 +24954,8 @@
AbstractInstruction *finished;
AbstractInstruction *finished1;
usqInt fixup;
+ AbstractInstruction *imm;
+ AbstractInstruction *imm1;
void *jumpTarget;
void *jumpTarget1;
AbstractInstruction *label;
@@ -25003,8 +24978,6 @@
sqInt rNext1;
sqInt rTop;
sqInt rTop1;
- AbstractInstruction *skip;
- AbstractInstruction *skip1;
sqInt target;
sqInt targetBytecodePC;
sqInt targetBytecodePC1;
@@ -25158,15 +25131,13 @@
else {
/* begin genEnsureOopInRegNotForwarded:scratchReg:ifForwarder:ifNotForwarder: */
assert(argReg != TempReg);
- /* begin MoveR:R: */
- genoperandoperand(MoveRR, argReg, TempReg);
/* notionally
self genGetClassIndexOfNonImm: reg into: scratch.
cogit CmpCq: objectMemory isForwardedObjectClassIndexPun R: TempReg.
but the following is an instruction shorter: */
- skip = genJumpImmediateInScratchReg(TempReg);
+ imm = genJumpImmediate(argReg);
/* begin MoveMw:r:R: */
genoperandoperandoperand(MoveMwrR, 0, argReg, TempReg);
/* begin AndCq:R: */
@@ -25184,22 +25155,20 @@
else {
finished = ((AbstractInstruction *) fixup);
}
- jmpTarget(skip, jmpTarget(ok, finished));
+ jmpTarget(imm, jmpTarget(ok, finished));
0;
}
}
if (unforwardRcvr) {
/* begin genEnsureOopInRegNotForwarded:scratchReg:ifForwarder:ifNotForwarder: */
assert(rcvrReg != TempReg);
- /* begin MoveR:R: */
- genoperandoperand(MoveRR, rcvrReg, TempReg);
/* notionally
self genGetClassIndexOfNonImm: reg into: scratch.
cogit CmpCq: objectMemory isForwardedObjectClassIndexPun R: TempReg.
but the following is an instruction shorter: */
- skip1 = genJumpImmediateInScratchReg(TempReg);
+ imm1 = genJumpImmediate(rcvrReg);
/* begin MoveMw:r:R: */
genoperandoperandoperand(MoveMwrR, 0, rcvrReg, TempReg);
/* begin AndCq:R: */
@@ -25217,7 +25186,7 @@
else {
finished1 = ((AbstractInstruction *) fixup);
}
- jmpTarget(skip1, jmpTarget(ok1, finished1));
+ jmpTarget(imm1, jmpTarget(ok1, finished1));
0;
}
return 0;
Modified: branches/Cog/nsspursrc/vm/cogitIA32.c
===================================================================
--- branches/Cog/nsspursrc/vm/cogitIA32.c 2015-06-03 16:00:39 UTC (rev 3367)
+++ branches/Cog/nsspursrc/vm/cogitIA32.c 2015-06-04 05:19:31 UTC (rev 3368)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1333 uuid: bc9001c2-8816-4b4e-bf91-8e11cad6ed6b
+ CCodeGenerator VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1333 uuid: bc9001c2-8816-4b4e-bf91-8e11cad6ed6b
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1333 uuid: bc9001c2-8816-4b4e-bf91-8e11cad6ed6b " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -394,6 +394,7 @@
static sqInt abstractRegisterForConcreteRegister(AbstractInstruction * self_in_abstractRegisterForConcreteRegister, sqInt reg) NoDbgRegParms;
static AbstractInstruction * addDependent(AbstractInstruction * self_in_addDependent, AbstractInstruction *anInstruction) NoDbgRegParms;
static sqInt availableRegisterOrNilFor(AbstractInstruction * self_in_availableRegisterOrNilFor, sqInt liveRegsMask) NoDbgRegParms;
+sqInt defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize);
static sqInt genAlignCStackSavingRegistersnumArgswordAlignment(AbstractInstruction * self_in_genAlignCStackSavingRegistersnumArgswordAlignment, sqInt saveRegs, sqInt numArgs, sqInt alignment) NoDbgRegParms;
static AbstractInstruction * generateICacheFlush(AbstractInstruction * self_in_generateICacheFlush) NoDbgRegParms;
static AbstractInstruction * genWriteCResultIntoReg(AbstractInstruction * self_in_genWriteCResultIntoReg, sqInt abstractRegister) NoDbgRegParms;
@@ -696,7 +697,6 @@
static void relocateCallsAndSelfReferencesInMethod(CogMethod *cogMethod) NoDbgRegParms;
static void relocateCallsInClosedPIC(CogMethod *cPIC) NoDbgRegParms;
static sqInt relocateIfCallOrMethodReferencemcpcdelta(sqInt annotation, char *mcpc, sqInt delta) NoDbgRegParms;
-static sqInt relocateMethodsPreCompaction(void);
static sqInt remapIfObjectRefpchasYoung(sqInt annotation, char *mcpc, sqInt hasYoungPtr) NoDbgRegParms;
static AbstractInstruction * gSubCwR(sqInt wordConstant, sqInt reg) NoDbgRegParms;
static sqInt scanForCleanBlocks(void);
@@ -750,6 +750,7 @@
void printOpenPICList(void);
static sqInt pruneYoungReferrers(void);
static sqInt relocateAndPruneYoungReferrers(void);
+static sqInt relocateMethodsPreCompaction(void);
static sqInt removeFromOpenPICList(CogMethod *anOpenPIC) NoDbgRegParms;
static sqInt removeFromUnpairedMethodList(CogMethod *aCogMethod) NoDbgRegParms;
static void voidYoungReferrersPostTenureAll(void);
@@ -758,6 +759,8 @@
static AbstractInstruction * genCmpClassFloatCompactIndexR(sqInt reg) NoDbgRegParms;
static AbstractInstruction * genCmpClassMethodContextCompactIndexR(sqInt reg) NoDbgRegParms;
static sqInt genInnerPrimitiveNewMethod(sqInt retNoffset) NoDbgRegParms;
+static AbstractInstruction * genJumpNotSmallIntegerscratchReg(sqInt aRegister, sqInt scratch) NoDbgRegParms;
+static sqInt genLoadSlotsourceRegdestReg(sqInt index, sqInt sourceReg, sqInt destReg) NoDbgRegParms;
static sqInt isUnannotatableConstant(CogSimStackEntry *simStackEntry) NoDbgRegParms;
static sqInt genAddSmallIntegerTagsTo(sqInt aRegister) NoDbgRegParms;
static void genConvertCharacterToSmallIntegerInReg(sqInt reg) NoDbgRegParms;
@@ -785,7 +788,6 @@
static sqInt genInnerPrimitiveStringAt(sqInt retNoffset) NoDbgRegParms;
static AbstractInstruction * genJumpNotSmallIntegerInScratchReg(sqInt aRegister) NoDbgRegParms;
static AbstractInstruction * genJumpNotSmallInteger(sqInt aRegister) NoDbgRegParms;
-static AbstractInstruction * genJumpSmallIntegerInScratchReg(sqInt aRegister) NoDbgRegParms;
static AbstractInstruction * genJumpSmallInteger(sqInt aRegister) NoDbgRegParms;
static sqInt genNewArrayOfSizeinitialized(sqInt size, sqInt initialized) NoDbgRegParms;
static sqInt genNoPopCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(sqInt bcpc, sqInt numArgs, sqInt numCopied, sqInt ctxtNumArgs, sqInt isLargeCtxt, sqInt isInBlock) NoDbgRegParms;
@@ -809,9 +811,9 @@
static sqInt genConvertCharacterToCodeInReg(sqInt reg) NoDbgRegParms;
static sqInt genConvertIntegerToCharacterInReg(sqInt reg) NoDbgRegParms;
static sqInt genEnsureObjInRegNotForwardedscratchReg(sqInt reg, sqInt scratch) NoDbgRegParms;
-static sqInt genEnsureObjInRegNotForwardedscratchRegupdatingMwr(sqInt reg, sqInt scratch, sqInt offset, sqInt baseReg) NoDbgRegParms;
static sqInt genEnsureOopInRegNotForwardedscratchReg(sqInt reg, sqInt scratch) NoDbgRegParms;
static sqInt genEnsureOopInRegNotForwardedscratchRegjumpBackTo(sqInt reg, sqInt scratch, AbstractInstruction *instruction) NoDbgRegParms;
+static sqInt genEnsureOopInRegNotForwardedscratchRegupdatingMwr(sqInt reg, sqInt scratch, sqInt offset, sqInt baseReg) NoDbgRegParms;
static void generateObjectRepresentationTrampolines(void);
static sqInt genGetActiveContextNumArgslargeinBlock(sqInt numArgs, sqInt isLargeContext, sqInt isInBlock) NoDbgRegParms;
static sqInt genGetBitsofFormatByteOfintobaseHeaderIntoScratch(sqInt mask, sqInt sourceReg, sqInt destReg, sqInt scratchReg) NoDbgRegParms;
@@ -827,10 +829,8 @@
static sqInt genInnerPrimitiveCharacterValue(sqInt retNOffset) NoDbgRegParms;
static sqInt genInnerPrimitiveIdenticalorNotIf(sqInt retNoffset, sqInt orNot) NoDbgRegParms;
static sqInt genInnerPrimitiveSize(sqInt retNoffset) NoDbgRegParms;
-static AbstractInstruction * genJumpImmediateInScratchReg(sqInt aRegister) NoDbgRegParms;
static AbstractInstruction * genJumpImmediate(sqInt aRegister) NoDbgRegParms;
static AbstractInstruction * genJumpNotCharacterInScratchReg(sqInt reg) NoDbgRegParms;
-static sqInt genLoadSlotsourceRegdestReg(sqInt index, sqInt sourceReg, sqInt destReg) NoDbgRegParms;
static sqInt genStoreCheckReceiverRegvalueRegscratchReginFrame(sqInt destReg, sqInt valueReg, sqInt scratchReg, sqInt inFrame) NoDbgRegParms;
static sqInt genStoreImmediateInSourceRegslotIndexdestReg(sqInt sourceReg, sqInt index, sqInt destReg) NoDbgRegParms;
static sqInt genStoreSourceRegslotIndexdestRegscratchReginFrame(sqInt sourceReg, sqInt index, sqInt destReg, sqInt scratchReg, sqInt inFrame) NoDbgRegParms;
@@ -1966,6 +1966,18 @@
return null;
}
+
+/* Return the default number of bytes to allocate for native code at startup.
+ The actual value can be set via vmParameterAt: and/or a preference in the
+ ini file. */
+
+ /* CogAbstractInstruction>>#defaultCogCodeSize */
+sqInt
+defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize)
+{
+ return 1024 * 1024;
+}
+
/* CogAbstractInstruction>>#genAlignCStackSavingRegisters:numArgs:wordAlignment: */
static sqInt
genAlignCStackSavingRegistersnumArgswordAlignment(AbstractInstruction * self_in_genAlignCStackSavingRegistersnumArgswordAlignment, sqInt saveRegs, sqInt numArgs, sqInt alignment)
@@ -7149,12 +7161,12 @@
}
return ceSendFromInLineCacheMiss(targetMethod);
}
- flushICacheFromto(processor, ((sqInt)pic), (((sqInt)pic)) + closedPICSize);
+ flushICacheFromto(processor, ((usqInt)pic), (((usqInt)pic)) + closedPICSize);
}
extent = (((pic->cmType)) == CMOpenPIC
? rewriteInlineCacheAttagtarget(backEnd, outerReturn, (targetMethod->selector), (((sqInt)pic)) + cmEntryOffset)
: rewriteCallAttarget(backEnd, outerReturn, (((sqInt)pic)) + cmEntryOffset));
- flushICacheFromto(processor, (outerReturn - 1) - extent, outerReturn - 1);
+ flushICacheFromto(processor, ((((usqInt)outerReturn)) - 1) - extent, (((usqInt)outerReturn)) - 1);
executeCogPICfromLinkedSendWithReceiverandCacheTag(pic, receiver, inlineCacheTagAt(backEnd, outerReturn));
return null;
}
@@ -7819,7 +7831,7 @@
address = addressOfEndOfCaseinCPIC(((cPIC->cPICNumCases)) - 1, cPIC);
size = generateInstructionsAt(address);
end = outputInstructionsAt(address);
- flushICacheFromto(processor, ((sqInt)cPIC), (((sqInt)cPIC)) + closedPICSize);
+ flushICacheFromto(processor, ((usqInt)cPIC), (((usqInt)cPIC)) + closedPICSize);
(cPIC->cPICNumCases = ((cPIC->cPICNumCases)) + 1);
return 0;
}
@@ -8166,7 +8178,7 @@
compactCompiledCode();
assert(allMethodsHaveCorrectHeader());
assert(kosherYoungReferrers());
- flushICacheFromto(processor, methodZoneBase, freeStart());
+ flushICacheFromto(processor, ((usqInt)methodZoneBase), ((usqInt)(freeStart())));
}
@@ -9351,7 +9363,7 @@
/* begin RetN: */
genoperand(RetN, 0);
outputInstructionsForGeneratedRuntimeAt(startAddress);
- flushICacheFromto(processor, startAddress, methodZoneBase);
+ flushICacheFromto(processor, ((usqInt)startAddress), ((usqInt)methodZoneBase));
recordGeneratedRunTimeaddress("ceCaptureCStackPointers", startAddress);
ceCaptureCStackPointers = ((void (*)(void)) startAddress);
}
@@ -9700,7 +9712,7 @@
generateEnilopmarts();
generateTracingTrampolines();
recordGeneratedRunTimeaddress("methodZoneBase", methodZoneBase);
- flushICacheFromto(processor, methodZoneStart, methodZoneBase);
+ flushICacheFromto(processor, ((usqInt)methodZoneStart), ((usqInt)methodZoneBase));
}
/* Cogit>>#generateVMOwnerLockFunctions */
@@ -9889,7 +9901,7 @@
/* begin JumpR: */
genoperand(JumpR, TempReg);
jmpTarget(jumpMiss, gLabel());
- genEnsureObjInRegNotForwardedscratchRegupdatingMwr(ReceiverResultReg, TempReg, FoxMFReceiver, FPReg);
+ genEnsureOopInRegNotForwardedscratchRegupdatingMwr(ReceiverResultReg, TempReg, FoxMFReceiver, FPReg);
@@ 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.1336.mcz
==================== Summary ====================
Name: VMMaker.oscog-eem.1336
Author: eem
Time: 3 June 2015, 10:06:12.601 pm
UUID: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
Ancestors: VMMaker.oscog-tpr.1335
Merge with VMMaker.oscog-tpr.1335, keeping the -1's
in the cache flush extent calculations.
Fix the hack introduced in VMMaker.oscog-eem.1199
for Sista which merely stopped reclaiming closed
PICs. In non-Sista VMs do the usual thing of decaying
usage counts on PICs, as with methods, and
reclaiming those least used.
In Sista, retain PICs until teh next cycle, identifying
unused PICs as part of the compaction scan,
reminiscent of tri-colour incremental GC.
Move defaultCogCodeSize into the
CogAbstractInstruction hierarchy so that e.g.
CogARMCompiler can specify a larger default
code zone.
=============== Diff against VMMaker.oscog-tpr.1335 ===============
Item was removed:
- ----- Method: CoInterpreter>>defaultCogCodeSize (in category 'initialization') -----
- defaultCogCodeSize
- "Return the default number of bytes to allocate for native code at startup.
- The actual value can be set via vmParameterAt: and/or a preference in the ini file."
- <inline: false>
- ^1024 * 1400!
Item was changed:
----- Method: CoInterpreter>>readImageFromFile:HeapSize:StartingAt: (in category 'image save/restore') -----
readImageFromFile: f HeapSize: desiredHeapSize StartingAt: imageOffset
"Read an image from the given file stream, allocating an amount of memory to its object heap.
V3: desiredHeapSize is the total size of the heap. Fail if the image has an unknown format or
requires more than the specified amount of memory.
Spur: desiredHeapSize is ignored; this routine will attempt to provide at least extraVMMemory's
ammount of free space after the image is loaded, taking any free space in teh image into account.
extraVMMemory is stored in the image header and is accessible as vmParameterAt: 23. If
extraVMMemory is 0, the value defaults to the default grow headroom. Fail if the image has an
unknown format or if sufficient memory cannot be allocated.
Details: This method detects when the image was stored on a machine with the opposite byte
ordering from this machine and swaps the bytes automatically. Furthermore, it allows the header
information to start 512 bytes into the file, since some file transfer programs for the Macintosh
apparently prepend a Mac-specific header of this size. Note that this same 512 bytes of prefix
area could also be used to store an exec command on Unix systems, allowing one to launch
Smalltalk by invoking the image name as a command."
| swapBytes headerStart headerSize dataSize oldBaseAddr
minimumMemory heapSize bytesRead bytesToShift firstSegSize
hdrNumStackPages hdrEdenBytes hdrCogCodeSize headerFlags hdrMaxExtSemTabSize allocationReserve |
<var: #f type: #sqImageFile>
<var: #heapSize type: #usqInt>
<var: #dataSize type: #'size_t'>
<var: #minimumMemory type: #usqInt>
<var: #desiredHeapSize type: #usqInt>
<var: #allocationReserve type: #usqInt>
<var: #headerStart type: #squeakFileOffsetType>
<var: #imageOffset type: #squeakFileOffsetType>
metaclassNumSlots := 6. "guess Metaclass instSize"
classNameIndex := 6. "guess (Class instVarIndexFor: 'name' ifAbsent: []) - 1"
swapBytes := self checkImageVersionFrom: f startingAt: imageOffset.
headerStart := (self sqImageFilePosition: f) - 4. "record header start position"
headerSize := self getWord32FromFile: f swap: swapBytes.
dataSize := self getLongFromFile: f swap: swapBytes.
oldBaseAddr := self getLongFromFile: f swap: swapBytes.
objectMemory specialObjectsOop: (self getLongFromFile: f swap: swapBytes).
objectMemory lastHash: (self getLongFromFile: f swap: swapBytes). "N.B. not used."
savedWindowSize := self getLongFromFile: f swap: swapBytes.
headerFlags := self getLongFromFile: f swap: swapBytes.
self setImageHeaderFlagsFrom: headerFlags.
extraVMMemory := self getWord32FromFile: f swap: swapBytes. "N.B. ignored in V3."
hdrNumStackPages := self getShortFromFile: f swap: swapBytes.
"4 stack pages is small. Should be able to run with as few as
three. 4 should be comfortable but slow. 8 is a reasonable
default. Can be changed via vmParameterAt: 43 put: n.
Can be set as a preference (Info.plist, VM.ini, command line etc).
If desiredNumStackPages is already non-zero then it has been
set as a preference. Ignore (but preserve) the header's default."
numStackPages := desiredNumStackPages ~= 0
ifTrue: [desiredNumStackPages]
ifFalse: [hdrNumStackPages = 0
ifTrue: [self defaultNumStackPages]
ifFalse: [hdrNumStackPages]].
desiredNumStackPages := hdrNumStackPages.
"This slot holds the size of the native method zone in 1k units. (pad to word boundary)."
hdrCogCodeSize := (self getShortFromFile: f swap: swapBytes) * 1024.
cogCodeSize := desiredCogCodeSize ~= 0
ifTrue: [desiredCogCodeSize]
ifFalse:
[hdrCogCodeSize = 0
+ ifTrue: [cogit defaultCogCodeSize]
- ifTrue: [self defaultCogCodeSize]
ifFalse: [hdrCogCodeSize]].
hdrEdenBytes := self getWord32FromFile: f swap: swapBytes.
objectMemory edenBytes: (desiredEdenBytes ~= 0
ifTrue: [desiredEdenBytes]
ifFalse:
[hdrEdenBytes = 0
ifTrue: [objectMemory defaultEdenBytes]
ifFalse: [hdrEdenBytes]]).
desiredEdenBytes := hdrEdenBytes.
hdrMaxExtSemTabSize := self getShortFromFile: f swap: swapBytes.
hdrMaxExtSemTabSize ~= 0 ifTrue:
[self setMaxExtSemSizeTo: hdrMaxExtSemTabSize].
"pad to word boundary. This slot can be used for anything else that will fit in 16 bits.
Preserve it to be polite to other VMs."
the2ndUnknownShort := self getShortFromFile: f swap: swapBytes.
firstSegSize := self getLongFromFile: f swap: swapBytes.
objectMemory firstSegmentSize: firstSegSize.
"compare memory requirements with availability"
allocationReserve := self interpreterAllocationReserveBytes.
minimumMemory := cogCodeSize "no need to include the stackZone; this is alloca'ed"
+ dataSize
+ objectMemory newSpaceBytes
+ allocationReserve.
objectMemory hasSpurMemoryManagerAPI
ifTrue:
[| freeOldSpaceInImage headroom |
freeOldSpaceInImage := self getLongFromFile: f swap: swapBytes.
headroom := objectMemory
initialHeadroom: extraVMMemory
givenFreeOldSpaceInImage: freeOldSpaceInImage.
heapSize := objectMemory roundUpHeapSize:
cogCodeSize "no need to include the stackZone; this is alloca'ed"
+ dataSize
+ headroom
+ objectMemory newSpaceBytes
+ (headroom > allocationReserve
ifTrue: [0]
ifFalse: [allocationReserve])]
ifFalse:
[heapSize := cogCodeSize "no need to include the stackZone; this is alloca'ed"
+ desiredHeapSize
+ objectMemory newSpaceBytes
+ (desiredHeapSize - dataSize > allocationReserve
ifTrue: [0]
ifFalse: [allocationReserve]).
heapSize < minimumMemory ifTrue:
[self insufficientMemorySpecifiedError]].
"allocate a contiguous block of memory for the Squeak heap and ancilliary data structures"
objectMemory memory: (self
allocateMemory: heapSize
minimum: minimumMemory
imageFile: f
headerSize: headerSize) asUnsignedInteger.
objectMemory memory ifNil:
[self insufficientMemoryAvailableError].
heapBase := objectMemory
setHeapBase: objectMemory memory + cogCodeSize
memoryLimit: objectMemory memory + heapSize
endOfMemory: objectMemory memory + cogCodeSize + dataSize.
"position file after the header"
self sqImageFile: f Seek: headerStart + headerSize.
"read in the image in bulk, then swap the bytes if necessary"
bytesRead := objectMemory readHeapFromImageFile: f dataBytes: dataSize.
bytesRead ~= dataSize ifTrue: [self unableToReadImageError].
self ensureImageFormatIsUpToDate: swapBytes.
"compute difference between old and new memory base addresses"
bytesToShift := objectMemory memoryBaseForImageRead - oldBaseAddr.
self initializeInterpreter: bytesToShift. "adjusts all oops to new location"
self initializeCodeGenerator.
^dataSize!
Item was added:
+ ----- Method: CogARMCompiler>>defaultCogCodeSize (in category 'accessing') -----
+ defaultCogCodeSize
+ "Return the default number of bytes to allocate for native code at startup.
+ The actual value can be set via vmParameterAt: and/or a preference in the ini file."
+ <api>
+ ^1024 * 1400!
Item was added:
+ ----- Method: CogAbstractInstruction>>defaultCogCodeSize (in category 'accessing') -----
+ defaultCogCodeSize
+ "Return the default number of bytes to allocate for native code at startup.
+ The actual value can be set via vmParameterAt: and/or a preference in the ini file."
+ <api>
+ ^1024 * 1024!
Item was added:
+ ----- Method: CogMethodZone>>clearSavedPICUsageCount: (in category 'compaction') -----
+ clearSavedPICUsageCount: cogMethod
+ "For Sista, where we want PICs to last so they can be observed, we need to keep PICs unless
+ they are definitely unused. So we need to identify unused PICs. So in planCompact, zero the
+ usage counts of all PICs, saving the actual usage count in blockEntryOffset. Then in
+ relocateMethodsPreCompaction (actually in relocateIfCallOrMethodReference:mcpc:delta:)
+ restore the usage counts of used PICs. Finally in compactCompiledCode, clear the blockEntryOffset
+ of the unused PICs; they will then have a zero count and be reclaimed in the next code compaction."
+ <var: #cogMethod type: #'CogMethod *'>
+ <option: #SistaVM>
+ cogMethod cmType = CMClosedPIC ifTrue:
+ [cogMethod blockEntryOffset: 0]!
Item was changed:
----- Method: CogMethodZone>>compactCompiledCode (in category 'compaction') -----
compactCompiledCode
| objectHeaderValue source dest bytes |
<var: #source type: #'CogMethod *'>
<var: #dest type: #'CogMethod *'>
objectHeaderValue := objectMemory nullHeaderForMachineCodeMethod.
source := coInterpreter cCoerceSimple: baseAddress to: #'CogMethod *'.
openPICList := nil.
methodCount := 0.
self cppIf: NewspeakVM ifTrue: [unpairedMethodList := nil].
[source < self limitZony
and: [source cmType ~= CMFree]] whileTrue:
[self assert: (cogit cogMethodDoesntLookKosher: source) = 0.
source objectHeader: objectHeaderValue.
source cmUsageCount > 0 ifTrue:
[source cmUsageCount: source cmUsageCount // 2].
self cppIf: NewspeakVM ifTrue:
[(source cmType = CMMethod
and: [(coInterpreter rawHeaderOf: source methodObject) asInteger ~= source asInteger]) ifTrue:
[source nextMethodOrIRCs: unpairedMethodList.
unpairedMethodList := source asUnsignedInteger]].
+ SistaVM ifTrue:
+ [self clearSavedPICUsageCount: source].
source cmType = CMOpenPIC ifTrue:
[source nextOpenPIC: openPICList asUnsignedInteger.
openPICList := source].
methodCount := methodCount + 1.
source := self methodAfter: source].
source >= self limitZony ifTrue:
[^self halt: 'no free methods; cannot compact.'].
dest := source.
[source < self limitZony] whileTrue:
[self assert: (cogit maybeFreeCogMethodDoesntLookKosher: source) = 0.
bytes := source blockSize.
source cmType ~= CMFree ifTrue:
[methodCount := methodCount + 1.
objectMemory mem: dest mo: source ve: bytes.
dest objectHeader: objectHeaderValue.
dest cmType = CMMethod
ifTrue:
["For non-Newspeak there should be a one-to-one mapping between bytecoded and
cog methods. For Newspeak not necessarily, but only for anonymous accessors."
"Only update the original method's header if it is referring to this CogMethod."
(coInterpreter rawHeaderOf: dest methodObject) asInteger = source asInteger
ifTrue:
[coInterpreter rawHeaderOf: dest methodObject put: dest asInteger]
ifFalse:
[self assert: (cogit noAssertMethodClassAssociationOf: dest methodObject) = objectMemory nilObject.
self cppIf: NewspeakVM ifTrue:
[dest nextMethodOrIRCs: unpairedMethodList.
unpairedMethodList := dest asUnsignedInteger]]]
ifFalse:
+ [SistaVM ifTrue:
+ [self clearSavedPICUsageCount: dest].
+ dest cmType = CMOpenPIC ifTrue:
- [dest cmType = CMOpenPIC ifTrue:
[dest nextOpenPIC: openPICList asUnsignedInteger.
openPICList := dest]].
dest cmUsageCount > 0 ifTrue:
[dest cmUsageCount: dest cmUsageCount // 2].
dest := coInterpreter
cCoerceSimple: dest asUnsignedInteger + bytes
to: #'CogMethod *'].
source := coInterpreter
cCoerceSimple: source asUnsignedInteger + bytes
to: #'CogMethod *'].
mzFreeStart := dest asUnsignedInteger.
methodBytesFreedSinceLastCompaction := 0!
Item was changed:
----- Method: CogMethodZone>>freeOlderMethodsForCompaction (in category 'compaction') -----
freeOlderMethodsForCompaction
+ "Free methods, preferring older methods for compaction, up to some fraction, currently a quarter."
- "Free methods, preferring older methods for compaction, up to some fraction."
| zoneSize amountToFree initialFreeSpace freedSoFar freeableUsage cogMethod |
<var: #cogMethod type: #'CogMethod *'>
zoneSize := limitAddress - baseAddress.
initialFreeSpace := limitAddress - mzFreeStart + methodBytesFreedSinceLastCompaction.
freedSoFar := initialFreeSpace.
amountToFree := zoneSize // 4. "4 needs to be e.g. a start-up parameter"
freeableUsage := 0.
[self cCode: ''
inSmalltalk: [coInterpreter transcript nextPutAll: 'freeing methods with usage '; print: freeableUsage; cr; flush].
+ cogMethod := cogit cCoerceSimple: baseAddress to: #'CogMethod *'.
- cogMethod := coInterpreter cCoerceSimple: baseAddress to: #'CogMethod *'.
[cogMethod asUnsignedInteger < mzFreeStart
and: [freedSoFar < amountToFree]] whileTrue:
+ [(self shouldFreeMethod: cogMethod given: freeableUsage) ifTrue:
- [(cogMethod cmType = CMMethod
- and: [cogMethod cmUsageCount <= freeableUsage]) ifTrue:
[self freeMethod: cogMethod.
freedSoFar := freedSoFar + cogMethod blockSize].
cogMethod := self methodAfter: cogMethod].
freedSoFar < amountToFree
and: [(freeableUsage := freeableUsage + 1) < CMMaxUsageCount]] whileTrue.
self cCode: ''
inSmalltalk: [coInterpreter transcript
nextPutAll: 'Compaction freeing '; print: freedSoFar;
nextPutAll: ' of '; print: zoneSize;
nextPutAll: ' (target: '; print: amountToFree;
nextPutAll: ' (newly freed: '; print: freedSoFar - initialFreeSpace;
cr; flush]!
Item was changed:
----- Method: CogMethodZone>>planCompaction (in category 'compaction') -----
planCompaction
+ "Some methods have been freed. Compute how much each survivor needs to
+ move during the ensuing compaction and record it in the objectHeader field.
+
+ For Sista, where we want PICs to last so they can be observed, we need to keep PICs unless
+ they are definitely unused. So we need to identify unused PICs. So in planCompact, zero the
+ usage counts of all PICs, saving the actual usage count in blockEntryOffset. Then in
+ relocateMethodsPreCompaction (actually in relocateIfCallOrMethodReference:mcpc:delta:)
+ restore the usage counts of used PICs. Finally in compactCompiledCode, clear the blockEntryOffset
+ of the unused PICs; they will then have a zero count and be reclaimed in the next code compaction."
- "Some metods have been freed. Compute how much each survivor needs to
- move during the ensuing compaction and record it in the objectHeader field."
| delta cogMethod |
<var: #cogMethod type: #'CogMethod *'>
delta := 0.
+ cogMethod := cogit cCoerceSimple: baseAddress to: #'CogMethod *'.
- cogMethod := coInterpreter cCoerceSimple: baseAddress to: #'CogMethod *'.
[cogMethod asUnsignedInteger < mzFreeStart] whileTrue:
[cogMethod cmType = CMFree
ifTrue: [delta := delta - cogMethod blockSize]
ifFalse:
[self assert: (cogit cogMethodDoesntLookKosher: cogMethod) = 0.
+ cogMethod objectHeader: delta.
+ SistaVM ifTrue:
+ [self savePICUsageCount: cogMethod]].
- cogMethod objectHeader: delta].
cogMethod := self methodAfter: cogMethod]!
Item was added:
+ ----- Method: CogMethodZone>>relocateMethodsPreCompaction (in category 'compaction') -----
+ relocateMethodsPreCompaction
+ "All surviving methods have had the amount they are going to relocate by
+ stored in their objectHeader fields. Relocate all relative calls so that after
+ the compaction of both the method containing each call and the call target
+ the calls invoke the same target."
+ | cogMethod |
+ <var: #cogMethod type: #'CogMethod *'>
+ cogMethod := cogit cCoerceSimple: baseAddress to: #'CogMethod *'.
+ [cogMethod < mzFreeStart] whileTrue:
+ [cogMethod cmType ~= CMFree ifTrue:
+ [cogMethod cmType = CMClosedPIC
+ ifTrue: [cogit relocateCallsInClosedPIC: cogMethod]
+ ifFalse: [cogit relocateCallsAndSelfReferencesInMethod: cogMethod]].
+ cogMethod := self methodAfter: cogMethod].
+ self relocateAndPruneYoungReferrers.
+ ^true!
Item was added:
+ ----- Method: CogMethodZone>>restorePICUsageCount: (in category 'compaction') -----
+ restorePICUsageCount: cogMethod
+ "For Sista, where we want PICs to last so they can be observed, we need to keep PICs unless
+ they are definitely unused. So we need to identify unused PICs. So in planCompact, zero the
+ usage counts of all PICs, saving the actual usage count in blockEntryOffset. Then in
+ relocateMethodsPreCompaction (actually in relocateIfCallOrMethodReference:mcpc:delta:)
+ restore the usage counts of used PICs. Finally in compactCompiledCode, clear the blockEntryOffset
+ of the unused PICs; they will then have a zero count and be reclaimed in the next code compaction."
+ <var: #cogMethod type: #'CogMethod *'>
+ <option: #SistaVM>
+ (cogMethod cmType = CMClosedPIC
+ and: [cogMethod blockEntryOffset ~= 0]) ifTrue:
+ [cogMethod
+ cmUsageCount: cogMethod blockEntryOffset;
+ blockEntryOffset: 0]!
Item was added:
+ ----- Method: CogMethodZone>>savePICUsageCount: (in category 'compaction') -----
+ savePICUsageCount: cogMethod
+ "For Sista, where we want PICs to last so they can be observed, we need to keep PICs unless
+ they are definitely unused. So we need to identify unused PICs. So in planCompact, zero the
+ usage counts of all PICs, saving the actual usage count in blockEntryOffset. Then in
+ relocateMethodsPreCompaction (actually in relocateIfCallOrMethodReference:mcpc:delta:)
+ restore the usage counts of used PICs. Finally in compactCompiledCode, clear the blockEntryOffset
+ of the unused PICs; they will then have a zero count and be reclaimed in the next code compaction."
+ <var: #cogMethod type: #'CogMethod *'>
+ <option: #SistaVM>
+ cogMethod cmType = CMClosedPIC ifTrue:
+ [cogMethod
+ blockEntryOffset: cogMethod cmUsageCount;
+ cmUsageCount: 0]!
Item was added:
+ ----- Method: CogMethodZone>>shouldFreeMethod:given: (in category 'compaction') -----
+ shouldFreeMethod: cogMethod given: freeableUsage
+ "Answer if cogMethod should be freed in the current pass of freeOlderMethodsForCompaction.
+
+ For Sista, where we want PICs to last so they can be observed, we need to keep PICs unless
+ they are definitely unused. So we need to identify unused PICs. So in planCompact, zero the
+ usage counts of all PICs, saving the actual usage count in blockEntryOffset. Then in
+ relocateMethodsPreCompaction (actually in relocateIfCallOrMethodReference:mcpc:delta:)
+ restore the usage counts of used PICs. Finally in compactCompiledCode, clear the blockEntryOffset
+ of the unused PICs; they will then have a zero count and be reclaimed in the next code compaction."
+ <var: #cogMethod type: #'CogMethod *'>
+ <inline: true>
+ ^SistaVM
+ ifTrue:
+ [cogMethod cmType = CMMethod
+ ifTrue: [cogMethod cmUsageCount <= freeableUsage]
+ ifFalse: [cogMethod cmType ~= CMFree
+ and: [cogMethod cmUsageCount = 0]]]
+ ifFalse:
+ [cogMethod cmType ~= CMFree
+ and: [cogMethod cmUsageCount <= freeableUsage]]!
Item was changed:
----- Method: CogVMSimulator>>openOn:extraMemory: (in category 'initialization') -----
openOn: fileName extraMemory: extraBytes
"CogVMSimulator new openOn: 'clone.im' extraMemory: 100000"
| f version headerSize dataSize count oldBaseAddr bytesToShift swapBytes
headerFlags firstSegSize heapSize
hdrNumStackPages hdrEdenBytes hdrMaxExtSemTabSize
hdrCogCodeSize stackZoneSize methodCacheSize primTraceLogSize allocationReserve |
"open image file and read the header"
f := FileStream readOnlyFileNamed: fileName.
f ifNil: [^self error: 'no image found'].
["begin ensure block..."
imageName := f fullName.
f binary.
version := self getWord32FromFile: f swap: false. "current version: 16r1968 (=6504) vive la revolucion!!"
(self readableFormat: version)
ifTrue: [swapBytes := false]
ifFalse: [(version := objectMemory byteSwapped: version) = self imageFormatVersion
ifTrue: [swapBytes := true]
ifFalse: [self error: 'incomaptible image format']].
headerSize := self getWord32FromFile: f swap: swapBytes.
dataSize := self getLongFromFile: f swap: swapBytes. "length of heap in file"
oldBaseAddr := self getLongFromFile: f swap: swapBytes. "object memory base address of image"
objectMemory specialObjectsOop: (self getLongFromFile: f swap: swapBytes).
objectMemory lastHash: (self getLongFromFile: f swap: swapBytes). "Should be loaded from, and saved to the image header"
savedWindowSize := self getLongFromFile: f swap: swapBytes.
headerFlags := self getLongFromFile: f swap: swapBytes.
self setImageHeaderFlagsFrom: headerFlags.
extraVMMemory := self getWord32FromFile: f swap: swapBytes.
hdrNumStackPages := self getShortFromFile: f swap: swapBytes.
"4 stack pages is small. Should be able to run with as few as
three. 4 should be comfortable but slow. 8 is a reasonable
default. Can be changed via vmParameterAt: 43 put: n"
numStackPages := desiredNumStackPages ~= 0
ifTrue: [desiredNumStackPages]
ifFalse: [hdrNumStackPages = 0
ifTrue: [self defaultNumStackPages]
ifFalse: [hdrNumStackPages]].
desiredNumStackPages := hdrNumStackPages.
stackZoneSize := self computeStackZoneSize.
"This slot holds the size of the native method zone in 1k units. (pad to word boundary)."
hdrCogCodeSize := (self getShortFromFile: f swap: swapBytes) * 1024.
cogCodeSize := desiredCogCodeSize ~= 0
ifTrue: [desiredCogCodeSize]
ifFalse:
[hdrCogCodeSize = 0
+ ifTrue: [cogit defaultCogCodeSize]
- ifTrue: [self defaultCogCodeSize]
ifFalse: [hdrCogCodeSize]].
desiredCogCodeSize := hdrCogCodeSize.
self assert: f position = (objectMemory wordSize = 4 ifTrue: [40] ifFalse: [64]).
hdrEdenBytes := self getWord32FromFile: f swap: swapBytes.
objectMemory edenBytes: (desiredEdenBytes ~= 0
ifTrue: [desiredEdenBytes]
ifFalse:
[hdrEdenBytes = 0
ifTrue: [objectMemory defaultEdenBytes]
ifFalse: [hdrEdenBytes]]).
desiredEdenBytes := hdrEdenBytes.
hdrMaxExtSemTabSize := self getShortFromFile: f swap: swapBytes.
hdrMaxExtSemTabSize ~= 0 ifTrue:
[self setMaxExtSemSizeTo: hdrMaxExtSemTabSize].
"pad to word boundary. This slot can be used for anything else that will fit in 16 bits.
Preserve it to be polite to other VMs."
the2ndUnknownShort := self getShortFromFile: f swap: swapBytes.
self assert: f position = (objectMemory wordSize = 4 ifTrue: [48] ifFalse: [72]).
firstSegSize := self getLongFromFile: f swap: swapBytes.
objectMemory firstSegmentSize: firstSegSize.
"For Open PICs to be able to probe the method cache during
simulation the methodCache must be relocated to memory."
methodCacheSize := methodCache size * objectMemory wordSize.
primTraceLogSize := primTraceLog size * objectMemory wordSize.
"allocate interpreter memory. This list is in address order, low to high.
In the actual VM the stack zone exists on the C stack."
heapBase := (Cogit guardPageSize
+ cogCodeSize
+ stackZoneSize
+ methodCacheSize
+ primTraceLogSize
+ self rumpCStackSize) roundUpTo: objectMemory allocationUnit.
"compare memory requirements with availability"
allocationReserve := self interpreterAllocationReserveBytes.
objectMemory hasSpurMemoryManagerAPI
ifTrue:
[| freeOldSpaceInImage headroom |
freeOldSpaceInImage := self getLongFromFile: f swap: swapBytes.
headroom := objectMemory
initialHeadroom: extraVMMemory
givenFreeOldSpaceInImage: freeOldSpaceInImage.
heapSize := objectMemory roundUpHeapSize:
dataSize
+ headroom
+ objectMemory newSpaceBytes
+ (headroom > allocationReserve
ifTrue: [0]
ifFalse: [allocationReserve])]
ifFalse:
[heapSize := dataSize
+ extraBytes
+ objectMemory newSpaceBytes
+ (extraBytes > allocationReserve
ifTrue: [0]
ifFalse: [allocationReserve])].
heapBase := objectMemory
setHeapBase: heapBase
memoryLimit: heapBase + heapSize
endOfMemory: heapBase + dataSize.
self assert: cogCodeSize \\ 4 = 0.
self assert: objectMemory memoryLimit \\ 4 = 0.
self assert: self rumpCStackSize \\ 4 = 0.
"read in the image in bulk, then swap the bytes if necessary"
f position: headerSize.
objectMemory memory: ((cogit processor endianness == #little
ifTrue: [LittleEndianBitmap]
ifFalse: [Bitmap]) new: objectMemory memoryLimit // 4).
count := objectMemory readHeapFromImageFile: f dataBytes: dataSize.
count ~= dataSize ifTrue: [self halt].
]
ensure: [f close].
self moveMethodCacheToMemoryAt: objectMemory cogCodeBase + cogCodeSize + stackZoneSize.
self movePrimTraceLogToMemoryAt: objectMemory cogCodeBase + cogCodeSize + stackZoneSize + methodCacheSize.
self ensureImageFormatIsUpToDate: swapBytes.
bytesToShift := objectMemory memoryBaseForImageRead - oldBaseAddr. "adjust pointers for zero base address"
Utilities
informUser: 'Relocating object pointers...'
during: [self initializeInterpreter: bytesToShift].
self initializeCodeGenerator!
Item was changed:
----- Method: Cogit>>ceSICMiss: (in category 'in-line cacheing') -----
ceSICMiss: receiver
"An in-line cache check in a method has failed. The failing entry check has jumped
to the ceMethodAbort abort call at the start of the method which has called this routine.
If possible allocate a closed PIC for the current and existing classes.
The stack looks like:
receiver
args
sender return address
sp=> ceMethodAbort call return address
So we can find the method that did the failing entry check at
ceMethodAbort call return address - missOffset
and we can find the send site from the outer return address."
<api>
| pic innerReturn outerReturn entryPoint targetMethod newTargetMethodOrNil errorSelectorOrNil cacheTag extent result |
<var: #pic type: #'CogMethod *'>
<var: #targetMethod type: #'CogMethod *'>
<var: #callerMethod type: #'CogMethod *'>
"Whether we can relink to a PIC or not we need to pop off the inner return and identify the target method."
innerReturn := coInterpreter popStack asUnsignedInteger.
targetMethod := self cCoerceSimple: innerReturn - missOffset to: #'CogMethod *'.
(objectMemory isOopForwarded: receiver) ifTrue:
[^coInterpreter ceSendFromInLineCacheMiss: targetMethod].
outerReturn := coInterpreter stackTop asUnsignedInteger.
self assert: (outerReturn between: methodZoneBase and: methodZone freeStart).
entryPoint := backEnd callTargetFromReturnAddress: outerReturn.
self assert: targetMethod selector ~= objectMemory nilObject.
self cppIf: NewspeakVM ifTrue:
[| callerMethod annotation |
self assert: targetMethod asInteger + cmEntryOffset = entryPoint.
callerMethod := coInterpreter mframeHomeMethod: coInterpreter getFramePointer.
self assert: (outerReturn
between: callerMethod asUnsignedInteger + cmNoCheckEntryOffset
and: callerMethod asUnsignedInteger + callerMethod blockSize).
annotation := self annotationForMcpc: outerReturn in: callerMethod.
self assert: annotation >= IsSendCall.
"Avoid the effort of implementing PICs for the relatively high dynamic frequency
self send and simply rebind the send site (for now)."
annotation = IsNSSelfSend ifTrue:
[^coInterpreter
ceSelfSend: targetMethod selector
to: receiver
numArgs: targetMethod cmNumArgs].
"Avoid the effort of implementing PICs for the relatively low dynamic frequency
dynamic super send and simply rebind the send site."
annotation = IsNSDynamicSuperSend ifTrue:
[^coInterpreter
ceDynamicSuperSend: targetMethod selector
to: receiver
numArgs: targetMethod cmNumArgs]].
self assert: targetMethod asInteger + cmEntryOffset = entryPoint.
self lookup: targetMethod selector
for: receiver
methodAndErrorSelectorInto:
[:method :errsel|
newTargetMethodOrNil := method.
errorSelectorOrNil := errsel].
"We assume lookupAndCog:for: will *not* reclaim the method zone"
self assert: outerReturn = coInterpreter stackTop.
cacheTag := objectRepresentation inlineCacheTagForInstance: receiver.
((errorSelectorOrNil notNil and: [errorSelectorOrNil ~= SelectorDoesNotUnderstand])
or: [(objectRepresentation inlineCacheTagIsYoung: cacheTag)
or: [(backEnd inlineCacheTagAt: outerReturn) = self picAbortDiscriminatorValue
or: [newTargetMethodOrNil isNil
or: [objectMemory isYoung: newTargetMethodOrNil]]]]) ifTrue:
[result := self patchToOpenPICFor: targetMethod selector
numArgs: targetMethod cmNumArgs
receiver: receiver.
self assert: result not. "If patchToOpenPICFor:.. returns we're out of code memory"
^coInterpreter ceSendFromInLineCacheMiss: targetMethod].
"See if an Open PIC is already available."
pic := methodZone openPICWithSelector: targetMethod selector.
pic isNil ifTrue:
["otherwise attempt to create a closed PIC for the two cases."
pic := self cogPICSelector: targetMethod selector
numArgs: targetMethod cmNumArgs
Case0Method: targetMethod
Case1Method: newTargetMethodOrNil
tag: cacheTag
isMNUCase: errorSelectorOrNil = SelectorDoesNotUnderstand.
(pic asInteger between: MaxNegativeErrorCode and: -1) ifTrue:
["For some reason the PIC couldn't be generated, most likely a lack of code memory.
Continue as if this is an unlinked send."
pic asInteger = InsufficientCodeSpace ifTrue:
[coInterpreter callForCogCompiledCodeCompaction].
^coInterpreter ceSendFromInLineCacheMiss: targetMethod].
processor flushICacheFrom: pic asUnsignedInteger to: pic asUnsignedInteger + closedPICSize].
"Relink the send site to the pic. If to an open PIC then reset the cache tag to the selector,
for the benefit of the cacheTag assert check in checkIfValidObjectRef:pc:cogMethod:."
extent := pic cmType = CMOpenPIC
ifTrue:
[backEnd
rewriteInlineCacheAt: outerReturn
tag: targetMethod selector
target: pic asInteger + cmEntryOffset]
ifFalse:
[backEnd
rewriteCallAt: outerReturn
target: pic asInteger + cmEntryOffset].
+ processor flushICacheFrom: outerReturn asUnsignedInteger - 1 - extent to: outerReturn asUnsignedInteger - 1.
- processor flushICacheFrom: outerReturn - extent to: outerReturn .
"Jump back into the pic at its entry in case this is an MNU (newTargetMethodOrNil is nil)"
coInterpreter
executeCogPIC: pic
fromLinkedSendWithReceiver: receiver
andCacheTag: (backEnd inlineCacheTagAt: outerReturn).
"NOTREACHED"
^nil!
Item was changed:
----- Method: Cogit>>compactCogCompiledCode (in category 'jit - api') -----
compactCogCompiledCode
<api>
self assert: self noCogMethodsMaximallyMarked.
coInterpreter markActiveMethodsAndReferents.
methodZone freeOlderMethodsForCompaction.
self freePICsWithFreedTargets.
methodZone planCompaction.
coInterpreter updateStackZoneReferencesToCompiledCodePreCompaction.
+ methodZone relocateMethodsPreCompaction.
- self relocateMethodsPreCompaction.
methodZone compactCompiledCode.
self assert: self allMethodsHaveCorrectHeader.
self assert: methodZone kosherYoungReferrers.
+ processor
+ flushICacheFrom: methodZoneBase asUnsignedInteger
+ to: methodZone freeStart asUnsignedInteger!
- processor flushICacheFrom: methodZoneBase asUnsignedInteger to: methodZone freeStart asUnsignedInteger!
Item was added:
+ ----- Method: Cogit>>defaultCogCodeSize (in category 'accessing') -----
+ defaultCogCodeSize
+ "Return the default number of bytes to allocate for native code at startup.
+ The actual value can be set via vmParameterAt: and/or a preference in the ini file."
+ <doNotGenerate>
+ ^backEnd defaultCogCodeSize!
Item was changed:
----- Method: Cogit>>linkSendAt:in:to:offset:receiver: (in category 'in-line cacheing') -----
linkSendAt: callSiteReturnAddress in: sendingMethod to: targetMethod offset: theEntryOffset receiver: receiver
<api>
<var: #sendingMethod type: #'CogMethod *'>
<var: #targetMethod type: #'CogMethod *'>
| inlineCacheTag address extent |
self assert: (theEntryOffset = cmEntryOffset or: [theEntryOffset = cmNoCheckEntryOffset]).
self assert: (callSiteReturnAddress between: methodZoneBase and: methodZone freeStart).
inlineCacheTag := theEntryOffset = cmNoCheckEntryOffset
ifTrue: [targetMethod selector "i.e. no change"]
ifFalse: [objectRepresentation inlineCacheTagForInstance: receiver].
(objectRepresentation inlineCacheTagIsYoung: inlineCacheTag) ifTrue:
[methodZone ensureInYoungReferrers: sendingMethod].
address := targetMethod asInteger + theEntryOffset.
extent := backEnd
rewriteInlineCacheAt: callSiteReturnAddress
tag: inlineCacheTag
target: address.
processor
+ flushICacheFrom: callSiteReturnAddress asUnsignedInteger - 1 - extent
+ to: callSiteReturnAddress asUnsignedInteger - 1!
- flushICacheFrom: callSiteReturnAddress asUnsignedInteger - extent
- to: callSiteReturnAddress asUnsignedInteger!
Item was changed:
----- Method: Cogit>>patchToOpenPICFor:numArgs:receiver: (in category 'in-line cacheing') -----
patchToOpenPICFor: selector numArgs: numArgs receiver: receiver
"Code entry closed PIC full or miss to an instance of a young class or to a young target method.
Attempt to patch the send site to an open PIC. Answer if the attempt succeeded; in fact it will
only return if the attempt failed.
The stack looks like:
receiver
args
sp=> sender return address"
<api>
| oPIC outerReturn extent |
<var: #oPIC type: #'CogMethod *'>
outerReturn := coInterpreter stackTop.
"See if an Open PIC is already available."
oPIC := methodZone openPICWithSelector: selector.
oPIC isNil ifTrue:
["otherwise attempt to create an Open PIC."
oPIC := self cogOpenPICSelector: selector numArgs: numArgs.
(oPIC asInteger between: MaxNegativeErrorCode and: -1) ifTrue:
["For some reason the PIC couldn't be generated, most likely a lack of code memory."
oPIC asInteger = InsufficientCodeSpace ifTrue:
[coInterpreter callForCogCompiledCodeCompaction].
^false]].
extent := backEnd
rewriteInlineCacheAt: outerReturn
tag: selector
target: oPIC asInteger + cmEntryOffset.
processor
+ flushICacheFrom: outerReturn asUnsignedInteger - 1 - extent to: outerReturn asUnsignedInteger - 1;
+ flushICacheFrom: oPIC asUnsignedInteger to: oPIC asUnsignedInteger + openPICSize.
- flushICacheFrom: outerReturn asUnsignedInteger - extent to: outerReturn asUnsignedInteger;
- flushICacheFrom: oPIC asInteger to: oPIC asInteger + openPICSize.
"Jump into the oPIC at its entry"
coInterpreter executeCogMethod: oPIC fromLinkedSendWithReceiver: receiver.
"NOTREACHED"
^true!
Item was changed:
----- Method: Cogit>>relocateIfCallOrMethodReference:mcpc:delta: (in category 'compaction') -----
relocateIfCallOrMethodReference: annotation mcpc: mcpc delta: delta
<var: #mcpc type: #'char *'>
| entryPoint targetMethod unlinkedRoutine |
<var: #targetMethod type: #'CogMethod *'>
<var: #nsSendCache type: #'NSSendCache *'>
self cppIf: NewspeakVM ifTrue:
[| nsSendCache |
annotation = IsNSSendCall ifTrue:
["Retrieve the send cache before relocating the stub call. Fetching the send
cache asserts the stub call points below all the cogged methods, but
until this method is actually moved, the adjusted stub call may appear to
point to somewhere in the method zone."
nsSendCache := self nsSendCacheFromReturnAddress: mcpc asInteger.
"Fix call to trampoline. This method is moving [delta] bytes, and calls are
relative, so adjust the call by -[delta] bytes"
backEnd relocateCallBeforeReturnPC: mcpc asInteger by: delta negated.
nsSendCache target ~= 0 ifTrue: "Send is linked"
[entryPoint := nsSendCache target.
targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'.
targetMethod cmType = CMMethod
ifTrue: "send target not freed; just relocate. The cache has an absolute
target, so only adjust by the target method's displacement."
[nsSendCache target: entryPoint + targetMethod objectHeader]
ifFalse: "send target was freed, unlink"
[self voidNSSendCache: nsSendCache]].
^0]].
(self isPureSendAnnotation: annotation) ifTrue:
[entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger.
entryPoint <= methodZoneBase ifTrue: "send is not linked; just relocate"
[backEnd relocateCallBeforeReturnPC: mcpc asInteger by: delta negated.
^0].
"It's a linked send; find which kind."
self
offsetAndSendTableFor: entryPoint
annotation: annotation
into: [:offset :sendTable|
targetMethod := self cCoerceSimple: entryPoint - offset to: #'CogMethod *'.
+ targetMethod cmType ~= CMFree ifTrue: "send target not freed; just relocate."
- targetMethod cmType = CMMethod ifTrue: "send target not freed; just relocate."
[backEnd
relocateCallBeforeReturnPC: mcpc asInteger
by: (delta - targetMethod objectHeader) negated.
+ SistaVM ifTrue: "See comment in planCompaction"
+ [methodZone restorePICUsageCount: targetMethod].
^0].
"Target was freed; map back to an unlinked send; but include this method's reocation"
unlinkedRoutine := sendTable at: (targetMethod cmNumArgs min: NumSendTrampolines - 1).
unlinkedRoutine := unlinkedRoutine - delta.
backEnd
rewriteInlineCacheAt: mcpc asInteger
tag: targetMethod selector
target: unlinkedRoutine.
^0]].
annotation = IsRelativeCall ifTrue:
[backEnd relocateCallBeforeReturnPC: mcpc asInteger by: delta negated.
^0].
annotation = IsAbsPCReference ifTrue:
[backEnd relocateMethodReferenceBeforeAddress: mcpc asInteger by: delta].
^0 "keep scanning"!
Item was removed:
- ----- Method: Cogit>>relocateMethodsPreCompaction (in category 'compaction') -----
- relocateMethodsPreCompaction
- "All surviving methods have had the amount they are going to relocate by
- stored in their objectHeader fields. Relocate all relative calls so that after
- the compaction of both the method containing each call and the call target
- the calls invoke the same target."
- | cogMethod |
- <var: #cogMethod type: #'CogMethod *'>
- cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'.
- [cogMethod < methodZone limitZony] whileTrue:
- [cogMethod cmType ~= CMFree ifTrue:
- [cogMethod cmType = CMClosedPIC
- ifTrue: [self relocateCallsInClosedPIC: cogMethod]
- ifFalse: [self relocateCallsAndSelfReferencesInMethod: cogMethod]].
- cogMethod := methodZone methodAfter: cogMethod].
- methodZone relocateAndPruneYoungReferrers.
- ^true!
1
0
tim Rowledge uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-tpr.1335.mcz
==================== Summary ====================
Name: VMMaker.oscog-tpr.1335
Author: tpr
Time: 3 June 2015, 5:49:55.408 pm
UUID: de4ebc16-0bda-42c8-b337-9d3b09f41627
Ancestors: VMMaker.oscog-eem.1334
Enable the magic MULL instruction on ARM.
Clean up flushICache usage
=============== Diff against VMMaker.oscog-eem.1334 ===============
Item was changed:
----- Method: CoInterpreter>>defaultCogCodeSize (in category 'initialization') -----
defaultCogCodeSize
"Return the default number of bytes to allocate for native code at startup.
The actual value can be set via vmParameterAt: and/or a preference in the ini file."
<inline: false>
+ ^1024 * 1400!
- ^1024 * 1024!
Item was changed:
----- Method: CogARMCompiler>>canMulRR (in category 'testing') -----
canMulRR
+ "we can do a MulRR be we can't simulate it correctly for some reason. More bug-fixing in the simulator one day"
<inline: true>
+ ^true!
- ^false!
Item was changed:
----- Method: Cogit>>ceSICMiss: (in category 'in-line cacheing') -----
ceSICMiss: receiver
"An in-line cache check in a method has failed. The failing entry check has jumped
to the ceMethodAbort abort call at the start of the method which has called this routine.
If possible allocate a closed PIC for the current and existing classes.
The stack looks like:
receiver
args
sender return address
sp=> ceMethodAbort call return address
So we can find the method that did the failing entry check at
ceMethodAbort call return address - missOffset
and we can find the send site from the outer return address."
<api>
| pic innerReturn outerReturn entryPoint targetMethod newTargetMethodOrNil errorSelectorOrNil cacheTag extent result |
<var: #pic type: #'CogMethod *'>
<var: #targetMethod type: #'CogMethod *'>
<var: #callerMethod type: #'CogMethod *'>
"Whether we can relink to a PIC or not we need to pop off the inner return and identify the target method."
innerReturn := coInterpreter popStack asUnsignedInteger.
targetMethod := self cCoerceSimple: innerReturn - missOffset to: #'CogMethod *'.
(objectMemory isOopForwarded: receiver) ifTrue:
[^coInterpreter ceSendFromInLineCacheMiss: targetMethod].
outerReturn := coInterpreter stackTop asUnsignedInteger.
self assert: (outerReturn between: methodZoneBase and: methodZone freeStart).
entryPoint := backEnd callTargetFromReturnAddress: outerReturn.
self assert: targetMethod selector ~= objectMemory nilObject.
self cppIf: NewspeakVM ifTrue:
[| callerMethod annotation |
self assert: targetMethod asInteger + cmEntryOffset = entryPoint.
callerMethod := coInterpreter mframeHomeMethod: coInterpreter getFramePointer.
self assert: (outerReturn
between: callerMethod asUnsignedInteger + cmNoCheckEntryOffset
and: callerMethod asUnsignedInteger + callerMethod blockSize).
annotation := self annotationForMcpc: outerReturn in: callerMethod.
self assert: annotation >= IsSendCall.
"Avoid the effort of implementing PICs for the relatively high dynamic frequency
self send and simply rebind the send site (for now)."
annotation = IsNSSelfSend ifTrue:
[^coInterpreter
ceSelfSend: targetMethod selector
to: receiver
numArgs: targetMethod cmNumArgs].
"Avoid the effort of implementing PICs for the relatively low dynamic frequency
dynamic super send and simply rebind the send site."
annotation = IsNSDynamicSuperSend ifTrue:
[^coInterpreter
ceDynamicSuperSend: targetMethod selector
to: receiver
numArgs: targetMethod cmNumArgs]].
self assert: targetMethod asInteger + cmEntryOffset = entryPoint.
self lookup: targetMethod selector
for: receiver
methodAndErrorSelectorInto:
[:method :errsel|
newTargetMethodOrNil := method.
errorSelectorOrNil := errsel].
"We assume lookupAndCog:for: will *not* reclaim the method zone"
self assert: outerReturn = coInterpreter stackTop.
cacheTag := objectRepresentation inlineCacheTagForInstance: receiver.
((errorSelectorOrNil notNil and: [errorSelectorOrNil ~= SelectorDoesNotUnderstand])
or: [(objectRepresentation inlineCacheTagIsYoung: cacheTag)
or: [(backEnd inlineCacheTagAt: outerReturn) = self picAbortDiscriminatorValue
or: [newTargetMethodOrNil isNil
or: [objectMemory isYoung: newTargetMethodOrNil]]]]) ifTrue:
[result := self patchToOpenPICFor: targetMethod selector
numArgs: targetMethod cmNumArgs
receiver: receiver.
self assert: result not. "If patchToOpenPICFor:.. returns we're out of code memory"
^coInterpreter ceSendFromInLineCacheMiss: targetMethod].
"See if an Open PIC is already available."
pic := methodZone openPICWithSelector: targetMethod selector.
pic isNil ifTrue:
["otherwise attempt to create a closed PIC for the two cases."
pic := self cogPICSelector: targetMethod selector
numArgs: targetMethod cmNumArgs
Case0Method: targetMethod
Case1Method: newTargetMethodOrNil
tag: cacheTag
isMNUCase: errorSelectorOrNil = SelectorDoesNotUnderstand.
(pic asInteger between: MaxNegativeErrorCode and: -1) ifTrue:
["For some reason the PIC couldn't be generated, most likely a lack of code memory.
Continue as if this is an unlinked send."
pic asInteger = InsufficientCodeSpace ifTrue:
[coInterpreter callForCogCompiledCodeCompaction].
^coInterpreter ceSendFromInLineCacheMiss: targetMethod].
+ processor flushICacheFrom: pic asUnsignedInteger to: pic asUnsignedInteger + closedPICSize].
- processor flushICacheFrom: pic asInteger to: pic asInteger + closedPICSize].
"Relink the send site to the pic. If to an open PIC then reset the cache tag to the selector,
for the benefit of the cacheTag assert check in checkIfValidObjectRef:pc:cogMethod:."
extent := pic cmType = CMOpenPIC
ifTrue:
[backEnd
rewriteInlineCacheAt: outerReturn
tag: targetMethod selector
target: pic asInteger + cmEntryOffset]
ifFalse:
[backEnd
rewriteCallAt: outerReturn
target: pic asInteger + cmEntryOffset].
+ processor flushICacheFrom: outerReturn - extent to: outerReturn .
- processor flushICacheFrom: outerReturn - 1 - extent to: outerReturn - 1.
"Jump back into the pic at its entry in case this is an MNU (newTargetMethodOrNil is nil)"
coInterpreter
executeCogPIC: pic
fromLinkedSendWithReceiver: receiver
andCacheTag: (backEnd inlineCacheTagAt: outerReturn).
"NOTREACHED"
^nil!
Item was changed:
----- Method: Cogit>>cogExtendPIC:CaseNMethod:tag:isMNUCase: (in category 'in-line cacheing') -----
cogExtendPIC: cPIC CaseNMethod: caseNMethod tag: caseNTag isMNUCase: isMNUCase
"Extend the cPIC with the supplied case. If caseNMethod is cogged dispatch direct to
its unchecked entry-point. If caseNMethod is not cogged, jump to the fast interpreter
dispatch, and if isMNUCase then dispatch to fast MNU invocation and mark the cPIC as
having the MNU case for cache flushing."
<var: #cPIC type: #'CogMethod *'>
| operand target address size end |
"stack allocate the various collections so that they
are effectively garbage collected on return."
coInterpreter
compilationBreak: cPIC selector
point: (objectMemory numBytesOf: cPIC selector)
isMNUCase: isMNUCase.
self allocateOpcodes: 5 bytecodes: 0.
methodLabel address: cPIC asUnsignedInteger; dependent: nil. "for pc-relative MoveCw: cPIC R: ClassReg"
self assert: (objectRepresentation inlineCacheTagIsYoung: caseNTag) not.
"Caller patches to open pic if caseNMethod is young."
self assert: (caseNMethod notNil and: [(objectMemory isYoung: caseNMethod) not]).
(isMNUCase not
and: [coInterpreter methodHasCogMethod: caseNMethod])
ifTrue:
[operand := 0.
target := (coInterpreter cogMethodOf: caseNMethod) asInteger + cmNoCheckEntryOffset]
ifFalse:
[operand := caseNMethod.
isMNUCase
ifTrue:
[cPIC cpicHasMNUCase: true.
target := cPIC asInteger + (self sizeof: CogMethod)]
ifFalse:
[target := cPIC asInteger + self picInterpretAbortOffset]].
self CmpCw: caseNTag R: TempReg.
self MoveCw: operand R: SendNumArgsReg.
self JumpLongZero: target.
self MoveCw: cPIC asUnsignedInteger R: ClassReg.
self JumpLong: (self cPICMissTrampolineFor: cPIC cmNumArgs).
self computeMaximumSizes.
address := self addressOfEndOfCase: cPIC cPICNumCases - 1 inCPIC: cPIC.
size := self generateInstructionsAt: address.
end := self outputInstructionsAt: address.
+ processor flushICacheFrom: cPIC asUnsignedInteger to: cPIC asUnsignedInteger + closedPICSize.
- processor flushICacheFrom: cPIC asInteger to: cPIC asInteger + closedPICSize.
cPIC cPICNumCases: cPIC cPICNumCases + 1.
^0!
Item was changed:
----- Method: Cogit>>compactCogCompiledCode (in category 'jit - api') -----
compactCogCompiledCode
<api>
self assert: self noCogMethodsMaximallyMarked.
coInterpreter markActiveMethodsAndReferents.
methodZone freeOlderMethodsForCompaction.
self freePICsWithFreedTargets.
methodZone planCompaction.
coInterpreter updateStackZoneReferencesToCompiledCodePreCompaction.
self relocateMethodsPreCompaction.
methodZone compactCompiledCode.
self assert: self allMethodsHaveCorrectHeader.
self assert: methodZone kosherYoungReferrers.
+ processor flushICacheFrom: methodZoneBase asUnsignedInteger to: methodZone freeStart asUnsignedInteger!
- processor flushICacheFrom: methodZoneBase to: methodZone freeStart!
Item was changed:
----- Method: Cogit>>generateCaptureCStackPointers: (in category 'initialization') -----
generateCaptureCStackPointers: captureFramePointer
"Generate the routine that writes the current values of the C frame and stack pointers into
variables. These are used to establish the C stack in trampolines back into the C run-time.
This is a presumptuous quick hack for x86. It is presumptuous for two reasons. Firstly
the system's frame and stack pointers may differ from those we use in generated code,
e.g. on register-rich RISCs. Secondly the ABI may not support a simple frameless call
as written here (for example 128-bit stack alignment on Mac OS X)."
| startAddress |
<inline: false>
self allocateOpcodes: 32 bytecodes: 0.
initialPC := 0.
endPC := numAbstractOpcodes - 1.
startAddress := methodZoneBase.
captureFramePointer ifTrue:
[self MoveR: FPReg Aw: self cFramePointerAddress].
"Capture the stack pointer prior to the call."
backEnd leafCallStackPointerDelta = 0
ifTrue: [self MoveR: SPReg Aw: self cStackPointerAddress]
ifFalse: [self MoveR: SPReg R: TempReg.
self AddCq: backEnd leafCallStackPointerDelta R: TempReg.
self MoveR: TempReg Aw: self cStackPointerAddress].
self RetN: 0.
self outputInstructionsForGeneratedRuntimeAt: startAddress.
+ processor flushICacheFrom: startAddress asUnsignedInteger to: methodZoneBase asUnsignedInteger.
- processor flushICacheFrom: startAddress to: methodZoneBase.
self recordGeneratedRunTime: 'ceCaptureCStackPointers' address: startAddress.
ceCaptureCStackPointers := self cCoerceSimple: startAddress to: #'void (*)(void)'!
Item was changed:
----- Method: Cogit>>generateTrampolines (in category 'initialization') -----
generateTrampolines
"Generate the run-time entries and exits at the base of the native code zone and update the base.
Read the class-side method trampolines for documentation on the various trampolines"
| methodZoneStart |
methodZoneStart := methodZoneBase.
methodLabel address: methodZoneStart.
self allocateOpcodes: 80 bytecodes: 0.
initialPC := 0.
endPC := numAbstractOpcodes - 1.
hasYoungReferent := false.
self generateSendTrampolines.
self generateMissAbortTrampolines.
objectRepresentation generateObjectRepresentationTrampolines.
self generateRunTimeTrampolines.
self cppIf: NewspeakVM ifTrue: [self generateNewspeakRuntime].
self cppIf: SistaVM ifTrue: [self generateSistaRuntime].
self generateEnilopmarts.
self generateTracingTrampolines.
"finish up"
self recordGeneratedRunTime: 'methodZoneBase' address: methodZoneBase.
+ processor flushICacheFrom: methodZoneStart asUnsignedInteger to: methodZoneBase asUnsignedInteger!
- processor flushICacheFrom: methodZoneStart to: methodZoneBase!
Item was changed:
----- Method: Cogit>>linkSendAt:in:to:offset:receiver: (in category 'in-line cacheing') -----
linkSendAt: callSiteReturnAddress in: sendingMethod to: targetMethod offset: theEntryOffset receiver: receiver
<api>
<var: #sendingMethod type: #'CogMethod *'>
<var: #targetMethod type: #'CogMethod *'>
| inlineCacheTag address extent |
self assert: (theEntryOffset = cmEntryOffset or: [theEntryOffset = cmNoCheckEntryOffset]).
self assert: (callSiteReturnAddress between: methodZoneBase and: methodZone freeStart).
inlineCacheTag := theEntryOffset = cmNoCheckEntryOffset
ifTrue: [targetMethod selector "i.e. no change"]
ifFalse: [objectRepresentation inlineCacheTagForInstance: receiver].
(objectRepresentation inlineCacheTagIsYoung: inlineCacheTag) ifTrue:
[methodZone ensureInYoungReferrers: sendingMethod].
address := targetMethod asInteger + theEntryOffset.
extent := backEnd
rewriteInlineCacheAt: callSiteReturnAddress
tag: inlineCacheTag
target: address.
processor
+ flushICacheFrom: callSiteReturnAddress asUnsignedInteger - extent
+ to: callSiteReturnAddress asUnsignedInteger!
- flushICacheFrom: callSiteReturnAddress - 1 - extent
- to: callSiteReturnAddress - 1!
Item was changed:
----- Method: Cogit>>mapObjectReferencesInMachineCodeForBecome (in category 'garbage collection') -----
mapObjectReferencesInMachineCodeForBecome
"Update all references to objects in machine code for a become.
Unlike incrementalGC or fullGC a method that does not refer to young may
refer to young as a result of the become operation. Unlike incrementalGC
or fullGC the reference from a Cog method to its methodObject *must not*
change since the two are two halves of the same object."
| cogMethod hasYoungObj hasYoungObjPtr freedPIC |
<var: #cogMethod type: #'CogMethod *'>
hasYoungObj := false.
hasYoungObjPtr := (self addressOf: hasYoungObj put: [:val| hasYoungObj := val]) asInteger.
codeModified := freedPIC := false.
self mapObjectReferencesInGeneratedRuntime.
cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'.
[cogMethod < methodZone limitZony] whileTrue:
[self assert: hasYoungObj not.
cogMethod cmType ~= CMFree ifTrue:
[self assert: (self cogMethodDoesntLookKosher: cogMethod) = 0.
cogMethod selector: (objectRepresentation remapOop: cogMethod selector).
cogMethod cmType = CMClosedPIC
ifTrue:
[((objectMemory isYoung: cogMethod selector)
or: [self mapObjectReferencesInClosedPIC: cogMethod]) ifTrue:
[freedPIC := true.
methodZone freeMethod: cogMethod]]
ifFalse:
[(objectMemory isYoung: cogMethod selector) ifTrue:
[hasYoungObj := true].
cogMethod cmType = CMMethod ifTrue:
[| remappedMethod |
self assert: cogMethod objectHeader = objectMemory nullHeaderForMachineCodeMethod.
remappedMethod := objectRepresentation remapOop: cogMethod methodObject.
remappedMethod ~= cogMethod methodObject ifTrue:
[(coInterpreter methodHasCogMethod: remappedMethod) ifTrue:
[self error: 'attempt to become two cogged methods'].
(objectMemory
withoutForwardingOn: cogMethod methodObject
and: remappedMethod
with: cogMethod cmUsesPenultimateLit
sendToCogit: #method:hasSameCodeAs:checkPenultimate:) ifFalse:
[self error: 'attempt to become cogged method into different method'].
"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 method object's header if it is referring to this CogMethod."
(coInterpreter rawHeaderOf: cogMethod methodObject) = cogMethod asInteger
ifTrue:
[coInterpreter
rawHeaderOf: cogMethod methodObject
put: cogMethod methodHeader.
cogMethod
methodHeader: (coInterpreter rawHeaderOf: remappedMethod);
methodObject: remappedMethod.
coInterpreter
rawHeaderOf: remappedMethod
put: cogMethod asInteger]
ifFalse:
[self assert: (self noAssertMethodClassAssociationOf: cogMethod methodObject)
= objectMemory nilObject.
cogMethod
methodHeader: (coInterpreter rawHeaderOf: remappedMethod);
methodObject: remappedMethod]].
(objectMemory isYoung: cogMethod methodObject) ifTrue:
[hasYoungObj := true]].
self mapFor: cogMethod
performUntil: #remapIfObjectRef:pc:hasYoung:
arg: hasYoungObjPtr.
hasYoungObj
ifTrue:
[methodZone ensureInYoungReferrers: cogMethod.
hasYoungObj := false]
ifFalse:
[cogMethod cmRefersToYoung: false]]].
cogMethod := methodZone methodAfter: cogMethod].
"we /must/ prune youngReferrers here because a) the [cogMethod cmRefersToYoung: false]
block could have removed a method and subsequently it could be added back, and b) we
can not tolerate duplicates in the youngReferrers list."
methodZone pruneYoungReferrers.
freedPIC ifTrue:
[self unlinkSendsToFree].
codeModified ifTrue: "After updating oops in inline caches we need to flush the icache."
+ [processor flushICacheFrom: codeBase asUnsignedInteger to: methodZone limitZony asUnsignedInteger]!
- [processor flushICacheFrom: codeBase to: methodZone limitZony asInteger]!
Item was changed:
----- Method: Cogit>>mapObjectReferencesInMachineCodeForFullGC (in category 'garbage collection') -----
mapObjectReferencesInMachineCodeForFullGC
"Update all references to objects in machine code for a full gc. Since
the current (New)ObjectMemory GC makes everything old in a full GC
a method not referring to young will not refer to young afterwards"
| cogMethod |
<var: #cogMethod type: #'CogMethod *'>
codeModified := false.
self mapObjectReferencesInGeneratedRuntime.
cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'.
[cogMethod < methodZone limitZony] whileTrue:
[cogMethod cmType ~= CMFree ifTrue:
[self assert: (self cogMethodDoesntLookKosher: cogMethod) = 0.
cogMethod selector: (objectRepresentation remapOop: cogMethod selector).
cogMethod cmType = CMClosedPIC
ifTrue:
[self assert: cogMethod cmRefersToYoung not.
self mapObjectReferencesInClosedPIC: cogMethod]
ifFalse:
[cogMethod cmType = CMMethod ifTrue:
[self assert: cogMethod objectHeader = objectMemory nullHeaderForMachineCodeMethod.
cogMethod methodObject: (objectRepresentation remapOop: cogMethod methodObject)].
self mapFor: cogMethod
performUntil: #remapIfObjectRef:pc:hasYoung:
arg: 0.
(cogMethod cmRefersToYoung
and: [objectRepresentation allYoungObjectsAgeInFullGC]) ifTrue:
[cogMethod cmRefersToYoung: false]]].
cogMethod := methodZone methodAfter: cogMethod].
methodZone pruneYoungReferrers.
codeModified ifTrue: "After updating oops in inline caches we need to flush the icache."
+ [processor flushICacheFrom: codeBase asUnsignedInteger to: methodZone limitZony asUnsignedInteger]!
- [processor flushICacheFrom: codeBase to: methodZone limitZony asInteger]!
Item was changed:
----- Method: Cogit>>mapObjectReferencesInMachineCodeForYoungGC (in category 'garbage collection') -----
mapObjectReferencesInMachineCodeForYoungGC
"Update all references to objects in machine code for either a Spur scavenging gc
or a Squeak V3 incremental GC. Avoid scanning all code by using the youngReferrers
list. In a young gc a method referring to young may no longer refer to young, but a
method not referring to young cannot and will not refer to young afterwards."
| pointer cogMethod hasYoungObj hasYoungObjPtr |
<var: #cogMethod type: #'CogMethod *'>
hasYoungObj := false.
hasYoungObjPtr := (self addressOf: hasYoungObj put: [:val| hasYoungObj := val]) asInteger.
codeModified := false.
pointer := methodZone youngReferrers.
[pointer < methodZone zoneEnd] whileTrue:
[self assert: hasYoungObj not.
cogMethod := coInterpreter cCoerceSimple: (objectMemory longAt: pointer) to: #'CogMethod *'.
cogMethod cmType = CMFree
ifTrue: [self assert: cogMethod cmRefersToYoung not]
ifFalse:
[self assert: (self cogMethodDoesntLookKosher: cogMethod) = 0.
cogMethod cmRefersToYoung ifTrue:
[self assert: (cogMethod cmType = CMMethod
or: [cogMethod cmType = CMOpenPIC]).
cogMethod selector: (objectRepresentation remapOop: cogMethod selector).
(objectMemory isYoung: cogMethod selector) ifTrue:
[hasYoungObj := true].
cogMethod cmType = CMMethod ifTrue:
[self assert: cogMethod objectHeader = objectMemory nullHeaderForMachineCodeMethod.
cogMethod methodObject: (objectRepresentation remapOop: cogMethod methodObject).
(objectMemory isYoung: cogMethod methodObject) ifTrue:
[hasYoungObj := true]].
self mapFor: cogMethod
performUntil: #remapIfObjectRef:pc:hasYoung:
arg: hasYoungObjPtr.
hasYoungObj
ifTrue: [hasYoungObj := false]
ifFalse: [cogMethod cmRefersToYoung: false]]].
pointer := pointer + objectMemory wordSize].
methodZone pruneYoungReferrers.
codeModified ifTrue: "After updating oops in inline caches we need to flush the icache."
+ [processor flushICacheFrom: methodZoneBase asUnsignedInteger to: methodZone limitZony asUnsignedInteger]!
- [processor flushICacheFrom: methodZoneBase to: methodZone limitZony asInteger]!
Item was changed:
----- Method: Cogit>>markAndTraceMachineCodeForNewSpaceGC (in category 'jit - api') -----
markAndTraceMachineCodeForNewSpaceGC
"Free any methods that refer to unmarked objects, unlinking sends to freed methods."
| pointer cogMethod |
<var: #cogMethod type: #'CogMethod *'>
objectMemory leakCheckNewSpaceGC ifTrue:
[self assert: self allMachineCodeObjectReferencesValid].
codeModified := false.
pointer := methodZone youngReferrers.
[pointer < methodZone zoneEnd] whileTrue:
[cogMethod := coInterpreter cCoerceSimple: (objectMemory longAt: pointer) to: #'CogMethod *'.
cogMethod cmRefersToYoung ifTrue:
[self assert: (self cogMethodDoesntLookKosher: cogMethod) = 0.
self assert: (cogMethod cmType = CMMethod
or: [cogMethod cmType = CMOpenPIC]).
(objectMemory isYoung: cogMethod selector) ifTrue:
[objectMemory markAndTrace: cogMethod selector].
cogMethod cmType = CMMethod ifTrue:
[(objectMemory isYoung: cogMethod methodObject) ifTrue:
[objectMemory markAndTrace: cogMethod methodObject].
self markYoungObjectsIn: cogMethod]].
pointer := pointer + objectMemory wordSize].
objectMemory leakCheckNewSpaceGC ifTrue:
[self assert: self allMachineCodeObjectReferencesValid].
codeModified ifTrue: "After updating oops in inline caches we need to flush the icache."
+ [processor flushICacheFrom: methodZoneBase asUnsignedInteger to: methodZone limitZony asUnsignedInteger]!
- [processor flushICacheFrom: methodZoneBase to: methodZone limitZony asInteger]!
Item was changed:
----- Method: Cogit>>markAndTraceMachineCodeOfMarkedMethods (in category 'jit - api') -----
markAndTraceMachineCodeOfMarkedMethods
"Mark objects in machine-code of marked methods (or open PICs with marked selectors)."
<api>
<option: #SpurObjectMemory>
| cogMethod |
<var: #cogMethod type: #'CogMethod *'>
objectMemory leakCheckFullGC ifTrue:
[self assert: self allMachineCodeObjectReferencesValid].
codeModified := false.
self markAndTraceObjectReferencesInGeneratedRuntime.
cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'.
[cogMethod < methodZone limitZony] whileTrue:
[(cogMethod cmType = CMMethod
and: [objectMemory isMarked: cogMethod methodObject]) ifTrue:
[self markAndTraceLiteralsIn: cogMethod].
(cogMethod cmType = CMOpenPIC
and: [(objectMemory isImmediate: cogMethod selector)
or: [objectMemory isMarked: cogMethod selector]]) ifTrue:
[self markAndTraceLiteralsIn: cogMethod].
cogMethod := methodZone methodAfter: cogMethod].
objectMemory leakCheckFullGC ifTrue:
[self assert: self allMachineCodeObjectReferencesValid].
codeModified ifTrue: "After updating oops in inline caches we need to flush the icache."
+ [processor flushICacheFrom: methodZoneBase asUnsignedInteger to: methodZone limitZony asUnsignedInteger]!
- [processor flushICacheFrom: methodZoneBase to: methodZone limitZony asInteger]!
Item was changed:
----- Method: Cogit>>markAndTraceOrFreeMachineCodeForFullGC (in category 'jit - api') -----
markAndTraceOrFreeMachineCodeForFullGC
"Free any methods that refer to unmarked objects, unlinking sends to freed methods."
| cogMethod |
<var: #cogMethod type: #'CogMethod *'>
objectMemory leakCheckFullGC ifTrue:
[self assert: self allMachineCodeObjectReferencesValid].
codeModified := false.
self markAndTraceObjectReferencesInGeneratedRuntime.
cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'.
[cogMethod < methodZone limitZony] whileTrue:
[self markAndTraceOrFreeCogMethod: cogMethod firstVisit: true.
cogMethod := methodZone methodAfter: cogMethod].
objectMemory leakCheckFullGC ifTrue:
[self assert: self allMachineCodeObjectReferencesValid].
codeModified ifTrue: "After updating oops in inline caches we need to flush the icache."
+ [processor flushICacheFrom: methodZoneBase asUnsignedInteger to: methodZone limitZony asUnsignedInteger]!
- [processor flushICacheFrom: methodZoneBase to: methodZone limitZony asInteger]!
Item was changed:
----- Method: Cogit>>patchToOpenPICFor:numArgs:receiver: (in category 'in-line cacheing') -----
patchToOpenPICFor: selector numArgs: numArgs receiver: receiver
"Code entry closed PIC full or miss to an instance of a young class or to a young target method.
Attempt to patch the send site to an open PIC. Answer if the attempt succeeded; in fact it will
only return if the attempt failed.
The stack looks like:
receiver
args
sp=> sender return address"
<api>
| oPIC outerReturn extent |
<var: #oPIC type: #'CogMethod *'>
outerReturn := coInterpreter stackTop.
"See if an Open PIC is already available."
oPIC := methodZone openPICWithSelector: selector.
oPIC isNil ifTrue:
["otherwise attempt to create an Open PIC."
oPIC := self cogOpenPICSelector: selector numArgs: numArgs.
(oPIC asInteger between: MaxNegativeErrorCode and: -1) ifTrue:
["For some reason the PIC couldn't be generated, most likely a lack of code memory."
oPIC asInteger = InsufficientCodeSpace ifTrue:
[coInterpreter callForCogCompiledCodeCompaction].
^false]].
extent := backEnd
rewriteInlineCacheAt: outerReturn
tag: selector
target: oPIC asInteger + cmEntryOffset.
processor
+ flushICacheFrom: outerReturn asUnsignedInteger - extent to: outerReturn asUnsignedInteger;
- flushICacheFrom: outerReturn - 1 - extent to: outerReturn - 1;
flushICacheFrom: oPIC asInteger to: oPIC asInteger + openPICSize.
"Jump into the oPIC at its entry"
coInterpreter executeCogMethod: oPIC fromLinkedSendWithReceiver: receiver.
"NOTREACHED"
^true!
Item was changed:
----- Method: Cogit>>unlinkAllSends (in category 'jit - api') -----
unlinkAllSends
<api>
"Unlink all sends in cog methods."
| cogMethod |
<var: #cogMethod type: #'CogMethod *'>
methodZoneBase isNil ifTrue: [^self].
cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'.
[cogMethod < methodZone limitZony] whileTrue:
[cogMethod cmType = CMMethod
ifTrue:
[self mapFor: cogMethod
performUntil: #unlinkIfLinkedSend:pc:ignored:
arg: 0]
ifFalse:
[cogMethod cmType ~= CMFree ifTrue:
[methodZone freeMethod: cogMethod]].
cogMethod := methodZone methodAfter: cogMethod].
"After updating inline caches we need to flush the icache."
+ processor flushICacheFrom: methodZoneBase asUnsignedInteger to: methodZone limitZony asUnsignedInteger!
- processor flushICacheFrom: methodZoneBase to: methodZone limitZony asInteger!
Item was changed:
----- Method: Cogit>>unlinkSendsLinkedForInvalidClasses (in category 'jit - api') -----
unlinkSendsLinkedForInvalidClasses
<api>
<option: #SpurObjectMemory>
"Unlink all sends in cog methods whose class tag is that of a forwarded class."
| cogMethod freedPIC |
<var: #cogMethod type: #'CogMethod *'>
methodZoneBase ifNil: [^self].
cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'.
codeModified := freedPIC := false.
[cogMethod < methodZone limitZony] whileTrue:
[cogMethod cmType = CMMethod
ifTrue:
[self mapFor: cogMethod
performUntil: #unlinkIfInvalidClassSend:pc:ignored:
arg: 0]
ifFalse:
[(cogMethod cmType = CMClosedPIC
and: [self cPICHasForwardedClass: cogMethod]) ifTrue:
[methodZone freeMethod: cogMethod.
freedPIC := true]].
cogMethod := methodZone methodAfter: cogMethod].
freedPIC
ifTrue: [self unlinkSendsToFree]
ifFalse:
[codeModified ifTrue: "After possibly updating inline caches we need to flush the icache."
+ [processor flushICacheFrom: methodZoneBase asUnsignedInteger to: methodZone limitZony asUnsignedInteger]]!
- [processor flushICacheFrom: methodZoneBase to: methodZone limitZony asInteger]]!
Item was changed:
----- Method: Cogit>>unlinkSendsOf:isMNUSelector: (in category 'jit - api') -----
unlinkSendsOf: selector isMNUSelector: isMNUSelector
<api>
"Unlink all sends in cog methods. Free all Closed PICs with the selector,
or with an MNU case if isMNUSelector. First check if any method actually
has the selector; if not there can't be any linked send to it. This routine
(including descendents) is performance critical. It contributes perhaps
30% of entire execution time in Compiler recompileAll."
| cogMethod mustScanAndUnlink |
<var: #cogMethod type: #'CogMethod *'>
methodZoneBase isNil ifTrue: [^self].
cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'.
mustScanAndUnlink := false.
isMNUSelector
ifTrue:
[[cogMethod < methodZone limitZony] whileTrue:
[cogMethod cmType ~= CMFree ifTrue:
[cogMethod cpicHasMNUCase
ifTrue:
[self assert: cogMethod cmType = CMClosedPIC.
methodZone freeMethod: cogMethod.
mustScanAndUnlink := true]
ifFalse:
[cogMethod selector = selector ifTrue:
[mustScanAndUnlink := true.
cogMethod cmType = CMClosedPIC ifTrue:
[methodZone freeMethod: cogMethod]]]].
cogMethod := methodZone methodAfter: cogMethod]]
ifFalse:
[[cogMethod < methodZone limitZony] whileTrue:
[(cogMethod cmType ~= CMFree
and: [cogMethod selector = selector]) ifTrue:
[mustScanAndUnlink := true.
cogMethod cmType = CMClosedPIC ifTrue:
[methodZone freeMethod: cogMethod]].
cogMethod := methodZone methodAfter: cogMethod]].
mustScanAndUnlink ifFalse:
[^self].
codeModified := false.
cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'.
[cogMethod < methodZone limitZony] whileTrue:
[cogMethod cmType = CMMethod ifTrue:
[self mapFor: cogMethod
performUntil: #unlinkIfFreeOrLinkedSend:pc:of:
arg: selector].
cogMethod := methodZone methodAfter: cogMethod].
codeModified ifTrue: "After possibly updating inline caches we need to flush the icache."
+ [processor flushICacheFrom: methodZoneBase asUnsignedInteger to: methodZone limitZony asUnsignedInteger]!
- [processor flushICacheFrom: methodZoneBase to: methodZone limitZony asInteger]!
Item was changed:
----- Method: Cogit>>unlinkSendsTo:andFreeIf: (in category 'jit - api') -----
unlinkSendsTo: targetMethodObject andFreeIf: freeIfTrue
<api>
"Unlink all sends in cog methods to a particular target method.
If targetMethodObject isn't actually a method (perhaps being
used via invokeAsMethod) then there's nothing to do."
| cogMethod targetMethod freedPIC |
<var: #cogMethod type: #'CogMethod *'>
<var: #targetMethod type: #'CogMethod *'>
((objectMemory isOopCompiledMethod: targetMethodObject)
and: [coInterpreter methodHasCogMethod: targetMethodObject]) ifFalse:
[^self].
targetMethod := coInterpreter cogMethodOf: targetMethodObject.
methodZoneBase isNil ifTrue: [^self].
codeModified := freedPIC := false.
cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'.
[cogMethod < methodZone limitZony] whileTrue:
[cogMethod cmType = CMMethod
ifTrue:
[self mapFor: cogMethod
performUntil: #unlinkIfLinkedSend:pc:to:
arg: targetMethod asInteger]
ifFalse:
[(cogMethod cmType = CMClosedPIC
and: [self cPIC: cogMethod HasTarget: targetMethod]) ifTrue:
[methodZone freeMethod: cogMethod.
freedPIC := true]].
cogMethod := methodZone methodAfter: cogMethod].
freeIfTrue ifTrue: [self freeMethod: targetMethod].
freedPIC
ifTrue: [self unlinkSendsToFree]
ifFalse:
[codeModified ifTrue: "After possibly updating inline caches we need to flush the icache."
+ [processor flushICacheFrom: methodZoneBase asUnsignedInteger to: methodZone limitZony asUnsignedInteger]]!
- [processor flushICacheFrom: methodZoneBase to: methodZone limitZony asInteger]]!
Item was changed:
----- Method: Cogit>>unlinkSendsToFree (in category 'garbage collection') -----
unlinkSendsToFree
<api>
"Unlink all sends in cog methods to free methods and/or pics."
| cogMethod |
<var: #cogMethod type: #'CogMethod *'>
methodZoneBase isNil ifTrue: [^self].
codeModified := false.
cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'.
[cogMethod < methodZone limitZony] whileTrue:
[cogMethod cmType = CMMethod
ifTrue:
[self mapFor: cogMethod
performUntil: #unlinkIfLinkedSendToFree:pc:ignored:
arg: 0]
ifFalse:
[cogMethod cmType = CMClosedPIC ifTrue:
[self assert: (self noTargetsFreeInClosedPIC: cogMethod)]].
cogMethod := methodZone methodAfter: cogMethod].
codeModified ifTrue: "After possibly updating inline caches we need to flush the icache."
+ [processor flushICacheFrom: methodZoneBase asUnsignedInteger to: methodZone limitZony asUnsignedInteger]!
- [processor flushICacheFrom: methodZoneBase to: methodZone limitZony asInteger]!
Item was changed:
----- Method: SimpleStackBasedCogit>>rewritePrimInvocationIn:to: (in category 'external primitive support') -----
rewritePrimInvocationIn: cogMethod to: primFunctionPointer
<api>
<var: #cogMethod type: #'CogMethod *'>
<var: #primFunctionPointer declareC: #'void (*primFunctionPointer)(void)'>
| primIndex flags address extent |
self assert: cogMethod cmType = CMMethod.
primIndex := coInterpreter
primitiveIndexOfMethod: cogMethod methodObject
header: cogMethod methodHeader.
flags := coInterpreter primitivePropertyFlags: primIndex.
"See compileInterpreterPrimitive:"
(flags bitAnd: PrimCallMayCallBack) ~= 0
ifTrue:
[address := cogMethod asUnsignedInteger
+ (externalPrimJumpOffsets at: cogMethod cmNumArgs).
extent := backEnd
rewriteJumpFullAt: address
target: (self cCode: [primFunctionPointer asUnsignedInteger]
inSmalltalk: [self simulatedTrampolineFor: primFunctionPointer])]
ifFalse:
[address := cogMethod asUnsignedInteger
+ (externalPrimCallOffsets at: cogMethod cmNumArgs).
extent := backEnd
rewriteCallFullAt: address
target: (self cCode: [primFunctionPointer asUnsignedInteger]
inSmalltalk: [self simulatedTrampolineFor: primFunctionPointer])].
+ processor flushICacheFrom: address asUnsignedInteger to: address asUnsignedInteger + extent!
- processor flushICacheFrom: address to: address + extent!
1
0
Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1334.mcz
==================== Summary ====================
Name: VMMaker.oscog-eem.1334
Author: eem
Time: 3 June 2015, 5:08:13.124 pm
UUID: 1d933034-0724-4da9-82e4-f79648b6dc8b
Ancestors: VMMaker.oscog-eem.1333
Spur:
Since the invariant is that the receiver is never
forwarded, Spur must check for forwarding on
block activation. A become between closure
creation and closure evaluation can forward the
receiver, and it must be unforwarded. Here we do
so by checking for a forwarded receiver in the
value[:] primitives. This is a major blow to block
performance; e.g. the nfib block
b := [:n| n <= 1
ifTrue: [1]
ifFalse: [1 + (b value: n - 1) + (b value: n - 2)]].
slows down by 11%. So we can and will do better.
We should scan for receiver usage in the JIT and
optionally compile unforwarding code in the prolog
depending on whether self is used or not.
Cogit:
Use the Tst-based generators for immediate and
SmallInteger tests more widely to save a few more
instructions.
=============== Diff against VMMaker.oscog-eem.1333 ===============
Item was changed:
----- Method: CoInterpreter>>activateNewClosureMethod:numArgs:mayContextSwitch: (in category 'control primitives') -----
activateNewClosureMethod: blockClosure numArgs: numArgs mayContextSwitch: mayContextSwitch
"Similar to activateNewMethod but for Closure and newMethod.
Override to handle the various interpreter/machine code transitions
and to create an appropriate frame layout."
| numCopied outerContext theMethod methodHeader inInterpreter closureIP switched |
<inline: true>
+ outerContext := objectMemory followField: ClosureOuterContextIndex ofObject: blockClosure.
- outerContext := objectMemory fetchPointer: ClosureOuterContextIndex ofObject: blockClosure.
self assert: outerContext ~= blockClosure.
numCopied := self copiedValueCountOfClosure: blockClosure.
+ theMethod := objectMemory followField: MethodIndex ofObject: outerContext.
- theMethod := objectMemory fetchPointer: MethodIndex ofObject: outerContext.
methodHeader := self rawHeaderOf: theMethod.
(self isCogMethodReference: methodHeader) ifTrue:
[^self executeCogBlock: (self cogMethodOf: theMethod)
closure: blockClosure
mayContextSwitch: mayContextSwitch].
"How do we know when to compile a block method?
One simple criterion is to check if the block is running within its inner context,
i.e. if the outerContext is married.
Even simpler is to remember the previous block entered via the interpreter and
compile if this is the same one. But we can thrash trying to compile an uncoggable
method unless we try and remember which ones can't be cogged. So also record
the last block method we failed to compile and avoid recompiling it."
(self methodWithHeaderShouldBeCogged: methodHeader)
ifTrue:
[theMethod = lastCoggableInterpretedBlockMethod
ifTrue:
[theMethod ~= lastUncoggableInterpretedBlockMethod ifTrue:
[cogit cog: theMethod selector: objectMemory nilObject.
(self methodHasCogMethod: theMethod) ifTrue:
[^self executeCogBlock: (self cogMethodOf: theMethod)
closure: blockClosure
mayContextSwitch: mayContextSwitch].
cogCompiledCodeCompactionCalledFor ifFalse:
[lastUncoggableInterpretedBlockMethod := theMethod]]]
ifFalse:
[lastCoggableInterpretedBlockMethod := theMethod]]
ifFalse:
[self maybeFlagMethodAsInterpreted: theMethod].
self assert: (self methodHasCogMethod: theMethod) not.
"Because this is an uncogged method we need to continue via the interpreter.
We could have been reached either from the interpreter, in which case we
should simply return, or from a machine code frame or from a compiled
primitive. In these latter two cases we must longjmp back to the interpreter.
The instructionPointer tells us which path we took.
If the sender was an interpreter frame but called through a (failing) primitive
then make sure we restore the saved instruction pointer and avoid pushing
ceReturnToInterpreterPC which is only valid between an interpreter caller
frame and a machine code callee frame."
(inInterpreter := instructionPointer >= objectMemory startOfMemory) ifFalse:
[instructionPointer = cogit ceReturnToInterpreterPC ifTrue:
[instructionPointer := self iframeSavedIP: framePointer]].
self push: instructionPointer.
self push: framePointer.
framePointer := stackPointer.
self push: theMethod.
self push: objectMemory nilObject. "FxThisContext field"
self push: (self encodeFrameFieldHasContext: false isBlock: true numArgs: numArgs).
self push: 0. "FoxIFSavedIP"
+ self push: (objectMemory followField: ReceiverIndex ofObject: outerContext).
- self push: (objectMemory fetchPointer: ReceiverIndex ofObject: outerContext).
"Copy the copied values..."
0 to: numCopied - 1 do:
[:i|
self push: (objectMemory
fetchPointer: i + ClosureFirstCopiedValueIndex
ofObject: blockClosure)].
self assert: (self frameIsBlockActivation: framePointer).
self assert: (self frameHasContext: framePointer) not.
"The initial instructions in the block nil-out remaining temps."
"the instruction pointer is a pointer variable equal to
method oop + ip + BaseHeaderSize
-1 for 0-based addressing of fetchByte
-1 because it gets incremented BEFORE fetching currentByte"
closureIP := self quickFetchInteger: ClosureStartPCIndex ofObject: blockClosure.
instructionPointer := theMethod + closureIP + objectMemory baseHeaderSize - 2.
self setMethod: theMethod methodHeader: methodHeader.
"Now check for stack overflow or an event (interrupt, must scavenge, etc)"
switched := false.
stackPointer < stackLimit ifTrue:
[switched := self handleStackOverflowOrEventAllowContextSwitch: mayContextSwitch].
self returnToExecutive: inInterpreter postContextSwitch: switched!
Item was removed:
- ----- Method: CogObjectRepresentation>>genEnsureObjInRegNotForwarded:scratchReg:updatingMw:r: (in category 'compile abstract instructions') -----
- genEnsureObjInRegNotForwarded: reg scratchReg: scratch updatingMw: offset r: baseReg
- "Make sure that the non-immediate oop in reg is not forwarded, updating the field
- at offset from baseReg. By default there is nothing to do. Subclasses for memory
- managers that forward will override."
- <inline: true>
- ^0!
Item was added:
+ ----- Method: CogObjectRepresentation>>genEnsureOopInRegNotForwarded:scratchReg:updatingMw:r: (in category 'compile abstract instructions') -----
+ genEnsureOopInRegNotForwarded: reg scratchReg: scratch updatingMw: offset r: baseReg
+ "Make sure that the oop in reg is not forwarded, updating the field at offset from baseReg.
+ By default there is nothing to do. Subclasses for memory managers that forward will override."
+ <inline: true>
+ ^0!
Item was added:
+ ----- Method: CogObjectRepresentation>>genEnsureOopInRegNotForwarded:scratchReg:updatingSlot:in: (in category 'compile abstract instructions') -----
+ genEnsureOopInRegNotForwarded: reg scratchReg: scratch updatingSlot: index in: objReg
+ "Make sure that the oop in reg is not forwarded, updating the slot in objReg with the value."
+ <inline: true>
+ ^self genEnsureOopInRegNotForwarded: reg
+ scratchReg: scratch
+ updatingMw: index * objectMemory wordSize + objectMemory baseHeaderSize
+ r: objReg!
Item was added:
+ ----- Method: CogObjectRepresentation>>genJumpNotSmallInteger:scratchReg: (in category 'compile abstract instructions') -----
+ genJumpNotSmallInteger: aRegister scratchReg: scratch
+ "Generate a compare and branch to test if aRegister contains other than a SmallInteger.
+ Answer the jump. Use scratch if required. Subclasses will override if scratch is needed."
+ <returnTypeC: #'AbstractInstruction *'>
+ ^self genJumpNotSmallInteger: aRegister!
Item was added:
+ ----- Method: CogObjectRepresentation>>genJumpSmallInteger:scratchReg: (in category 'compile abstract instructions') -----
+ genJumpSmallInteger: aRegister scratchReg: scratch
+ "Generate a compare and branch to test if aRegister contains a SmallInteger.
+ Answer the jump. Use scratch if required. Subclasses will override if scratch is needed."
+ <returnTypeC: #'AbstractInstruction *'>
+ ^self genJumpSmallInteger: aRegister!
Item was added:
+ ----- Method: CogObjectRepresentation>>genLoadSlot:sourceReg:destReg: (in category 'compile abstract instructions') -----
+ genLoadSlot: index sourceReg: sourceReg destReg: destReg
+ cogit
+ MoveMw: index * objectMemory wordSize + objectMemory baseHeaderSize
+ r: sourceReg
+ R: destReg.
+ ^0!
Item was changed:
----- Method: CogObjectRepresentationFor32BitSpur>>allImmediate:branchIf:notInstanceOfBehaviors:target: (in category 'sista support') -----
allImmediate: immediateMask branchIf: reg notInstanceOfBehaviors: arrayObj target: targetFixUp
| jmpImmediate |
< inline: true>
<var: #targetFixUp type: #'AbstractInstruction *'>
self assert: immediateMask = objectMemory tagMask.
+ jmpImmediate := self genJumpNotImmediate: reg.
- cogit MoveR: reg R: TempReg.
- jmpImmediate := self genJumpNotImmediateInScratchReg: TempReg.
jmpImmediate jmpTarget: targetFixUp.
^0!
Item was changed:
----- Method: CogObjectRepresentationFor32BitSpur>>genInnerPrimitiveAtPut: (in category 'primitive generators') -----
genInnerPrimitiveAtPut: retNoffset
"Implement the guts of primitiveAtPut"
| formatReg jumpImmediate jumpBadIndex
jumpNotIndexablePointers jumpNotIndexableBits
jumpIsContext jumpIsCompiledMethod jumpIsBytes jumpHasFixedFields
jumpArrayOutOfBounds jumpFixedFieldsOutOfBounds
jumpWordsOutOfBounds jumpBytesOutOfBounds jumpBytesOutOfRange
jumpNonSmallIntegerValue jumpShortsUnsupported jumpNotPointers
|
<inline: true>
"c.f. StackInterpreter>>stSizeOf: SpurMemoryManager>>lengthOf:format: fixedFieldsOf:format:length:"
<var: #jumpIsBytes type: #'AbstractInstruction *'>
<var: #jumpBadIndex type: #'AbstractInstruction *'>
<var: #jumpIsContext type: #'AbstractInstruction *'>
<var: #jumpImmediate type: #'AbstractInstruction *'>
<var: #jumpHasFixedFields type: #'AbstractInstruction *'>
<var: #jumpNotIndexableBits type: #'AbstractInstruction *'>
<var: #jumpArrayOutOfBounds type: #'AbstractInstruction *'>
<var: #jumpBytesOutOfBounds type: #'AbstractInstruction *'>
<var: #jumpShortsUnsupported type: #'AbstractInstruction *'>
<var: #jumpWordsOutOfBounds type: #'AbstractInstruction *'>
<var: #jumpNotIndexablePointers type: #'AbstractInstruction *'>
jumpImmediate := self genJumpImmediate: ReceiverResultReg.
+ jumpBadIndex := self genJumpNotSmallInteger: Arg0Reg scratchReg: TempReg.
- jumpBadIndex := self genJumpNotSmallInteger: Arg0Reg.
self genConvertSmallIntegerToIntegerInReg: Arg0Reg.
cogit SubCq: 1 R: Arg0Reg. "1-rel => 0-rel"
"formatReg := self formatOf: ReceiverResultReg"
self genGetFormatOf: ReceiverResultReg
into: (formatReg := SendNumArgsReg)
leastSignificantHalfOfBaseHeaderIntoScratch: nil.
self genGetNumSlotsOf: ReceiverResultReg into: ClassReg.
"dispatch on format in a combination of highest dynamic frequency order first and convenience.
0 = 0 sized objects (UndefinedObject True False et al)
1 = non-indexable objects with inst vars (Point et al)
2 = indexable objects with no inst vars (Array et al)
3 = indexable objects with inst vars (MethodContext AdditionalMethodState et al)
4 = weak indexable objects with inst vars (WeakArray et al)
5 = weak non-indexable objects with inst vars (ephemerons) (Ephemeron)
6 unused, reserved for exotic pointer objects?
7 Forwarded Object, 1st field is pointer, rest of fields are ignored
8 unused, reserved for exotic non-pointer objects?
9 (?) 64-bit indexable
10 - 11 32-bit indexable
12 - 15 16-bit indexable
16 - 23 byte indexable
24 - 31 compiled method"
cogit CmpCq: objectMemory weakArrayFormat R: formatReg.
jumpNotPointers := cogit JumpAbove: 0.
"optimistic store check; assume index in range (almost always is)."
self genStoreCheckReceiverReg: ReceiverResultReg
valueReg: Arg1Reg
scratchReg: TempReg
inFrame: false.
cogit CmpCq: objectMemory arrayFormat R: formatReg.
jumpNotIndexablePointers := cogit JumpBelow: 0.
jumpHasFixedFields := cogit JumpNonZero: 0.
cogit CmpR: Arg0Reg R: ClassReg.
jumpArrayOutOfBounds := cogit JumpBelowOrEqual: 0.
cogit AddCq: objectMemory baseHeaderSize >> objectMemory shiftForWord R: Arg0Reg.
cogit MoveR: Arg1Reg Xwr: Arg0Reg R: ReceiverResultReg.
cogit MoveR: Arg1Reg R: ReceiverResultReg.
cogit RetN: retNoffset.
jumpHasFixedFields jmpTarget: cogit Label.
self genGetClassIndexOfNonImm: ReceiverResultReg into: formatReg.
cogit CmpCq: ClassMethodContextCompactIndex R: formatReg.
jumpIsContext := cogit JumpZero: 0.
"get # fixed fields in formatReg"
cogit PushR: ClassReg.
self genGetClassObjectOfClassIndex: formatReg into: ClassReg scratchReg: TempReg.
self genLoadSlot: InstanceSpecificationIndex sourceReg: ClassReg destReg: formatReg.
cogit PopR: ClassReg.
self genConvertSmallIntegerToIntegerInReg: formatReg.
cogit AndCq: objectMemory fixedFieldsOfClassFormatMask R: formatReg.
cogit SubR: formatReg R: ClassReg.
cogit AddCq: objectMemory baseHeaderSize >> objectMemory shiftForWord R: formatReg.
cogit CmpR: Arg0Reg R: ClassReg.
jumpFixedFieldsOutOfBounds := cogit JumpBelowOrEqual: 0.
cogit AddR: formatReg R: Arg0Reg.
cogit MoveR: Arg1Reg Xwr: Arg0Reg R: ReceiverResultReg.
cogit MoveR: Arg1Reg R: ReceiverResultReg.
cogit RetN: retNoffset.
jumpNotPointers jmpTarget:
(cogit CmpCq: objectMemory firstCompiledMethodFormat R: formatReg).
jumpIsCompiledMethod := cogit JumpAboveOrEqual: 0.
+ jumpNonSmallIntegerValue := self genJumpNotSmallInteger: Arg1Reg scratchReg: TempReg.
- cogit MoveR: Arg1Reg R: TempReg.
- jumpNonSmallIntegerValue := self genJumpNotSmallIntegerInScratchReg: TempReg.
cogit CmpCq: objectMemory firstByteFormat R: formatReg.
jumpIsBytes := cogit JumpAboveOrEqual: 0.
cogit CmpCq: objectMemory firstShortFormat R: formatReg.
jumpShortsUnsupported := cogit JumpAboveOrEqual: 0.
cogit CmpCq: objectMemory firstLongFormat R: formatReg.
"For now ignore 64-bit indexability."
jumpNotIndexableBits := cogit JumpBelow: 0.
cogit CmpR: Arg0Reg R: ClassReg.
jumpWordsOutOfBounds := cogit JumpBelowOrEqual: 0.
cogit MoveR: Arg1Reg R: TempReg.
self genConvertSmallIntegerToIntegerInReg: TempReg.
cogit AddCq: objectMemory baseHeaderSize >> objectMemory shiftForWord R: Arg0Reg.
cogit MoveR: TempReg Xwr: Arg0Reg R: ReceiverResultReg.
cogit MoveR: Arg1Reg R: ReceiverResultReg.
cogit RetN: retNoffset.
jumpIsBytes jmpTarget:
(cogit CmpCq: (objectMemory integerObjectOf: 255) R: Arg1Reg).
jumpBytesOutOfRange := cogit JumpAbove: 0.
cogit LogicalShiftLeftCq: objectMemory shiftForWord R: ClassReg.
cogit AndCq: objectMemory wordSize - 1 R: formatReg.
cogit SubR: formatReg R: ClassReg;
CmpR: Arg0Reg R: ClassReg.
jumpBytesOutOfBounds := cogit JumpBelowOrEqual: 0.
cogit MoveR: Arg1Reg R: TempReg.
self genConvertSmallIntegerToIntegerInReg: TempReg.
cogit AddCq: objectMemory baseHeaderSize R: Arg0Reg.
cogit MoveR: TempReg Xbr: Arg0Reg R: ReceiverResultReg.
cogit MoveR: Arg1Reg R: ReceiverResultReg.
cogit RetN: retNoffset.
"there are no shorts as yet. so this is dead code:
jumpIsShorts jmpTarget:
(cogit CmpCq: (objectMemory integerObjectOf: 65535) R: Arg1Reg).
jumpShortsOutOfRange := cogit JumpAbove: 0.
cogit LogicalShiftLeftCq: objectMemory shiftForWord - 1 R: ClassReg.
cogit AndCq: 1 R: formatReg.
cogit SubR: formatReg R: ClassReg;
CmpR: Arg0Reg R: ClassReg.
jumpShortsOutOfBounds := cogit JumpBelowOrEqual: 0.
cogit MoveR: Arg1Reg R: TempReg.
cogit genConvertSmallIntegerToIntegerInReg: TempReg.
cogit AddR: Arg0Reg R: ReceiverResultReg.
cogit MoveR: TempReg M16: objectMemory baseHeaderSize r: ReceiverResultReg.
cogit MoveR: Arg1Reg R: ReceiverResultReg.
jumpShortsDone := cogit Jump: 0."
jumpIsContext jmpTarget:
(jumpNotIndexableBits jmpTarget:
(jumpBytesOutOfRange jmpTarget:
(jumpIsCompiledMethod jmpTarget:
(jumpArrayOutOfBounds jmpTarget:
(jumpBytesOutOfBounds jmpTarget:
(jumpShortsUnsupported jmpTarget:
(jumpWordsOutOfBounds jmpTarget:
(jumpNotIndexablePointers jmpTarget:
(jumpNonSmallIntegerValue jmpTarget:
(jumpFixedFieldsOutOfBounds jmpTarget: cogit Label)))))))))).
cogit AddCq: 1 R: Arg0Reg. "0-rel => 1-rel"
self genConvertIntegerToSmallIntegerInReg: Arg0Reg.
jumpBadIndex jmpTarget: (jumpImmediate jmpTarget: cogit Label).
^0!
Item was changed:
----- Method: CogObjectRepresentationFor32BitSpur>>genInnerPrimitiveMirrorNew: (in category 'primitive generators') -----
genInnerPrimitiveMirrorNew: retNoffset
"Implement 1-arg (instantiateFixedClass:) primitiveNew for convenient cases:
- the class argument has a hash
- the class argument is fixed size (excluding ephemerons to save instructions & miniscule time)
- single word header/num slots < numSlotsMask
- the result fits in eden (actually below scavengeThreshold)"
<option: #NewspeakVM>
| halfHeaderReg fillReg instSpecReg byteSizeReg
jumpImmediate jumpUnhashed jumpNotFixedPointers jumpTooSmall jumpBadFormat
jumpNoSpace jumpTooBig jumpHasSlots jumpVariableOrEphemeron
fillLoop skip |
<var: 'skip' type: #'AbstractInstruction *'>
<var: 'fillLoop' type: #'AbstractInstruction *'>
<var: 'jumpTooBig' type: #'AbstractInstruction *'>
<var: 'jumpHasSlots' type: #'AbstractInstruction *'>
<var: 'jumpNoSpace' type: #'AbstractInstruction *'>
<var: 'jumpTooSmall' type: #'AbstractInstruction *'>
<var: 'jumpUnhashed' type: #'AbstractInstruction *'>
<var: 'jumpImmediate' type: #'AbstractInstruction *'>
<var: 'jumpBadFormat' type: #'AbstractInstruction *'>
<var: 'jumpNotFixedPointers' type: #'AbstractInstruction *'>
<var: 'jumpVariableOrEphemeron' type: #'AbstractInstruction *'>
"half header will contain 1st half of header (classIndex/class's hash & format),
then 2nd half of header (numSlots/fixed size) and finally fill value (nilObject)."
halfHeaderReg := fillReg := SendNumArgsReg.
"inst spec will hold class's instance specification, then byte size and finally end of new object."
instSpecReg := byteSizeReg := ClassReg.
"get freeStart as early as possible so as not to wait later..."
cogit MoveAw: objectMemory freeStartAddress R: Arg1Reg.
"validate class arg; sigh, this mirror crap hobbles unfairly; there is a better way with selector namespaces..."
+ jumpImmediate := self genJumpImmediate: Arg0Reg.
- cogit MoveR: Arg0Reg R: TempReg.
- jumpImmediate := self genJumpImmediateInScratchReg: TempReg.
"Is the class arg pointers with at least 3 fields?"
self genGetFormatOf: Arg0Reg
into: TempReg
leastSignificantHalfOfBaseHeaderIntoScratch: nil.
cogit CmpCq: objectMemory nonIndexablePointerFormat R: TempReg.
jumpNotFixedPointers := cogit JumpNonZero: 0.
self genGetRawSlotSizeOfNonImm: Arg0Reg into: TempReg.
cogit CmpCq: InstanceSpecificationIndex + 1 R: TempReg.
jumpTooSmall := cogit JumpLess: 0.
"get class's hash & fail if 0"
self genGetHashFieldNonImmOf: Arg0Reg into: halfHeaderReg.
jumpUnhashed := cogit JumpZero: 0.
"get class's format inst var for both inst spec (format field) and num fixed fields"
self genLoadSlot: InstanceSpecificationIndex sourceReg: Arg0Reg destReg: instSpecReg.
+ jumpBadFormat := self genJumpNotSmallInteger: instSpecReg scratchReg: TempReg.
- cogit MoveR: instSpecReg R: TempReg.
- jumpBadFormat := self genJumpNotSmallIntegerInScratchReg: TempReg.
self genConvertSmallIntegerToIntegerInReg: instSpecReg.
+ cogit MoveR: instSpecReg R: TempReg.
cogit LogicalShiftRightCq: objectMemory fixedFieldsFieldWidth R: TempReg.
cogit AndCq: objectMemory formatMask R: TempReg.
cogit AndCq: objectMemory fixedFieldsOfClassFormatMask R: instSpecReg.
"fail if not fixed or if ephemeron (rare beasts so save the cycles)"
cogit CmpCq: objectMemory nonIndexablePointerFormat R: TempReg.
jumpVariableOrEphemeron := cogit JumpAbove: 0.
cogit CmpCq: objectMemory numSlotsMask R: instSpecReg.
jumpTooBig := cogit JumpAboveOrEqual: 0.
"Add format to classIndex/format half header; other word contains numSlots"
cogit LogicalShiftLeftCq: objectMemory formatShift R: TempReg.
cogit AddR: TempReg R: halfHeaderReg.
"write half header now; it frees halfHeaderReg"
cogit MoveR: halfHeaderReg Mw: 0 r: Arg1Reg.
"save unrounded numSlots for header"
cogit MoveR: instSpecReg R: halfHeaderReg.
"compute byte size; remember 0-sized objects still need 1 slot & allocation is
rounded up to 8 bytes."
cogit CmpCq: 0 R: byteSizeReg. "a.k.a. instSpecReg"
jumpHasSlots := cogit JumpNonZero: 0.
cogit MoveCq: objectMemory baseHeaderSize * 2 R: byteSizeReg.
skip := cogit Jump: 0.
"round up to allocationUnit"
jumpHasSlots jmpTarget:
(cogit MoveR: byteSizeReg R: TempReg).
cogit AndCq: 1 R: TempReg.
cogit AddR: TempReg R: byteSizeReg.
cogit AddCq: objectMemory baseHeaderSize / objectMemory wordSize R: byteSizeReg.
cogit LogicalShiftLeftCq: objectMemory shiftForWord R: byteSizeReg.
skip jmpTarget:
"shift halfHeaderReg to put numSlots in correct place"
(cogit LogicalShiftLeftCq: objectMemory numSlotsHalfShift R: halfHeaderReg).
"check if allocation fits (freeSize + byteSize < scavengeThreshold); scavengeThreshold is constant."
cogit AddR: Arg1Reg R: byteSizeReg.
cogit CmpCq: objectMemory getScavengeThreshold R: byteSizeReg.
jumpNoSpace := cogit JumpAboveOrEqual: 0.
"write back new freeStart; get result. byteSizeReg holds new freeStart, the limit of the object"
cogit MoveR: byteSizeReg Aw: objectMemory freeStartAddress.
cogit MoveR: Arg1Reg R: ReceiverResultReg.
"write other half of header (numSlots/identityHash)"
cogit MoveR: halfHeaderReg Mw: 4 r: Arg1Reg.
"now fill"
cogit LoadEffectiveAddressMw: objectMemory baseHeaderSize r: ReceiverResultReg R: Arg1Reg.
cogit MoveCq: objectMemory nilObject R: fillReg.
"at least two words; so can make this a [fill 2 words. reached limit?] whileFalse"
fillLoop :=
cogit MoveR: fillReg Mw: 0 r: Arg1Reg.
cogit MoveR: fillReg Mw: 4 r: Arg1Reg.
cogit AddCq: 8 R: Arg1Reg.
cogit CmpR: Arg1Reg R: byteSizeReg.
cogit JumpAbove: fillLoop.
cogit RetN: retNoffset.
jumpNotFixedPointers jmpTarget:
(jumpBadFormat jmpTarget:
(jumpTooSmall jmpTarget:
(jumpImmediate jmpTarget:
(jumpUnhashed jmpTarget:
(jumpVariableOrEphemeron jmpTarget:
(jumpTooBig jmpTarget:
(jumpNoSpace jmpTarget: cogit Label))))))).
^0!
Item was changed:
----- Method: CogObjectRepresentationFor32BitSpur>>genInnerPrimitiveMirrorNewWithArg: (in category 'primitive generators') -----
genInnerPrimitiveMirrorNewWithArg: retNoffset
"Implement instantiateVariableClass:withSize: for convenient cases:
- the class argument has a hash
- the class argument is variable and not compiled method
- single word header/num slots < numSlotsMask
- the result fits in eden
See superclass method for dynamic frequencies of formats.
For the moment we implement only arrayFormat, firstByteFormat & firstLongFormat"
<option: #NewspeakVM>
| halfHeaderReg fillReg instSpecReg byteSizeReg maxSlots
jumpArrayTooBig jumpByteTooBig jumpLongTooBig
jumpArrayFormat jumpByteFormat jumpBytePrepDone jumpLongPrepDone
jumpUnhashed jumpTooSmall jumpImmediate jumpNotFixedPointers
jumpNElementsNonInt jumpFailCuzFixed jumpNoSpace jumpHasSlots fillLoop skip |
<var: 'skip' type: #'AbstractInstruction *'>
<var: 'fillLoop' type: #'AbstractInstruction *'>
<var: 'jumpHasSlots' type: #'AbstractInstruction *'>
<var: 'jumpNoSpace' type: #'AbstractInstruction *'>
<var: 'jumpTooSmall' type: #'AbstractInstruction *'>
<var: 'jumpUnhashed' type: #'AbstractInstruction *'>
<var: 'jumpImmediate' type: #'AbstractInstruction *'>
<var: 'jumpByteFormat' type: #'AbstractInstruction *'>
<var: 'jumpByteTooBig' type: #'AbstractInstruction *'>
<var: 'jumpLongTooBig' type: #'AbstractInstruction *'>
<var: 'jumpArrayFormat' type: #'AbstractInstruction *'>
<var: 'jumpArrayTooBig' type: #'AbstractInstruction *'>
<var: 'jumpFailCuzFixed' type: #'AbstractInstruction *'>
<var: 'jumpBytePrepDone' type: #'AbstractInstruction *'>
<var: 'jumpLongPrepDone' type: #'AbstractInstruction *'>
<var: 'jumpNElementsNonInt' type: #'AbstractInstruction *'>
<var: 'jumpNotFixedPointers' type: #'AbstractInstruction *'>
"half header will contain 1st half of header (classIndex/class's hash & format),
then 2nd half of header (numSlots) and finally fill value (nilObject)."
halfHeaderReg := fillReg := SendNumArgsReg.
"inst spec will hold class's instance specification and then byte size and finally numSlots half of header"
instSpecReg := byteSizeReg := ClassReg.
"The max slots we'll allocate here are those for a single header"
maxSlots := objectMemory numSlotsMask - 1.
"check size and fail if not a +ve integer"
+ jumpNElementsNonInt := self genJumpNotSmallInteger: Arg1Reg scratchReg: TempReg.
- cogit MoveR: Arg1Reg R: TempReg.
- jumpNElementsNonInt := self genJumpNotSmallIntegerInScratchReg: TempReg.
"Is the class arg pointers with at least 3 fields?"
+ jumpImmediate := self genJumpImmediate: Arg0Reg.
- cogit MoveR: Arg0Reg R: TempReg.
- jumpImmediate := self genJumpImmediateInScratchReg: TempReg.
self genGetFormatOf: Arg0Reg
into: TempReg
leastSignificantHalfOfBaseHeaderIntoScratch: nil.
cogit CmpCq: objectMemory nonIndexablePointerFormat R: TempReg.
jumpNotFixedPointers := cogit JumpNonZero: 0.
self genGetRawSlotSizeOfNonImm: Arg0Reg into: TempReg.
cogit CmpCq: InstanceSpecificationIndex + 1 R: TempReg.
jumpTooSmall := cogit JumpLess: 0.
"get class's hash & fail if 0"
self genGetHashFieldNonImmOf: Arg0Reg into: halfHeaderReg.
jumpUnhashed := cogit JumpZero: 0.
"The basicNew: code below (copied from genInnerPrimitiveNewWithArg:) expects class
in ReceiverResultReg and size in Arg0Reg. Shuffle args to match, undoing on failure."
cogit
PushR: ReceiverResultReg;
MoveR: Arg0Reg R: ReceiverResultReg;
MoveR: Arg1Reg R: Arg0Reg.
"get freeStart as early as possible so as not to wait later..."
cogit MoveAw: objectMemory freeStartAddress R: Arg1Reg.
"get class's format inst var for inst spec (format field)"
self genLoadSlot: InstanceSpecificationIndex sourceReg: ReceiverResultReg destReg: instSpecReg.
cogit LogicalShiftRightCq: objectMemory fixedFieldsFieldWidth + self numSmallIntegerTagBits R: instSpecReg.
cogit AndCq: objectMemory formatMask R: instSpecReg.
"Add format to classIndex/format half header now"
cogit MoveR: instSpecReg R: TempReg.
cogit LogicalShiftLeftCq: objectMemory formatShift R: TempReg.
cogit AddR: TempReg R: halfHeaderReg.
"get integer value of num fields in TempReg now"
cogit MoveR: Arg0Reg R: TempReg.
self genConvertSmallIntegerToIntegerInReg: TempReg.
"dispatch on format, failing if not variable or if compiled method"
cogit CmpCq: objectMemory arrayFormat R: instSpecReg.
jumpArrayFormat := cogit JumpZero: 0.
cogit CmpCq: objectMemory firstByteFormat R: instSpecReg.
jumpByteFormat := cogit JumpZero: 0.
cogit CmpCq: objectMemory firstLongFormat R: instSpecReg.
jumpFailCuzFixed := cogit JumpNonZero: 0.
cogit CmpCq: (objectMemory integerObjectOf: maxSlots) R: Arg0Reg.
jumpLongTooBig := cogit JumpAbove: 0.
"save num elements/slot size to instSpecReg"
cogit MoveR: TempReg R: instSpecReg.
"push fill value"
cogit PushCq: 0.
jumpLongPrepDone := cogit Jump: 0. "go allocate"
jumpByteFormat jmpTarget:
(cogit CmpCq: (objectMemory integerObjectOf: maxSlots * objectMemory wordSize) R: Arg0Reg).
jumpByteTooBig := cogit JumpAbove: 0.
"save num elements to instSpecReg"
cogit MoveR: TempReg R: instSpecReg.
"compute odd bits and add into halfHeaderReg; oddBits := 4 - nElements bitAnd: 3"
cogit MoveCq: objectMemory wordSize R: TempReg.
cogit SubR: instSpecReg R: TempReg.
cogit AndCq: objectMemory wordSize - 1 R: TempReg.
cogit LogicalShiftLeftCq: objectMemory formatShift R: TempReg.
cogit AddR: TempReg R: halfHeaderReg.
"round up num elements to numSlots in instSpecReg"
cogit AddCq: objectMemory wordSize - 1 R: instSpecReg.
cogit LogicalShiftRightCq: objectMemory shiftForWord R: instSpecReg.
"push fill value"
cogit PushCq: 0.
jumpBytePrepDone := cogit Jump: 0. "go allocate"
jumpArrayFormat jmpTarget:
(cogit CmpCq: (objectMemory integerObjectOf: maxSlots) R: Arg0Reg).
jumpArrayTooBig := cogit JumpAbove: 0.
"save num elements/slot size to instSpecReg"
cogit MoveR: TempReg R: instSpecReg.
"push fill value"
cogit PushCw: objectMemory nilObject.
"fall through to allocate"
jumpBytePrepDone jmpTarget:
(jumpLongPrepDone jmpTarget: cogit Label).
"write half header now; it frees halfHeaderReg"
cogit MoveR: halfHeaderReg Mw: 0 r: Arg1Reg.
"save numSlots to halfHeaderReg"
cogit MoveR: instSpecReg R: halfHeaderReg.
"compute byte size; remember 0-sized objects still need 1 slot & allocation is
rounded up to 8 bytes."
cogit CmpCq: 0 R: byteSizeReg. "a.k.a. instSpecReg"
jumpHasSlots := cogit JumpNonZero: 0.
cogit MoveCq: objectMemory baseHeaderSize * 2 R: byteSizeReg.
skip := cogit Jump: 0.
"round up to allocationUnit"
jumpHasSlots jmpTarget:
(cogit MoveR: byteSizeReg R: TempReg).
cogit AndCq: 1 R: TempReg.
cogit AddR: TempReg R: byteSizeReg.
cogit AddCq: objectMemory baseHeaderSize / objectMemory wordSize R: byteSizeReg.
cogit LogicalShiftLeftCq: objectMemory shiftForWord R: byteSizeReg.
skip jmpTarget:
"shift halfHeaderReg to put numSlots in correct place"
(cogit LogicalShiftLeftCq: objectMemory numSlotsHalfShift R: halfHeaderReg).
"check if allocation fits"
cogit AddR: Arg1Reg R: byteSizeReg.
cogit CmpCq: objectMemory getScavengeThreshold R: byteSizeReg.
jumpNoSpace := cogit JumpAboveOrEqual: 0.
"get result, increment freeStart and write it back. Arg1Reg holds new freeStart, the limit of the object"
cogit MoveR: Arg1Reg R: ReceiverResultReg.
cogit MoveR: byteSizeReg Aw: objectMemory freeStartAddress.
"write other half of header (numSlots/0 identityHash)"
cogit MoveR: halfHeaderReg Mw: 4 r: ReceiverResultReg.
"now fill"
cogit PopR: fillReg.
cogit PopR: TempReg. "discard pushed receiver"
cogit LoadEffectiveAddressMw: objectMemory baseHeaderSize r: ReceiverResultReg R: Arg1Reg.
"at least two words; so can make this a [fill 2 words. reached limit?] whileFalse"
fillLoop :=
cogit MoveR: fillReg Mw: 0 r: Arg1Reg.
cogit MoveR: fillReg Mw: 4 r: Arg1Reg.
cogit AddCq: 8 R: Arg1Reg.
cogit CmpR: Arg1Reg R: byteSizeReg.
cogit JumpAbove: fillLoop.
cogit RetN: retNoffset.
"pop discarded fill value & fall through to failure"
jumpNoSpace jmpTarget: (cogit PopR: TempReg).
jumpFailCuzFixed jmpTarget:
(jumpArrayTooBig jmpTarget:
(jumpByteTooBig jmpTarget:
(jumpLongTooBig jmpTarget: cogit Label))).
"unshuffle arguments"
cogit
MoveR: Arg0Reg R: Arg1Reg;
MoveR: ReceiverResultReg R: Arg0Reg;
PopR: ReceiverResultReg.
jumpUnhashed jmpTarget:
(jumpImmediate jmpTarget:
(jumpNotFixedPointers jmpTarget:
(jumpTooSmall jmpTarget:
(jumpNElementsNonInt jmpTarget: cogit Label)))).
^0!
Item was changed:
----- Method: CogObjectRepresentationFor64BitSpur>>allImmediate:branchIf:notInstanceOfBehaviors:target: (in category 'sista support') -----
allImmediate: immediateMask branchIf: reg notInstanceOfBehaviors: arrayObj target: targetFixUp
| incorrectTag tag1 tag2 |
<var: #targetFixUp type: #'AbstractInstruction *'>
+ (self genJumpNotImmediate: reg) jmpTarget: targetFixUp.
- cogit MoveR: reg R: TempReg.
- (self genJumpNotImmediateInScratchReg: TempReg) jmpTarget: targetFixUp.
immediateMask = objectMemory tagMask ifFalse:
[ "TempReg holds the rcvr tag"
"In this case one immediate tag out of the three is not present in arrayObj.
We look for it, and generate a jump to the fixup if the rcvr tag matches"
tag1 := objectMemory classTagForClass: (objectMemory fetchPointer: 0 ofObject: arrayObj).
tag2 := objectMemory classTagForClass: (objectMemory fetchPointer: 1 ofObject: arrayObj).
incorrectTag := self fetchImmediateTagOtherThanTag1: tag1 tag2: tag2.
cogit CmpCq: incorrectTag R: TempReg.
cogit JumpZero: targetFixUp ].!
Item was added:
+ ----- Method: CogObjectRepresentationFor64BitSpur>>genJumpNotSmallInteger:scratchReg: (in category 'compile abstract instructions') -----
+ genJumpNotSmallInteger: reg scratchReg: scratch
+ "Generate a compare and branch to test if aRegister contains other than a SmallInteger.
+ Answer the jump. Override since scratch is needed."
+ cogit AndCq: objectMemory tagMask R: reg R: scratch.
+ cogit CmpCq: objectMemory smallIntegerTag R: scratch.
+ ^cogit JumpNonZero: 0!
Item was added:
+ ----- Method: CogObjectRepresentationFor64BitSpur>>genJumpSmallInteger:scratchReg: (in category 'compile abstract instructions') -----
+ genJumpSmallInteger: reg scratchReg: scratch
+ "Generate a compare and branch to test if aRegister contains a SmallInteger.
+ Answer the jump. Override since scratch is needed."
+ cogit AndCq: objectMemory tagMask R: reg R: scratch.
+ cogit CmpCq: objectMemory smallIntegerTag R: scratch.
+ ^cogit JumpZero: 0!
Item was changed:
----- Method: CogObjectRepresentationForSpur>>branchIf:notInstanceOfBehavior:target: (in category 'sista support') -----
branchIf: reg notInstanceOfBehavior: classObj target: targetFixUp
"Generate a branch if reg is an instance of classObj, otherwise fall-
through. Cannot change the value of reg (may be used afterwards)."
| classIndex |
<inline: true>
<var: #targetFixUp type: #'AbstractInstruction *'>
classIndex := objectMemory classTagForClass: classObj.
(objectMemory isImmediateClass: classObj)
ifTrue:
[self branchIf: reg hasNotImmediateTag: classIndex target: targetFixUp ]
ifFalse:
+ [(self genJumpImmediate: reg) jmpTarget: targetFixUp.
- [cogit MoveR: reg R: TempReg.
- (self genJumpImmediateInScratchReg: TempReg) jmpTarget: targetFixUp.
self genGetClassIndexOfNonImm: reg into: TempReg.
self genCmpClassIndex: classIndex R: TempReg.
cogit JumpNonZero: targetFixUp ].
^0!
Item was removed:
- ----- Method: CogObjectRepresentationForSpur>>genEnsureObjInRegNotForwarded:scratchReg:updatingMw:r: (in category 'compile abstract instructions') -----
- genEnsureObjInRegNotForwarded: reg scratchReg: scratch updatingMw: offset r: baseReg
- "Make sure that the object in reg is not forwarded, and the field reg[offset] is updated
- if the object in reg is forwarded. Use the fact that isForwardedObjectClassIndexPun is
- a power of two to save an instruction."
- | loop imm ok |
- <var: #ok type: #'AbstractInstruction *'>
- <var: #imm type: #'AbstractInstruction *'>
- <var: #loop type: #'AbstractInstruction *'>
- self assert: reg ~= scratch.
- loop := cogit Label.
- cogit MoveR: reg R: scratch.
- imm := self genJumpImmediateInScratchReg: scratch.
- "notionally
- self genGetClassIndexOfNonImm: reg into: scratch.
- cogit CmpCq: objectMemory isForwardedObjectClassIndexPun R: TempReg.
- but the following is an instruction shorter:"
- cogit MoveMw: 0 r: reg R: scratch.
- cogit
- AndCq: objectMemory classIndexMask - objectMemory isForwardedObjectClassIndexPun
- R: scratch.
- ok := cogit JumpNonZero: 0.
- self genLoadSlot: 0 sourceReg: reg destReg: reg.
- cogit MoveR: reg Mw: offset r: baseReg.
- cogit Jump: loop.
- ok jmpTarget: (imm jmpTarget: cogit Label).
- ^0!
Item was changed:
----- Method: CogObjectRepresentationForSpur>>genEnsureOopInRegNotForwarded:scratchReg:ifForwarder:ifNotForwarder: (in category 'compile abstract instructions') -----
genEnsureOopInRegNotForwarded: reg scratchReg: scratch ifForwarder: fwdJumpTarget ifNotForwarder: nonFwdJumpTargetOrZero
"Make sure that the oop in reg is not forwarded.
Use the fact that isForwardedObjectClassIndexPun is a power of two to save an instruction."
+ | imm ok finished |
- | skip ok finished |
<inline: true>
<var: #ok type: #'AbstractInstruction *'>
+ <var: #imm type: #'AbstractInstruction *'>
- <var: #skip type: #'AbstractInstruction *'>
<var: #finished type: #'AbstractInstruction *'>
self assert: reg ~= scratch.
+ imm := self genJumpImmediate: reg.
- cogit MoveR: reg R: scratch.
- skip := self genJumpImmediateInScratchReg: scratch.
"notionally
self genGetClassIndexOfNonImm: reg into: scratch.
cogit CmpCq: objectMemory isForwardedObjectClassIndexPun R: TempReg.
but the following is an instruction shorter:"
cogit MoveMw: 0 r: reg R: scratch.
cogit
AndCq: objectMemory classIndexMask - objectMemory isForwardedObjectClassIndexPun
R: scratch.
ok := cogit JumpNonZero: 0.
self genLoadSlot: 0 sourceReg: reg destReg: reg.
cogit Jump: fwdJumpTarget.
finished := nonFwdJumpTargetOrZero = 0
ifTrue: [ cogit Label ]
ifFalse: [ self cCoerceSimple: nonFwdJumpTargetOrZero to: #'AbstractInstruction *' ].
+ imm jmpTarget: (ok jmpTarget: finished).
- skip jmpTarget: (ok jmpTarget: finished).
^0!
Item was added:
+ ----- Method: CogObjectRepresentationForSpur>>genEnsureOopInRegNotForwarded:scratchReg:updatingMw:r: (in category 'compile abstract instructions') -----
+ genEnsureOopInRegNotForwarded: reg scratchReg: scratch updatingMw: offset r: baseReg
+ "Make sure that the oop in reg is not forwarded, and the field reg[offset] is updated
+ if the object in reg is forwarded. Use the fact that isForwardedObjectClassIndexPun is
+ a power of two to save an instruction."
+ | loop imm ok |
+ <var: #ok type: #'AbstractInstruction *'>
+ <var: #imm type: #'AbstractInstruction *'>
+ <var: #loop type: #'AbstractInstruction *'>
+ self assert: reg ~= scratch.
+ loop := cogit Label.
+ imm := self genJumpImmediate: reg.
+ "notionally
+ self genGetClassIndexOfNonImm: reg into: scratch.
+ cogit CmpCq: objectMemory isForwardedObjectClassIndexPun R: TempReg.
+ but the following is an instruction shorter:"
+ cogit MoveMw: 0 r: reg R: scratch.
+ cogit
+ AndCq: objectMemory classIndexMask - objectMemory isForwardedObjectClassIndexPun
+ R: scratch.
+ ok := cogit JumpNonZero: 0.
+ self genLoadSlot: 0 sourceReg: reg destReg: reg.
+ cogit MoveR: reg Mw: offset r: baseReg.
+ cogit Jump: loop.
+ ok jmpTarget: (imm jmpTarget: cogit Label).
+ ^0!
Item was removed:
- ----- Method: CogObjectRepresentationForSpur>>genLoadSlot:sourceReg:destReg: (in category 'compile abstract instructions') -----
- genLoadSlot: index sourceReg: sourceReg destReg: destReg
- cogit
- MoveMw: index * objectMemory wordSize + objectMemory baseHeaderSize
- r: sourceReg
- R: destReg.
- ^0!
Item was changed:
----- Method: CogObjectRepresentationForSpur>>mixed:branchIf:notInstanceOfBehaviors:target: (in category 'sista support') -----
mixed: numNonImmediates branchIf: reg notInstanceOfBehaviors: arrayObj target: targetFixUp
| jmpImmediate jumps label numCases classObj index |
<var: #label type: #'AbstractInstruction *'>
<var: #jmpImmediate type: #'AbstractInstruction *'>
<var: #jumps type: #'AbstractInstruction **'>
<var: #targetFixUp type: #'AbstractInstruction *'>
numCases := objectMemory numSlotsOf: arrayObj.
+ jmpImmediate := self genJumpImmediate: reg.
- cogit MoveR: reg R: TempReg.
- jmpImmediate := self genJumpImmediateInScratchReg: TempReg.
"Rcvr is non immediate"
jumps := self alloca: numNonImmediates type: (self cCode: [#'AbstractInstruction *'] inSmalltalk: [cogit backEnd class]).
self genGetClassIndexOfNonImm: reg into: TempReg.
index := 0.
0 to: numCases - 1 do:
[:i|
classObj := objectMemory fetchPointer: i ofObject: arrayObj.
(objectMemory isImmediateClass: classObj) ifFalse: [
self genCmpClassIndex: (objectMemory classTagForClass: classObj) R: TempReg.
jumps at: index put: (cogit JumpZero: 0).
index := index + 1 ] ].
cogit Jump: targetFixUp.
"Rcvr is immediate"
jmpImmediate jmpTarget: cogit Label.
numCases - numNonImmediates "num Immediates allowed"
caseOf:
{[ 1 ] -> [ "1 immediate allowed. jump to targetFixUp if the rcvr is not this immediate"
0 to: numCases - 1 do:
[ :j |
classObj := objectMemory fetchPointer: j ofObject: arrayObj.
(objectMemory isImmediateClass: classObj) ifTrue: [
self branchIf: reg hasNotImmediateTag: (objectMemory classTagForClass: classObj) target: targetFixUp ] ] ] .
[ 2 ] -> [ "2 immediates allowed. On 32 bits nothing to do, all immediate are allowed, on 64 bits generates the jump to fixup for the third tag"
self branch2CasesIf: reg notInstanceOfBehaviors: arrayObj target: targetFixUp ] .
[ 3 ] -> [ "nothing to do, all immediates are allowed." ] }.
label := self Label.
0 to: numNonImmediates - 1 do: [:i |
(jumps at: i) jmpTarget: label ].
^ 0
!
Item was changed:
----- Method: CogObjectRepresentationForSpur>>noneImmediateBranchIf:notInstanceOfBehaviors:target: (in category 'sista support') -----
noneImmediateBranchIf: reg notInstanceOfBehaviors: arrayObj target: targetFixUp
"All classes in arrayObj are not immediate"
| label numJumps jumps classObj |
<var: #targetFixUp type: #'AbstractInstruction *'>
<var: #label type: #'AbstractInstruction *'>
<var: #jumps type: #'AbstractInstruction **'>
- cogit MoveR: reg R: TempReg.
jumps := self alloca: (objectMemory numSlotsOf: arrayObj) type: (self cCode: [#'AbstractInstruction *'] inSmalltalk: [cogit backEnd class]).
+ (self genJumpImmediate: reg) jmpTarget: targetFixUp.
- (self genJumpImmediateInScratchReg: TempReg) jmpTarget: targetFixUp.
self genGetClassIndexOfNonImm: reg into: TempReg.
0 to: (numJumps := objectMemory numSlotsOf: arrayObj) - 1 do:
[:i|
classObj := objectMemory fetchPointer: i ofObject: arrayObj.
self genCmpClassIndex: (objectMemory classTagForClass: classObj) R: TempReg.
jumps at: i put: (cogit JumpZero: 0) ].
cogit Jump: targetFixUp.
label := self Label.
0 to: numJumps - 1 do: [:i |
(jumps at: i) jmpTarget: label ].
^0!
Item was removed:
- ----- Method: CogObjectRepresentationForSqueakV3>>genLoadSlot:sourceReg:destReg: (in category 'compile abstract instructions') -----
- genLoadSlot: index sourceReg: sourceReg destReg: destReg
- cogit MoveMw: index * objectMemory wordSize + objectMemory baseHeaderSize r: sourceReg R: destReg.
- ^0!
Item was changed:
----- Method: Cogit>>genNSSendTrampolineFor:numArgs:called: (in category 'initialization') -----
genNSSendTrampolineFor: aRoutine numArgs: numArgs called: aString
"ReceiverResultReg: method receiver
SendNumArgsReg: the NSSendCache cache"
<option: #NewspeakVM>
<var: #aRoutine type: #'void *'>
<var: #aString type: #'char *'>
| jumpMiss jumpItsTheReceiverStupid |
<var: #jumpMiss type: #'AbstractInstruction *'>
<var: #jumpItsTheReceiverStupid type: #'AbstractInstruction *'>
opcodeIndex := 0.
objectRepresentation
genGetInlineCacheClassTagFrom: ReceiverResultReg
into: ClassReg
forEntry: false.
self MoveMw: NSCClassTagIndex * objectMemory wordSize r: SendNumArgsReg R: TempReg.
self CmpR: ClassReg R: TempReg.
jumpMiss := self JumpNonZero: 0.
self MoveMw: NSCEnclosingObjectIndex * objectMemory wordSize r: SendNumArgsReg R: TempReg.
self CmpCq: 0 R: TempReg.
jumpItsTheReceiverStupid := self JumpZero: 0.
self MoveR: TempReg R: ReceiverResultReg.
"Now set the stacked receiver, if needed. If there are reg args this is
not required; see genPushRegisterArgsForNumArgs:numArgs: below."
(self numRegArgs = 0 or: [numArgs > self numRegArgs]) ifTrue:
[numArgs >= (NumSendTrampolines - 1)
ifTrue: "arbitrary argument count"
[self MoveMw: NSCNumArgsIndex * objectMemory wordSize r: SendNumArgsReg R: TempReg.
backEnd hasLinkRegister ifFalse:
[self AddCq: 1 R: TempReg]..
self MoveR: ReceiverResultReg Xwr: TempReg R: SPReg]
ifFalse: "Known argument count"
[self MoveR: TempReg Mw: (backEnd hasLinkRegister ifTrue: [0] ifFalse: [1]) + numArgs * objectMemory wordSize r: SPReg]].
jumpItsTheReceiverStupid jmpTarget: self Label.
self MoveMw: NSCTargetIndex * objectMemory wordSize r: SendNumArgsReg R: TempReg.
self JumpR: TempReg.
jumpMiss jmpTarget: self Label.
objectRepresentation
+ genEnsureOopInRegNotForwarded: ReceiverResultReg
- genEnsureObjInRegNotForwarded: ReceiverResultReg
scratchReg: TempReg
updatingMw: FoxMFReceiver
r: FPReg.
self numRegArgs > 0 ifTrue:
[backEnd genPushRegisterArgsForNumArgs: numArgs scratchReg: TempReg].
^self
genTrampolineFor: aRoutine
called: aString
numArgs: 2
arg: SendNumArgsReg "The NSSendCache"
arg: ReceiverResultReg
arg: nil
arg: nil
saveRegs: false
pushLinkReg: true
resultReg: ReceiverResultReg "Never happens?"
appendOpcodes: true!
Item was changed:
----- Method: SimpleStackBasedCogit>>compileOpenPIC:numArgs: (in category 'in-line cacheing') -----
compileOpenPIC: selector numArgs: numArgs
"Compile the code for an open PIC. Perform a probe of the first-level method
lookup cache followed by a call of ceSendFromInLineCacheMiss: if the probe fails."
| jumpSelectorMiss jumpClassMiss itsAHit jumpBCMethod |
<var: #jumpSelectorMiss type: #'AbstractInstruction *'>
<var: #jumpClassMiss type: #'AbstractInstruction *'>
<var: #itsAHit type: #'AbstractInstruction *'>
<var: #jumpBCMethod type: #'AbstractInstruction *'>
self compilePICAbort: numArgs.
entry := objectRepresentation genGetClassTagOf: ReceiverResultReg into: ClassReg scratchReg: TempReg.
"Do first of three probes. See CoInterpreter>>lookupInMethodCacheSel:classTag:"
self flag: #lookupInMethodCacheSel:classTag:. "so this method shows up as a sender of lookupInMethodCacheSel:class:"
self MoveR: ClassReg R: SendNumArgsReg.
self annotate: (self XorCw: selector R: ClassReg) objRef: selector.
self LogicalShiftLeftCq: objectMemory shiftForWord R: ClassReg.
self AndCq: MethodCacheMask << objectMemory shiftForWord R: ClassReg.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << objectMemory shiftForWord)
r: ClassReg
R: TempReg.
self annotate: (self CmpCw: selector R: TempReg) objRef: selector.
jumpSelectorMiss := self JumpNonZero: 0.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << objectMemory shiftForWord)
r: ClassReg
R: TempReg.
self CmpR: SendNumArgsReg R: TempReg.
jumpClassMiss := self JumpNonZero: 0.
itsAHit := self Label.
"Fetch the method. The interpret trampoline requires the bytecoded method in SendNumArgsReg"
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheMethod << objectMemory shiftForWord)
r: ClassReg
R: SendNumArgsReg.
"If the method is compiled jump to its unchecked entry-point, otherwise interpret it."
+ objectRepresentation genLoadSlot: HeaderIndex sourceReg: SendNumArgsReg destReg: ClassReg.
+ jumpBCMethod := objectRepresentation genJumpImmediate: ClassReg.
- objectRepresentation
- genLoadSlot: HeaderIndex sourceReg: SendNumArgsReg destReg: TempReg.
- self MoveR: TempReg R: ClassReg.
- jumpBCMethod := objectRepresentation genJumpSmallIntegerInScratchReg: TempReg.
jumpBCMethod jmpTarget: picInterpretAbort.
self AddCq: cmNoCheckEntryOffset R: ClassReg.
self JumpR: ClassReg.
"First probe missed. Do second of three probes. Shift hash right one and retry."
jumpSelectorMiss jmpTarget: (jumpClassMiss jmpTarget: self Label).
self MoveR: SendNumArgsReg R: ClassReg.
self annotate: (self XorCw: selector R: ClassReg) objRef: selector.
self LogicalShiftLeftCq: objectMemory shiftForWord - 1 R: ClassReg.
self AndCq: MethodCacheMask << objectMemory shiftForWord R: ClassReg.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << objectMemory shiftForWord)
r: ClassReg
R: TempReg.
self annotate: (self CmpCw: selector R: TempReg) objRef: selector.
jumpSelectorMiss := self JumpNonZero: 0.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << objectMemory shiftForWord)
r: ClassReg
R: TempReg.
self CmpR: SendNumArgsReg R: TempReg.
self JumpZero: itsAHit.
"Second probe missed. Do last probe. Shift hash right two and retry."
jumpSelectorMiss jmpTarget: self Label.
self MoveR: SendNumArgsReg R: ClassReg.
self annotate: (self XorCw: selector R: ClassReg) objRef: selector.
objectMemory shiftForWord > 2 ifTrue:
[self LogicalShiftLeftCq: objectMemory shiftForWord - 1 R: ClassReg].
self AndCq: MethodCacheMask << objectMemory shiftForWord R: ClassReg.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << objectMemory shiftForWord)
r: ClassReg
R: TempReg.
self annotate: (self CmpCw: selector R: TempReg) objRef: selector.
jumpSelectorMiss := self JumpNonZero: 0.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << objectMemory shiftForWord)
r: ClassReg
R: TempReg.
self CmpR: SendNumArgsReg R: TempReg.
self JumpZero: itsAHit.
"Last probe missed. Call ceSendFromInLineCacheMiss: to do the full lookup."
jumpSelectorMiss jmpTarget: self Label.
self genSmalltalkToCStackSwitch: true.
methodLabel addDependent: (self annotateAbsolutePCRef: (self MoveCw: methodLabel asInteger R: SendNumArgsReg)).
self
compileCallFor: #ceSendFromInLineCacheMiss:
numArgs: 1
arg: SendNumArgsReg
arg: nil
arg: nil
arg: nil
resultReg: nil
saveRegs: false
"Note that this call does not return."!
Item was changed:
----- Method: SimpleStackBasedCogit>>genDoubleArithmetic:preOpCheck: (in category 'primitive generators') -----
genDoubleArithmetic: arithmeticOperator preOpCheck: preOpCheckOrNil
"Stack looks like
receiver (also in ResultReceiverReg)
arg
return address"
<var: #preOpCheckOrNil declareC: 'AbstractInstruction *(*preOpCheckOrNil)(int rcvrReg, int argReg)'>
| jumpFailClass jumpFailAlloc jumpFailCheck jumpImmediate jumpNonInt doOp fail |
<var: #jumpFailClass type: #'AbstractInstruction *'>
<var: #jumpFailAlloc type: #'AbstractInstruction *'>
<var: #jumpNonInt type: #'AbstractInstruction *'>
<var: #jumpImmediate type: #'AbstractInstruction *'>
<var: #jumpFailCheck type: #'AbstractInstruction *'>
<var: #doOp type: #'AbstractInstruction *'>
<var: #fail type: #'AbstractInstruction *'>
+ self genLoadArgAtDepth: 0 into: ClassReg.
- self genLoadArgAtDepth: 0 into: TempReg.
objectRepresentation genGetDoubleValueOf: ReceiverResultReg into: DPFPReg0.
+ jumpImmediate := objectRepresentation genJumpImmediate: ClassReg.
- self MoveR: TempReg R: ClassReg.
- jumpImmediate := objectRepresentation genJumpImmediateInScratchReg: TempReg.
objectRepresentation genGetCompactClassIndexNonImmOf: ClassReg into: SendNumArgsReg.
objectRepresentation genCmpClassFloatCompactIndexR: SendNumArgsReg.
jumpFailClass := self JumpNonZero: 0.
objectRepresentation genGetDoubleValueOf: ClassReg into: DPFPReg1.
doOp := self Label.
preOpCheckOrNil ifNotNil:
[jumpFailCheck := self perform: preOpCheckOrNil with: DPFPReg0 with: DPFPReg1].
self gen: arithmeticOperator operand: DPFPReg1 operand: DPFPReg0.
jumpFailAlloc := objectRepresentation
genAllocFloatValue: DPFPReg0
into: SendNumArgsReg
scratchReg: ClassReg
scratchReg: TempReg.
self MoveR: SendNumArgsReg R: ReceiverResultReg.
self RetN: (self primRetNOffsetFor: 1).
jumpImmediate jmpTarget: self Label.
objectRepresentation smallIntegerIsOnlyImmediateType ifFalse:
+ [jumpNonInt := objectRepresentation genJumpNotSmallInteger: ClassReg scratchReg: TempReg].
- [jumpNonInt := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg].
objectRepresentation genConvertSmallIntegerToIntegerInReg: ClassReg.
self ConvertR: ClassReg Rd: DPFPReg1.
self Jump: doOp.
jumpFailAlloc jmpTarget: self Label.
self compileFallbackToInterpreterPrimitive.
fail := self Label.
jumpFailClass jmpTarget: fail.
preOpCheckOrNil ifNotNil:
[jumpFailCheck jmpTarget: fail].
objectRepresentation smallIntegerIsOnlyImmediateType ifFalse:
[jumpNonInt jmpTarget: fail].
^0!
Item was changed:
----- Method: SimpleStackBasedCogit>>genDoubleComparison:invert: (in category 'primitive generators') -----
genDoubleComparison: jumpOpcodeGenerator invert: invertComparison
"Stack looks like
receiver (also in ResultReceiverReg)
arg
return address"
<var: #jumpOpcodeGenerator declareC: 'AbstractInstruction *(*jumpOpcodeGenerator)(void *)'>
| jumpFail jumpImmediate jumpNonInt jumpCond compare |
<var: #jumpImmediate type: #'AbstractInstruction *'>
<var: #jumpNonInt type: #'AbstractInstruction *'>
<var: #jumpCond type: #'AbstractInstruction *'>
<var: #compare type: #'AbstractInstruction *'>
<var: #jumpFail type: #'AbstractInstruction *'>
+ self genLoadArgAtDepth: 0 into: ClassReg.
- self genLoadArgAtDepth: 0 into: TempReg.
objectRepresentation genGetDoubleValueOf: ReceiverResultReg into: DPFPReg0.
+ jumpImmediate := objectRepresentation genJumpImmediate: ClassReg.
- self MoveR: TempReg R: ClassReg.
- jumpImmediate := objectRepresentation genJumpImmediateInScratchReg: TempReg.
objectRepresentation genGetCompactClassIndexNonImmOf: ClassReg into: SendNumArgsReg.
objectRepresentation genCmpClassFloatCompactIndexR: SendNumArgsReg.
jumpFail := self JumpNonZero: 0.
objectRepresentation genGetDoubleValueOf: ClassReg into: DPFPReg1.
invertComparison "May need to invert for NaNs"
ifTrue: [compare := self CmpRd: DPFPReg0 Rd: DPFPReg1]
ifFalse: [compare := self CmpRd: DPFPReg1 Rd: DPFPReg0].
jumpCond := self perform: jumpOpcodeGenerator with: 0. "FP jumps are a little weird"
self genMoveFalseR: ReceiverResultReg.
self RetN: (self primRetNOffsetFor: 1).
jumpCond jmpTarget: (self genMoveTrueR: ReceiverResultReg).
self RetN: (self primRetNOffsetFor: 1).
jumpImmediate jmpTarget: self Label.
objectRepresentation smallIntegerIsOnlyImmediateType ifFalse:
+ [jumpNonInt := objectRepresentation genJumpNotSmallInteger: ClassReg scratchReg: TempReg].
- [jumpNonInt := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg].
objectRepresentation genConvertSmallIntegerToIntegerInReg: ClassReg.
self ConvertR: ClassReg Rd: DPFPReg1.
self Jump: compare.
jumpFail jmpTarget: self Label.
objectRepresentation smallIntegerIsOnlyImmediateType ifFalse:
[jumpNonInt jmpTarget: jumpFail getJmpTarget].
^0!
Item was changed:
----- Method: SimpleStackBasedCogit>>genPrimitiveClosureValue (in category 'primitive generators') -----
genPrimitiveClosureValue
"Check the argument count. Fail if wrong.
Get the method from the outerContext and see if it is cogged. If so, jump to the
block entry or the no-context-switch entry, as appropriate, and we're done. If not,
invoke the interpreter primitive."
| jumpFailNArgs jumpFail1 jumpFail2 jumpFail3 jumpFail4 jumpBCMethod primitiveRoutine result |
<var: #jumpFail5 type: #'AbstractInstruction *'>
<var: #jumpFail2 type: #'AbstractInstruction *'>
<var: #jumpFail3 type: #'AbstractInstruction *'>
<var: #jumpFail4 type: #'AbstractInstruction *'>
<var: #jumpFailNArgs type: #'AbstractInstruction *'>
<var: #jumpBCMethod type: #'AbstractInstruction *'>
<var: #primitiveRoutine declareC: 'void (*primitiveRoutine)()'>
objectRepresentation genLoadSlot: ClosureNumArgsIndex sourceReg: ReceiverResultReg destReg: TempReg.
self CmpCq: (objectMemory integerObjectOf: methodOrBlockNumArgs) R: TempReg.
jumpFailNArgs := self JumpNonZero: 0.
objectRepresentation genLoadSlot: ClosureOuterContextIndex sourceReg: ReceiverResultReg destReg: ClassReg.
jumpFail1 := objectRepresentation genJumpImmediate: ClassReg.
objectRepresentation genGetCompactClassIndexNonImmOf: ClassReg into: TempReg.
objectRepresentation genCmpClassMethodContextCompactIndexR: TempReg.
jumpFail2 := self JumpNonZero: 0.
+ "This could be deferred to the prologue (compileBlockFrameBuild:) if blocks were
+ scanned to see if they referred to the receiver. But for now this is safe if slow."
+ objectRepresentation hasSpurMemoryManagerAPI ifTrue:
+ [objectRepresentation
+ genLoadSlot: ReceiverIndex sourceReg: ClassReg destReg: SendNumArgsReg;
+ genEnsureOopInRegNotForwarded: SendNumArgsReg
+ scratchReg: TempReg
+ updatingSlot: ReceiverIndex
+ in: ClassReg].
objectRepresentation genLoadSlot: MethodIndex sourceReg: ClassReg destReg: SendNumArgsReg.
jumpFail3 := objectRepresentation genJumpImmediate: SendNumArgsReg.
objectRepresentation genGetFormatOf: SendNumArgsReg into: TempReg.
self CmpCq: objectMemory firstCompiledMethodFormat R: TempReg.
jumpFail4 := self JumpLess: 0.
objectRepresentation genLoadSlot: HeaderIndex sourceReg: SendNumArgsReg destReg: ClassReg.
jumpBCMethod := objectRepresentation genJumpSmallInteger: ClassReg.
self MoveM16: (self offset: CogMethod of: #blockEntryOffset) r: ClassReg R: TempReg.
self AddR: ClassReg R: TempReg.
primitiveRoutine := coInterpreter
functionPointerForCompiledMethod: methodObj
primitiveIndex: primitiveIndex.
primitiveRoutine = #primitiveClosureValueNoContextSwitch ifTrue:
[blockNoContextSwitchOffset = nil ifTrue:
[^NotFullyInitialized].
self SubCq: blockNoContextSwitchOffset R: TempReg].
self JumpR: TempReg.
jumpBCMethod jmpTarget: (jumpFail1 jmpTarget: (jumpFail2 jmpTarget: (jumpFail3 jmpTarget: (jumpFail4 jmpTarget: self Label)))).
(result := self compileInterpreterPrimitive: primitiveRoutine) < 0 ifTrue:
[^result].
jumpFailNArgs jmpTarget: self Label.
^0!
Item was changed:
----- Method: SimpleStackBasedCogit>>genSmallIntegerComparison:orDoubleComparison: (in category 'primitive generators') -----
genSmallIntegerComparison: jumpOpcode orDoubleComparison: jumpFPOpcodeGenerator
"Stack looks like
receiver (also in ResultReceiverReg)
arg
return address"
| jumpDouble jumpNonInt jumpFail jumpTrue jumpCond |
<var: #jumpFPOpcodeGenerator declareC: 'AbstractInstruction *(*jumpFPOpcodeGenerator)(void *)'>
<var: #jumpDouble type: #'AbstractInstruction *'>
<var: #jumpNonInt type: #'AbstractInstruction *'>
<var: #jumpCond type: #'AbstractInstruction *'>
<var: #jumpTrue type: #'AbstractInstruction *'>
<var: #jumpFail type: #'AbstractInstruction *'>
backEnd hasDoublePrecisionFloatingPointSupport ifFalse:
[^self genSmallIntegerComparison: jumpOpcode].
+ self genLoadArgAtDepth: 0 into: ClassReg.
+ jumpDouble := objectRepresentation genJumpNotSmallInteger: ClassReg scratchReg: TempReg.
- self genLoadArgAtDepth: 0 into: TempReg.
- self MoveR: TempReg R: ClassReg.
- jumpDouble := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg.
self CmpR: ClassReg R: ReceiverResultReg. "N.B. FLAGS := RRReg - ClassReg"
jumpTrue := self gen: jumpOpcode.
self genMoveFalseR: ReceiverResultReg.
self RetN: (self primRetNOffsetFor: 1).
jumpTrue jmpTarget: (self genMoveTrueR: ReceiverResultReg).
self RetN: (self primRetNOffsetFor: 1).
"Argument may be a Float : let us check or fail"
jumpDouble jmpTarget: self Label.
objectRepresentation smallIntegerIsOnlyImmediateType ifFalse:
+ [jumpNonInt := objectRepresentation genJumpImmediate: ClassReg].
- [self MoveR: ClassReg R: TempReg.
- jumpNonInt := objectRepresentation genJumpImmediateInScratchReg: TempReg].
objectRepresentation genGetCompactClassIndexNonImmOf: ClassReg into: SendNumArgsReg.
objectRepresentation genCmpClassFloatCompactIndexR: SendNumArgsReg.
jumpFail := self JumpNonZero: 0.
"It was a Float, so convert the receiver to double and perform the operation"
self MoveR: ReceiverResultReg R: TempReg.
objectRepresentation genConvertSmallIntegerToIntegerInReg: TempReg.
self ConvertR: TempReg Rd: DPFPReg0.
objectRepresentation genGetDoubleValueOf: ClassReg into: DPFPReg1.
self CmpRd: DPFPReg1 Rd: DPFPReg0.
jumpCond := self perform: jumpFPOpcodeGenerator with: 0. "FP jumps are a little weird"
self genMoveFalseR: ReceiverResultReg.
self RetN: (self primRetNOffsetFor: 1).
jumpCond jmpTarget: (self genMoveTrueR: ReceiverResultReg).
self RetN: (self primRetNOffsetFor: 1).
objectRepresentation smallIntegerIsOnlyImmediateType
ifTrue: [jumpFail jmpTarget: self Label]
ifFalse: [jumpNonInt jmpTarget: (jumpFail jmpTarget: self Label)].
^0!
Item was changed:
----- Method: StackInterpreter>>activateNewClosureMethod:numArgs:mayContextSwitch: (in category 'control primitives') -----
activateNewClosureMethod: blockClosure numArgs: numArgs mayContextSwitch: mayContextSwitch
"Similar to activateNewMethod but for Closure and newMethod."
| numCopied outerContext theMethod closureIP |
<inline: true>
+ outerContext := objectMemory followField: ClosureOuterContextIndex ofObject: blockClosure.
- outerContext := objectMemory fetchPointer: ClosureOuterContextIndex ofObject: blockClosure.
numCopied := self copiedValueCountOfClosure: blockClosure.
+ theMethod := objectMemory followField: MethodIndex ofObject: outerContext.
- theMethod := objectMemory fetchPointer: MethodIndex ofObject: outerContext.
self push: instructionPointer.
self push: framePointer.
framePointer := stackPointer.
self push: theMethod.
self push: (self encodeFrameFieldHasContext: false isBlock: true numArgs: numArgs).
self push: objectMemory nilObject. "FxThisContext field"
+ self push: (objectMemory followField: ReceiverIndex ofObject: outerContext).
- self push: (objectMemory fetchPointer: ReceiverIndex ofObject: outerContext).
"Copy the copied values..."
0 to: numCopied - 1 do:
[:i|
self push: (objectMemory
fetchPointer: i + ClosureFirstCopiedValueIndex
ofObject: blockClosure)].
self assert: (self frameIsBlockActivation: framePointer).
self assert: (self frameHasContext: framePointer) not.
"The initial instructions in the block nil-out remaining temps."
"the instruction pointer is a pointer variable equal to
method oop + ip + BaseHeaderSize
-1 for 0-based addressing of fetchByte
-1 because it gets incremented BEFORE fetching currentByte"
closureIP := self quickFetchInteger: ClosureStartPCIndex ofObject: blockClosure.
instructionPointer := theMethod + closureIP + objectMemory baseHeaderSize - 2.
self setMethod: theMethod.
"Now check for stack overflow or an event (interrupt, must scavenge, etc)"
stackPointer < stackLimit ifTrue:
[self handleStackOverflowOrEventAllowContextSwitch: mayContextSwitch]!
Item was changed:
----- Method: StackToRegisterMappingCogit>>compileOpenPIC:numArgs: (in category 'in-line cacheing') -----
compileOpenPIC: selector numArgs: numArgs
"Compile the code for an open PIC. Perform a probe of the first-level method
lookup cache followed by a call of ceSendFromInLineCacheMiss: if the probe fails.
Override to push the register args when calling ceSendFromInLineCacheMiss:"
| jumpSelectorMiss jumpClassMiss itsAHit jumpBCMethod |
<var: #jumpSelectorMiss type: #'AbstractInstruction *'>
<var: #jumpClassMiss type: #'AbstractInstruction *'>
<var: #itsAHit type: #'AbstractInstruction *'>
<var: #jumpBCMethod type: #'AbstractInstruction *'>
self compilePICAbort: numArgs.
entry := objectRepresentation genGetClassTagOf: ReceiverResultReg into: ClassReg scratchReg: TempReg.
"Do first of three probes. See CoInterpreter>>lookupInMethodCacheSel:classTag:"
self flag: #lookupInMethodCacheSel:classTag:. "so this method shows up as a sender of lookupInMethodCacheSel:class:"
self MoveR: ClassReg R: SendNumArgsReg.
self annotate: (self XorCw: selector R: ClassReg) objRef: selector.
self LogicalShiftLeftCq: objectMemory shiftForWord R: ClassReg.
self AndCq: MethodCacheMask << objectMemory shiftForWord R: ClassReg.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << objectMemory shiftForWord)
r: ClassReg
R: TempReg.
self annotate: (self CmpCw: selector R: TempReg) objRef: selector.
jumpSelectorMiss := self JumpNonZero: 0.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << objectMemory shiftForWord)
r: ClassReg
R: TempReg.
self CmpR: SendNumArgsReg R: TempReg.
jumpClassMiss := self JumpNonZero: 0.
itsAHit := self Label.
"Fetch the method. The interpret trampoline requires the bytecoded method in SendNumArgsReg"
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheMethod << objectMemory shiftForWord)
r: ClassReg
R: SendNumArgsReg.
"If the method is compiled jump to its unchecked entry-point, otherwise interpret it."
+ objectRepresentation genLoadSlot: HeaderIndex sourceReg: SendNumArgsReg destReg: ClassReg.
+ jumpBCMethod := objectRepresentation genJumpImmediate: ClassReg.
- objectRepresentation
- genLoadSlot: HeaderIndex sourceReg: SendNumArgsReg destReg: TempReg.
- self MoveR: TempReg R: ClassReg.
- jumpBCMethod := objectRepresentation genJumpSmallIntegerInScratchReg: TempReg.
jumpBCMethod jmpTarget: picInterpretAbort.
self AddCq: cmNoCheckEntryOffset R: ClassReg.
self JumpR: ClassReg.
"First probe missed. Do second of three probes. Shift hash right one and retry."
jumpSelectorMiss jmpTarget: (jumpClassMiss jmpTarget: self Label).
self MoveR: SendNumArgsReg R: ClassReg.
self annotate: (self XorCw: selector R: ClassReg) objRef: selector.
self LogicalShiftLeftCq: objectMemory shiftForWord - 1 R: ClassReg.
self AndCq: MethodCacheMask << objectMemory shiftForWord R: ClassReg.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << objectMemory shiftForWord)
r: ClassReg
R: TempReg.
self annotate: (self CmpCw: selector R: TempReg) objRef: selector.
jumpSelectorMiss := self JumpNonZero: 0.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << objectMemory shiftForWord)
r: ClassReg
R: TempReg.
self CmpR: SendNumArgsReg R: TempReg.
self JumpZero: itsAHit.
"Second probe missed. Do last probe. Shift hash right two and retry."
jumpSelectorMiss jmpTarget: self Label.
self MoveR: SendNumArgsReg R: ClassReg.
self annotate: (self XorCw: selector R: ClassReg) objRef: selector.
objectMemory shiftForWord > 2 ifTrue:
[self LogicalShiftLeftCq: objectMemory shiftForWord - 1 R: ClassReg].
self AndCq: MethodCacheMask << objectMemory shiftForWord R: ClassReg.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << objectMemory shiftForWord)
r: ClassReg
R: TempReg.
self annotate: (self CmpCw: selector R: TempReg) objRef: selector.
jumpSelectorMiss := self JumpNonZero: 0.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << objectMemory shiftForWord)
r: ClassReg
R: TempReg.
self CmpR: SendNumArgsReg R: TempReg.
self JumpZero: itsAHit.
"Last probe missed. Call ceSendFromInLineCacheMiss: to do the full lookup."
jumpSelectorMiss jmpTarget: self Label.
backEnd genPushRegisterArgsForNumArgs: numArgs scratchReg: SendNumArgsReg.
self genSmalltalkToCStackSwitch: true.
methodLabel addDependent: (self annotateAbsolutePCRef: (self MoveCw: methodLabel asInteger R: SendNumArgsReg)).
self
compileCallFor: #ceSendFromInLineCacheMiss:
numArgs: 1
arg: SendNumArgsReg
arg: nil
arg: nil
arg: nil
resultReg: nil
saveRegs: false
"Note that this call does not return."!
Item was changed:
----- Method: StackToRegisterMappingCogit>>genDoubleArithmetic:preOpCheck: (in category 'primitive generators') -----
genDoubleArithmetic: arithmeticOperator preOpCheck: preOpCheckOrNil
"Receiver and arg in registers.
Stack looks like
return address"
<var: #preOpCheckOrNil declareC: 'AbstractInstruction *(*preOpCheckOrNil)(int rcvrReg, int argReg)'>
| jumpFailClass jumpFailAlloc jumpFailCheck jumpImmediate jumpNonInt doOp |
<var: #jumpFailClass type: #'AbstractInstruction *'>
<var: #jumpFailAlloc type: #'AbstractInstruction *'>
<var: #jumpImmediate type: #'AbstractInstruction *'>
<var: #jumpNonInt type: #'AbstractInstruction *'>
<var: #jumpFailCheck type: #'AbstractInstruction *'>
<var: #doOp type: #'AbstractInstruction *'>
- self MoveR: Arg0Reg R: TempReg.
objectRepresentation genGetDoubleValueOf: ReceiverResultReg into: DPFPReg0.
self MoveR: Arg0Reg R: ClassReg.
+ jumpImmediate := objectRepresentation genJumpImmediate: Arg0Reg.
- jumpImmediate := objectRepresentation genJumpImmediateInScratchReg: TempReg.
objectRepresentation genGetCompactClassIndexNonImmOf: Arg0Reg into: SendNumArgsReg.
objectRepresentation genCmpClassFloatCompactIndexR: SendNumArgsReg.
jumpFailClass := self JumpNonZero: 0.
objectRepresentation genGetDoubleValueOf: Arg0Reg into: DPFPReg1.
doOp := self Label.
preOpCheckOrNil ifNotNil:
[jumpFailCheck := self perform: preOpCheckOrNil with: DPFPReg0 with: DPFPReg1].
self gen: arithmeticOperator operand: DPFPReg1 operand: DPFPReg0.
jumpFailAlloc := objectRepresentation
genAllocFloatValue: DPFPReg0
into: SendNumArgsReg
scratchReg: ClassReg
scratchReg: TempReg.
self MoveR: SendNumArgsReg R: ReceiverResultReg.
self RetN: 0.
"We need to push the register args on two paths; this one and the interpreter primitive path.
But the interpreter primitive path won't unless regArgsHaveBeenPushed is false."
self assert: methodOrBlockNumArgs <= self numRegArgs.
jumpFailClass jmpTarget: self Label.
preOpCheckOrNil ifNotNil:
[jumpFailCheck jmpTarget: jumpFailClass getJmpTarget].
backEnd genPushRegisterArgsForNumArgs: methodOrBlockNumArgs scratchReg: SendNumArgsReg.
jumpFailClass := self Jump: 0.
jumpImmediate jmpTarget: self Label.
objectRepresentation smallIntegerIsOnlyImmediateType ifFalse:
+ [jumpNonInt := objectRepresentation genJumpNotSmallInteger: Arg0Reg].
- [jumpNonInt := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg].
objectRepresentation genConvertSmallIntegerToIntegerInReg: ClassReg.
self ConvertR: ClassReg Rd: DPFPReg1.
self Jump: doOp.
jumpFailAlloc jmpTarget: self Label.
self compileFallbackToInterpreterPrimitive.
jumpFailClass jmpTarget: self Label.
objectRepresentation smallIntegerIsOnlyImmediateType ifFalse:
[jumpNonInt jmpTarget: jumpFailClass getJmpTarget].
^0!
Item was changed:
----- Method: StackToRegisterMappingCogit>>genDoubleComparison:invert: (in category 'primitive generators') -----
genDoubleComparison: jumpOpcodeGenerator invert: invertComparison
"Receiver and arg in registers.
Stack looks like
return address"
<var: #jumpOpcodeGenerator declareC: 'AbstractInstruction *(*jumpOpcodeGenerator)(void *)'>
| jumpFail jumpImmediate jumpNonInt jumpCond compare |
<var: #jumpImmediate type: #'AbstractInstruction *'>
<var: #jumpNonInt type: #'AbstractInstruction *'>
<var: #jumpCond type: #'AbstractInstruction *'>
<var: #compare type: #'AbstractInstruction *'>
<var: #jumpFail type: #'AbstractInstruction *'>
- self MoveR: Arg0Reg R: TempReg.
objectRepresentation genGetDoubleValueOf: ReceiverResultReg into: DPFPReg0.
+ jumpImmediate := objectRepresentation genJumpImmediate: Arg0Reg.
- jumpImmediate := objectRepresentation genJumpImmediateInScratchReg: TempReg.
objectRepresentation genGetCompactClassIndexNonImmOf: Arg0Reg into: SendNumArgsReg.
objectRepresentation genCmpClassFloatCompactIndexR: SendNumArgsReg.
jumpFail := self JumpNonZero: 0.
objectRepresentation genGetDoubleValueOf: Arg0Reg into: DPFPReg1.
invertComparison "May need to invert for NaNs"
ifTrue: [compare := self CmpRd: DPFPReg0 Rd: DPFPReg1]
ifFalse: [compare := self CmpRd: DPFPReg1 Rd: DPFPReg0].
jumpCond := self perform: jumpOpcodeGenerator with: 0. "FP jumps are a little weird"
self genMoveFalseR: ReceiverResultReg.
self RetN: 0.
jumpCond jmpTarget: (self genMoveTrueR: ReceiverResultReg).
self RetN: 0.
jumpImmediate jmpTarget: self Label.
objectRepresentation smallIntegerIsOnlyImmediateType ifFalse:
+ [jumpNonInt := objectRepresentation genJumpNotSmallInteger: Arg0Reg scratchReg: TempReg].
- [jumpNonInt := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg].
objectRepresentation genConvertSmallIntegerToIntegerInReg: Arg0Reg.
self ConvertR: Arg0Reg Rd: DPFPReg1.
self Jump: compare.
jumpFail jmpTarget: self Label.
objectRepresentation smallIntegerIsOnlyImmediateType ifFalse:
[jumpNonInt jmpTarget: jumpFail getJmpTarget].
^0!
Item was changed:
----- Method: StackToRegisterMappingCogit>>genPrimitiveAdd (in category 'primitive generators') -----
genPrimitiveAdd
| jumpNotSI jumpOvfl |
<var: #jumpNotSI type: #'AbstractInstruction *'>
<var: #jumpOvfl type: #'AbstractInstruction *'>
- self MoveR: Arg0Reg R: TempReg.
self MoveR: Arg0Reg R: ClassReg.
+ jumpNotSI := objectRepresentation genJumpNotSmallInteger: Arg0Reg scratchReg: TempReg.
- jumpNotSI := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg.
objectRepresentation genRemoveSmallIntegerTagsInScratchReg: ClassReg.
self AddR: ReceiverResultReg R: ClassReg.
jumpOvfl := self JumpOverflow: 0.
self MoveR: ClassReg R: ReceiverResultReg.
self RetN: 0.
jumpOvfl jmpTarget: (jumpNotSI jmpTarget: self Label).
^0!
Item was changed:
----- Method: StackToRegisterMappingCogit>>genPrimitiveBitAnd (in category 'primitive generators') -----
genPrimitiveBitAnd
| jumpNotSI |
<var: #jumpNotSI type: #'AbstractInstruction *'>
+ jumpNotSI := objectRepresentation genJumpNotSmallInteger: Arg0Reg scratchReg: TempReg.
- self MoveR: Arg0Reg R: TempReg.
- jumpNotSI := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg.
"Whether the SmallInteger tags are zero or non-zero, oring them together will preserve them."
self AndR: Arg0Reg R: ReceiverResultReg.
self RetN: 0.
jumpNotSI jmpTarget: self Label.
^0!
Item was changed:
----- Method: StackToRegisterMappingCogit>>genPrimitiveBitOr (in category 'primitive generators') -----
genPrimitiveBitOr
| jumpNotSI |
<var: #jumpNotSI type: #'AbstractInstruction *'>
+ jumpNotSI := objectRepresentation genJumpNotSmallInteger: Arg0Reg scratchReg: TempReg.
- self MoveR: Arg0Reg R: TempReg.
- jumpNotSI := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg.
"Whether the SmallInteger tags are zero or non-zero, oring them together will preserve them."
self OrR: Arg0Reg R: ReceiverResultReg.
self RetN: 0.
jumpNotSI jmpTarget: self Label.
^0!
Item was changed:
----- Method: StackToRegisterMappingCogit>>genPrimitiveBitShift (in category 'primitive generators') -----
genPrimitiveBitShift
"Receiver and arg in registers.
Stack looks like
return address
rTemp := rArg0
rClass := tTemp
rTemp := rTemp & 1
jz nonInt
rClass >>= 1
cmp 0,rClass
jge neg
cmp 31,rClass // numSmallIntegerBits, jge for sign
jge tooBig
rTemp := rReceiver
rTemp <<= rClass
rTemp >>= rClass (arithmetic)
cmp rTemp,rReceiver
jnz ovfl
rReceiver := rReceiver - 1
rReceiver := rReceiver <<= rClass
rReceiver := rReceiver + 1
ret
neg:
rClass := 0 - rClass
cmp 31,rClass
jge inRange
rClass := 31
inRange
rReceiver := rReceiver >>= rClass.
rReceiver := rReceiver | 1.
ret
ovfl
tooBig
nonInt:
fail"
| jumpNotSI jumpOvfl jumpNegative jumpTooBig jumpInRange |
<var: #jumpNotSI type: #'AbstractInstruction *'>
<var: #jumpOvfl type: #'AbstractInstruction *'>
<var: #jumpNegative type: #'AbstractInstruction *'>
<var: #jumpTooBig type: #'AbstractInstruction *'>
<var: #jumpInRange type: #'AbstractInstruction *'>
self assert: self numRegArgs >= 1.
- self MoveR: Arg0Reg R: TempReg.
self MoveR: Arg0Reg R: ClassReg.
+ jumpNotSI := objectRepresentation genJumpNotSmallInteger: Arg0Reg scratchReg: TempReg.
- jumpNotSI := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg.
objectRepresentation genConvertSmallIntegerToIntegerInReg: ClassReg.
(self lastOpcode setsConditionCodesFor: JumpNegative) ifFalse:
[self CmpCq: 0 R: ClassReg]. "N.B. FLAGS := ClassReg - 0"
jumpNegative := self JumpNegative: 0.
self CmpCq: objectRepresentation numSmallIntegerBits R: ClassReg. "N.B. FLAGS := ClassReg - 31"
jumpTooBig := self JumpGreaterOrEqual: 0.
self MoveR: ReceiverResultReg R: TempReg.
self LogicalShiftLeftR: ClassReg R: TempReg.
self ArithmeticShiftRightR: ClassReg R: TempReg.
self CmpR: TempReg R: ReceiverResultReg. "N.B. FLAGS := RRReg - TempReg"
jumpOvfl := self JumpNonZero: 0.
objectRepresentation genRemoveSmallIntegerTagsInScratchReg: ReceiverResultReg.
self LogicalShiftLeftR: ClassReg R: ReceiverResultReg.
objectRepresentation genAddSmallIntegerTagsTo: ReceiverResultReg.
self RetN: 0.
jumpNegative jmpTarget: (self NegateR: ClassReg).
self CmpCq: objectRepresentation numSmallIntegerBits R: ClassReg. "N.B. FLAGS := ClassReg - 31"
jumpInRange := self JumpLessOrEqual: 0.
self MoveCq: objectRepresentation numSmallIntegerBits R: ClassReg.
jumpInRange jmpTarget: (self ArithmeticShiftRightR: ClassReg R: ReceiverResultReg).
objectRepresentation genSetSmallIntegerTagsIn: ReceiverResultReg.
self RetN: 0.
jumpNotSI jmpTarget: (jumpTooBig jmpTarget: (jumpOvfl jmpTarget: self Label)).
^0!
Item was changed:
----- Method: StackToRegisterMappingCogit>>genPrimitiveBitXor (in category 'primitive generators') -----
genPrimitiveBitXor
| jumpNotSI |
<var: #jumpNotSI type: #'AbstractInstruction *'>
+ jumpNotSI := objectRepresentation genJumpNotSmallInteger: Arg0Reg scratchReg: TempReg.
- self MoveR: Arg0Reg R: TempReg.
- jumpNotSI := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg.
"Clear one or the other tag so that xoring will preserve them."
objectRepresentation genRemoveSmallIntegerTagsInScratchReg: Arg0Reg.
self XorR: Arg0Reg R: ReceiverResultReg.
self RetN: 0.
jumpNotSI jmpTarget: self Label.
^0!
Item was changed:
----- Method: StackToRegisterMappingCogit>>genPrimitiveDiv (in category 'primitive generators') -----
genPrimitiveDiv
| jumpNotSI jumpZero jumpExact jumpSameSign convert |
<var: #convert type: #'AbstractInstruction *'>
<var: #jumpZero type: #'AbstractInstruction *'>
<var: #jumpNotSI type: #'AbstractInstruction *'>
<var: #jumpExact type: #'AbstractInstruction *'>
<var: #jumpSameSign type: #'AbstractInstruction *'>
- self MoveR: Arg0Reg R: TempReg.
self MoveR: Arg0Reg R: ClassReg.
self MoveR: Arg0Reg R: Arg1Reg.
+ jumpNotSI := objectRepresentation genJumpNotSmallInteger: Arg0Reg scratchReg: TempReg.
- jumpNotSI := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg.
"We must shift away the tags, not just subtract them, so that the
overflow case doesn't actually overflow the machine instruction."
objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: ClassReg.
(self lastOpcode setsConditionCodesFor: JumpZero) ifFalse:
[self CmpCq: 0 R: ClassReg].
jumpZero := self JumpZero: 0.
self MoveR: ReceiverResultReg R: TempReg.
objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: TempReg.
self DivR: ClassReg R: TempReg Quo: TempReg Rem: ClassReg.
"If remainder is zero we must check for overflow."
self CmpCq: 0 R: ClassReg.
jumpExact := self JumpZero: 0.
"If arg and remainder signs are different we must round down."
self XorR: ClassReg R: Arg1Reg.
(self lastOpcode setsConditionCodesFor: JumpZero) ifFalse:
[self CmpCq: 0 R: Arg1Reg].
jumpSameSign := self JumpGreaterOrEqual: 0.
self SubCq: 1 R: TempReg.
jumpSameSign jmpTarget: (convert := self Label).
objectRepresentation genConvertIntegerToSmallIntegerInReg: TempReg.
self MoveR: TempReg R: ReceiverResultReg.
self RetN: 0.
"test for overflow; the only case is SmallInteger minVal // -1"
jumpExact jmpTarget:
(self CmpCq: (1 << (objectRepresentation numSmallIntegerBits - 1)) R: TempReg).
self JumpLess: convert.
jumpZero jmpTarget: (jumpNotSI jmpTarget: self Label).
^0!
Item was changed:
----- Method: StackToRegisterMappingCogit>>genPrimitiveDivide (in category 'primitive generators') -----
genPrimitiveDivide
| jumpNotSI jumpZero jumpInexact jumpOverflow |
<var: #jumpNotSI type: #'AbstractInstruction *'>
<var: #jumpZero type: #'AbstractInstruction *'>
<var: #jumpInexact type: #'AbstractInstruction *'>
<var: #jumpOverflow type: #'AbstractInstruction *'>
- self MoveR: Arg0Reg R: TempReg.
self MoveR: Arg0Reg R: ClassReg.
+ jumpNotSI := objectRepresentation genJumpNotSmallInteger: Arg0Reg scratchReg: TempReg.
- jumpNotSI := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg.
"We must shift away the tags, not just subtract them, so that the
overflow case doesn't actually overflow the machine instruction."
objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: ClassReg.
jumpZero := self JumpZero: 0.
self MoveR: ReceiverResultReg R: TempReg.
objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: TempReg.
self DivR: ClassReg R: TempReg Quo: TempReg Rem: ClassReg.
"If remainder is non-zero fail."
self CmpCq: 0 R: ClassReg.
jumpInexact := self JumpNonZero: 0.
"test for overflow; the only case is SmallInteger minVal / -1"
self CmpCq: (1 << (objectRepresentation numSmallIntegerBits - 1)) R: TempReg.
jumpOverflow := self JumpGreaterOrEqual: 0.
objectRepresentation genConvertIntegerToSmallIntegerInReg: TempReg.
self MoveR: TempReg R: ReceiverResultReg.
self RetN: 0.
jumpOverflow jmpTarget: (jumpInexact jmpTarget: (jumpZero jmpTarget: (jumpNotSI jmpTarget: self Label))).
^0!
Item was changed:
----- Method: StackToRegisterMappingCogit>>genPrimitiveMod (in category 'primitive generators') -----
genPrimitiveMod
| jumpNotSI jumpZero jumpExact jumpSameSign |
<var: #jumpNotSI type: #'AbstractInstruction *'>
<var: #jumpZero type: #'AbstractInstruction *'>
<var: #jumpExact type: #'AbstractInstruction *'>
<var: #jumpSameSign type: #'AbstractInstruction *'>
- self MoveR: Arg0Reg R: TempReg.
self MoveR: Arg0Reg R: ClassReg.
+ jumpNotSI := objectRepresentation genJumpNotSmallInteger: Arg0Reg scratchReg: TempReg.
- jumpNotSI := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg.
objectRepresentation genRemoveSmallIntegerTagsInScratchReg: ClassReg.
jumpZero := self JumpZero: 0.
self MoveR: ClassReg R: Arg1Reg.
self MoveR: ReceiverResultReg R: TempReg.
objectRepresentation genRemoveSmallIntegerTagsInScratchReg: TempReg.
self DivR: ClassReg R: TempReg Quo: TempReg Rem: ClassReg.
"If remainder is zero we're done."
self CmpCq: 0 R: ClassReg.
jumpExact := self JumpZero: 0.
"If arg and remainder signs are different we must reflect around zero."
self XorR: ClassReg R: Arg1Reg.
(self lastOpcode setsConditionCodesFor: JumpZero) ifFalse:
[self CmpCq: 0 R: Arg1Reg].
jumpSameSign := self JumpGreaterOrEqual: 0.
self XorR: ClassReg R: Arg1Reg.
self AddR: Arg1Reg R: ClassReg.
jumpSameSign jmpTarget: (jumpExact jmpTarget: self Label).
objectRepresentation genSetSmallIntegerTagsIn: ClassReg.
self MoveR: ClassReg R: ReceiverResultReg.
self RetN: 0.
jumpZero jmpTarget: (jumpNotSI jmpTarget: self Label).
^0!
Item was changed:
----- Method: StackToRegisterMappingCogit>>genPrimitiveMultiply (in category 'primitive generators') -----
genPrimitiveMultiply
| jumpNotSI jumpOvfl |
<var: #jumpNotSI type: #'AbstractInstruction *'>
<var: #jumpOvfl type: #'AbstractInstruction *'>
- self MoveR: Arg0Reg R: TempReg.
self MoveR: Arg0Reg R: ClassReg.
self MoveR: ReceiverResultReg R: Arg1Reg.
+ jumpNotSI := objectRepresentation genJumpNotSmallInteger: Arg0Reg scratchReg: TempReg..
- jumpNotSI := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg.
objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: ClassReg.
objectRepresentation genRemoveSmallIntegerTagsInScratchReg: Arg1Reg.
self MulR: Arg1Reg R: ClassReg.
jumpOvfl := self JumpOverflow: 0.
objectRepresentation genSetSmallIntegerTagsIn: ClassReg.
self MoveR: ClassReg R: ReceiverResultReg.
self RetN: 0.
jumpOvfl jmpTarget: (jumpNotSI jmpTarget: self Label).
^0!
Item was changed:
----- Method: StackToRegisterMappingCogit>>genPrimitiveQuo (in category 'primitive generators') -----
genPrimitiveQuo
| jumpNotSI jumpZero jumpOverflow |
<var: #jumpNotSI type: #'AbstractInstruction *'>
<var: #jumpZero type: #'AbstractInstruction *'>
<var: #jumpOverflow type: #'AbstractInstruction *'>
- self MoveR: Arg0Reg R: TempReg.
self MoveR: Arg0Reg R: ClassReg.
+ jumpNotSI := objectRepresentation genJumpNotSmallInteger: Arg0Reg scratchReg: TempReg.
- jumpNotSI := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg.
"We must shift away the tags, not just subtract them, so that the
overflow case doesn't actually overflow the machine instruction."
objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: ClassReg.
(self lastOpcode setsConditionCodesFor: JumpZero) ifFalse:
[self CmpCq: 0 R: ClassReg].
jumpZero := self JumpZero: 0.
self MoveR: ReceiverResultReg R: TempReg.
objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: TempReg.
self DivR: ClassReg R: TempReg Quo: TempReg Rem: ClassReg.
"test for overflow; the only case is SmallInteger minVal quo: -1"
self CmpCq: (1 << (objectRepresentation numSmallIntegerBits - 1)) R: TempReg.
jumpOverflow := self JumpGreaterOrEqual: 0.
objectRepresentation genConvertIntegerToSmallIntegerInReg: TempReg.
self MoveR: TempReg R: ReceiverResultReg.
self RetN: 0.
jumpOverflow jmpTarget: (jumpZero jmpTarget: (jumpNotSI jmpTarget: self Label)).
^0!
Item was changed:
----- Method: StackToRegisterMappingCogit>>genPrimitiveSubtract (in category 'primitive generators') -----
genPrimitiveSubtract
| jumpNotSI jumpOvfl |
<var: #jumpNotSI type: #'AbstractInstruction *'>
<var: #jumpOvfl type: #'AbstractInstruction *'>
+ jumpNotSI := objectRepresentation genJumpNotSmallInteger: Arg0Reg scratchReg: TempReg.
- self MoveR: Arg0Reg R: TempReg.
- jumpNotSI := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg.
self MoveR: ReceiverResultReg R: TempReg.
self SubR: Arg0Reg R: TempReg.
jumpOvfl := self JumpOverflow: 0.
objectRepresentation genAddSmallIntegerTagsTo: TempReg.
self MoveR: TempReg R: ReceiverResultReg.
self RetN: 0.
jumpOvfl jmpTarget: (jumpNotSI jmpTarget: self Label).
^0!
Item was changed:
----- Method: StackToRegisterMappingCogit>>genSmallIntegerComparison: (in category 'primitive generators') -----
genSmallIntegerComparison: jumpOpcode
| jumpFail jumpTrue |
<var: #jumpFail type: #'AbstractInstruction *'>
<var: #jumpTrue type: #'AbstractInstruction *'>
+ jumpFail := objectRepresentation genJumpNotSmallInteger: Arg0Reg scratchReg: TempReg.
- self MoveR: Arg0Reg R: TempReg.
- jumpFail := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg.
self CmpR: Arg0Reg R: ReceiverResultReg. "N.B. FLAGS := RRReg - Arg0Reg"
jumpTrue := self gen: jumpOpcode.
self genMoveFalseR: ReceiverResultReg.
self RetN: 0.
jumpTrue jmpTarget: (self genMoveTrueR: ReceiverResultReg).
self RetN: 0.
jumpFail jmpTarget: self Label.
^0!
Item was changed:
----- Method: StackToRegisterMappingCogit>>genSmallIntegerComparison:orDoubleComparison: (in category 'primitive generators') -----
genSmallIntegerComparison: jumpOpcode orDoubleComparison: jumpFPOpcodeGenerator
"Stack looks like
return address"
| jumpDouble jumpNonInt jumpFail jumpTrue jumpCond |
<var: #jumpFPOpcodeGenerator declareC: 'AbstractInstruction *(*jumpFPOpcodeGenerator)(void *)'>
<var: #jumpDouble type: #'AbstractInstruction *'>
<var: #jumpNonInt type: #'AbstractInstruction *'>
<var: #jumpCond type: #'AbstractInstruction *'>
<var: #jumpTrue type: #'AbstractInstruction *'>
<var: #jumpFail type: #'AbstractInstruction *'>
backEnd hasDoublePrecisionFloatingPointSupport ifFalse:
[^self genSmallIntegerComparison: jumpOpcode].
+ jumpDouble := objectRepresentation genJumpNotSmallInteger: Arg0Reg scratchReg: TempReg.
- self MoveR: Arg0Reg R: TempReg.
- jumpDouble := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg.
self CmpR: Arg0Reg R: ReceiverResultReg. "N.B. FLAGS := RRReg - Arg0Reg"
jumpTrue := self gen: jumpOpcode.
self genMoveFalseR: ReceiverResultReg.
self RetN: 0.
jumpTrue jmpTarget: (self genMoveTrueR: ReceiverResultReg).
self RetN: 0.
"Argument may be a Float : let us check or fail"
jumpDouble jmpTarget: self Label.
objectRepresentation smallIntegerIsOnlyImmediateType ifFalse:
+ [jumpNonInt := objectRepresentation genJumpImmediate: Arg0Reg].
- [self MoveR: ClassReg R: TempReg.
- jumpNonInt := objectRepresentation genJumpImmediateInScratchReg: TempReg].
objectRepresentation genGetCompactClassIndexNonImmOf: Arg0Reg into: SendNumArgsReg.
objectRepresentation genCmpClassFloatCompactIndexR: SendNumArgsReg.
jumpFail := self JumpNonZero: 0.
"It was a Float, so convert the receiver to double and perform the operation"
objectRepresentation genConvertSmallIntegerToIntegerInReg: ReceiverResultReg.
self ConvertR: ReceiverResultReg Rd: DPFPReg0.
objectRepresentation genGetDoubleValueOf: Arg0Reg into: DPFPReg1.
self CmpRd: DPFPReg1 Rd: DPFPReg0.
jumpCond := self perform: jumpFPOpcodeGenerator with: 0. "FP jumps are a little weird"
self genMoveFalseR: ReceiverResultReg.
self RetN: 0.
jumpCond jmpTarget: (self genMoveTrueR: ReceiverResultReg).
self RetN: 0.
objectRepresentation smallIntegerIsOnlyImmediateType
ifTrue: [jumpFail jmpTarget: self Label]
ifFalse: [jumpNonInt jmpTarget: (jumpFail jmpTarget: self Label)].
^0!
1
0
Fwd: [Pharo-dev] I need reviewer of https://pharo.fogbugz.com/default.asp?15646
by Nicolas Cellier 03 Jun '15
by Nicolas Cellier 03 Jun '15
03 Jun '15
Ah, that reminds me that our MC configuration map store the UUID, so Squeak
should rock...
Alas, we do not use this UUID to enforce correctness at load time !!!
If it's a feature, it's rather a bad one ;)
2015-06-03 15:46 GMT+02:00 Thierry Goubier <thierry.goubier(a)gmail.com>:
>
>
> 2015-06-03 15:09 GMT+02:00 Nicolai Hess <nicolaihess(a)web.de>:
>
>>
>>
>> self versionFromFileNamed: fileName
>> is called after it isn't found in the MCCacheRepository
>> and if it is not found in its own special repository cache , it is loaded
>> with
>> self loadVersionFromFileNamed:
>> and this again looks up in the MCCacheRepostory:
>>
>> loadVersionFromFileNamed: aString
>> (MCCacheRepository uniqueInstance includesFileNamed: aString)
>> ifTrue: [ ^ MCCacheRepository uniqueInstance
>> loadVersionFromFileNamed: aString].
>>
>> ^ self versionReaderForFileNamed: aString do: [:r | r version]
>>
>> but this time it searches the package in the MCCacheRepitory by its name
>> only and load
>> the version info from that file.
>>
>
> Thanks for finding that. Interesting, that semantic missmatch ... which
> amounts to loosing the version info in places during the loading process.
>
> Notes for documentation :
>
> - FileTree changes versionFromFileNamed: to disable the internal
> repository cache (but cache is still an instance variable because of
> inheritance, and it goes through PackageCache).
>
> - GitFileTree avoids the PackageCache altogether and is the only type of
> repo not to have that bug in Pharo4 (Yes! But I had no idea why :)).
>
>
>>
>>> We need to build test repositories to have correct coverage of those
>>> issues, because at the moment I'm not sure I understand the case you are
>>> describing :(
>>>
>>
>>
>> Try to load
>>
>> SLICE-Issue-15646-Cleaning-method-category-api-should-be-protocol-part-1-StephaneDucasse.1
>> from pharo 5.0 inbox repository.
>> This slice has dependencies to packages
>> DebuggerActions-StephaneDucasse.75, Kernel-StephaneDucasse.2042
>> which are both in pharo 5.0 main and inbox repository but with different
>> uuids
>>
>
> Yuck :(
>
> So, if I understood well, what is happening is:
>
> - Reading from Pharo5Main, DebuggerActions-StephaneDucasse.75 is loaded in
> PackageCache (and in the cache of Pharo5Main).
> - Comparing UUIDs say that this is not the right one.
> - Reading from Pharo5Inbox, DebuggerActions-StephaneDucasse.75 is loaded
> in the cache of Pharo5Inbox
> - First read inside package cache say that the file exist but has the
> wrong UUID
> - Second read has matching file name inside Pharo5Inbox
> - So it loads the version from Pharo5Inbox
> - which test PackageCache for DebuggerActions-StephaneDucasse.75 ...
> which is true
> - But uuids don't match
> - so it fails....
>
> I hate package-cache.
>
>
>>
>>
>> If pharo 5.0 main repository is searched first, it will only find
>> packages with the wrong version info,
>> even if the packages in the 5.0 inbox have the correct version info.
>>
>
> You're right.
>
> So your fix should work. I would not hesitate however:
>
> - to move the version reading line inside versionWithInfo:ifAbsent:
> - to factor the cache update into an #updateCacheWith: v (so that it can
> also be called from versionFromFileNamed:) called from
> versionWithInfo:ifAbsent:
>
> Thierry
>
>
>>
>>
>>
>>
>>>
>>> Thierry
>>>
>>>
>>>>
>>>>
>>>>
>>>>
>>>>
>>>>
>>>>>
>>>>> Package loads with version info happens in two cases:
>>>>> - dependency loading (i.e. slices)
>>>>> - history loading (i.e. browsing history and merges).
>>>>>
>>>>> Anything else is loading by name, since this is what is recorded in
>>>>> Configurations and Gofer scripts.
>>>>>
>>>>> Thierry
>>>>>
>>>>>
>>>>>>
>>>>>> nicolai
>>>>>>
>>>>>>
>>>>>>
>>>>>>
>>>>>>>
>>>>>>> Maybe we could for real put (part of) the UID in the filename?
>>>>>>>
>>>>>>> In a disconnected system the case that the filename is the same for
>>>>>>> different files will always happen if the name is contructed
>>>>>>> as it is now.
>>>>>>>
>>>>>>> Marcus
>>>>>>>
>>>>>>> > On 02 Jun 2015, at 22:37, stepharo <stepharo(a)free.fr> wrote:
>>>>>>> >
>>>>>>> > I hate so much this bug....
>>>>>>> >
>>>>>>> >
>>>>>>> > Le 1/6/15 15:04, Ben Coman a écrit :
>>>>>>> >> Stef, I can now see all the dependent packages for the new slice,
>>>>>>> but
>>>>>>> >> I still have a strange error. However I'm not sure if its a bug
>>>>>>> or
>>>>>>> >> something unique at my end.
>>>>>>> >>
>>>>>>> >> Can someone try merging
>>>>>>> >>
>>>>>>> SLICE-Issue-15646-Cleaning-method-category-api-should-be-protocol-part-1-StephaneDucasse.1
>>>>>>> >>
>>>>>>> >> What I see at top of stack is two calls to
>>>>>>> MCVersionMerger>>addVersion:
>>>>>>> >>
>>>>>>> >> MCVersionMerger>>addVersion: aVersion
>>>>>>> >> records add: (MCMergeRecord version: aVersion).
>>>>>>> >> aVersion dependencies
>>>>>>> >> do: [:ea | | dep satisfied |
>>>>>>> >> dep := ea resolve.
>>>>>>> >> satisfied := (records anySatisfy: [:r | r version
>>>>>>> = dep]).
>>>>>>> >> satisfied ifFalse: [self addVersion: dep]] "<<<
>>>>>>> race? "
>>>>>>> >> displayingProgress: [ :ea| 'Searching dependency: ',
>>>>>>> ea
>>>>>>> >> package name]
>>>>>>> >> "15646Note: variable /satisfied/ added for
>>>>>>> reporting/debugging"
>>>>>>> >>
>>>>>>> >> One level down from where the error occurs the debugger shows...
>>>>>>> >>
>>>>>>> >> /aVersion/ --> a
>>>>>>> >>
>>>>>>> MCVersion(SLICE-Issue-15646-Cleaning-method-category-api-should-be-protocol-part-1-StephaneDucasse.1)
>>>>>>> >>
>>>>>>> >> /ea/ --> a MCVersionInfo(DebuggerActions-StephaneDucasse.75)
>>>>>>> >>
>>>>>>> >> /dep/ --> nil
>>>>>>> >>
>>>>>>> >> /satisfied/ --> false
>>>>>>> >>
>>>>>>> >> and the following which contradicts the value in /satisfied/
>>>>>>> >>
>>>>>>> >> (records anySatisfy: [:r | r version = dep]) --> true.
>>>>>>> >>
>>>>>>> >> so there seems to be a race such that the ifFalse block is
>>>>>>> improperly
>>>>>>> >> executed, such that the recursive call on top of stack has...
>>>>>>> >>
>>>>>>> >> /aVersion/-->nil
>>>>>>> >>
>>>>>>> >> hence MNU receiver of "dependencies" is nil.
>>>>>>> >>
>>>>>>> >> cheers -ben
>>>>>>> >>
>>>>>>> >>
>>>>>>> >> On Mon, Jun 1, 2015 at 10:36 AM, Ben Coman <btc(a)openinworld.com>
>>>>>>> wrote:
>>>>>>> >>> I tried, but it seems some packages are missing from the inbox.
>>>>>>> >>> cheers -ben
>>>>>>> >>>
>>>>>>> >>> On Sun, May 31, 2015 at 2:19 PM, stepharo <stepharo(a)free.fr>
>>>>>>> wrote:
>>>>>>> >>>> Hi
>>>>>>> >>>>
>>>>>>> >>>> I continued to clean that classes have categories and method
>>>>>>> protocols
>>>>>>> >>>> because it was not finished.
>>>>>>> >>>> This entry is just adding protocol in the classes that were
>>>>>>> missing it,
>>>>>>> >>>> adding comments, and fixing some local senders
>>>>>>> >>>> It does not remove the category API but puts it in a
>>>>>>> accessing-backward
>>>>>>> >>>> protocol and in a second step I will fix all the senders I can
>>>>>>> (ie not
>>>>>>> >>>> Metacello for example).
>>>>>>> >>>> Category is really overloaded and we get lost when trying to
>>>>>>> understand
>>>>>>> >>>> code.
>>>>>>> >>>> I want to rename RBRule 'category' into 'kind' for this reason.
>>>>>>> >>>>
>>>>>>> >>>> Stef
>>>>>>> >>>>
>>>>>>> >>
>>>>>>> >
>>>>>>> >
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>
>>>>>
>>>>
>>>
>>
>
1
0