diff --git a/nsspur64src/vm/cogit.h b/nsspur64src/vm/cogit.h index 48b75d5c1c..b4bba7f1a0 100644 --- a/nsspur64src/vm/cogit.h +++ b/nsspur64src/vm/cogit.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ diff --git a/nsspur64src/vm/cogitX64SysV.c b/nsspur64src/vm/cogitX64SysV.c index 98522d99de..0da9b21fdb 100644 --- a/nsspur64src/vm/cogitX64SysV.c +++ b/nsspur64src/vm/cogitX64SysV.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -6133,7 +6133,8 @@ endPCOf(sqInt aMethod) ? 256 : 0) # else /* MULTIPLEBYTECODESETS */ - 0 + (assert(!((methodUsesAlternateBytecodeSet(aMethod)))), + 0) # endif /* MULTIPLEBYTECODESETS */ ; nExts = 0; @@ -6526,7 +6527,7 @@ followForwardedLiteralsIn(CogMethod *cogMethod) val = 0; assert((((cogMethod->cmType)) != CMMethod) || (!(isForwarded((cogMethod->methodObject))))); - hasYoungObj = 0; + hasYoungObj = isYoung((cogMethod->methodObject)); if (shouldRemapOop((cogMethod->selector))) { (cogMethod->selector = remapObj((cogMethod->selector))); if (isYoung((cogMethod->selector))) { @@ -8163,9 +8164,9 @@ gJumpFPEqual(void *jumpTarget) AbstractInstruction *jumpUnordered; /* begin genJumpFPOrderedAnd:to: */ - jumpToTarget = genoperand(JumpFPEqual, ((sqInt)jumpTarget)); jumpUnordered = genoperand(JumpFPUnordered, ((sqInt)jumpTarget)); - addDependent(jumpToTarget, jumpUnordered); + jumpToTarget = genoperand(JumpFPEqual, ((sqInt)jumpTarget)); + jmpTarget(jumpUnordered, genoperandoperand(Label, (labelCounter += 1), bytecodePC)); return jumpToTarget; } @@ -16822,7 +16823,8 @@ genSmallIntegerComparisonorDoubleComparisoninvert(sqInt jumpOpcode, AbstractInst genoperand(RetN, (methodOrBlockNumArgs + 1) * BytesPerWord); } jmpTarget(jumpTrue, returnTrue); - jmpTarget(jumpNotSmallFloat, (jumpNotFloatAtAll = genJumpImmediate(Arg0Reg))); + jmpTarget(jumpNotSmallFloat, genoperandoperand(Label, (labelCounter += 1), bytecodePC)); + jumpNotFloatAtAll = genJumpImmediate(Arg0Reg); genGetCompactClassIndexNonImmOfinto(Arg0Reg, SendNumArgsReg); genCmpClassFloatCompactIndexR(SendNumArgsReg); /* begin JumpNonZero: */ diff --git a/nsspur64src/vm/cogitX64WIN64.c b/nsspur64src/vm/cogitX64WIN64.c index 9ade542169..01894dea3e 100644 --- a/nsspur64src/vm/cogitX64WIN64.c +++ b/nsspur64src/vm/cogitX64WIN64.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -6141,7 +6141,8 @@ endPCOf(sqInt aMethod) ? 256 : 0) # else /* MULTIPLEBYTECODESETS */ - 0 + (assert(!((methodUsesAlternateBytecodeSet(aMethod)))), + 0) # endif /* MULTIPLEBYTECODESETS */ ; nExts = 0; @@ -6534,7 +6535,7 @@ followForwardedLiteralsIn(CogMethod *cogMethod) val = 0; assert((((cogMethod->cmType)) != CMMethod) || (!(isForwarded((cogMethod->methodObject))))); - hasYoungObj = 0; + hasYoungObj = isYoung((cogMethod->methodObject)); if (shouldRemapOop((cogMethod->selector))) { (cogMethod->selector = remapObj((cogMethod->selector))); if (isYoung((cogMethod->selector))) { @@ -8171,9 +8172,9 @@ gJumpFPEqual(void *jumpTarget) AbstractInstruction *jumpUnordered; /* begin genJumpFPOrderedAnd:to: */ - jumpToTarget = genoperand(JumpFPEqual, ((sqInt)jumpTarget)); jumpUnordered = genoperand(JumpFPUnordered, ((sqInt)jumpTarget)); - addDependent(jumpToTarget, jumpUnordered); + jumpToTarget = genoperand(JumpFPEqual, ((sqInt)jumpTarget)); + jmpTarget(jumpUnordered, genoperandoperand(Label, (labelCounter += 1), bytecodePC)); return jumpToTarget; } @@ -16830,7 +16831,8 @@ genSmallIntegerComparisonorDoubleComparisoninvert(sqInt jumpOpcode, AbstractInst genoperand(RetN, (methodOrBlockNumArgs + 1) * BytesPerWord); } jmpTarget(jumpTrue, returnTrue); - jmpTarget(jumpNotSmallFloat, (jumpNotFloatAtAll = genJumpImmediate(Arg0Reg))); + jmpTarget(jumpNotSmallFloat, genoperandoperand(Label, (labelCounter += 1), bytecodePC)); + jumpNotFloatAtAll = genJumpImmediate(Arg0Reg); genGetCompactClassIndexNonImmOfinto(Arg0Reg, SendNumArgsReg); genCmpClassFloatCompactIndexR(SendNumArgsReg); /* begin JumpNonZero: */ diff --git a/nsspur64src/vm/cointerp.c b/nsspur64src/vm/cointerp.c index 23d989cddb..db29385022 100644 --- a/nsspur64src/vm/cointerp.c +++ b/nsspur64src/vm/cointerp.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1259,7 +1259,7 @@ extern sqInt nonIndexablePointerFormat(void); static sqInt noUnscannedEphemerons(void); static sqInt NoDbgRegParms numBytesOfBytes(sqInt objOop); extern sqInt numBytesOf(sqInt objOop); -extern sqInt numPointerSlotsOf(sqInt objOop); +extern usqInt numPointerSlotsOf(sqInt objOop); static usqInt NoDbgRegParms numSlotsOfAny(sqInt objOop); extern usqInt numSlotsOf(sqInt objOop); static sqInt NoDbgRegParms numStrongSlotsOfInephemeral(sqInt objOop); @@ -2622,7 +2622,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 578 */] }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.2558"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.2561"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -46013,7 +46013,6 @@ becomewithtwoWaycopyHash(sqInt array1, sqInt array2, sqInt twoWayFlag, sqInt cop } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -47902,7 +47901,7 @@ copyObjtoAddrstopAtsavedFirstFieldsindex(sqInt objOop, sqInt segAddr, sqInt endS sqInt iLimiT; sqInt methodHeader; sqInt numLiterals; - sqInt numMediatedSlots; + usqInt numMediatedSlots; usqInt numSlots; usqInt numSlots1; sqInt oop; @@ -54415,7 +54414,7 @@ numBytesOf(sqInt objOop) Works with CompiledMethods, as well as ordinary objects. */ /* SpurMemoryManager>>#numPointerSlotsOf: */ -sqInt +usqInt numPointerSlotsOf(sqInt objOop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt contextSize; @@ -55448,7 +55447,6 @@ pinObject(sqInt objOop) } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -57629,7 +57627,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop1))); contextSize = (sp >> 3); l10: /* end fetchStackPointerOf: */; - i = CtxtTempFrameStart + contextSize; + i = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l11; } /* begin numSlotsOf: */ @@ -57661,7 +57659,7 @@ printReferencesTo(sqInt anOop) } assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - i = numLiterals + LiteralStart; + i = ((usqInt) (numLiterals + LiteralStart)); l11: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop1 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -57715,7 +57713,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop1))); contextSize = (sp >> 3); l12: /* end fetchStackPointerOf: */; - i = CtxtTempFrameStart + contextSize; + i = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l13; } /* begin numSlotsOf: */ @@ -57747,7 +57745,7 @@ printReferencesTo(sqInt anOop) } assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - i = numLiterals + LiteralStart; + i = ((usqInt) (numLiterals + LiteralStart)); l13: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop1 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -57802,7 +57800,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop11))); contextSize = (sp >> 3); l14: /* end fetchStackPointerOf: */; - i = CtxtTempFrameStart + contextSize; + i = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l15; } /* begin numSlotsOf: */ @@ -57834,7 +57832,7 @@ printReferencesTo(sqInt anOop) } assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - i = numLiterals + LiteralStart; + i = ((usqInt) (numLiterals + LiteralStart)); l15: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop11 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -60867,10 +60865,10 @@ updatePointers(void) sqInt numLiterals1; sqInt numLiterals2; sqInt numLiterals3; - sqInt numPointerSlots; - sqInt numPointerSlots1; - sqInt numPointerSlots2; - sqInt numPointerSlots3; + usqInt numPointerSlots; + usqInt numPointerSlots1; + usqInt numPointerSlots2; + usqInt numPointerSlots3; usqInt numSlots; usqInt numSlots1; usqInt numSlots11; @@ -61435,7 +61433,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(obj))); contextSize = (sp >> 3); l7: /* end fetchStackPointerOf: */; - numPointerSlots = ((usqInt) (CtxtTempFrameStart + contextSize)); + numPointerSlots = CtxtTempFrameStart + contextSize; goto l8; } /* begin numSlotsOf: */ @@ -61464,7 +61462,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) l5: /* end methodHeaderFromSavedFirstField: */; assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - numPointerSlots = ((usqInt) (numLiterals + LiteralStart)); + numPointerSlots = numLiterals + LiteralStart; l8: /* end numPointerSlotsWhileCompactingOf:withFormat:savedFirstFieldPointer: */; if ((fmt <= 5 /* lastPointerFormat */) && (numPointerSlots > 0)) { diff --git a/nsspur64src/vm/cointerp.h b/nsspur64src/vm/cointerp.h index 09545b8d88..1be56b80d6 100644 --- a/nsspur64src/vm/cointerp.h +++ b/nsspur64src/vm/cointerp.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ @@ -245,7 +245,7 @@ extern sqInt minSlotsForShortening(void); extern sqInt nilObject(void); extern sqInt nonIndexablePointerFormat(void); extern sqInt numBytesOf(sqInt objOop); -extern sqInt numPointerSlotsOf(sqInt objOop); +extern usqInt numPointerSlotsOf(sqInt objOop); extern usqInt numSlotsOf(sqInt objOop); extern sqInt numStrongSlotsOfWeakling(sqInt objOop); extern sqInt objectAfter(sqInt objOop); diff --git a/nsspur64src/vm/gcc3x-cointerp.c b/nsspur64src/vm/gcc3x-cointerp.c index d3f583799e..4daf2024db 100644 --- a/nsspur64src/vm/gcc3x-cointerp.c +++ b/nsspur64src/vm/gcc3x-cointerp.c @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1262,7 +1262,7 @@ extern sqInt nonIndexablePointerFormat(void); static sqInt noUnscannedEphemerons(void); static sqInt NoDbgRegParms numBytesOfBytes(sqInt objOop); extern sqInt numBytesOf(sqInt objOop); -extern sqInt numPointerSlotsOf(sqInt objOop); +extern usqInt numPointerSlotsOf(sqInt objOop); static usqInt NoDbgRegParms numSlotsOfAny(sqInt objOop); extern usqInt numSlotsOf(sqInt objOop); static sqInt NoDbgRegParms numStrongSlotsOfInephemeral(sqInt objOop); @@ -2625,7 +2625,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 578 */] }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.2558"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.2561"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -46022,7 +46022,6 @@ becomewithtwoWaycopyHash(sqInt array1, sqInt array2, sqInt twoWayFlag, sqInt cop } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -47911,7 +47910,7 @@ copyObjtoAddrstopAtsavedFirstFieldsindex(sqInt objOop, sqInt segAddr, sqInt endS sqInt iLimiT; sqInt methodHeader; sqInt numLiterals; - sqInt numMediatedSlots; + usqInt numMediatedSlots; usqInt numSlots; usqInt numSlots1; sqInt oop; @@ -54424,7 +54423,7 @@ numBytesOf(sqInt objOop) Works with CompiledMethods, as well as ordinary objects. */ /* SpurMemoryManager>>#numPointerSlotsOf: */ -sqInt +usqInt numPointerSlotsOf(sqInt objOop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt contextSize; @@ -55457,7 +55456,6 @@ pinObject(sqInt objOop) } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -57638,7 +57636,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop1))); contextSize = (sp >> 3); l10: /* end fetchStackPointerOf: */; - i = CtxtTempFrameStart + contextSize; + i = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l11; } /* begin numSlotsOf: */ @@ -57670,7 +57668,7 @@ printReferencesTo(sqInt anOop) } assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - i = numLiterals + LiteralStart; + i = ((usqInt) (numLiterals + LiteralStart)); l11: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop1 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -57724,7 +57722,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop1))); contextSize = (sp >> 3); l12: /* end fetchStackPointerOf: */; - i = CtxtTempFrameStart + contextSize; + i = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l13; } /* begin numSlotsOf: */ @@ -57756,7 +57754,7 @@ printReferencesTo(sqInt anOop) } assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - i = numLiterals + LiteralStart; + i = ((usqInt) (numLiterals + LiteralStart)); l13: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop1 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -57811,7 +57809,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop11))); contextSize = (sp >> 3); l14: /* end fetchStackPointerOf: */; - i = CtxtTempFrameStart + contextSize; + i = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l15; } /* begin numSlotsOf: */ @@ -57843,7 +57841,7 @@ printReferencesTo(sqInt anOop) } assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - i = numLiterals + LiteralStart; + i = ((usqInt) (numLiterals + LiteralStart)); l15: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop11 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -60876,10 +60874,10 @@ updatePointers(void) sqInt numLiterals1; sqInt numLiterals2; sqInt numLiterals3; - sqInt numPointerSlots; - sqInt numPointerSlots1; - sqInt numPointerSlots2; - sqInt numPointerSlots3; + usqInt numPointerSlots; + usqInt numPointerSlots1; + usqInt numPointerSlots2; + usqInt numPointerSlots3; usqInt numSlots; usqInt numSlots1; usqInt numSlots11; @@ -61444,7 +61442,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(obj))); contextSize = (sp >> 3); l7: /* end fetchStackPointerOf: */; - numPointerSlots = ((usqInt) (CtxtTempFrameStart + contextSize)); + numPointerSlots = CtxtTempFrameStart + contextSize; goto l8; } /* begin numSlotsOf: */ @@ -61473,7 +61471,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) l5: /* end methodHeaderFromSavedFirstField: */; assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - numPointerSlots = ((usqInt) (numLiterals + LiteralStart)); + numPointerSlots = numLiterals + LiteralStart; l8: /* end numPointerSlotsWhileCompactingOf:withFormat:savedFirstFieldPointer: */; if ((fmt <= 5 /* lastPointerFormat */) && (numPointerSlots > 0)) { diff --git a/nsspursrc/vm/cogit.h b/nsspursrc/vm/cogit.h index 48b75d5c1c..b4bba7f1a0 100644 --- a/nsspursrc/vm/cogit.h +++ b/nsspursrc/vm/cogit.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ diff --git a/nsspursrc/vm/cogitARMv5.c b/nsspursrc/vm/cogitARMv5.c index 06866af2a4..a4a0b62cc1 100644 --- a/nsspursrc/vm/cogitARMv5.c +++ b/nsspursrc/vm/cogitARMv5.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -10820,7 +10820,8 @@ endPCOf(sqInt aMethod) ? 256 : 0) # else /* MULTIPLEBYTECODESETS */ - 0 + (assert(!((methodUsesAlternateBytecodeSet(aMethod)))), + 0) # endif /* MULTIPLEBYTECODESETS */ ; nExts = 0; @@ -11215,7 +11216,7 @@ followForwardedLiteralsIn(CogMethod *cogMethod) val = 0; assert((((cogMethod->cmType)) != CMMethod) || (!(isForwarded((cogMethod->methodObject))))); - hasYoungObj = 0; + hasYoungObj = isYoung((cogMethod->methodObject)); if (shouldRemapOop((cogMethod->selector))) { (cogMethod->selector = remapObj((cogMethod->selector))); if (isYoung((cogMethod->selector))) { diff --git a/nsspursrc/vm/cogitIA32.c b/nsspursrc/vm/cogitIA32.c index cd5374e292..afea30b34a 100644 --- a/nsspursrc/vm/cogitIA32.c +++ b/nsspursrc/vm/cogitIA32.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -10818,7 +10818,8 @@ endPCOf(sqInt aMethod) ? 256 : 0) # else /* MULTIPLEBYTECODESETS */ - 0 + (assert(!((methodUsesAlternateBytecodeSet(aMethod)))), + 0) # endif /* MULTIPLEBYTECODESETS */ ; nExts = 0; @@ -11213,7 +11214,7 @@ followForwardedLiteralsIn(CogMethod *cogMethod) val = 0; assert((((cogMethod->cmType)) != CMMethod) || (!(isForwarded((cogMethod->methodObject))))); - hasYoungObj = 0; + hasYoungObj = isYoung((cogMethod->methodObject)); if (shouldRemapOop((cogMethod->selector))) { (cogMethod->selector = remapObj((cogMethod->selector))); if (isYoung((cogMethod->selector))) { @@ -12890,9 +12891,9 @@ gJumpFPEqual(void *jumpTarget) AbstractInstruction *jumpUnordered; /* begin genJumpFPOrderedAnd:to: */ - jumpToTarget = genoperand(JumpFPEqual, ((sqInt)jumpTarget)); jumpUnordered = genoperand(JumpFPUnordered, ((sqInt)jumpTarget)); - addDependent(jumpToTarget, jumpUnordered); + jumpToTarget = genoperand(JumpFPEqual, ((sqInt)jumpTarget)); + jmpTarget(jumpUnordered, genoperandoperand(Label, (labelCounter += 1), bytecodePC)); return jumpToTarget; } diff --git a/nsspursrc/vm/cogitMIPSEL.c b/nsspursrc/vm/cogitMIPSEL.c index fe223489eb..8ec44466fb 100644 --- a/nsspursrc/vm/cogitMIPSEL.c +++ b/nsspursrc/vm/cogitMIPSEL.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -5989,7 +5989,8 @@ endPCOf(sqInt aMethod) ? 256 : 0) # else /* MULTIPLEBYTECODESETS */ - 0 + (assert(!((methodUsesAlternateBytecodeSet(aMethod)))), + 0) # endif /* MULTIPLEBYTECODESETS */ ; nExts = 0; @@ -6382,7 +6383,7 @@ followForwardedLiteralsIn(CogMethod *cogMethod) val = 0; assert((((cogMethod->cmType)) != CMMethod) || (!(isForwarded((cogMethod->methodObject))))); - hasYoungObj = 0; + hasYoungObj = isYoung((cogMethod->methodObject)); if (shouldRemapOop((cogMethod->selector))) { (cogMethod->selector = remapObj((cogMethod->selector))); if (isYoung((cogMethod->selector))) { diff --git a/nsspursrc/vm/cointerp.c b/nsspursrc/vm/cointerp.c index 48b7fa8bf0..91a66d891b 100644 --- a/nsspursrc/vm/cointerp.c +++ b/nsspursrc/vm/cointerp.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2600,7 +2600,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 578 */] }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.2558"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.2561"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -45270,7 +45270,6 @@ becomewithtwoWaycopyHash(sqInt array1, sqInt array2, sqInt twoWayFlag, sqInt cop } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -54642,7 +54641,6 @@ pinObject(sqInt objOop) } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -60592,7 +60590,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(obj))); contextSize = (sp >> 1); l5: /* end fetchStackPointerOf: */; - numPointerSlots = CtxtTempFrameStart + contextSize; + numPointerSlots = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l9; } /* begin numSlotsOf: */ @@ -60622,7 +60620,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) /* begin literalCountOfMethodHeader: */ assert((header & 1)); numLiterals = ((header >> 1)) & AlternateHeaderNumLiteralsMask; - numPointerSlots = numLiterals + LiteralStart; + numPointerSlots = ((usqInt) (numLiterals + LiteralStart)); l9: /* end numPointerSlotsWhileCompactingOf:withFormat:savedFirstFieldPointer: */; if ((fmt <= 5 /* lastPointerFormat */) && (numPointerSlots > 0)) { diff --git a/nsspursrc/vm/cointerp.h b/nsspursrc/vm/cointerp.h index f82c9bdbd7..f9b1f2aa9a 100644 --- a/nsspursrc/vm/cointerp.h +++ b/nsspursrc/vm/cointerp.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ diff --git a/nsspursrc/vm/gcc3x-cointerp.c b/nsspursrc/vm/gcc3x-cointerp.c index 25054565f7..ffbdecefb7 100644 --- a/nsspursrc/vm/gcc3x-cointerp.c +++ b/nsspursrc/vm/gcc3x-cointerp.c @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2603,7 +2603,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 578 */] }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.2558"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.2561"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -45279,7 +45279,6 @@ becomewithtwoWaycopyHash(sqInt array1, sqInt array2, sqInt twoWayFlag, sqInt cop } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -54651,7 +54650,6 @@ pinObject(sqInt objOop) } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -60601,7 +60599,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(obj))); contextSize = (sp >> 1); l5: /* end fetchStackPointerOf: */; - numPointerSlots = CtxtTempFrameStart + contextSize; + numPointerSlots = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l9; } /* begin numSlotsOf: */ @@ -60631,7 +60629,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) /* begin literalCountOfMethodHeader: */ assert((header & 1)); numLiterals = ((header >> 1)) & AlternateHeaderNumLiteralsMask; - numPointerSlots = numLiterals + LiteralStart; + numPointerSlots = ((usqInt) (numLiterals + LiteralStart)); l9: /* end numPointerSlotsWhileCompactingOf:withFormat:savedFirstFieldPointer: */; if ((fmt <= 5 /* lastPointerFormat */) && (numPointerSlots > 0)) { diff --git a/spur64src/vm/cogit.h b/spur64src/vm/cogit.h index a336ba19d4..2e72211871 100644 --- a/spur64src/vm/cogit.h +++ b/spur64src/vm/cogit.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ diff --git a/spur64src/vm/cogitX64SysV.c b/spur64src/vm/cogitX64SysV.c index 8a7eb18ad1..7d63b9c63e 100644 --- a/spur64src/vm/cogitX64SysV.c +++ b/spur64src/vm/cogitX64SysV.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -6110,7 +6110,8 @@ endPCOf(sqInt aMethod) ? 256 : 0) # else /* MULTIPLEBYTECODESETS */ - 0 + (assert(!((methodUsesAlternateBytecodeSet(aMethod)))), + 0) # endif /* MULTIPLEBYTECODESETS */ ; nExts = 0; @@ -6505,7 +6506,7 @@ followForwardedLiteralsIn(CogMethod *cogMethod) val = 0; assert((((cogMethod->cmType)) != CMMethod) || (!(isForwarded((cogMethod->methodObject))))); - hasYoungObj = 0; + hasYoungObj = isYoung((cogMethod->methodObject)); if (shouldRemapOop((cogMethod->selector))) { (cogMethod->selector = remapObj((cogMethod->selector))); if (isYoung((cogMethod->selector))) { @@ -8063,9 +8064,9 @@ gJumpFPEqual(void *jumpTarget) AbstractInstruction *jumpUnordered; /* begin genJumpFPOrderedAnd:to: */ - jumpToTarget = genoperand(JumpFPEqual, ((sqInt)jumpTarget)); jumpUnordered = genoperand(JumpFPUnordered, ((sqInt)jumpTarget)); - addDependent(jumpToTarget, jumpUnordered); + jumpToTarget = genoperand(JumpFPEqual, ((sqInt)jumpTarget)); + jmpTarget(jumpUnordered, genoperandoperand(Label, (labelCounter += 1), bytecodePC)); return jumpToTarget; } @@ -15849,7 +15850,8 @@ genSmallIntegerComparisonorDoubleComparisoninvert(sqInt jumpOpcode, AbstractInst genoperand(RetN, (methodOrBlockNumArgs + 1) * BytesPerWord); } jmpTarget(jumpTrue, returnTrue); - jmpTarget(jumpNotSmallFloat, (jumpNotFloatAtAll = genJumpImmediate(Arg0Reg))); + jmpTarget(jumpNotSmallFloat, genoperandoperand(Label, (labelCounter += 1), bytecodePC)); + jumpNotFloatAtAll = genJumpImmediate(Arg0Reg); genGetCompactClassIndexNonImmOfinto(Arg0Reg, SendNumArgsReg); genCmpClassFloatCompactIndexR(SendNumArgsReg); /* begin JumpNonZero: */ diff --git a/spur64src/vm/cogitX64WIN64.c b/spur64src/vm/cogitX64WIN64.c index 893ab3a1a0..71608cef0b 100644 --- a/spur64src/vm/cogitX64WIN64.c +++ b/spur64src/vm/cogitX64WIN64.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -6118,7 +6118,8 @@ endPCOf(sqInt aMethod) ? 256 : 0) # else /* MULTIPLEBYTECODESETS */ - 0 + (assert(!((methodUsesAlternateBytecodeSet(aMethod)))), + 0) # endif /* MULTIPLEBYTECODESETS */ ; nExts = 0; @@ -6513,7 +6514,7 @@ followForwardedLiteralsIn(CogMethod *cogMethod) val = 0; assert((((cogMethod->cmType)) != CMMethod) || (!(isForwarded((cogMethod->methodObject))))); - hasYoungObj = 0; + hasYoungObj = isYoung((cogMethod->methodObject)); if (shouldRemapOop((cogMethod->selector))) { (cogMethod->selector = remapObj((cogMethod->selector))); if (isYoung((cogMethod->selector))) { @@ -8071,9 +8072,9 @@ gJumpFPEqual(void *jumpTarget) AbstractInstruction *jumpUnordered; /* begin genJumpFPOrderedAnd:to: */ - jumpToTarget = genoperand(JumpFPEqual, ((sqInt)jumpTarget)); jumpUnordered = genoperand(JumpFPUnordered, ((sqInt)jumpTarget)); - addDependent(jumpToTarget, jumpUnordered); + jumpToTarget = genoperand(JumpFPEqual, ((sqInt)jumpTarget)); + jmpTarget(jumpUnordered, genoperandoperand(Label, (labelCounter += 1), bytecodePC)); return jumpToTarget; } @@ -15857,7 +15858,8 @@ genSmallIntegerComparisonorDoubleComparisoninvert(sqInt jumpOpcode, AbstractInst genoperand(RetN, (methodOrBlockNumArgs + 1) * BytesPerWord); } jmpTarget(jumpTrue, returnTrue); - jmpTarget(jumpNotSmallFloat, (jumpNotFloatAtAll = genJumpImmediate(Arg0Reg))); + jmpTarget(jumpNotSmallFloat, genoperandoperand(Label, (labelCounter += 1), bytecodePC)); + jumpNotFloatAtAll = genJumpImmediate(Arg0Reg); genGetCompactClassIndexNonImmOfinto(Arg0Reg, SendNumArgsReg); genCmpClassFloatCompactIndexR(SendNumArgsReg); /* begin JumpNonZero: */ diff --git a/spur64src/vm/cointerp.c b/spur64src/vm/cointerp.c index aa0b8e0ad6..6c598bffb5 100644 --- a/spur64src/vm/cointerp.c +++ b/spur64src/vm/cointerp.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1244,7 +1244,7 @@ extern sqInt nonIndexablePointerFormat(void); static sqInt noUnscannedEphemerons(void); static sqInt NoDbgRegParms numBytesOfBytes(sqInt objOop); extern sqInt numBytesOf(sqInt objOop); -extern sqInt numPointerSlotsOf(sqInt objOop); +extern usqInt numPointerSlotsOf(sqInt objOop); static usqInt NoDbgRegParms numSlotsOfAny(sqInt objOop); extern usqInt numSlotsOf(sqInt objOop); static sqInt NoDbgRegParms numStrongSlotsOfInephemeral(sqInt objOop); @@ -2594,7 +2594,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 578 */] }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.2558]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.2561]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -44503,7 +44503,6 @@ becomewithtwoWaycopyHash(sqInt array1, sqInt array2, sqInt twoWayFlag, sqInt cop } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -46392,7 +46391,7 @@ copyObjtoAddrstopAtsavedFirstFieldsindex(sqInt objOop, sqInt segAddr, sqInt endS sqInt iLimiT; sqInt methodHeader; sqInt numLiterals; - sqInt numMediatedSlots; + usqInt numMediatedSlots; usqInt numSlots; usqInt numSlots1; sqInt oop; @@ -52905,7 +52904,7 @@ numBytesOf(sqInt objOop) Works with CompiledMethods, as well as ordinary objects. */ /* SpurMemoryManager>>#numPointerSlotsOf: */ -sqInt +usqInt numPointerSlotsOf(sqInt objOop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt contextSize; @@ -53938,7 +53937,6 @@ pinObject(sqInt objOop) } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -56119,7 +56117,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop1))); contextSize = (sp >> 3); l10: /* end fetchStackPointerOf: */; - i = CtxtTempFrameStart + contextSize; + i = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l11; } /* begin numSlotsOf: */ @@ -56151,7 +56149,7 @@ printReferencesTo(sqInt anOop) } assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - i = numLiterals + LiteralStart; + i = ((usqInt) (numLiterals + LiteralStart)); l11: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop1 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -56205,7 +56203,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop1))); contextSize = (sp >> 3); l12: /* end fetchStackPointerOf: */; - i = CtxtTempFrameStart + contextSize; + i = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l13; } /* begin numSlotsOf: */ @@ -56237,7 +56235,7 @@ printReferencesTo(sqInt anOop) } assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - i = numLiterals + LiteralStart; + i = ((usqInt) (numLiterals + LiteralStart)); l13: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop1 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -56292,7 +56290,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop11))); contextSize = (sp >> 3); l14: /* end fetchStackPointerOf: */; - i = CtxtTempFrameStart + contextSize; + i = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l15; } /* begin numSlotsOf: */ @@ -56324,7 +56322,7 @@ printReferencesTo(sqInt anOop) } assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - i = numLiterals + LiteralStart; + i = ((usqInt) (numLiterals + LiteralStart)); l15: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop11 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -59354,10 +59352,10 @@ updatePointers(void) sqInt numLiterals1; sqInt numLiterals2; sqInt numLiterals3; - sqInt numPointerSlots; - sqInt numPointerSlots1; - sqInt numPointerSlots2; - sqInt numPointerSlots3; + usqInt numPointerSlots; + usqInt numPointerSlots1; + usqInt numPointerSlots2; + usqInt numPointerSlots3; usqInt numSlots; usqInt numSlots1; usqInt numSlots11; @@ -64297,8 +64295,8 @@ void (*functionPointerForinClass(sqInt primIdx,sqInt theClass))(void) static sqInt getErrorObjectFromPrimFailCode(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt clone; - usqInt errObj; + sqInt clone; + sqInt errObj; sqInt fieldIndex; sqInt i; sqInt knownClassIndex; diff --git a/spur64src/vm/cointerp.h b/spur64src/vm/cointerp.h index 01b95e9254..04eb5531a3 100644 --- a/spur64src/vm/cointerp.h +++ b/spur64src/vm/cointerp.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ @@ -242,7 +242,7 @@ extern sqInt minSlotsForShortening(void); extern sqInt nilObject(void); extern sqInt nonIndexablePointerFormat(void); extern sqInt numBytesOf(sqInt objOop); -extern sqInt numPointerSlotsOf(sqInt objOop); +extern usqInt numPointerSlotsOf(sqInt objOop); extern usqInt numSlotsOf(sqInt objOop); extern sqInt numStrongSlotsOfWeakling(sqInt objOop); extern sqInt objectAfter(sqInt objOop); diff --git a/spur64src/vm/cointerpmt.c b/spur64src/vm/cointerpmt.c index 17cf97a7f7..23f986a987 100644 --- a/spur64src/vm/cointerpmt.c +++ b/spur64src/vm/cointerpmt.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - CoInterpreterMT VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CoInterpreterMT VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1325,7 +1325,7 @@ extern sqInt nonIndexablePointerFormat(void); static sqInt noUnscannedEphemerons(void); static sqInt NoDbgRegParms numBytesOfBytes(sqInt objOop); extern sqInt numBytesOf(sqInt objOop); -extern sqInt numPointerSlotsOf(sqInt objOop); +extern usqInt numPointerSlotsOf(sqInt objOop); static usqInt NoDbgRegParms numSlotsOfAny(sqInt objOop); extern usqInt numSlotsOf(sqInt objOop); static sqInt NoDbgRegParms numStrongSlotsOfInephemeral(sqInt objOop); @@ -2689,7 +2689,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 578 */] }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.2558]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.2561]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -46934,7 +46934,6 @@ becomewithtwoWaycopyHash(sqInt array1, sqInt array2, sqInt twoWayFlag, sqInt cop } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -48823,7 +48822,7 @@ copyObjtoAddrstopAtsavedFirstFieldsindex(sqInt objOop, sqInt segAddr, sqInt endS sqInt iLimiT; sqInt methodHeader; sqInt numLiterals; - sqInt numMediatedSlots; + usqInt numMediatedSlots; usqInt numSlots; usqInt numSlots1; sqInt oop; @@ -55351,7 +55350,7 @@ numBytesOf(sqInt objOop) Works with CompiledMethods, as well as ordinary objects. */ /* SpurMemoryManager>>#numPointerSlotsOf: */ -sqInt +usqInt numPointerSlotsOf(sqInt objOop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt contextSize; @@ -56384,7 +56383,6 @@ pinObject(sqInt objOop) } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -58565,7 +58563,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop1))); contextSize = (sp >> 3); l10: /* end fetchStackPointerOf: */; - i = CtxtTempFrameStart + contextSize; + i = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l11; } /* begin numSlotsOf: */ @@ -58597,7 +58595,7 @@ printReferencesTo(sqInt anOop) } assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - i = numLiterals + LiteralStart; + i = ((usqInt) (numLiterals + LiteralStart)); l11: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop1 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -58651,7 +58649,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop1))); contextSize = (sp >> 3); l12: /* end fetchStackPointerOf: */; - i = CtxtTempFrameStart + contextSize; + i = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l13; } /* begin numSlotsOf: */ @@ -58683,7 +58681,7 @@ printReferencesTo(sqInt anOop) } assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - i = numLiterals + LiteralStart; + i = ((usqInt) (numLiterals + LiteralStart)); l13: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop1 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -58738,7 +58736,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop11))); contextSize = (sp >> 3); l14: /* end fetchStackPointerOf: */; - i = CtxtTempFrameStart + contextSize; + i = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l15; } /* begin numSlotsOf: */ @@ -58770,7 +58768,7 @@ printReferencesTo(sqInt anOop) } assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - i = numLiterals + LiteralStart; + i = ((usqInt) (numLiterals + LiteralStart)); l15: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop11 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -61807,10 +61805,10 @@ updatePointers(void) sqInt numLiterals1; sqInt numLiterals2; sqInt numLiterals3; - sqInt numPointerSlots; - sqInt numPointerSlots1; - sqInt numPointerSlots2; - sqInt numPointerSlots3; + usqInt numPointerSlots; + usqInt numPointerSlots1; + usqInt numPointerSlots2; + usqInt numPointerSlots3; usqInt numSlots; usqInt numSlots1; usqInt numSlots11; @@ -62375,7 +62373,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(obj))); contextSize = (sp >> 3); l7: /* end fetchStackPointerOf: */; - numPointerSlots = ((usqInt) (CtxtTempFrameStart + contextSize)); + numPointerSlots = CtxtTempFrameStart + contextSize; goto l8; } /* begin numSlotsOf: */ @@ -62404,7 +62402,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) l5: /* end methodHeaderFromSavedFirstField: */; assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - numPointerSlots = ((usqInt) (numLiterals + LiteralStart)); + numPointerSlots = numLiterals + LiteralStart; l8: /* end numPointerSlotsWhileCompactingOf:withFormat:savedFirstFieldPointer: */; if ((fmt <= 5 /* lastPointerFormat */) && (numPointerSlots > 0)) { diff --git a/spur64src/vm/cointerpmt.h b/spur64src/vm/cointerpmt.h index f5b7d12b7a..c154bab295 100644 --- a/spur64src/vm/cointerpmt.h +++ b/spur64src/vm/cointerpmt.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ @@ -246,7 +246,7 @@ extern sqInt minSlotsForShortening(void); extern sqInt nilObject(void); extern sqInt nonIndexablePointerFormat(void); extern sqInt numBytesOf(sqInt objOop); -extern sqInt numPointerSlotsOf(sqInt objOop); +extern usqInt numPointerSlotsOf(sqInt objOop); extern usqInt numSlotsOf(sqInt objOop); extern sqInt numStrongSlotsOfWeakling(sqInt objOop); extern sqInt objectAfter(sqInt objOop); diff --git a/spur64src/vm/gcc3x-cointerp.c b/spur64src/vm/gcc3x-cointerp.c index e8c29d1b2f..0cd100be42 100644 --- a/spur64src/vm/gcc3x-cointerp.c +++ b/spur64src/vm/gcc3x-cointerp.c @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1247,7 +1247,7 @@ extern sqInt nonIndexablePointerFormat(void); static sqInt noUnscannedEphemerons(void); static sqInt NoDbgRegParms numBytesOfBytes(sqInt objOop); extern sqInt numBytesOf(sqInt objOop); -extern sqInt numPointerSlotsOf(sqInt objOop); +extern usqInt numPointerSlotsOf(sqInt objOop); static usqInt NoDbgRegParms numSlotsOfAny(sqInt objOop); extern usqInt numSlotsOf(sqInt objOop); static sqInt NoDbgRegParms numStrongSlotsOfInephemeral(sqInt objOop); @@ -2597,7 +2597,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 578 */] }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.2558]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.2561]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -44512,7 +44512,6 @@ becomewithtwoWaycopyHash(sqInt array1, sqInt array2, sqInt twoWayFlag, sqInt cop } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -46401,7 +46400,7 @@ copyObjtoAddrstopAtsavedFirstFieldsindex(sqInt objOop, sqInt segAddr, sqInt endS sqInt iLimiT; sqInt methodHeader; sqInt numLiterals; - sqInt numMediatedSlots; + usqInt numMediatedSlots; usqInt numSlots; usqInt numSlots1; sqInt oop; @@ -52914,7 +52913,7 @@ numBytesOf(sqInt objOop) Works with CompiledMethods, as well as ordinary objects. */ /* SpurMemoryManager>>#numPointerSlotsOf: */ -sqInt +usqInt numPointerSlotsOf(sqInt objOop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt contextSize; @@ -53947,7 +53946,6 @@ pinObject(sqInt objOop) } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -56128,7 +56126,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop1))); contextSize = (sp >> 3); l10: /* end fetchStackPointerOf: */; - i = CtxtTempFrameStart + contextSize; + i = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l11; } /* begin numSlotsOf: */ @@ -56160,7 +56158,7 @@ printReferencesTo(sqInt anOop) } assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - i = numLiterals + LiteralStart; + i = ((usqInt) (numLiterals + LiteralStart)); l11: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop1 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -56214,7 +56212,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop1))); contextSize = (sp >> 3); l12: /* end fetchStackPointerOf: */; - i = CtxtTempFrameStart + contextSize; + i = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l13; } /* begin numSlotsOf: */ @@ -56246,7 +56244,7 @@ printReferencesTo(sqInt anOop) } assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - i = numLiterals + LiteralStart; + i = ((usqInt) (numLiterals + LiteralStart)); l13: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop1 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -56301,7 +56299,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop11))); contextSize = (sp >> 3); l14: /* end fetchStackPointerOf: */; - i = CtxtTempFrameStart + contextSize; + i = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l15; } /* begin numSlotsOf: */ @@ -56333,7 +56331,7 @@ printReferencesTo(sqInt anOop) } assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - i = numLiterals + LiteralStart; + i = ((usqInt) (numLiterals + LiteralStart)); l15: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop11 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -59363,10 +59361,10 @@ updatePointers(void) sqInt numLiterals1; sqInt numLiterals2; sqInt numLiterals3; - sqInt numPointerSlots; - sqInt numPointerSlots1; - sqInt numPointerSlots2; - sqInt numPointerSlots3; + usqInt numPointerSlots; + usqInt numPointerSlots1; + usqInt numPointerSlots2; + usqInt numPointerSlots3; usqInt numSlots; usqInt numSlots1; usqInt numSlots11; @@ -64306,8 +64304,8 @@ void (*functionPointerForinClass(sqInt primIdx,sqInt theClass))(void) static sqInt getErrorObjectFromPrimFailCode(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt clone; - usqInt errObj; + sqInt clone; + sqInt errObj; sqInt fieldIndex; sqInt i; sqInt knownClassIndex; diff --git a/spur64src/vm/gcc3x-cointerpmt.c b/spur64src/vm/gcc3x-cointerpmt.c index 7edbf43093..1423346943 100644 --- a/spur64src/vm/gcc3x-cointerpmt.c +++ b/spur64src/vm/gcc3x-cointerpmt.c @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - CoInterpreterMT VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CoInterpreterMT VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1328,7 +1328,7 @@ extern sqInt nonIndexablePointerFormat(void); static sqInt noUnscannedEphemerons(void); static sqInt NoDbgRegParms numBytesOfBytes(sqInt objOop); extern sqInt numBytesOf(sqInt objOop); -extern sqInt numPointerSlotsOf(sqInt objOop); +extern usqInt numPointerSlotsOf(sqInt objOop); static usqInt NoDbgRegParms numSlotsOfAny(sqInt objOop); extern usqInt numSlotsOf(sqInt objOop); static sqInt NoDbgRegParms numStrongSlotsOfInephemeral(sqInt objOop); @@ -2692,7 +2692,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 578 */] }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.2558]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.2561]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -46943,7 +46943,6 @@ becomewithtwoWaycopyHash(sqInt array1, sqInt array2, sqInt twoWayFlag, sqInt cop } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -48832,7 +48831,7 @@ copyObjtoAddrstopAtsavedFirstFieldsindex(sqInt objOop, sqInt segAddr, sqInt endS sqInt iLimiT; sqInt methodHeader; sqInt numLiterals; - sqInt numMediatedSlots; + usqInt numMediatedSlots; usqInt numSlots; usqInt numSlots1; sqInt oop; @@ -55360,7 +55359,7 @@ numBytesOf(sqInt objOop) Works with CompiledMethods, as well as ordinary objects. */ /* SpurMemoryManager>>#numPointerSlotsOf: */ -sqInt +usqInt numPointerSlotsOf(sqInt objOop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt contextSize; @@ -56393,7 +56392,6 @@ pinObject(sqInt objOop) } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -58574,7 +58572,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop1))); contextSize = (sp >> 3); l10: /* end fetchStackPointerOf: */; - i = CtxtTempFrameStart + contextSize; + i = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l11; } /* begin numSlotsOf: */ @@ -58606,7 +58604,7 @@ printReferencesTo(sqInt anOop) } assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - i = numLiterals + LiteralStart; + i = ((usqInt) (numLiterals + LiteralStart)); l11: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop1 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -58660,7 +58658,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop1))); contextSize = (sp >> 3); l12: /* end fetchStackPointerOf: */; - i = CtxtTempFrameStart + contextSize; + i = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l13; } /* begin numSlotsOf: */ @@ -58692,7 +58690,7 @@ printReferencesTo(sqInt anOop) } assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - i = numLiterals + LiteralStart; + i = ((usqInt) (numLiterals + LiteralStart)); l13: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop1 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -58747,7 +58745,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop11))); contextSize = (sp >> 3); l14: /* end fetchStackPointerOf: */; - i = CtxtTempFrameStart + contextSize; + i = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l15; } /* begin numSlotsOf: */ @@ -58779,7 +58777,7 @@ printReferencesTo(sqInt anOop) } assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - i = numLiterals + LiteralStart; + i = ((usqInt) (numLiterals + LiteralStart)); l15: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop11 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -61816,10 +61814,10 @@ updatePointers(void) sqInt numLiterals1; sqInt numLiterals2; sqInt numLiterals3; - sqInt numPointerSlots; - sqInt numPointerSlots1; - sqInt numPointerSlots2; - sqInt numPointerSlots3; + usqInt numPointerSlots; + usqInt numPointerSlots1; + usqInt numPointerSlots2; + usqInt numPointerSlots3; usqInt numSlots; usqInt numSlots1; usqInt numSlots11; @@ -62384,7 +62382,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(obj))); contextSize = (sp >> 3); l7: /* end fetchStackPointerOf: */; - numPointerSlots = ((usqInt) (CtxtTempFrameStart + contextSize)); + numPointerSlots = CtxtTempFrameStart + contextSize; goto l8; } /* begin numSlotsOf: */ @@ -62413,7 +62411,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) l5: /* end methodHeaderFromSavedFirstField: */; assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - numPointerSlots = ((usqInt) (numLiterals + LiteralStart)); + numPointerSlots = numLiterals + LiteralStart; l8: /* end numPointerSlotsWhileCompactingOf:withFormat:savedFirstFieldPointer: */; if ((fmt <= 5 /* lastPointerFormat */) && (numPointerSlots > 0)) { diff --git a/spurlowcode64src/vm/cogit.h b/spurlowcode64src/vm/cogit.h index 4da5205aae..f663819ded 100644 --- a/spurlowcode64src/vm/cogit.h +++ b/spurlowcode64src/vm/cogit.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ diff --git a/spurlowcode64src/vm/cogitX64SysV.c b/spurlowcode64src/vm/cogitX64SysV.c index 0b32501c8d..7fdcc98d99 100644 --- a/spurlowcode64src/vm/cogitX64SysV.c +++ b/spurlowcode64src/vm/cogitX64SysV.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -6765,7 +6765,8 @@ endPCOf(sqInt aMethod) ? 256 : 0) # else /* MULTIPLEBYTECODESETS */ - 0 + (assert(!((methodUsesAlternateBytecodeSet(aMethod)))), + 0) # endif /* MULTIPLEBYTECODESETS */ ; nExts = 0; @@ -7160,7 +7161,7 @@ followForwardedLiteralsIn(CogMethod *cogMethod) val = 0; assert((((cogMethod->cmType)) != CMMethod) || (!(isForwarded((cogMethod->methodObject))))); - hasYoungObj = 0; + hasYoungObj = isYoung((cogMethod->methodObject)); if (shouldRemapOop((cogMethod->selector))) { (cogMethod->selector = remapObj((cogMethod->selector))); if (isYoung((cogMethod->selector))) { @@ -8866,9 +8867,9 @@ gJumpFPEqual(void *jumpTarget) AbstractInstruction *jumpUnordered; /* begin genJumpFPOrderedAnd:to: */ - jumpToTarget = genoperand(JumpFPEqual, ((sqInt)jumpTarget)); jumpUnordered = genoperand(JumpFPUnordered, ((sqInt)jumpTarget)); - addDependent(jumpToTarget, jumpUnordered); + jumpToTarget = genoperand(JumpFPEqual, ((sqInt)jumpTarget)); + jmpTarget(jumpUnordered, genoperandoperand(Label, (labelCounter += 1), bytecodePC)); return jumpToTarget; } @@ -8908,9 +8909,9 @@ gJumpFPLessOrEqual(void *jumpTarget) AbstractInstruction *jumpUnordered; /* begin genJumpFPOrderedAnd:to: */ - jumpToTarget = genoperand(JumpFPLessOrEqual, ((sqInt)jumpTarget)); jumpUnordered = genoperand(JumpFPUnordered, ((sqInt)jumpTarget)); - addDependent(jumpToTarget, jumpUnordered); + jumpToTarget = genoperand(JumpFPLessOrEqual, ((sqInt)jumpTarget)); + jmpTarget(jumpUnordered, genoperandoperand(Label, (labelCounter += 1), bytecodePC)); return jumpToTarget; } @@ -8926,9 +8927,9 @@ gJumpFPLess(void *jumpTarget) AbstractInstruction *jumpUnordered; /* begin genJumpFPOrderedAnd:to: */ - jumpToTarget = genoperand(JumpFPLess, ((sqInt)jumpTarget)); jumpUnordered = genoperand(JumpFPUnordered, ((sqInt)jumpTarget)); - addDependent(jumpToTarget, jumpUnordered); + jumpToTarget = genoperand(JumpFPLess, ((sqInt)jumpTarget)); + jmpTarget(jumpUnordered, genoperandoperand(Label, (labelCounter += 1), bytecodePC)); return jumpToTarget; } @@ -17213,7 +17214,8 @@ genSmallIntegerComparisonorDoubleComparisoninvert(sqInt jumpOpcode, AbstractInst genoperand(RetN, (methodOrBlockNumArgs + 1) * BytesPerWord); } jmpTarget(jumpTrue, returnTrue); - jmpTarget(jumpNotSmallFloat, (jumpNotFloatAtAll = genJumpImmediate(Arg0Reg))); + jmpTarget(jumpNotSmallFloat, genoperandoperand(Label, (labelCounter += 1), bytecodePC)); + jumpNotFloatAtAll = genJumpImmediate(Arg0Reg); genGetCompactClassIndexNonImmOfinto(Arg0Reg, SendNumArgsReg); genCmpClassFloatCompactIndexR(SendNumArgsReg); /* begin JumpNonZero: */ diff --git a/spurlowcode64src/vm/cogitX64WIN64.c b/spurlowcode64src/vm/cogitX64WIN64.c index 9da877dba0..7f0f9bba81 100644 --- a/spurlowcode64src/vm/cogitX64WIN64.c +++ b/spurlowcode64src/vm/cogitX64WIN64.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -6797,7 +6797,8 @@ endPCOf(sqInt aMethod) ? 256 : 0) # else /* MULTIPLEBYTECODESETS */ - 0 + (assert(!((methodUsesAlternateBytecodeSet(aMethod)))), + 0) # endif /* MULTIPLEBYTECODESETS */ ; nExts = 0; @@ -7192,7 +7193,7 @@ followForwardedLiteralsIn(CogMethod *cogMethod) val = 0; assert((((cogMethod->cmType)) != CMMethod) || (!(isForwarded((cogMethod->methodObject))))); - hasYoungObj = 0; + hasYoungObj = isYoung((cogMethod->methodObject)); if (shouldRemapOop((cogMethod->selector))) { (cogMethod->selector = remapObj((cogMethod->selector))); if (isYoung((cogMethod->selector))) { @@ -8898,9 +8899,9 @@ gJumpFPEqual(void *jumpTarget) AbstractInstruction *jumpUnordered; /* begin genJumpFPOrderedAnd:to: */ - jumpToTarget = genoperand(JumpFPEqual, ((sqInt)jumpTarget)); jumpUnordered = genoperand(JumpFPUnordered, ((sqInt)jumpTarget)); - addDependent(jumpToTarget, jumpUnordered); + jumpToTarget = genoperand(JumpFPEqual, ((sqInt)jumpTarget)); + jmpTarget(jumpUnordered, genoperandoperand(Label, (labelCounter += 1), bytecodePC)); return jumpToTarget; } @@ -8940,9 +8941,9 @@ gJumpFPLessOrEqual(void *jumpTarget) AbstractInstruction *jumpUnordered; /* begin genJumpFPOrderedAnd:to: */ - jumpToTarget = genoperand(JumpFPLessOrEqual, ((sqInt)jumpTarget)); jumpUnordered = genoperand(JumpFPUnordered, ((sqInt)jumpTarget)); - addDependent(jumpToTarget, jumpUnordered); + jumpToTarget = genoperand(JumpFPLessOrEqual, ((sqInt)jumpTarget)); + jmpTarget(jumpUnordered, genoperandoperand(Label, (labelCounter += 1), bytecodePC)); return jumpToTarget; } @@ -8958,9 +8959,9 @@ gJumpFPLess(void *jumpTarget) AbstractInstruction *jumpUnordered; /* begin genJumpFPOrderedAnd:to: */ - jumpToTarget = genoperand(JumpFPLess, ((sqInt)jumpTarget)); jumpUnordered = genoperand(JumpFPUnordered, ((sqInt)jumpTarget)); - addDependent(jumpToTarget, jumpUnordered); + jumpToTarget = genoperand(JumpFPLess, ((sqInt)jumpTarget)); + jmpTarget(jumpUnordered, genoperandoperand(Label, (labelCounter += 1), bytecodePC)); return jumpToTarget; } @@ -17245,7 +17246,8 @@ genSmallIntegerComparisonorDoubleComparisoninvert(sqInt jumpOpcode, AbstractInst genoperand(RetN, (methodOrBlockNumArgs + 1) * BytesPerWord); } jmpTarget(jumpTrue, returnTrue); - jmpTarget(jumpNotSmallFloat, (jumpNotFloatAtAll = genJumpImmediate(Arg0Reg))); + jmpTarget(jumpNotSmallFloat, genoperandoperand(Label, (labelCounter += 1), bytecodePC)); + jumpNotFloatAtAll = genJumpImmediate(Arg0Reg); genGetCompactClassIndexNonImmOfinto(Arg0Reg, SendNumArgsReg); genCmpClassFloatCompactIndexR(SendNumArgsReg); /* begin JumpNonZero: */ diff --git a/spurlowcode64src/vm/cointerp.c b/spurlowcode64src/vm/cointerp.c index 341f2e6e3d..593696f7ec 100644 --- a/spurlowcode64src/vm/cointerp.c +++ b/spurlowcode64src/vm/cointerp.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1261,7 +1261,7 @@ static sqInt NoDbgRegParms num32BitUnitsOf(sqInt objOop); static sqInt NoDbgRegParms num64BitUnitsOf(sqInt objOop); static sqInt NoDbgRegParms numBytesOfBytes(sqInt objOop); extern sqInt numBytesOf(sqInt objOop); -extern sqInt numPointerSlotsOf(sqInt objOop); +extern usqInt numPointerSlotsOf(sqInt objOop); static usqInt NoDbgRegParms numSlotsOfAny(sqInt objOop); extern usqInt numSlotsOf(sqInt objOop); static sqInt NoDbgRegParms numStrongSlotsOfInephemeral(sqInt objOop); @@ -2620,7 +2620,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 578 */] }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.2558]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.2561]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -64235,7 +64235,6 @@ becomewithtwoWaycopyHash(sqInt array1, sqInt array2, sqInt twoWayFlag, sqInt cop } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -66124,7 +66123,7 @@ copyObjtoAddrstopAtsavedFirstFieldsindex(sqInt objOop, sqInt segAddr, sqInt endS sqInt iLimiT; sqInt methodHeader; sqInt numLiterals; - sqInt numMediatedSlots; + usqInt numMediatedSlots; usqInt numSlots; usqInt numSlots1; sqInt oop; @@ -72699,7 +72698,7 @@ numBytesOf(sqInt objOop) Works with CompiledMethods, as well as ordinary objects. */ /* SpurMemoryManager>>#numPointerSlotsOf: */ -sqInt +usqInt numPointerSlotsOf(sqInt objOop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt contextSize; @@ -73732,7 +73731,6 @@ pinObject(sqInt objOop) } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -75913,7 +75911,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop1))); contextSize = (sp >> 3); l10: /* end fetchStackPointerOf: */; - i = CtxtTempFrameStart + contextSize; + i = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l11; } /* begin numSlotsOf: */ @@ -75945,7 +75943,7 @@ printReferencesTo(sqInt anOop) } assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - i = numLiterals + LiteralStart; + i = ((usqInt) (numLiterals + LiteralStart)); l11: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop1 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -75999,7 +75997,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop1))); contextSize = (sp >> 3); l12: /* end fetchStackPointerOf: */; - i = CtxtTempFrameStart + contextSize; + i = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l13; } /* begin numSlotsOf: */ @@ -76031,7 +76029,7 @@ printReferencesTo(sqInt anOop) } assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - i = numLiterals + LiteralStart; + i = ((usqInt) (numLiterals + LiteralStart)); l13: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop1 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -76086,7 +76084,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop11))); contextSize = (sp >> 3); l14: /* end fetchStackPointerOf: */; - i = CtxtTempFrameStart + contextSize; + i = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l15; } /* begin numSlotsOf: */ @@ -76118,7 +76116,7 @@ printReferencesTo(sqInt anOop) } assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - i = numLiterals + LiteralStart; + i = ((usqInt) (numLiterals + LiteralStart)); l15: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop11 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -79158,10 +79156,10 @@ updatePointers(void) sqInt numLiterals1; sqInt numLiterals2; sqInt numLiterals3; - sqInt numPointerSlots; - sqInt numPointerSlots1; - sqInt numPointerSlots2; - sqInt numPointerSlots3; + usqInt numPointerSlots; + usqInt numPointerSlots1; + usqInt numPointerSlots2; + usqInt numPointerSlots3; usqInt numSlots; usqInt numSlots1; usqInt numSlots11; diff --git a/spurlowcode64src/vm/cointerp.h b/spurlowcode64src/vm/cointerp.h index 661b78bf2e..fdb1f6eabe 100644 --- a/spurlowcode64src/vm/cointerp.h +++ b/spurlowcode64src/vm/cointerp.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ @@ -246,7 +246,7 @@ extern sqInt minSlotsForShortening(void); extern sqInt nilObject(void); extern sqInt nonIndexablePointerFormat(void); extern sqInt numBytesOf(sqInt objOop); -extern sqInt numPointerSlotsOf(sqInt objOop); +extern usqInt numPointerSlotsOf(sqInt objOop); extern usqInt numSlotsOf(sqInt objOop); extern sqInt numStrongSlotsOfWeakling(sqInt objOop); extern sqInt objectAfter(sqInt objOop); diff --git a/spurlowcode64src/vm/gcc3x-cointerp.c b/spurlowcode64src/vm/gcc3x-cointerp.c index dbc781b542..2c3279fe4a 100644 --- a/spurlowcode64src/vm/gcc3x-cointerp.c +++ b/spurlowcode64src/vm/gcc3x-cointerp.c @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1264,7 +1264,7 @@ static sqInt NoDbgRegParms num32BitUnitsOf(sqInt objOop); static sqInt NoDbgRegParms num64BitUnitsOf(sqInt objOop); static sqInt NoDbgRegParms numBytesOfBytes(sqInt objOop); extern sqInt numBytesOf(sqInt objOop); -extern sqInt numPointerSlotsOf(sqInt objOop); +extern usqInt numPointerSlotsOf(sqInt objOop); static usqInt NoDbgRegParms numSlotsOfAny(sqInt objOop); extern usqInt numSlotsOf(sqInt objOop); static sqInt NoDbgRegParms numStrongSlotsOfInephemeral(sqInt objOop); @@ -2623,7 +2623,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 578 */] }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.2558]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.2561]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -64244,7 +64244,6 @@ becomewithtwoWaycopyHash(sqInt array1, sqInt array2, sqInt twoWayFlag, sqInt cop } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -66133,7 +66132,7 @@ copyObjtoAddrstopAtsavedFirstFieldsindex(sqInt objOop, sqInt segAddr, sqInt endS sqInt iLimiT; sqInt methodHeader; sqInt numLiterals; - sqInt numMediatedSlots; + usqInt numMediatedSlots; usqInt numSlots; usqInt numSlots1; sqInt oop; @@ -72708,7 +72707,7 @@ numBytesOf(sqInt objOop) Works with CompiledMethods, as well as ordinary objects. */ /* SpurMemoryManager>>#numPointerSlotsOf: */ -sqInt +usqInt numPointerSlotsOf(sqInt objOop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt contextSize; @@ -73741,7 +73740,6 @@ pinObject(sqInt objOop) } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -75922,7 +75920,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop1))); contextSize = (sp >> 3); l10: /* end fetchStackPointerOf: */; - i = CtxtTempFrameStart + contextSize; + i = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l11; } /* begin numSlotsOf: */ @@ -75954,7 +75952,7 @@ printReferencesTo(sqInt anOop) } assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - i = numLiterals + LiteralStart; + i = ((usqInt) (numLiterals + LiteralStart)); l11: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop1 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -76008,7 +76006,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop1))); contextSize = (sp >> 3); l12: /* end fetchStackPointerOf: */; - i = CtxtTempFrameStart + contextSize; + i = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l13; } /* begin numSlotsOf: */ @@ -76040,7 +76038,7 @@ printReferencesTo(sqInt anOop) } assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - i = numLiterals + LiteralStart; + i = ((usqInt) (numLiterals + LiteralStart)); l13: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop1 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -76095,7 +76093,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop11))); contextSize = (sp >> 3); l14: /* end fetchStackPointerOf: */; - i = CtxtTempFrameStart + contextSize; + i = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l15; } /* begin numSlotsOf: */ @@ -76127,7 +76125,7 @@ printReferencesTo(sqInt anOop) } assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - i = numLiterals + LiteralStart; + i = ((usqInt) (numLiterals + LiteralStart)); l15: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop11 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -79167,10 +79165,10 @@ updatePointers(void) sqInt numLiterals1; sqInt numLiterals2; sqInt numLiterals3; - sqInt numPointerSlots; - sqInt numPointerSlots1; - sqInt numPointerSlots2; - sqInt numPointerSlots3; + usqInt numPointerSlots; + usqInt numPointerSlots1; + usqInt numPointerSlots2; + usqInt numPointerSlots3; usqInt numSlots; usqInt numSlots1; usqInt numSlots11; diff --git a/spurlowcodesrc/vm/cogit.h b/spurlowcodesrc/vm/cogit.h index 4da5205aae..f663819ded 100644 --- a/spurlowcodesrc/vm/cogit.h +++ b/spurlowcodesrc/vm/cogit.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ diff --git a/spurlowcodesrc/vm/cogitARMv5.c b/spurlowcodesrc/vm/cogitARMv5.c index 8581047fe7..87f9227d34 100644 --- a/spurlowcodesrc/vm/cogitARMv5.c +++ b/spurlowcodesrc/vm/cogitARMv5.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -11409,7 +11409,8 @@ endPCOf(sqInt aMethod) ? 256 : 0) # else /* MULTIPLEBYTECODESETS */ - 0 + (assert(!((methodUsesAlternateBytecodeSet(aMethod)))), + 0) # endif /* MULTIPLEBYTECODESETS */ ; nExts = 0; @@ -11806,7 +11807,7 @@ followForwardedLiteralsIn(CogMethod *cogMethod) val = 0; assert((((cogMethod->cmType)) != CMMethod) || (!(isForwarded((cogMethod->methodObject))))); - hasYoungObj = 0; + hasYoungObj = isYoung((cogMethod->methodObject)); if (shouldRemapOop((cogMethod->selector))) { (cogMethod->selector = remapObj((cogMethod->selector))); if (isYoung((cogMethod->selector))) { diff --git a/spurlowcodesrc/vm/cogitIA32.c b/spurlowcodesrc/vm/cogitIA32.c index 6aa0d55e64..02ef165cbb 100644 --- a/spurlowcodesrc/vm/cogitIA32.c +++ b/spurlowcodesrc/vm/cogitIA32.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -11413,7 +11413,8 @@ endPCOf(sqInt aMethod) ? 256 : 0) # else /* MULTIPLEBYTECODESETS */ - 0 + (assert(!((methodUsesAlternateBytecodeSet(aMethod)))), + 0) # endif /* MULTIPLEBYTECODESETS */ ; nExts = 0; @@ -11810,7 +11811,7 @@ followForwardedLiteralsIn(CogMethod *cogMethod) val = 0; assert((((cogMethod->cmType)) != CMMethod) || (!(isForwarded((cogMethod->methodObject))))); - hasYoungObj = 0; + hasYoungObj = isYoung((cogMethod->methodObject)); if (shouldRemapOop((cogMethod->selector))) { (cogMethod->selector = remapObj((cogMethod->selector))); if (isYoung((cogMethod->selector))) { @@ -13556,9 +13557,9 @@ gJumpFPEqual(void *jumpTarget) AbstractInstruction *jumpUnordered; /* begin genJumpFPOrderedAnd:to: */ - jumpToTarget = genoperand(JumpFPEqual, ((sqInt)jumpTarget)); jumpUnordered = genoperand(JumpFPUnordered, ((sqInt)jumpTarget)); - addDependent(jumpToTarget, jumpUnordered); + jumpToTarget = genoperand(JumpFPEqual, ((sqInt)jumpTarget)); + jmpTarget(jumpUnordered, genoperandoperand(Label, (labelCounter += 1), bytecodePC)); return jumpToTarget; } @@ -13598,9 +13599,9 @@ gJumpFPLessOrEqual(void *jumpTarget) AbstractInstruction *jumpUnordered; /* begin genJumpFPOrderedAnd:to: */ - jumpToTarget = genoperand(JumpFPLessOrEqual, ((sqInt)jumpTarget)); jumpUnordered = genoperand(JumpFPUnordered, ((sqInt)jumpTarget)); - addDependent(jumpToTarget, jumpUnordered); + jumpToTarget = genoperand(JumpFPLessOrEqual, ((sqInt)jumpTarget)); + jmpTarget(jumpUnordered, genoperandoperand(Label, (labelCounter += 1), bytecodePC)); return jumpToTarget; } @@ -13616,9 +13617,9 @@ gJumpFPLess(void *jumpTarget) AbstractInstruction *jumpUnordered; /* begin genJumpFPOrderedAnd:to: */ - jumpToTarget = genoperand(JumpFPLess, ((sqInt)jumpTarget)); jumpUnordered = genoperand(JumpFPUnordered, ((sqInt)jumpTarget)); - addDependent(jumpToTarget, jumpUnordered); + jumpToTarget = genoperand(JumpFPLess, ((sqInt)jumpTarget)); + jmpTarget(jumpUnordered, genoperandoperand(Label, (labelCounter += 1), bytecodePC)); return jumpToTarget; } diff --git a/spurlowcodesrc/vm/cogitMIPSEL.c b/spurlowcodesrc/vm/cogitMIPSEL.c index c38811d186..6a41f273bb 100644 --- a/spurlowcodesrc/vm/cogitMIPSEL.c +++ b/spurlowcodesrc/vm/cogitMIPSEL.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -6520,7 +6520,8 @@ endPCOf(sqInt aMethod) ? 256 : 0) # else /* MULTIPLEBYTECODESETS */ - 0 + (assert(!((methodUsesAlternateBytecodeSet(aMethod)))), + 0) # endif /* MULTIPLEBYTECODESETS */ ; nExts = 0; @@ -6915,7 +6916,7 @@ followForwardedLiteralsIn(CogMethod *cogMethod) val = 0; assert((((cogMethod->cmType)) != CMMethod) || (!(isForwarded((cogMethod->methodObject))))); - hasYoungObj = 0; + hasYoungObj = isYoung((cogMethod->methodObject)); if (shouldRemapOop((cogMethod->selector))) { (cogMethod->selector = remapObj((cogMethod->selector))); if (isYoung((cogMethod->selector))) { diff --git a/spurlowcodesrc/vm/cointerp.c b/spurlowcodesrc/vm/cointerp.c index 661166f03d..847cb55a00 100644 --- a/spurlowcodesrc/vm/cointerp.c +++ b/spurlowcodesrc/vm/cointerp.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1239,7 +1239,7 @@ static sqInt NoDbgRegParms num32BitUnitsOf(sqInt objOop); static sqInt NoDbgRegParms num64BitUnitsOf(sqInt objOop); static sqInt NoDbgRegParms numBytesOfBytes(sqInt objOop); extern sqInt numBytesOf(sqInt objOop); -extern usqInt numPointerSlotsOf(sqInt objOop); +extern sqInt numPointerSlotsOf(sqInt objOop); static usqInt NoDbgRegParms numSlotsOfAny(sqInt objOop); extern usqInt numSlotsOf(sqInt objOop); static sqInt NoDbgRegParms numStrongSlotsOfInephemeral(sqInt objOop); @@ -2599,7 +2599,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 578 */] }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.2558]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.2561]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -38402,8 +38402,7 @@ mnuMethodOrNilFor(sqInt rcvr) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt currentClass; sqInt dictionary; - sqInt fieldIndex; - usqInt index; + sqInt index; usqInt length; sqInt mask; sqInt methodArray; @@ -38452,7 +38451,7 @@ mnuMethodOrNilFor(sqInt rcvr) wrapAround = 0; while (1) { /* begin fetchPointer:ofObject: */ - nextSelector = longAt((dictionary + BaseHeaderSize) + (index << (shiftForWord()))); + nextSelector = longAt((dictionary + BaseHeaderSize) + (((sqInt)((usqInt)(index) << (shiftForWord()))))); if (nextSelector == GIV(nilObj)) { mnuMethod = null; goto l11; @@ -38470,12 +38469,10 @@ mnuMethodOrNilFor(sqInt rcvr) } methodArray = objOop; /* begin followField:ofObject: */ - fieldIndex = index - SelectorStart; - /* begin fetchPointer:ofObject: */ - objOop1 = longAt((methodArray + BaseHeaderSize) + (((sqInt)((usqInt)(fieldIndex) << (shiftForWord()))))); + objOop1 = longAt((methodArray + BaseHeaderSize) + (((sqInt)((usqInt)((index - SelectorStart)) << (shiftForWord()))))); if (((objOop1 & (tagMask())) == 0) && (((longAt(objOop1)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0)) { - objOop1 = fixFollowedFieldofObjectwithInitialValue(fieldIndex, methodArray, objOop1); + objOop1 = fixFollowedFieldofObjectwithInitialValue(index - SelectorStart, methodArray, objOop1); } mnuMethod = objOop1; goto l11; @@ -63675,7 +63672,6 @@ becomewithtwoWaycopyHash(sqInt array1, sqInt array2, sqInt twoWayFlag, sqInt cop } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -65557,7 +65553,7 @@ copyObjtoAddrstopAtsavedFirstFieldsindex(sqInt objOop, sqInt segAddr, sqInt endS sqInt iLimiT; sqInt methodHeader; sqInt numLiterals; - usqInt numMediatedSlots; + sqInt numMediatedSlots; usqInt numSlots; usqInt numSlots1; sqInt oop; @@ -65589,7 +65585,7 @@ copyObjtoAddrstopAtsavedFirstFieldsindex(sqInt objOop, sqInt segAddr, sqInt endS here but that requires access to framePointer. */ /* begin numSlotsOfMarriedContext: */ contextSize = stackPointerIndexForFrame(frameOfMarriedContext(objOop)); - numMediatedSlots = ((sqInt) (CtxtTempFrameStart + contextSize)); + numMediatedSlots = CtxtTempFrameStart + contextSize; for (i1 = 0; i1 < numMediatedSlots; i1 += 1) { oop = fetchPointerofMarriedContext(i1, objOop); assert(!(isOopForwarded(copy))); @@ -72092,7 +72088,7 @@ numBytesOf(sqInt objOop) Works with CompiledMethods, as well as ordinary objects. */ /* SpurMemoryManager>>#numPointerSlotsOf: */ -usqInt +sqInt numPointerSlotsOf(sqInt objOop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt contextSize; @@ -73109,7 +73105,6 @@ pinObject(sqInt objOop) } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -75289,7 +75284,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(objOop1))); contextSize = (sp >> 1); l12: /* end fetchStackPointerOf: */; - i = ((usqInt) (CtxtTempFrameStart + contextSize)); + i = CtxtTempFrameStart + contextSize; goto l11; } /* begin numSlotsOf: */ @@ -75322,7 +75317,7 @@ printReferencesTo(sqInt anOop) /* begin literalCountOfMethodHeader: */ assert((header & 1)); numLiterals = ((header >> 1)) & AlternateHeaderNumLiteralsMask; - i = ((usqInt) (numLiterals + LiteralStart)); + i = numLiterals + LiteralStart; l11: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop1 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -75376,7 +75371,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(objOop1))); contextSize = (sp >> 1); l14: /* end fetchStackPointerOf: */; - i = ((usqInt) (CtxtTempFrameStart + contextSize)); + i = CtxtTempFrameStart + contextSize; goto l13; } /* begin numSlotsOf: */ @@ -75409,7 +75404,7 @@ printReferencesTo(sqInt anOop) /* begin literalCountOfMethodHeader: */ assert((header & 1)); numLiterals = ((header >> 1)) & AlternateHeaderNumLiteralsMask; - i = ((usqInt) (numLiterals + LiteralStart)); + i = numLiterals + LiteralStart; l13: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop1 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -75464,7 +75459,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(objOop11))); contextSize = (sp >> 1); l16: /* end fetchStackPointerOf: */; - i = ((usqInt) (CtxtTempFrameStart + contextSize)); + i = CtxtTempFrameStart + contextSize; goto l15; } /* begin numSlotsOf: */ @@ -75497,7 +75492,7 @@ printReferencesTo(sqInt anOop) /* begin literalCountOfMethodHeader: */ assert((header & 1)); numLiterals = ((header >> 1)) & AlternateHeaderNumLiteralsMask; - i = ((usqInt) (numLiterals + LiteralStart)); + i = numLiterals + LiteralStart; l15: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop11 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -78494,10 +78489,10 @@ updatePointers(void) sqInt numLiterals1; sqInt numLiterals2; sqInt numLiterals3; - usqInt numPointerSlots; - usqInt numPointerSlots1; - usqInt numPointerSlots2; - usqInt numPointerSlots3; + sqInt numPointerSlots; + sqInt numPointerSlots1; + sqInt numPointerSlots2; + sqInt numPointerSlots3; usqInt numSlots; usqInt numSlots1; usqInt numSlots11; @@ -85479,8 +85474,7 @@ lookupSelectorinClass(sqInt selector, sqInt class) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt currentClass; sqInt dictionary; - sqInt fieldIndex; - usqInt index; + sqInt index; usqInt length; sqInt mask; sqInt meth; @@ -85524,7 +85518,7 @@ lookupSelectorinClass(sqInt selector, sqInt class) wrapAround = 0; while (1) { /* begin fetchPointer:ofObject: */ - nextSelector = longAt((dictionary + BaseHeaderSize) + (index << (shiftForWord()))); + nextSelector = longAt((dictionary + BaseHeaderSize) + (((sqInt)((usqInt)(index) << (shiftForWord()))))); if (nextSelector == GIV(nilObj)) { meth = null; goto l8; @@ -85542,12 +85536,10 @@ lookupSelectorinClass(sqInt selector, sqInt class) } methodArray = objOop2; /* begin followField:ofObject: */ - fieldIndex = index - SelectorStart; - /* begin fetchPointer:ofObject: */ - objOop1 = longAt((methodArray + BaseHeaderSize) + (((sqInt)((usqInt)(fieldIndex) << (shiftForWord()))))); + objOop1 = longAt((methodArray + BaseHeaderSize) + (((sqInt)((usqInt)((index - SelectorStart)) << (shiftForWord()))))); if (((objOop1 & (tagMask())) == 0) && (((longAt(objOop1)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0)) { - objOop1 = fixFollowedFieldofObjectwithInitialValue(fieldIndex, methodArray, objOop1); + objOop1 = fixFollowedFieldofObjectwithInitialValue(index - SelectorStart, methodArray, objOop1); } meth = objOop1; goto l8; diff --git a/spurlowcodesrc/vm/cointerp.h b/spurlowcodesrc/vm/cointerp.h index 47357c6d8a..a68db60248 100644 --- a/spurlowcodesrc/vm/cointerp.h +++ b/spurlowcodesrc/vm/cointerp.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ @@ -244,7 +244,7 @@ extern sqInt minSlotsForShortening(void); extern sqInt nilObject(void); extern sqInt nonIndexablePointerFormat(void); extern sqInt numBytesOf(sqInt objOop); -extern usqInt numPointerSlotsOf(sqInt objOop); +extern sqInt numPointerSlotsOf(sqInt objOop); extern usqInt numSlotsOf(sqInt objOop); extern sqInt numStrongSlotsOfWeakling(sqInt objOop); extern sqInt objectAfter(sqInt objOop); diff --git a/spurlowcodesrc/vm/gcc3x-cointerp.c b/spurlowcodesrc/vm/gcc3x-cointerp.c index dc600211e9..d1e5bb55cd 100644 --- a/spurlowcodesrc/vm/gcc3x-cointerp.c +++ b/spurlowcodesrc/vm/gcc3x-cointerp.c @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1242,7 +1242,7 @@ static sqInt NoDbgRegParms num32BitUnitsOf(sqInt objOop); static sqInt NoDbgRegParms num64BitUnitsOf(sqInt objOop); static sqInt NoDbgRegParms numBytesOfBytes(sqInt objOop); extern sqInt numBytesOf(sqInt objOop); -extern usqInt numPointerSlotsOf(sqInt objOop); +extern sqInt numPointerSlotsOf(sqInt objOop); static usqInt NoDbgRegParms numSlotsOfAny(sqInt objOop); extern usqInt numSlotsOf(sqInt objOop); static sqInt NoDbgRegParms numStrongSlotsOfInephemeral(sqInt objOop); @@ -2602,7 +2602,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 578 */] }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.2558]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.2561]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -38411,8 +38411,7 @@ mnuMethodOrNilFor(sqInt rcvr) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt currentClass; sqInt dictionary; - sqInt fieldIndex; - usqInt index; + sqInt index; usqInt length; sqInt mask; sqInt methodArray; @@ -38461,7 +38460,7 @@ mnuMethodOrNilFor(sqInt rcvr) wrapAround = 0; while (1) { /* begin fetchPointer:ofObject: */ - nextSelector = longAt((dictionary + BaseHeaderSize) + (index << (shiftForWord()))); + nextSelector = longAt((dictionary + BaseHeaderSize) + (((sqInt)((usqInt)(index) << (shiftForWord()))))); if (nextSelector == GIV(nilObj)) { mnuMethod = null; goto l11; @@ -38479,12 +38478,10 @@ mnuMethodOrNilFor(sqInt rcvr) } methodArray = objOop; /* begin followField:ofObject: */ - fieldIndex = index - SelectorStart; - /* begin fetchPointer:ofObject: */ - objOop1 = longAt((methodArray + BaseHeaderSize) + (((sqInt)((usqInt)(fieldIndex) << (shiftForWord()))))); + objOop1 = longAt((methodArray + BaseHeaderSize) + (((sqInt)((usqInt)((index - SelectorStart)) << (shiftForWord()))))); if (((objOop1 & (tagMask())) == 0) && (((longAt(objOop1)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0)) { - objOop1 = fixFollowedFieldofObjectwithInitialValue(fieldIndex, methodArray, objOop1); + objOop1 = fixFollowedFieldofObjectwithInitialValue(index - SelectorStart, methodArray, objOop1); } mnuMethod = objOop1; goto l11; @@ -63684,7 +63681,6 @@ becomewithtwoWaycopyHash(sqInt array1, sqInt array2, sqInt twoWayFlag, sqInt cop } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -65566,7 +65562,7 @@ copyObjtoAddrstopAtsavedFirstFieldsindex(sqInt objOop, sqInt segAddr, sqInt endS sqInt iLimiT; sqInt methodHeader; sqInt numLiterals; - usqInt numMediatedSlots; + sqInt numMediatedSlots; usqInt numSlots; usqInt numSlots1; sqInt oop; @@ -65598,7 +65594,7 @@ copyObjtoAddrstopAtsavedFirstFieldsindex(sqInt objOop, sqInt segAddr, sqInt endS here but that requires access to framePointer. */ /* begin numSlotsOfMarriedContext: */ contextSize = stackPointerIndexForFrame(frameOfMarriedContext(objOop)); - numMediatedSlots = ((sqInt) (CtxtTempFrameStart + contextSize)); + numMediatedSlots = CtxtTempFrameStart + contextSize; for (i1 = 0; i1 < numMediatedSlots; i1 += 1) { oop = fetchPointerofMarriedContext(i1, objOop); assert(!(isOopForwarded(copy))); @@ -72101,7 +72097,7 @@ numBytesOf(sqInt objOop) Works with CompiledMethods, as well as ordinary objects. */ /* SpurMemoryManager>>#numPointerSlotsOf: */ -usqInt +sqInt numPointerSlotsOf(sqInt objOop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt contextSize; @@ -73118,7 +73114,6 @@ pinObject(sqInt objOop) } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -75298,7 +75293,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(objOop1))); contextSize = (sp >> 1); l12: /* end fetchStackPointerOf: */; - i = ((usqInt) (CtxtTempFrameStart + contextSize)); + i = CtxtTempFrameStart + contextSize; goto l11; } /* begin numSlotsOf: */ @@ -75331,7 +75326,7 @@ printReferencesTo(sqInt anOop) /* begin literalCountOfMethodHeader: */ assert((header & 1)); numLiterals = ((header >> 1)) & AlternateHeaderNumLiteralsMask; - i = ((usqInt) (numLiterals + LiteralStart)); + i = numLiterals + LiteralStart; l11: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop1 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -75385,7 +75380,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(objOop1))); contextSize = (sp >> 1); l14: /* end fetchStackPointerOf: */; - i = ((usqInt) (CtxtTempFrameStart + contextSize)); + i = CtxtTempFrameStart + contextSize; goto l13; } /* begin numSlotsOf: */ @@ -75418,7 +75413,7 @@ printReferencesTo(sqInt anOop) /* begin literalCountOfMethodHeader: */ assert((header & 1)); numLiterals = ((header >> 1)) & AlternateHeaderNumLiteralsMask; - i = ((usqInt) (numLiterals + LiteralStart)); + i = numLiterals + LiteralStart; l13: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop1 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -75473,7 +75468,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(objOop11))); contextSize = (sp >> 1); l16: /* end fetchStackPointerOf: */; - i = ((usqInt) (CtxtTempFrameStart + contextSize)); + i = CtxtTempFrameStart + contextSize; goto l15; } /* begin numSlotsOf: */ @@ -75506,7 +75501,7 @@ printReferencesTo(sqInt anOop) /* begin literalCountOfMethodHeader: */ assert((header & 1)); numLiterals = ((header >> 1)) & AlternateHeaderNumLiteralsMask; - i = ((usqInt) (numLiterals + LiteralStart)); + i = numLiterals + LiteralStart; l15: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop11 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -78503,10 +78498,10 @@ updatePointers(void) sqInt numLiterals1; sqInt numLiterals2; sqInt numLiterals3; - usqInt numPointerSlots; - usqInt numPointerSlots1; - usqInt numPointerSlots2; - usqInt numPointerSlots3; + sqInt numPointerSlots; + sqInt numPointerSlots1; + sqInt numPointerSlots2; + sqInt numPointerSlots3; usqInt numSlots; usqInt numSlots1; usqInt numSlots11; @@ -85488,8 +85483,7 @@ lookupSelectorinClass(sqInt selector, sqInt class) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt currentClass; sqInt dictionary; - sqInt fieldIndex; - usqInt index; + sqInt index; usqInt length; sqInt mask; sqInt meth; @@ -85533,7 +85527,7 @@ lookupSelectorinClass(sqInt selector, sqInt class) wrapAround = 0; while (1) { /* begin fetchPointer:ofObject: */ - nextSelector = longAt((dictionary + BaseHeaderSize) + (index << (shiftForWord()))); + nextSelector = longAt((dictionary + BaseHeaderSize) + (((sqInt)((usqInt)(index) << (shiftForWord()))))); if (nextSelector == GIV(nilObj)) { meth = null; goto l8; @@ -85551,12 +85545,10 @@ lookupSelectorinClass(sqInt selector, sqInt class) } methodArray = objOop2; /* begin followField:ofObject: */ - fieldIndex = index - SelectorStart; - /* begin fetchPointer:ofObject: */ - objOop1 = longAt((methodArray + BaseHeaderSize) + (((sqInt)((usqInt)(fieldIndex) << (shiftForWord()))))); + objOop1 = longAt((methodArray + BaseHeaderSize) + (((sqInt)((usqInt)((index - SelectorStart)) << (shiftForWord()))))); if (((objOop1 & (tagMask())) == 0) && (((longAt(objOop1)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0)) { - objOop1 = fixFollowedFieldofObjectwithInitialValue(fieldIndex, methodArray, objOop1); + objOop1 = fixFollowedFieldofObjectwithInitialValue(index - SelectorStart, methodArray, objOop1); } meth = objOop1; goto l8; diff --git a/spursista64src/vm/cogit.h b/spursista64src/vm/cogit.h index 6497fa49b5..4f7212be1a 100644 --- a/spursista64src/vm/cogit.h +++ b/spursista64src/vm/cogit.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ diff --git a/spursista64src/vm/cogitX64SysV.c b/spursista64src/vm/cogitX64SysV.c index 1a58f008cc..c2ece8085c 100644 --- a/spursista64src/vm/cogitX64SysV.c +++ b/spursista64src/vm/cogitX64SysV.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - SistaCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + SistaCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -6300,7 +6300,8 @@ endPCOf(sqInt aMethod) ? 256 : 0) # else /* MULTIPLEBYTECODESETS */ - 0 + (assert(!((methodUsesAlternateBytecodeSet(aMethod)))), + 0) # endif /* MULTIPLEBYTECODESETS */ ; nExts = 0; @@ -6671,7 +6672,7 @@ followForwardedLiteralsIn(CogMethod *cogMethod) val = 0; assert((((cogMethod->cmType)) != CMMethod) || (!(isForwarded((cogMethod->methodObject))))); - hasYoungObj = 0; + hasYoungObj = isYoung((cogMethod->methodObject)); if (shouldRemapOop((cogMethod->selector))) { (cogMethod->selector = remapObj((cogMethod->selector))); if (isYoung((cogMethod->selector))) { @@ -8134,9 +8135,9 @@ gJumpFPEqual(void *jumpTarget) AbstractInstruction *jumpUnordered; /* begin genJumpFPOrderedAnd:to: */ - jumpToTarget = genoperand(JumpFPEqual, ((sqInt)jumpTarget)); jumpUnordered = genoperand(JumpFPUnordered, ((sqInt)jumpTarget)); - addDependent(jumpToTarget, jumpUnordered); + jumpToTarget = genoperand(JumpFPEqual, ((sqInt)jumpTarget)); + jmpTarget(jumpUnordered, genoperandoperand(Label, (labelCounter += 1), bytecodePC)); return jumpToTarget; } @@ -16156,7 +16157,8 @@ genSmallIntegerComparisonorDoubleComparisoninvert(sqInt jumpOpcode, AbstractInst genoperand(RetN, (methodOrBlockNumArgs + 1) * BytesPerWord); } jmpTarget(jumpTrue, returnTrue); - jmpTarget(jumpNotSmallFloat, (jumpNotFloatAtAll = genJumpImmediate(Arg0Reg))); + jmpTarget(jumpNotSmallFloat, genoperandoperand(Label, (labelCounter += 1), bytecodePC)); + jumpNotFloatAtAll = genJumpImmediate(Arg0Reg); genGetCompactClassIndexNonImmOfinto(Arg0Reg, SendNumArgsReg); genCmpClassFloatCompactIndexR(SendNumArgsReg); /* begin JumpNonZero: */ diff --git a/spursista64src/vm/cogitX64WIN64.c b/spursista64src/vm/cogitX64WIN64.c index 8bcf6d66e1..a4e9444380 100644 --- a/spursista64src/vm/cogitX64WIN64.c +++ b/spursista64src/vm/cogitX64WIN64.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - SistaCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + SistaCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -6308,7 +6308,8 @@ endPCOf(sqInt aMethod) ? 256 : 0) # else /* MULTIPLEBYTECODESETS */ - 0 + (assert(!((methodUsesAlternateBytecodeSet(aMethod)))), + 0) # endif /* MULTIPLEBYTECODESETS */ ; nExts = 0; @@ -6679,7 +6680,7 @@ followForwardedLiteralsIn(CogMethod *cogMethod) val = 0; assert((((cogMethod->cmType)) != CMMethod) || (!(isForwarded((cogMethod->methodObject))))); - hasYoungObj = 0; + hasYoungObj = isYoung((cogMethod->methodObject)); if (shouldRemapOop((cogMethod->selector))) { (cogMethod->selector = remapObj((cogMethod->selector))); if (isYoung((cogMethod->selector))) { @@ -8142,9 +8143,9 @@ gJumpFPEqual(void *jumpTarget) AbstractInstruction *jumpUnordered; /* begin genJumpFPOrderedAnd:to: */ - jumpToTarget = genoperand(JumpFPEqual, ((sqInt)jumpTarget)); jumpUnordered = genoperand(JumpFPUnordered, ((sqInt)jumpTarget)); - addDependent(jumpToTarget, jumpUnordered); + jumpToTarget = genoperand(JumpFPEqual, ((sqInt)jumpTarget)); + jmpTarget(jumpUnordered, genoperandoperand(Label, (labelCounter += 1), bytecodePC)); return jumpToTarget; } @@ -16164,7 +16165,8 @@ genSmallIntegerComparisonorDoubleComparisoninvert(sqInt jumpOpcode, AbstractInst genoperand(RetN, (methodOrBlockNumArgs + 1) * BytesPerWord); } jmpTarget(jumpTrue, returnTrue); - jmpTarget(jumpNotSmallFloat, (jumpNotFloatAtAll = genJumpImmediate(Arg0Reg))); + jmpTarget(jumpNotSmallFloat, genoperandoperand(Label, (labelCounter += 1), bytecodePC)); + jumpNotFloatAtAll = genJumpImmediate(Arg0Reg); genGetCompactClassIndexNonImmOfinto(Arg0Reg, SendNumArgsReg); genCmpClassFloatCompactIndexR(SendNumArgsReg); /* begin JumpNonZero: */ diff --git a/spursista64src/vm/cointerp.c b/spursista64src/vm/cointerp.c index 5b9fe4667d..2455484d24 100644 --- a/spursista64src/vm/cointerp.c +++ b/spursista64src/vm/cointerp.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1258,7 +1258,7 @@ static sqInt NoDbgRegParms num32BitUnitsOf(sqInt objOop); static sqInt NoDbgRegParms num64BitUnitsOf(sqInt objOop); static sqInt NoDbgRegParms numBytesOfBytes(sqInt objOop); extern sqInt numBytesOf(sqInt objOop); -extern usqInt numPointerSlotsOf(sqInt objOop); +extern sqInt numPointerSlotsOf(sqInt objOop); static usqInt NoDbgRegParms numSlotsOfAny(sqInt objOop); extern usqInt numSlotsOf(sqInt objOop); static sqInt NoDbgRegParms numStrongSlotsOfInephemeral(sqInt objOop); @@ -2610,7 +2610,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 578 */] }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.2558]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.2561]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -47429,7 +47429,6 @@ becomewithtwoWaycopyHash(sqInt array1, sqInt array2, sqInt twoWayFlag, sqInt cop } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -49318,7 +49317,7 @@ copyObjtoAddrstopAtsavedFirstFieldsindex(sqInt objOop, sqInt segAddr, sqInt endS sqInt iLimiT; sqInt methodHeader; sqInt numLiterals; - usqInt numMediatedSlots; + sqInt numMediatedSlots; usqInt numSlots; usqInt numSlots1; sqInt oop; @@ -55893,7 +55892,7 @@ numBytesOf(sqInt objOop) Works with CompiledMethods, as well as ordinary objects. */ /* SpurMemoryManager>>#numPointerSlotsOf: */ -usqInt +sqInt numPointerSlotsOf(sqInt objOop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt contextSize; @@ -56926,7 +56925,6 @@ pinObject(sqInt objOop) } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -59107,7 +59105,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop1))); contextSize = (sp >> 3); l10: /* end fetchStackPointerOf: */; - i = ((usqInt) (CtxtTempFrameStart + contextSize)); + i = CtxtTempFrameStart + contextSize; goto l11; } /* begin numSlotsOf: */ @@ -59139,7 +59137,7 @@ printReferencesTo(sqInt anOop) } assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - i = ((usqInt) (numLiterals + LiteralStart)); + i = numLiterals + LiteralStart; l11: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop1 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -59193,7 +59191,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop1))); contextSize = (sp >> 3); l12: /* end fetchStackPointerOf: */; - i = ((usqInt) (CtxtTempFrameStart + contextSize)); + i = CtxtTempFrameStart + contextSize; goto l13; } /* begin numSlotsOf: */ @@ -59225,7 +59223,7 @@ printReferencesTo(sqInt anOop) } assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - i = ((usqInt) (numLiterals + LiteralStart)); + i = numLiterals + LiteralStart; l13: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop1 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -59280,7 +59278,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop11))); contextSize = (sp >> 3); l14: /* end fetchStackPointerOf: */; - i = ((usqInt) (CtxtTempFrameStart + contextSize)); + i = CtxtTempFrameStart + contextSize; goto l15; } /* begin numSlotsOf: */ @@ -59312,7 +59310,7 @@ printReferencesTo(sqInt anOop) } assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - i = ((usqInt) (numLiterals + LiteralStart)); + i = numLiterals + LiteralStart; l15: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop11 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -62352,10 +62350,10 @@ updatePointers(void) sqInt numLiterals1; sqInt numLiterals2; sqInt numLiterals3; - usqInt numPointerSlots; - usqInt numPointerSlots1; - usqInt numPointerSlots2; - usqInt numPointerSlots3; + sqInt numPointerSlots; + sqInt numPointerSlots1; + sqInt numPointerSlots2; + sqInt numPointerSlots3; usqInt numSlots; usqInt numSlots1; usqInt numSlots11; @@ -62920,7 +62918,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(obj))); contextSize = (sp >> 3); l7: /* end fetchStackPointerOf: */; - numPointerSlots = ((usqInt) (CtxtTempFrameStart + contextSize)); + numPointerSlots = CtxtTempFrameStart + contextSize; goto l8; } /* begin numSlotsOf: */ @@ -62949,7 +62947,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) l5: /* end methodHeaderFromSavedFirstField: */; assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - numPointerSlots = ((usqInt) (numLiterals + LiteralStart)); + numPointerSlots = numLiterals + LiteralStart; l8: /* end numPointerSlotsWhileCompactingOf:withFormat:savedFirstFieldPointer: */; if ((fmt <= 5 /* lastPointerFormat */) && (numPointerSlots > 0)) { @@ -67295,8 +67293,8 @@ void (*functionPointerForinClass(sqInt primIdx,sqInt theClass))(void) static sqInt getErrorObjectFromPrimFailCode(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt clone; - usqInt errObj; + sqInt clone; + sqInt errObj; sqInt fieldIndex; sqInt i; sqInt knownClassIndex; diff --git a/spursista64src/vm/cointerp.h b/spursista64src/vm/cointerp.h index 143d0d7dd1..a3ce4cce5b 100644 --- a/spursista64src/vm/cointerp.h +++ b/spursista64src/vm/cointerp.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ @@ -245,7 +245,7 @@ extern sqInt minSlotsForShortening(void); extern sqInt nilObject(void); extern sqInt nonIndexablePointerFormat(void); extern sqInt numBytesOf(sqInt objOop); -extern usqInt numPointerSlotsOf(sqInt objOop); +extern sqInt numPointerSlotsOf(sqInt objOop); extern usqInt numSlotsOf(sqInt objOop); extern sqInt numStrongSlotsOfWeakling(sqInt objOop); extern sqInt objectAfter(sqInt objOop); diff --git a/spursista64src/vm/gcc3x-cointerp.c b/spursista64src/vm/gcc3x-cointerp.c index 6ebea2ec9a..c652368a56 100644 --- a/spursista64src/vm/gcc3x-cointerp.c +++ b/spursista64src/vm/gcc3x-cointerp.c @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1261,7 +1261,7 @@ static sqInt NoDbgRegParms num32BitUnitsOf(sqInt objOop); static sqInt NoDbgRegParms num64BitUnitsOf(sqInt objOop); static sqInt NoDbgRegParms numBytesOfBytes(sqInt objOop); extern sqInt numBytesOf(sqInt objOop); -extern usqInt numPointerSlotsOf(sqInt objOop); +extern sqInt numPointerSlotsOf(sqInt objOop); static usqInt NoDbgRegParms numSlotsOfAny(sqInt objOop); extern usqInt numSlotsOf(sqInt objOop); static sqInt NoDbgRegParms numStrongSlotsOfInephemeral(sqInt objOop); @@ -2613,7 +2613,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 578 */] }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.2558]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.2561]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -47438,7 +47438,6 @@ becomewithtwoWaycopyHash(sqInt array1, sqInt array2, sqInt twoWayFlag, sqInt cop } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -49327,7 +49326,7 @@ copyObjtoAddrstopAtsavedFirstFieldsindex(sqInt objOop, sqInt segAddr, sqInt endS sqInt iLimiT; sqInt methodHeader; sqInt numLiterals; - usqInt numMediatedSlots; + sqInt numMediatedSlots; usqInt numSlots; usqInt numSlots1; sqInt oop; @@ -55902,7 +55901,7 @@ numBytesOf(sqInt objOop) Works with CompiledMethods, as well as ordinary objects. */ /* SpurMemoryManager>>#numPointerSlotsOf: */ -usqInt +sqInt numPointerSlotsOf(sqInt objOop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt contextSize; @@ -56935,7 +56934,6 @@ pinObject(sqInt objOop) } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -59116,7 +59114,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop1))); contextSize = (sp >> 3); l10: /* end fetchStackPointerOf: */; - i = ((usqInt) (CtxtTempFrameStart + contextSize)); + i = CtxtTempFrameStart + contextSize; goto l11; } /* begin numSlotsOf: */ @@ -59148,7 +59146,7 @@ printReferencesTo(sqInt anOop) } assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - i = ((usqInt) (numLiterals + LiteralStart)); + i = numLiterals + LiteralStart; l11: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop1 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -59202,7 +59200,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop1))); contextSize = (sp >> 3); l12: /* end fetchStackPointerOf: */; - i = ((usqInt) (CtxtTempFrameStart + contextSize)); + i = CtxtTempFrameStart + contextSize; goto l13; } /* begin numSlotsOf: */ @@ -59234,7 +59232,7 @@ printReferencesTo(sqInt anOop) } assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - i = ((usqInt) (numLiterals + LiteralStart)); + i = numLiterals + LiteralStart; l13: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop1 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -59289,7 +59287,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop11))); contextSize = (sp >> 3); l14: /* end fetchStackPointerOf: */; - i = ((usqInt) (CtxtTempFrameStart + contextSize)); + i = CtxtTempFrameStart + contextSize; goto l15; } /* begin numSlotsOf: */ @@ -59321,7 +59319,7 @@ printReferencesTo(sqInt anOop) } assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - i = ((usqInt) (numLiterals + LiteralStart)); + i = numLiterals + LiteralStart; l15: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop11 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -62361,10 +62359,10 @@ updatePointers(void) sqInt numLiterals1; sqInt numLiterals2; sqInt numLiterals3; - usqInt numPointerSlots; - usqInt numPointerSlots1; - usqInt numPointerSlots2; - usqInt numPointerSlots3; + sqInt numPointerSlots; + sqInt numPointerSlots1; + sqInt numPointerSlots2; + sqInt numPointerSlots3; usqInt numSlots; usqInt numSlots1; usqInt numSlots11; @@ -62929,7 +62927,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(obj))); contextSize = (sp >> 3); l7: /* end fetchStackPointerOf: */; - numPointerSlots = ((usqInt) (CtxtTempFrameStart + contextSize)); + numPointerSlots = CtxtTempFrameStart + contextSize; goto l8; } /* begin numSlotsOf: */ @@ -62958,7 +62956,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) l5: /* end methodHeaderFromSavedFirstField: */; assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - numPointerSlots = ((usqInt) (numLiterals + LiteralStart)); + numPointerSlots = numLiterals + LiteralStart; l8: /* end numPointerSlotsWhileCompactingOf:withFormat:savedFirstFieldPointer: */; if ((fmt <= 5 /* lastPointerFormat */) && (numPointerSlots > 0)) { @@ -67304,8 +67302,8 @@ void (*functionPointerForinClass(sqInt primIdx,sqInt theClass))(void) static sqInt getErrorObjectFromPrimFailCode(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt clone; - usqInt errObj; + sqInt clone; + sqInt errObj; sqInt fieldIndex; sqInt i; sqInt knownClassIndex; diff --git a/spursistasrc/vm/cogit.h b/spursistasrc/vm/cogit.h index 6497fa49b5..4f7212be1a 100644 --- a/spursistasrc/vm/cogit.h +++ b/spursistasrc/vm/cogit.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ diff --git a/spursistasrc/vm/cogitARMv5.c b/spursistasrc/vm/cogitARMv5.c index 6f329ee510..45e05394b9 100644 --- a/spursistasrc/vm/cogitARMv5.c +++ b/spursistasrc/vm/cogitARMv5.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - SistaCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + SistaCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -11001,7 +11001,8 @@ endPCOf(sqInt aMethod) ? 256 : 0) # else /* MULTIPLEBYTECODESETS */ - 0 + (assert(!((methodUsesAlternateBytecodeSet(aMethod)))), + 0) # endif /* MULTIPLEBYTECODESETS */ ; nExts = 0; @@ -11374,7 +11375,7 @@ followForwardedLiteralsIn(CogMethod *cogMethod) val = 0; assert((((cogMethod->cmType)) != CMMethod) || (!(isForwarded((cogMethod->methodObject))))); - hasYoungObj = 0; + hasYoungObj = isYoung((cogMethod->methodObject)); if (shouldRemapOop((cogMethod->selector))) { (cogMethod->selector = remapObj((cogMethod->selector))); if (isYoung((cogMethod->selector))) { diff --git a/spursistasrc/vm/cogitIA32.c b/spursistasrc/vm/cogitIA32.c index b97ea239ac..950d7e6712 100644 --- a/spursistasrc/vm/cogitIA32.c +++ b/spursistasrc/vm/cogitIA32.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - SistaCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + SistaCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -10977,7 +10977,8 @@ endPCOf(sqInt aMethod) ? 256 : 0) # else /* MULTIPLEBYTECODESETS */ - 0 + (assert(!((methodUsesAlternateBytecodeSet(aMethod)))), + 0) # endif /* MULTIPLEBYTECODESETS */ ; nExts = 0; @@ -11350,7 +11351,7 @@ followForwardedLiteralsIn(CogMethod *cogMethod) val = 0; assert((((cogMethod->cmType)) != CMMethod) || (!(isForwarded((cogMethod->methodObject))))); - hasYoungObj = 0; + hasYoungObj = isYoung((cogMethod->methodObject)); if (shouldRemapOop((cogMethod->selector))) { (cogMethod->selector = remapObj((cogMethod->selector))); if (isYoung((cogMethod->selector))) { @@ -12806,9 +12807,9 @@ gJumpFPEqual(void *jumpTarget) AbstractInstruction *jumpUnordered; /* begin genJumpFPOrderedAnd:to: */ - jumpToTarget = genoperand(JumpFPEqual, ((sqInt)jumpTarget)); jumpUnordered = genoperand(JumpFPUnordered, ((sqInt)jumpTarget)); - addDependent(jumpToTarget, jumpUnordered); + jumpToTarget = genoperand(JumpFPEqual, ((sqInt)jumpTarget)); + jmpTarget(jumpUnordered, genoperandoperand(Label, (labelCounter += 1), bytecodePC)); return jumpToTarget; } diff --git a/spursistasrc/vm/cogitMIPSEL.c b/spursistasrc/vm/cogitMIPSEL.c index aefef43b03..a794a05790 100644 --- a/spursistasrc/vm/cogitMIPSEL.c +++ b/spursistasrc/vm/cogitMIPSEL.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - SistaCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + SistaCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -5972,7 +5972,7 @@ cPICHasForwardedClass(CogMethod *cPIC) static sqInt NoDbgRegParms cPICHasFreedTargets(CogMethod *cPIC) { - sqInt entryPoint; + usqInt entryPoint; sqInt i; sqInt pc; CogMethod *targetMethod; @@ -6156,7 +6156,8 @@ endPCOf(sqInt aMethod) ? 256 : 0) # else /* MULTIPLEBYTECODESETS */ - 0 + (assert(!((methodUsesAlternateBytecodeSet(aMethod)))), + 0) # endif /* MULTIPLEBYTECODESETS */ ; nExts = 0; @@ -6527,7 +6528,7 @@ followForwardedLiteralsIn(CogMethod *cogMethod) val = 0; assert((((cogMethod->cmType)) != CMMethod) || (!(isForwarded((cogMethod->methodObject))))); - hasYoungObj = 0; + hasYoungObj = isYoung((cogMethod->methodObject)); if (shouldRemapOop((cogMethod->selector))) { (cogMethod->selector = remapObj((cogMethod->selector))); if (isYoung((cogMethod->selector))) { @@ -31576,7 +31577,7 @@ populatewithPICInfoForfirstCacheTag(sqInt tuple, CogMethod *cPIC, sqInt firstCac { sqInt cacheTag; sqInt classOop; - sqInt entryPoint; + usqInt entryPoint; sqInt i; sqInt pc; CogMethod *targetMethod; diff --git a/spursistasrc/vm/cointerp.c b/spursistasrc/vm/cointerp.c index 5a686780c3..612f1f8a14 100644 --- a/spursistasrc/vm/cointerp.c +++ b/spursistasrc/vm/cointerp.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2589,7 +2589,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 578 */] }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.2558]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.2561]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -46734,7 +46734,6 @@ becomewithtwoWaycopyHash(sqInt array1, sqInt array2, sqInt twoWayFlag, sqInt cop } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -56168,7 +56167,6 @@ pinObject(sqInt objOop) } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ diff --git a/spursistasrc/vm/cointerp.h b/spursistasrc/vm/cointerp.h index 93acd89e9f..92832a28db 100644 --- a/spursistasrc/vm/cointerp.h +++ b/spursistasrc/vm/cointerp.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ diff --git a/spursistasrc/vm/gcc3x-cointerp.c b/spursistasrc/vm/gcc3x-cointerp.c index 1d7f5257f8..49f99ec9b3 100644 --- a/spursistasrc/vm/gcc3x-cointerp.c +++ b/spursistasrc/vm/gcc3x-cointerp.c @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2592,7 +2592,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 578 */] }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.2558]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.2561]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -46743,7 +46743,6 @@ becomewithtwoWaycopyHash(sqInt array1, sqInt array2, sqInt twoWayFlag, sqInt cop } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -56177,7 +56176,6 @@ pinObject(sqInt objOop) } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ diff --git a/spursrc/vm/cogit.h b/spursrc/vm/cogit.h index a336ba19d4..2e72211871 100644 --- a/spursrc/vm/cogit.h +++ b/spursrc/vm/cogit.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ diff --git a/spursrc/vm/cogitARMv5.c b/spursrc/vm/cogitARMv5.c index d5c596a916..cd18db628f 100644 --- a/spursrc/vm/cogitARMv5.c +++ b/spursrc/vm/cogitARMv5.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -10807,7 +10807,8 @@ endPCOf(sqInt aMethod) ? 256 : 0) # else /* MULTIPLEBYTECODESETS */ - 0 + (assert(!((methodUsesAlternateBytecodeSet(aMethod)))), + 0) # endif /* MULTIPLEBYTECODESETS */ ; nExts = 0; @@ -11204,7 +11205,7 @@ followForwardedLiteralsIn(CogMethod *cogMethod) val = 0; assert((((cogMethod->cmType)) != CMMethod) || (!(isForwarded((cogMethod->methodObject))))); - hasYoungObj = 0; + hasYoungObj = isYoung((cogMethod->methodObject)); if (shouldRemapOop((cogMethod->selector))) { (cogMethod->selector = remapObj((cogMethod->selector))); if (isYoung((cogMethod->selector))) { diff --git a/spursrc/vm/cogitIA32.c b/spursrc/vm/cogitIA32.c index 6388ba5885..39b3abb413 100644 --- a/spursrc/vm/cogitIA32.c +++ b/spursrc/vm/cogitIA32.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -10785,7 +10785,8 @@ endPCOf(sqInt aMethod) ? 256 : 0) # else /* MULTIPLEBYTECODESETS */ - 0 + (assert(!((methodUsesAlternateBytecodeSet(aMethod)))), + 0) # endif /* MULTIPLEBYTECODESETS */ ; nExts = 0; @@ -11182,7 +11183,7 @@ followForwardedLiteralsIn(CogMethod *cogMethod) val = 0; assert((((cogMethod->cmType)) != CMMethod) || (!(isForwarded((cogMethod->methodObject))))); - hasYoungObj = 0; + hasYoungObj = isYoung((cogMethod->methodObject)); if (shouldRemapOop((cogMethod->selector))) { (cogMethod->selector = remapObj((cogMethod->selector))); if (isYoung((cogMethod->selector))) { @@ -12780,9 +12781,9 @@ gJumpFPEqual(void *jumpTarget) AbstractInstruction *jumpUnordered; /* begin genJumpFPOrderedAnd:to: */ - jumpToTarget = genoperand(JumpFPEqual, ((sqInt)jumpTarget)); jumpUnordered = genoperand(JumpFPUnordered, ((sqInt)jumpTarget)); - addDependent(jumpToTarget, jumpUnordered); + jumpToTarget = genoperand(JumpFPEqual, ((sqInt)jumpTarget)); + jmpTarget(jumpUnordered, genoperandoperand(Label, (labelCounter += 1), bytecodePC)); return jumpToTarget; } diff --git a/spursrc/vm/cogitMIPSEL.c b/spursrc/vm/cogitMIPSEL.c index 67f7f0512f..623af0d922 100644 --- a/spursrc/vm/cogitMIPSEL.c +++ b/spursrc/vm/cogitMIPSEL.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -5968,7 +5968,8 @@ endPCOf(sqInt aMethod) ? 256 : 0) # else /* MULTIPLEBYTECODESETS */ - 0 + (assert(!((methodUsesAlternateBytecodeSet(aMethod)))), + 0) # endif /* MULTIPLEBYTECODESETS */ ; nExts = 0; @@ -6363,7 +6364,7 @@ followForwardedLiteralsIn(CogMethod *cogMethod) val = 0; assert((((cogMethod->cmType)) != CMMethod) || (!(isForwarded((cogMethod->methodObject))))); - hasYoungObj = 0; + hasYoungObj = isYoung((cogMethod->methodObject)); if (shouldRemapOop((cogMethod->selector))) { (cogMethod->selector = remapObj((cogMethod->selector))); if (isYoung((cogMethod->selector))) { @@ -9549,7 +9550,7 @@ static void NoDbgRegParms relocateCallsInClosedPIC(CogMethod *cPIC) { sqInt callDelta; - usqInt entryPoint; + sqInt entryPoint; sqInt i; sqInt pc; sqLong refDelta; diff --git a/spursrc/vm/cointerp.c b/spursrc/vm/cointerp.c index 8b5908d49c..0bf133853c 100644 --- a/spursrc/vm/cointerp.c +++ b/spursrc/vm/cointerp.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1221,7 +1221,7 @@ extern sqInt nonIndexablePointerFormat(void); static sqInt noUnscannedEphemerons(void); static sqInt NoDbgRegParms numBytesOfBytes(sqInt objOop); extern sqInt numBytesOf(sqInt objOop); -extern usqInt numPointerSlotsOf(sqInt objOop); +extern sqInt numPointerSlotsOf(sqInt objOop); static usqInt NoDbgRegParms numSlotsOfAny(sqInt objOop); extern usqInt numSlotsOf(sqInt objOop); static sqInt NoDbgRegParms numStrongSlotsOfInephemeral(sqInt objOop); @@ -2572,7 +2572,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 578 */] }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.2558]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.2561]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -43712,7 +43712,6 @@ becomewithtwoWaycopyHash(sqInt array1, sqInt array2, sqInt twoWayFlag, sqInt cop } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -45594,7 +45593,7 @@ copyObjtoAddrstopAtsavedFirstFieldsindex(sqInt objOop, sqInt segAddr, sqInt endS sqInt iLimiT; sqInt methodHeader; sqInt numLiterals; - usqInt numMediatedSlots; + sqInt numMediatedSlots; usqInt numSlots; usqInt numSlots1; sqInt oop; @@ -45626,7 +45625,7 @@ copyObjtoAddrstopAtsavedFirstFieldsindex(sqInt objOop, sqInt segAddr, sqInt endS here but that requires access to framePointer. */ /* begin numSlotsOfMarriedContext: */ contextSize = stackPointerIndexForFrame(frameOfMarriedContext(objOop)); - numMediatedSlots = ((sqInt) (CtxtTempFrameStart + contextSize)); + numMediatedSlots = CtxtTempFrameStart + contextSize; for (i1 = 0; i1 < numMediatedSlots; i1 += 1) { oop = fetchPointerofMarriedContext(i1, objOop); assert(!(isOopForwarded(copy))); @@ -52067,7 +52066,7 @@ numBytesOf(sqInt objOop) Works with CompiledMethods, as well as ordinary objects. */ /* SpurMemoryManager>>#numPointerSlotsOf: */ -usqInt +sqInt numPointerSlotsOf(sqInt objOop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt contextSize; @@ -53084,7 +53083,6 @@ pinObject(sqInt objOop) } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -55264,7 +55262,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(objOop1))); contextSize = (sp >> 1); l12: /* end fetchStackPointerOf: */; - i = ((usqInt) (CtxtTempFrameStart + contextSize)); + i = CtxtTempFrameStart + contextSize; goto l11; } /* begin numSlotsOf: */ @@ -55297,7 +55295,7 @@ printReferencesTo(sqInt anOop) /* begin literalCountOfMethodHeader: */ assert((header & 1)); numLiterals = ((header >> 1)) & AlternateHeaderNumLiteralsMask; - i = ((usqInt) (numLiterals + LiteralStart)); + i = numLiterals + LiteralStart; l11: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop1 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -55351,7 +55349,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(objOop1))); contextSize = (sp >> 1); l14: /* end fetchStackPointerOf: */; - i = ((usqInt) (CtxtTempFrameStart + contextSize)); + i = CtxtTempFrameStart + contextSize; goto l13; } /* begin numSlotsOf: */ @@ -55384,7 +55382,7 @@ printReferencesTo(sqInt anOop) /* begin literalCountOfMethodHeader: */ assert((header & 1)); numLiterals = ((header >> 1)) & AlternateHeaderNumLiteralsMask; - i = ((usqInt) (numLiterals + LiteralStart)); + i = numLiterals + LiteralStart; l13: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop1 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -55439,7 +55437,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(objOop11))); contextSize = (sp >> 1); l16: /* end fetchStackPointerOf: */; - i = ((usqInt) (CtxtTempFrameStart + contextSize)); + i = CtxtTempFrameStart + contextSize; goto l15; } /* begin numSlotsOf: */ @@ -55472,7 +55470,7 @@ printReferencesTo(sqInt anOop) /* begin literalCountOfMethodHeader: */ assert((header & 1)); numLiterals = ((header >> 1)) & AlternateHeaderNumLiteralsMask; - i = ((usqInt) (numLiterals + LiteralStart)); + i = numLiterals + LiteralStart; l15: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop11 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -58459,10 +58457,10 @@ updatePointers(void) sqInt numLiterals1; sqInt numLiterals2; sqInt numLiterals3; - usqInt numPointerSlots; - usqInt numPointerSlots1; - usqInt numPointerSlots2; - usqInt numPointerSlots3; + sqInt numPointerSlots; + sqInt numPointerSlots1; + sqInt numPointerSlots2; + sqInt numPointerSlots3; usqInt numSlots; usqInt numSlots1; usqInt numSlots11; @@ -59031,7 +59029,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(obj))); contextSize = (sp >> 1); l5: /* end fetchStackPointerOf: */; - numPointerSlots = ((usqInt) (CtxtTempFrameStart + contextSize)); + numPointerSlots = CtxtTempFrameStart + contextSize; goto l9; } /* begin numSlotsOf: */ @@ -59061,7 +59059,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) /* begin literalCountOfMethodHeader: */ assert((header & 1)); numLiterals = ((header >> 1)) & AlternateHeaderNumLiteralsMask; - numPointerSlots = ((usqInt) (numLiterals + LiteralStart)); + numPointerSlots = numLiterals + LiteralStart; l9: /* end numPointerSlotsWhileCompactingOf:withFormat:savedFirstFieldPointer: */; if ((fmt <= 5 /* lastPointerFormat */) && (numPointerSlots > 0)) { @@ -63422,8 +63420,8 @@ void (*functionPointerForinClass(sqInt primIdx,sqInt theClass))(void) static sqInt getErrorObjectFromPrimFailCode(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt clone; - sqInt errObj; + usqInt clone; + usqInt errObj; sqInt fieldIndex; sqInt i; sqInt knownClassIndex; diff --git a/spursrc/vm/cointerp.h b/spursrc/vm/cointerp.h index b152d83a0c..3aacfc75ed 100644 --- a/spursrc/vm/cointerp.h +++ b/spursrc/vm/cointerp.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ @@ -240,7 +240,7 @@ extern sqInt minSlotsForShortening(void); extern sqInt nilObject(void); extern sqInt nonIndexablePointerFormat(void); extern sqInt numBytesOf(sqInt objOop); -extern usqInt numPointerSlotsOf(sqInt objOop); +extern sqInt numPointerSlotsOf(sqInt objOop); extern usqInt numSlotsOf(sqInt objOop); extern sqInt numStrongSlotsOfWeakling(sqInt objOop); extern sqInt objectAfter(sqInt objOop); diff --git a/spursrc/vm/cointerpmt.c b/spursrc/vm/cointerpmt.c index 99b8cb31d9..83e31e3b70 100644 --- a/spursrc/vm/cointerpmt.c +++ b/spursrc/vm/cointerpmt.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - CoInterpreterMT VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CoInterpreterMT VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2667,7 +2667,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 578 */] }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.2558]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.2561]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -46143,7 +46143,6 @@ becomewithtwoWaycopyHash(sqInt array1, sqInt array2, sqInt twoWayFlag, sqInt cop } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -55530,7 +55529,6 @@ pinObject(sqInt objOop) } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -61484,7 +61482,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(obj))); contextSize = (sp >> 1); l5: /* end fetchStackPointerOf: */; - numPointerSlots = CtxtTempFrameStart + contextSize; + numPointerSlots = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l9; } /* begin numSlotsOf: */ @@ -61514,7 +61512,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) /* begin literalCountOfMethodHeader: */ assert((header & 1)); numLiterals = ((header >> 1)) & AlternateHeaderNumLiteralsMask; - numPointerSlots = numLiterals + LiteralStart; + numPointerSlots = ((usqInt) (numLiterals + LiteralStart)); l9: /* end numPointerSlotsWhileCompactingOf:withFormat:savedFirstFieldPointer: */; if ((fmt <= 5 /* lastPointerFormat */) && (numPointerSlots > 0)) { diff --git a/spursrc/vm/cointerpmt.h b/spursrc/vm/cointerpmt.h index 5cd39c32a7..7fcd9266fc 100644 --- a/spursrc/vm/cointerpmt.h +++ b/spursrc/vm/cointerpmt.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ diff --git a/spursrc/vm/gcc3x-cointerp.c b/spursrc/vm/gcc3x-cointerp.c index 0ab213eeba..3c83a585b2 100644 --- a/spursrc/vm/gcc3x-cointerp.c +++ b/spursrc/vm/gcc3x-cointerp.c @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1224,7 +1224,7 @@ extern sqInt nonIndexablePointerFormat(void); static sqInt noUnscannedEphemerons(void); static sqInt NoDbgRegParms numBytesOfBytes(sqInt objOop); extern sqInt numBytesOf(sqInt objOop); -extern usqInt numPointerSlotsOf(sqInt objOop); +extern sqInt numPointerSlotsOf(sqInt objOop); static usqInt NoDbgRegParms numSlotsOfAny(sqInt objOop); extern usqInt numSlotsOf(sqInt objOop); static sqInt NoDbgRegParms numStrongSlotsOfInephemeral(sqInt objOop); @@ -2575,7 +2575,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 578 */] }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.2558]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.2561]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -43721,7 +43721,6 @@ becomewithtwoWaycopyHash(sqInt array1, sqInt array2, sqInt twoWayFlag, sqInt cop } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -45603,7 +45602,7 @@ copyObjtoAddrstopAtsavedFirstFieldsindex(sqInt objOop, sqInt segAddr, sqInt endS sqInt iLimiT; sqInt methodHeader; sqInt numLiterals; - usqInt numMediatedSlots; + sqInt numMediatedSlots; usqInt numSlots; usqInt numSlots1; sqInt oop; @@ -45635,7 +45634,7 @@ copyObjtoAddrstopAtsavedFirstFieldsindex(sqInt objOop, sqInt segAddr, sqInt endS here but that requires access to framePointer. */ /* begin numSlotsOfMarriedContext: */ contextSize = stackPointerIndexForFrame(frameOfMarriedContext(objOop)); - numMediatedSlots = ((sqInt) (CtxtTempFrameStart + contextSize)); + numMediatedSlots = CtxtTempFrameStart + contextSize; for (i1 = 0; i1 < numMediatedSlots; i1 += 1) { oop = fetchPointerofMarriedContext(i1, objOop); assert(!(isOopForwarded(copy))); @@ -52076,7 +52075,7 @@ numBytesOf(sqInt objOop) Works with CompiledMethods, as well as ordinary objects. */ /* SpurMemoryManager>>#numPointerSlotsOf: */ -usqInt +sqInt numPointerSlotsOf(sqInt objOop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt contextSize; @@ -53093,7 +53092,6 @@ pinObject(sqInt objOop) } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -55273,7 +55271,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(objOop1))); contextSize = (sp >> 1); l12: /* end fetchStackPointerOf: */; - i = ((usqInt) (CtxtTempFrameStart + contextSize)); + i = CtxtTempFrameStart + contextSize; goto l11; } /* begin numSlotsOf: */ @@ -55306,7 +55304,7 @@ printReferencesTo(sqInt anOop) /* begin literalCountOfMethodHeader: */ assert((header & 1)); numLiterals = ((header >> 1)) & AlternateHeaderNumLiteralsMask; - i = ((usqInt) (numLiterals + LiteralStart)); + i = numLiterals + LiteralStart; l11: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop1 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -55360,7 +55358,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(objOop1))); contextSize = (sp >> 1); l14: /* end fetchStackPointerOf: */; - i = ((usqInt) (CtxtTempFrameStart + contextSize)); + i = CtxtTempFrameStart + contextSize; goto l13; } /* begin numSlotsOf: */ @@ -55393,7 +55391,7 @@ printReferencesTo(sqInt anOop) /* begin literalCountOfMethodHeader: */ assert((header & 1)); numLiterals = ((header >> 1)) & AlternateHeaderNumLiteralsMask; - i = ((usqInt) (numLiterals + LiteralStart)); + i = numLiterals + LiteralStart; l13: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop1 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -55448,7 +55446,7 @@ printReferencesTo(sqInt anOop) assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(objOop11))); contextSize = (sp >> 1); l16: /* end fetchStackPointerOf: */; - i = ((usqInt) (CtxtTempFrameStart + contextSize)); + i = CtxtTempFrameStart + contextSize; goto l15; } /* begin numSlotsOf: */ @@ -55481,7 +55479,7 @@ printReferencesTo(sqInt anOop) /* begin literalCountOfMethodHeader: */ assert((header & 1)); numLiterals = ((header >> 1)) & AlternateHeaderNumLiteralsMask; - i = ((usqInt) (numLiterals + LiteralStart)); + i = numLiterals + LiteralStart; l15: /* end numPointerSlotsOf: */; while (((i -= 1)) >= 0) { if (anOop == (longAt((objOop11 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) { @@ -58468,10 +58466,10 @@ updatePointers(void) sqInt numLiterals1; sqInt numLiterals2; sqInt numLiterals3; - usqInt numPointerSlots; - usqInt numPointerSlots1; - usqInt numPointerSlots2; - usqInt numPointerSlots3; + sqInt numPointerSlots; + sqInt numPointerSlots1; + sqInt numPointerSlots2; + sqInt numPointerSlots3; usqInt numSlots; usqInt numSlots1; usqInt numSlots11; @@ -59040,7 +59038,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(obj))); contextSize = (sp >> 1); l5: /* end fetchStackPointerOf: */; - numPointerSlots = ((usqInt) (CtxtTempFrameStart + contextSize)); + numPointerSlots = CtxtTempFrameStart + contextSize; goto l9; } /* begin numSlotsOf: */ @@ -59070,7 +59068,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) /* begin literalCountOfMethodHeader: */ assert((header & 1)); numLiterals = ((header >> 1)) & AlternateHeaderNumLiteralsMask; - numPointerSlots = ((usqInt) (numLiterals + LiteralStart)); + numPointerSlots = numLiterals + LiteralStart; l9: /* end numPointerSlotsWhileCompactingOf:withFormat:savedFirstFieldPointer: */; if ((fmt <= 5 /* lastPointerFormat */) && (numPointerSlots > 0)) { @@ -63431,8 +63429,8 @@ void (*functionPointerForinClass(sqInt primIdx,sqInt theClass))(void) static sqInt getErrorObjectFromPrimFailCode(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt clone; - sqInt errObj; + usqInt clone; + usqInt errObj; sqInt fieldIndex; sqInt i; sqInt knownClassIndex; diff --git a/spursrc/vm/gcc3x-cointerpmt.c b/spursrc/vm/gcc3x-cointerpmt.c index 224822700c..cde5149302 100644 --- a/spursrc/vm/gcc3x-cointerpmt.c +++ b/spursrc/vm/gcc3x-cointerpmt.c @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - CoInterpreterMT VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CoInterpreterMT VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2670,7 +2670,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 578 */] }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.2558]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.2561]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -46152,7 +46152,6 @@ becomewithtwoWaycopyHash(sqInt array1, sqInt array2, sqInt twoWayFlag, sqInt cop } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -55539,7 +55538,6 @@ pinObject(sqInt objOop) } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ - /* send of break elided */; spurPostBecomeAction(GIV(becomeEffectsFlags)); followMovableLiteralsAndUpdateYoungReferrers(); /* begin nilUncoggableMethods */ @@ -61493,7 +61491,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(obj))); contextSize = (sp >> 1); l5: /* end fetchStackPointerOf: */; - numPointerSlots = CtxtTempFrameStart + contextSize; + numPointerSlots = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l9; } /* begin numSlotsOf: */ @@ -61523,7 +61521,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) /* begin literalCountOfMethodHeader: */ assert((header & 1)); numLiterals = ((header >> 1)) & AlternateHeaderNumLiteralsMask; - numPointerSlots = numLiterals + LiteralStart; + numPointerSlots = ((usqInt) (numLiterals + LiteralStart)); l9: /* end numPointerSlotsWhileCompactingOf:withFormat:savedFirstFieldPointer: */; if ((fmt <= 5 /* lastPointerFormat */) && (numPointerSlots > 0)) { diff --git a/src/vm/cogit.h b/src/vm/cogit.h index 314085e87e..3fd010d94c 100644 --- a/src/vm/cogit.h +++ b/src/vm/cogit.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ diff --git a/src/vm/cogitARMv5.c b/src/vm/cogitARMv5.c index 7a2eae7633..53a0ff942c 100644 --- a/src/vm/cogitARMv5.c +++ b/src/vm/cogitARMv5.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -10168,7 +10168,8 @@ endPCOf(sqInt aMethod) ? 256 : 0) # else /* MULTIPLEBYTECODESETS */ - 0 + (assert(!((methodUsesAlternateBytecodeSet(aMethod)))), + 0) # endif /* MULTIPLEBYTECODESETS */ ; nExts = 0; diff --git a/src/vm/cogitIA32.c b/src/vm/cogitIA32.c index 73164d605f..6db7dc89cf 100644 --- a/src/vm/cogitIA32.c +++ b/src/vm/cogitIA32.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -10169,7 +10169,8 @@ endPCOf(sqInt aMethod) ? 256 : 0) # else /* MULTIPLEBYTECODESETS */ - 0 + (assert(!((methodUsesAlternateBytecodeSet(aMethod)))), + 0) # endif /* MULTIPLEBYTECODESETS */ ; nExts = 0; @@ -11866,9 +11867,9 @@ gJumpFPEqual(void *jumpTarget) AbstractInstruction *jumpUnordered; /* begin genJumpFPOrderedAnd:to: */ - jumpToTarget = genoperand(JumpFPEqual, ((sqInt)jumpTarget)); jumpUnordered = genoperand(JumpFPUnordered, ((sqInt)jumpTarget)); - addDependent(jumpToTarget, jumpUnordered); + jumpToTarget = genoperand(JumpFPEqual, ((sqInt)jumpTarget)); + jmpTarget(jumpUnordered, genoperandoperand(Label, (labelCounter += 1), bytecodePC)); return jumpToTarget; } diff --git a/src/vm/cogitMIPSEL.c b/src/vm/cogitMIPSEL.c index dd8af2719f..c9191d4fd0 100644 --- a/src/vm/cogitMIPSEL.c +++ b/src/vm/cogitMIPSEL.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGenerator VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -5344,7 +5344,8 @@ endPCOf(sqInt aMethod) ? 256 : 0) # else /* MULTIPLEBYTECODESETS */ - 0 + (assert(!((methodUsesAlternateBytecodeSet(aMethod)))), + 0) # endif /* MULTIPLEBYTECODESETS */ ; nExts = 0; @@ -8625,7 +8626,7 @@ static void NoDbgRegParms relocateCallsInClosedPIC(CogMethod *cPIC) { sqInt callDelta; - usqInt entryPoint; + sqInt entryPoint; sqInt i; sqInt pc; sqInt refDelta; diff --git a/src/vm/cointerp.c b/src/vm/cointerp.c index d132f42e7f..7432f05f83 100644 --- a/src/vm/cointerp.c +++ b/src/vm/cointerp.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2212,7 +2212,7 @@ static void (*primitiveTable[MaxPrimitiveIndex + 2 /* 578 */])(void) = { 0 }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscog-eem.2558]"; +const char *interpreterVersion = "Croquet Closure Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscog-eem.2561]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -31367,7 +31367,6 @@ becomewithtwoWaycopyHash(sqInt array1, sqInt array2, sqInt twoWayFlag, sqInt cop } } /* begin postBecomeAction: */ - /* send of break elided */; cogitPostGCAction(GIV(gcMode)); /* begin nilUncoggableMethods */ GIV(lastCoggableInterpretedBlockMethod) = (GIV(lastUncoggableInterpretedBlockMethod) = null); @@ -32467,7 +32466,7 @@ eeInstantiateSmallClassnumSlots(sqInt classPointer, sqInt numSlots) { DECL_MAYBE_SQ_GLOBAL_STRUCT usqInt hash; int hdrSize; - usqInt header1; + sqInt header1; sqInt header2; usqInt newChunk; usqInt newFreeStart; diff --git a/src/vm/cointerp.h b/src/vm/cointerp.h index abc7d2fc4d..5c9e23f20f 100644 --- a/src/vm/cointerp.h +++ b/src/vm/cointerp.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ diff --git a/src/vm/cointerpmt.c b/src/vm/cointerpmt.c index a0ae686949..4b8ac8d396 100644 --- a/src/vm/cointerpmt.c +++ b/src/vm/cointerpmt.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - CoInterpreterMT VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CoInterpreterMT VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2306,7 +2306,7 @@ static void (*primitiveTable[MaxPrimitiveIndex + 2 /* 578 */])(void) = { 0 }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.2558]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.2561]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -33777,7 +33777,6 @@ becomewithtwoWaycopyHash(sqInt array1, sqInt array2, sqInt twoWayFlag, sqInt cop } } /* begin postBecomeAction: */ - /* send of break elided */; cogitPostGCAction(GIV(gcMode)); /* begin nilUncoggableMethods */ GIV(lastCoggableInterpretedBlockMethod) = (GIV(lastUncoggableInterpretedBlockMethod) = null); @@ -34740,7 +34739,7 @@ static sqInt NoDbgRegParms eeInstantiateMethodContextSlots(sqInt numSlots) { DECL_MAYBE_SQ_GLOBAL_STRUCT usqInt hash; - sqInt header1; + usqInt header1; usqInt newChunk; usqInt newFreeStart; sqInt newObj; @@ -34877,7 +34876,7 @@ eeInstantiateSmallClassnumSlots(sqInt classPointer, sqInt numSlots) { DECL_MAYBE_SQ_GLOBAL_STRUCT usqInt hash; int hdrSize; - sqInt header1; + usqInt header1; sqInt header2; usqInt newChunk; usqInt newFreeStart; diff --git a/src/vm/cointerpmt.h b/src/vm/cointerpmt.h index 2b3d5a1062..02fd2f535b 100644 --- a/src/vm/cointerpmt.h +++ b/src/vm/cointerpmt.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ diff --git a/src/vm/gcc3x-cointerp.c b/src/vm/gcc3x-cointerp.c index 38a0f43212..e5c386f580 100644 --- a/src/vm/gcc3x-cointerp.c +++ b/src/vm/gcc3x-cointerp.c @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2215,7 +2215,7 @@ static void (*primitiveTable[MaxPrimitiveIndex + 2 /* 578 */])(void) = { 0 }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscog-eem.2558]"; +const char *interpreterVersion = "Croquet Closure Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscog-eem.2561]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -31376,7 +31376,6 @@ becomewithtwoWaycopyHash(sqInt array1, sqInt array2, sqInt twoWayFlag, sqInt cop } } /* begin postBecomeAction: */ - /* send of break elided */; cogitPostGCAction(GIV(gcMode)); /* begin nilUncoggableMethods */ GIV(lastCoggableInterpretedBlockMethod) = (GIV(lastUncoggableInterpretedBlockMethod) = null); @@ -32476,7 +32475,7 @@ eeInstantiateSmallClassnumSlots(sqInt classPointer, sqInt numSlots) { DECL_MAYBE_SQ_GLOBAL_STRUCT usqInt hash; int hdrSize; - usqInt header1; + sqInt header1; sqInt header2; usqInt newChunk; usqInt newFreeStart; diff --git a/src/vm/gcc3x-cointerpmt.c b/src/vm/gcc3x-cointerpmt.c index 57f80c6024..9055cd925c 100644 --- a/src/vm/gcc3x-cointerpmt.c +++ b/src/vm/gcc3x-cointerpmt.c @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 from - CoInterpreterMT VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b + CoInterpreterMT VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.2558 uuid: ecd4b81e-cfaa-4167-a8ad-c2ebbb4e460b " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.2561 uuid: 38122521-e0fd-4e4d-9903-8a99a82bac38 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2309,7 +2309,7 @@ static void (*primitiveTable[MaxPrimitiveIndex + 2 /* 578 */])(void) = { 0 }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.2558]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.2561]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -33786,7 +33786,6 @@ becomewithtwoWaycopyHash(sqInt array1, sqInt array2, sqInt twoWayFlag, sqInt cop } } /* begin postBecomeAction: */ - /* send of break elided */; cogitPostGCAction(GIV(gcMode)); /* begin nilUncoggableMethods */ GIV(lastCoggableInterpretedBlockMethod) = (GIV(lastUncoggableInterpretedBlockMethod) = null); @@ -34749,7 +34748,7 @@ static sqInt NoDbgRegParms eeInstantiateMethodContextSlots(sqInt numSlots) { DECL_MAYBE_SQ_GLOBAL_STRUCT usqInt hash; - sqInt header1; + usqInt header1; usqInt newChunk; usqInt newFreeStart; sqInt newObj; @@ -34886,7 +34885,7 @@ eeInstantiateSmallClassnumSlots(sqInt classPointer, sqInt numSlots) { DECL_MAYBE_SQ_GLOBAL_STRUCT usqInt hash; int hdrSize; - sqInt header1; + usqInt header1; sqInt header2; usqInt newChunk; usqInt newFreeStart;