From ff88ad7e8eec8020384fca717c5327056bcf7414 Mon Sep 17 00:00:00 2001 From: nicolas-cellier-aka-nice Date: Mon, 8 Aug 2016 01:13:44 +0200 Subject: [PATCH] Regenerate sources with VMMaker.oscogLLP64-nice.1920 Version 1919 incorrectly use PRIxPTR instead of PRIxSQPTR. The first macro is available in C99 but not included in interp.h. Notice the unwanted sqInt <-> usqInt changes Code generation is not fully reproducible. This is due to type inferencer/inliner which don't allways follow the same path (probably due to unordered method dictionaries) --- nsspur64src/vm/cogit.h | 2 +- nsspur64src/vm/cogitX64.c | 6 +++--- nsspur64src/vm/cogmethod.h | 2 +- nsspur64src/vm/cointerp.c | 28 ++++++++++++------------ nsspur64src/vm/cointerp.h | 2 +- nsspur64src/vm/gcc3x-cointerp.c | 28 ++++++++++++------------ nsspur64src/vm/interp.h | 2 +- nsspur64src/vm/nssendcache.h | 2 +- nsspur64src/vm/vmCallback.h | 2 +- nsspursrc/vm/cogit.h | 2 +- nsspursrc/vm/cogitARMv5.c | 18 ++++++++-------- nsspursrc/vm/cogitIA32.c | 12 +++++------ nsspursrc/vm/cogitMIPSEL.c | 18 ++++++++-------- nsspursrc/vm/cogmethod.h | 2 +- nsspursrc/vm/cointerp.c | 28 ++++++++++++------------ nsspursrc/vm/cointerp.h | 2 +- nsspursrc/vm/gcc3x-cointerp.c | 28 ++++++++++++------------ nsspursrc/vm/interp.h | 2 +- nsspursrc/vm/nssendcache.h | 2 +- nsspursrc/vm/vmCallback.h | 2 +- nsspurstack64src/vm/gcc3x-interp.c | 10 ++++----- nsspurstack64src/vm/interp.c | 10 ++++----- nsspurstack64src/vm/interp.h | 2 +- nsspurstack64src/vm/vmCallback.h | 2 +- nsspurstacksrc/vm/gcc3x-interp.c | 10 ++++----- nsspurstacksrc/vm/interp.c | 10 ++++----- nsspurstacksrc/vm/interp.h | 2 +- nsspurstacksrc/vm/vmCallback.h | 2 +- spur64src/vm/cogit.h | 2 +- spur64src/vm/cogitX64.c | 12 +++++------ spur64src/vm/cogmethod.h | 2 +- spur64src/vm/cointerp.c | 24 ++++++++++----------- spur64src/vm/cointerp.h | 2 +- spur64src/vm/gcc3x-cointerp.c | 24 ++++++++++----------- spur64src/vm/interp.h | 2 +- spur64src/vm/vmCallback.h | 2 +- spursistasrc/vm/cogit.h | 2 +- spursistasrc/vm/cogitARMv5.c | 12 +++++------ spursistasrc/vm/cogitIA32.c | 18 ++++++++-------- spursistasrc/vm/cogitMIPSEL.c | 28 ++++++++++++------------ spursistasrc/vm/cogmethod.h | 2 +- spursistasrc/vm/cointerp.c | 18 ++++++++-------- spursistasrc/vm/cointerp.h | 2 +- spursistasrc/vm/gcc3x-cointerp.c | 18 ++++++++-------- spursistasrc/vm/interp.h | 2 +- spursistasrc/vm/vmCallback.h | 2 +- spursrc/vm/cogit.h | 2 +- spursrc/vm/cogitARMv5.c | 14 ++++++------ spursrc/vm/cogitIA32.c | 10 ++++----- spursrc/vm/cogitMIPSEL.c | 20 +++++++++--------- spursrc/vm/cogmethod.h | 2 +- spursrc/vm/cointerp.c | 26 +++++++++++------------ spursrc/vm/cointerp.h | 2 +- spursrc/vm/gcc3x-cointerp.c | 26 +++++++++++------------ spursrc/vm/interp.h | 2 +- spursrc/vm/vmCallback.h | 2 +- spurstack64src/vm/gcc3x-interp.c | 10 ++++----- spurstack64src/vm/interp.c | 10 ++++----- spurstack64src/vm/interp.h | 2 +- spurstack64src/vm/vmCallback.h | 2 +- spurstacksrc/vm/gcc3x-interp.c | 10 ++++----- spurstacksrc/vm/interp.c | 10 ++++----- spurstacksrc/vm/interp.h | 2 +- spurstacksrc/vm/vmCallback.h | 2 +- src/vm/cogit.h | 2 +- src/vm/cogitARMv5.c | 8 +++---- src/vm/cogitIA32.c | 16 +++++++------- src/vm/cogitMIPSEL.c | 16 +++++++------- src/vm/cogmethod.h | 2 +- src/vm/cointerp.c | 34 +++++++++++++++--------------- src/vm/cointerp.h | 2 +- src/vm/cointerpmt.c | 30 +++++++++++++------------- src/vm/cointerpmt.h | 2 +- src/vm/gcc3x-cointerp.c | 34 +++++++++++++++--------------- src/vm/gcc3x-cointerpmt.c | 30 +++++++++++++------------- src/vm/interp.h | 2 +- src/vm/vmCallback.h | 2 +- stacksrc/vm/gcc3x-interp.c | 10 ++++----- stacksrc/vm/interp.c | 10 ++++----- stacksrc/vm/interp.h | 2 +- stacksrc/vm/vmCallback.h | 2 +- 81 files changed, 385 insertions(+), 385 deletions(-) diff --git a/nsspur64src/vm/cogit.h b/nsspur64src/vm/cogit.h index 1ff82f8ace..0bd41385e6 100644 --- a/nsspur64src/vm/cogit.h +++ b/nsspur64src/vm/cogit.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ diff --git a/nsspur64src/vm/cogitX64.c b/nsspur64src/vm/cogitX64.c index 7c7bd9a037..d3037750d2 100644 --- a/nsspur64src/vm/cogitX64.c +++ b/nsspur64src/vm/cogitX64.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; diff --git a/nsspur64src/vm/cogmethod.h b/nsspur64src/vm/cogmethod.h index 6e0a484438..ee4b11f5c2 100644 --- a/nsspur64src/vm/cogmethod.h +++ b/nsspur64src/vm/cogmethod.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ typedef struct { diff --git a/nsspur64src/vm/cointerp.c b/nsspur64src/vm/cointerp.c index 73d339cf90..ddec4a454f 100644 --- a/nsspur64src/vm/cointerp.c +++ b/nsspur64src/vm/cointerp.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - CoInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CoInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2456,7 +2456,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 577 */] }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscogLLP64-nice.1919"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscogLLP64-nice.1920"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -17723,7 +17723,7 @@ checkStackIntegrity(void) sqInt i; sqInt methodField; sqInt ok; - sqInt oop; + usqInt oop; char *theFP; StackPage *thePage; char *theSP; @@ -23811,7 +23811,7 @@ printFrameWithSP(char *theFP, char *theSP) usqInt index; sqInt methodField; usqInt numArgs; - usqInt numTemps; + sqInt numTemps; char *rcvrAddress; sqInt rcvrOrClosure; sqInt theMethod; @@ -34812,7 +34812,7 @@ primitiveImmediateAsInteger(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt oop; char *sp; - sqInt value; + usqInt value; value = 0; oop = longAt(GIV(stackPointer)); @@ -42822,7 +42822,7 @@ changeClassOfto(sqInt rcvr, sqInt argClass) sqInt fmt; usqInt instBytes; sqInt instFormat; - sqInt newFormat; + usqInt newFormat; sqInt normalizedInstFormat; usqInt numBytes; usqInt numSlots; @@ -42991,7 +42991,7 @@ changeClassOfto(sqInt rcvr, sqInt argClass) /* begin set:classIndexTo:formatTo: */ assert(((classIndex >= 0) && (classIndex <= (classIndexMask())))); assert(((newFormat >= 0) && (newFormat <= (formatMask())))); - longAtput(rcvr, ((longAt(rcvr)) & (~((((sqInt)((usqInt)((formatMask())) << (formatShift())))) + (classIndexMask())))) + (classIndex + (((sqInt)((usqInt)(newFormat) << (formatShift())))))); + longAtput(rcvr, ((longAt(rcvr)) & (~((((sqInt)((usqInt)((formatMask())) << (formatShift())))) + (classIndexMask())))) + (classIndex + (newFormat << (formatShift())))); return 0; } @@ -49993,7 +49993,7 @@ eliminateAndFreeForwardersForPigCompact(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt address; sqInt address1; - usqInt bytes; + sqInt bytes; sqInt endOfFreeRun; sqInt f; sqInt firstOfFreeRun; @@ -61694,7 +61694,7 @@ maybeSplObj(sqInt index) static sqInt NoDbgRegParms moveARunOfObjectsStartingAtupTo(usqInt startAddress, usqInt limit) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt chunkBytes; + usqInt chunkBytes; sqInt classIndex; sqInt classIndex1; sqInt dest; @@ -67539,7 +67539,7 @@ static void NoDbgRegParms bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { usqInt bridgeSpan; - usqInt clifton; + sqInt clifton; usqInt segEnd; segEnd = ((aSegment->segSize)) + ((aSegment->segStart)); @@ -68126,8 +68126,8 @@ writeSegmentnextSegmenttoFile(SpurSegmentInfo *segment, SpurSegmentInfo *nextSeg { usqLong firstSavedBridgeWord; sqInt nWritten; - sqInt pier1; - sqInt pier2; + usqInt pier1; + usqInt pier2; usqLong secondSavedBridgeWord; pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); diff --git a/nsspur64src/vm/cointerp.h b/nsspur64src/vm/cointerp.h index 5c1a1483d7..e4368fe3de 100644 --- a/nsspur64src/vm/cointerp.h +++ b/nsspur64src/vm/cointerp.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ diff --git a/nsspur64src/vm/gcc3x-cointerp.c b/nsspur64src/vm/gcc3x-cointerp.c index e4c7f27f7f..4e2ff052ab 100644 --- a/nsspur64src/vm/gcc3x-cointerp.c +++ b/nsspur64src/vm/gcc3x-cointerp.c @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - CoInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CoInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2459,7 +2459,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 577 */] }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscogLLP64-nice.1919"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscogLLP64-nice.1920"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -17732,7 +17732,7 @@ checkStackIntegrity(void) sqInt i; sqInt methodField; sqInt ok; - sqInt oop; + usqInt oop; char *theFP; StackPage *thePage; char *theSP; @@ -23820,7 +23820,7 @@ printFrameWithSP(char *theFP, char *theSP) usqInt index; sqInt methodField; usqInt numArgs; - usqInt numTemps; + sqInt numTemps; char *rcvrAddress; sqInt rcvrOrClosure; sqInt theMethod; @@ -34821,7 +34821,7 @@ primitiveImmediateAsInteger(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt oop; char *sp; - sqInt value; + usqInt value; value = 0; oop = longAt(GIV(stackPointer)); @@ -42831,7 +42831,7 @@ changeClassOfto(sqInt rcvr, sqInt argClass) sqInt fmt; usqInt instBytes; sqInt instFormat; - sqInt newFormat; + usqInt newFormat; sqInt normalizedInstFormat; usqInt numBytes; usqInt numSlots; @@ -43000,7 +43000,7 @@ changeClassOfto(sqInt rcvr, sqInt argClass) /* begin set:classIndexTo:formatTo: */ assert(((classIndex >= 0) && (classIndex <= (classIndexMask())))); assert(((newFormat >= 0) && (newFormat <= (formatMask())))); - longAtput(rcvr, ((longAt(rcvr)) & (~((((sqInt)((usqInt)((formatMask())) << (formatShift())))) + (classIndexMask())))) + (classIndex + (((sqInt)((usqInt)(newFormat) << (formatShift())))))); + longAtput(rcvr, ((longAt(rcvr)) & (~((((sqInt)((usqInt)((formatMask())) << (formatShift())))) + (classIndexMask())))) + (classIndex + (newFormat << (formatShift())))); return 0; } @@ -50002,7 +50002,7 @@ eliminateAndFreeForwardersForPigCompact(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt address; sqInt address1; - usqInt bytes; + sqInt bytes; sqInt endOfFreeRun; sqInt f; sqInt firstOfFreeRun; @@ -61703,7 +61703,7 @@ maybeSplObj(sqInt index) static sqInt NoDbgRegParms moveARunOfObjectsStartingAtupTo(usqInt startAddress, usqInt limit) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt chunkBytes; + usqInt chunkBytes; sqInt classIndex; sqInt classIndex1; sqInt dest; @@ -67548,7 +67548,7 @@ static void NoDbgRegParms bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { usqInt bridgeSpan; - usqInt clifton; + sqInt clifton; usqInt segEnd; segEnd = ((aSegment->segSize)) + ((aSegment->segStart)); @@ -68135,8 +68135,8 @@ writeSegmentnextSegmenttoFile(SpurSegmentInfo *segment, SpurSegmentInfo *nextSeg { usqLong firstSavedBridgeWord; sqInt nWritten; - sqInt pier1; - sqInt pier2; + usqInt pier1; + usqInt pier2; usqLong secondSavedBridgeWord; pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); diff --git a/nsspur64src/vm/interp.h b/nsspur64src/vm/interp.h index a339e161b4..6a002ade13 100644 --- a/nsspur64src/vm/interp.h +++ b/nsspur64src/vm/interp.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ #define VM_PROXY_MAJOR 1 diff --git a/nsspur64src/vm/nssendcache.h b/nsspur64src/vm/nssendcache.h index 33b8a87d63..06e1462c76 100644 --- a/nsspur64src/vm/nssendcache.h +++ b/nsspur64src/vm/nssendcache.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ typedef struct { diff --git a/nsspur64src/vm/vmCallback.h b/nsspur64src/vm/vmCallback.h index 421c4e448a..6ccb4003fd 100644 --- a/nsspur64src/vm/vmCallback.h +++ b/nsspur64src/vm/vmCallback.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ #define VM_CALLBACK_INC 1 diff --git a/nsspursrc/vm/cogit.h b/nsspursrc/vm/cogit.h index 1ff82f8ace..0bd41385e6 100644 --- a/nsspursrc/vm/cogit.h +++ b/nsspursrc/vm/cogit.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ diff --git a/nsspursrc/vm/cogitARMv5.c b/nsspursrc/vm/cogitARMv5.c index db8a5410ab..6b850e9c43 100644 --- a/nsspursrc/vm/cogitARMv5.c +++ b/nsspursrc/vm/cogitARMv5.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -709,7 +709,7 @@ static AbstractInstruction * NoDbgRegParms gMoveCwR(sqInt wordConstant, sqInt re static AbstractInstruction * NoDbgRegParms gMoveMwrR(sqInt offset, sqInt baseReg, sqInt destReg); static AbstractInstruction * NoDbgRegParms gMoveRMwr(sqInt sourceReg, sqInt offset, sqInt baseReg); static AbstractInstruction * NoDbgRegParms gMoveRR(sqInt reg1, sqInt reg2); -static sqInt NoDbgRegParms mapEndFor(CogMethod *cogMethod); +static usqInt NoDbgRegParms mapEndFor(CogMethod *cogMethod); static sqInt NoDbgRegParms mapForperformUntilarg(CogMethod *cogMethod, sqInt (*functionSymbol)(sqInt annotation, char *mcpc, sqInt arg), sqInt arg); static sqInt NoDbgRegParms mapObjectReferencesInClosedPIC(CogMethod *cPIC); static void mapObjectReferencesInGeneratedRuntime(void); @@ -7517,7 +7517,7 @@ static sqInt NoDbgRegParms blockDispatchTargetsForperformarg(CogMethod *cogMethod, usqInt (*binaryFunction)(sqInt mcpc, sqInt arg), sqInt arg) { sqInt blockEntry; - sqInt end; + usqInt end; sqInt pc; sqInt result; usqInt targetpc; @@ -7561,7 +7561,7 @@ bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod) sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - sqInt endbcpc; + usqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -12044,7 +12044,7 @@ gMoveRR(sqInt reg1, sqInt reg2) /* Answer the address of the null byte at the end of the method map. */ /* Cogit>>#mapEndFor: */ -static sqInt NoDbgRegParms +static usqInt NoDbgRegParms mapEndFor(CogMethod *cogMethod) { usqInt end; @@ -13104,7 +13104,7 @@ mcPCForBackwardBranchstartBcpcin(sqInt bcpc, sqInt startbcpc, CogBlockMethod *co sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - sqInt endbcpc; + usqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -24992,7 +24992,7 @@ mapPCDataForinto(CogMethod *cogMethod, sqInt arrayObj) CogBlockMethod *cogMethod1; BytecodeDescriptor *descriptor; sqInt distance; - sqInt endbcpc; + usqInt endbcpc; sqInt errCode; CogMethod *homeMethod; sqInt isBackwardBranch; diff --git a/nsspursrc/vm/cogitIA32.c b/nsspursrc/vm/cogitIA32.c index 4828e2499f..3de08359b2 100644 --- a/nsspursrc/vm/cogitIA32.c +++ b/nsspursrc/vm/cogitIA32.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -6679,7 +6679,7 @@ bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod) sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -12065,7 +12065,7 @@ mcPCForBackwardBranchstartBcpcin(sqInt bcpc, sqInt startbcpc, CogBlockMethod *co sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -22174,7 +22174,7 @@ mapPCDataForinto(CogMethod *cogMethod, sqInt arrayObj) CogBlockMethod *cogMethod1; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; sqInt errCode; CogMethod *homeMethod; sqInt isBackwardBranch; diff --git a/nsspursrc/vm/cogitMIPSEL.c b/nsspursrc/vm/cogitMIPSEL.c index b7f838afd6..e72e7ac188 100644 --- a/nsspursrc/vm/cogitMIPSEL.c +++ b/nsspursrc/vm/cogitMIPSEL.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -2679,7 +2679,7 @@ bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod) sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -8075,7 +8075,7 @@ mcPCForBackwardBranchstartBcpcin(sqInt bcpc, sqInt startbcpc, CogBlockMethod *co sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -8751,7 +8751,7 @@ static void NoDbgRegParms relocateCallsInClosedPIC(CogMethod *cPIC) { sqLong callDelta; - usqInt entryPoint; + sqInt entryPoint; sqInt i; sqInt pc; sqLong refDelta; @@ -8801,7 +8801,7 @@ relocateIfCallOrMethodReferencemcpcdelta(sqInt annotation, char *mcpc, sqInt ref { usqInt cacheAddress; sqInt callDelta; - usqInt entryPoint; + sqInt entryPoint; usqInt entryPoint1; char *mcpc1; NSSendCache *nsSendCache; @@ -9621,7 +9621,7 @@ static sqInt NoDbgRegParms unlinkIfLinkedSendpcto(sqInt annotation, char *mcpc, sqInt theCogMethod) { usqInt cacheAddress; - usqInt entryPoint; + sqInt entryPoint; usqInt entryPoint1; char *mcpc1; NSSendCache *nsSendCache; @@ -22323,7 +22323,7 @@ mapPCDataForinto(CogMethod *cogMethod, sqInt arrayObj) CogBlockMethod *cogMethod1; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; sqInt errCode; CogMethod *homeMethod; sqInt isBackwardBranch; diff --git a/nsspursrc/vm/cogmethod.h b/nsspursrc/vm/cogmethod.h index 6e0a484438..ee4b11f5c2 100644 --- a/nsspursrc/vm/cogmethod.h +++ b/nsspursrc/vm/cogmethod.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ typedef struct { diff --git a/nsspursrc/vm/cointerp.c b/nsspursrc/vm/cointerp.c index 24b71c444a..49074efc2e 100644 --- a/nsspursrc/vm/cointerp.c +++ b/nsspursrc/vm/cointerp.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - CoInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CoInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2432,7 +2432,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 577 */] }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscogLLP64-nice.1919"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscogLLP64-nice.1920"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -23059,7 +23059,7 @@ printFrameWithSP(char *theFP, char *theSP) char *rcvrAddress; sqInt rcvrOrClosure; sqInt theMethod; - usqInt theMethodEnd; + sqInt theMethodEnd; sqInt topThing; if (!((((((usqInt)theFP)) & (BytesPerWord - 1)) == 0) @@ -34737,7 +34737,7 @@ primitiveImmediateAsInteger(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt oop; char *sp; - usqInt value; + sqInt value; value = 0; oop = longAt(GIV(stackPointer)); @@ -41847,7 +41847,7 @@ changeClassOfto(sqInt rcvr, sqInt argClass) sqInt fmt; usqInt instBytes; sqInt instFormat; - usqInt newFormat; + sqInt newFormat; sqInt normalizedInstFormat; usqInt numBytes; usqInt numSlots; @@ -42014,7 +42014,7 @@ changeClassOfto(sqInt rcvr, sqInt argClass) assert(((classIndex >= 0) && (classIndex <= (classIndexMask())))); assert(((newFormat >= 0) && (newFormat <= (formatMask())))); flag("endianness"); - longAtput(rcvr, ((longAt(rcvr)) & ((unsigned int)~((((sqInt)((usqInt)((formatMask())) << (formatShift())))) + (classIndexMask())))) + (classIndex + (newFormat << (formatShift())))); + longAtput(rcvr, ((longAt(rcvr)) & ((unsigned int)~((((sqInt)((usqInt)((formatMask())) << (formatShift())))) + (classIndexMask())))) + (classIndex + (((sqInt)((usqInt)(newFormat) << (formatShift())))))); return 0; } @@ -43741,7 +43741,7 @@ scavengeFutureSurvivorSpaceStartingAt(sqInt initialAddress) usqInt numSlots1; usqInt numSlots2; sqInt obj; - sqInt ptr; + usqInt ptr; usqInt slotBytes; ptr = initialAddress; @@ -48932,7 +48932,7 @@ eliminateAndFreeForwardersForPigCompact(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt address; sqInt address1; - sqInt bytes; + usqInt bytes; sqInt endOfFreeRun; sqInt f; sqInt firstOfFreeRun; @@ -60438,7 +60438,7 @@ maybeSplObj(sqInt index) static sqInt NoDbgRegParms moveARunOfObjectsStartingAtupTo(usqInt startAddress, usqInt limit) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt chunkBytes; + usqInt chunkBytes; sqInt classIndex; sqInt classIndex1; sqInt dest; @@ -66264,7 +66264,7 @@ static void NoDbgRegParms bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { usqInt bridgeSpan; - sqInt clifton; + usqInt clifton; usqInt segEnd; segEnd = ((aSegment->segSize)) + ((aSegment->segStart)); @@ -66851,8 +66851,8 @@ writeSegmentnextSegmenttoFile(SpurSegmentInfo *segment, SpurSegmentInfo *nextSeg { usqLong firstSavedBridgeWord; sqInt nWritten; - sqInt pier1; - sqInt pier2; + usqInt pier1; + usqInt pier2; usqLong secondSavedBridgeWord; pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); diff --git a/nsspursrc/vm/cointerp.h b/nsspursrc/vm/cointerp.h index f26426b1ce..06931ff605 100644 --- a/nsspursrc/vm/cointerp.h +++ b/nsspursrc/vm/cointerp.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ diff --git a/nsspursrc/vm/gcc3x-cointerp.c b/nsspursrc/vm/gcc3x-cointerp.c index 380961ce0b..cdfbcd2ba4 100644 --- a/nsspursrc/vm/gcc3x-cointerp.c +++ b/nsspursrc/vm/gcc3x-cointerp.c @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - CoInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CoInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2435,7 +2435,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 577 */] }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscogLLP64-nice.1919"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscogLLP64-nice.1920"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -23068,7 +23068,7 @@ printFrameWithSP(char *theFP, char *theSP) char *rcvrAddress; sqInt rcvrOrClosure; sqInt theMethod; - usqInt theMethodEnd; + sqInt theMethodEnd; sqInt topThing; if (!((((((usqInt)theFP)) & (BytesPerWord - 1)) == 0) @@ -34746,7 +34746,7 @@ primitiveImmediateAsInteger(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt oop; char *sp; - usqInt value; + sqInt value; value = 0; oop = longAt(GIV(stackPointer)); @@ -41856,7 +41856,7 @@ changeClassOfto(sqInt rcvr, sqInt argClass) sqInt fmt; usqInt instBytes; sqInt instFormat; - usqInt newFormat; + sqInt newFormat; sqInt normalizedInstFormat; usqInt numBytes; usqInt numSlots; @@ -42023,7 +42023,7 @@ changeClassOfto(sqInt rcvr, sqInt argClass) assert(((classIndex >= 0) && (classIndex <= (classIndexMask())))); assert(((newFormat >= 0) && (newFormat <= (formatMask())))); flag("endianness"); - longAtput(rcvr, ((longAt(rcvr)) & ((unsigned int)~((((sqInt)((usqInt)((formatMask())) << (formatShift())))) + (classIndexMask())))) + (classIndex + (newFormat << (formatShift())))); + longAtput(rcvr, ((longAt(rcvr)) & ((unsigned int)~((((sqInt)((usqInt)((formatMask())) << (formatShift())))) + (classIndexMask())))) + (classIndex + (((sqInt)((usqInt)(newFormat) << (formatShift())))))); return 0; } @@ -43750,7 +43750,7 @@ scavengeFutureSurvivorSpaceStartingAt(sqInt initialAddress) usqInt numSlots1; usqInt numSlots2; sqInt obj; - sqInt ptr; + usqInt ptr; usqInt slotBytes; ptr = initialAddress; @@ -48941,7 +48941,7 @@ eliminateAndFreeForwardersForPigCompact(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt address; sqInt address1; - sqInt bytes; + usqInt bytes; sqInt endOfFreeRun; sqInt f; sqInt firstOfFreeRun; @@ -60447,7 +60447,7 @@ maybeSplObj(sqInt index) static sqInt NoDbgRegParms moveARunOfObjectsStartingAtupTo(usqInt startAddress, usqInt limit) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt chunkBytes; + usqInt chunkBytes; sqInt classIndex; sqInt classIndex1; sqInt dest; @@ -66273,7 +66273,7 @@ static void NoDbgRegParms bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { usqInt bridgeSpan; - sqInt clifton; + usqInt clifton; usqInt segEnd; segEnd = ((aSegment->segSize)) + ((aSegment->segStart)); @@ -66860,8 +66860,8 @@ writeSegmentnextSegmenttoFile(SpurSegmentInfo *segment, SpurSegmentInfo *nextSeg { usqLong firstSavedBridgeWord; sqInt nWritten; - sqInt pier1; - sqInt pier2; + usqInt pier1; + usqInt pier2; usqLong secondSavedBridgeWord; pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); diff --git a/nsspursrc/vm/interp.h b/nsspursrc/vm/interp.h index 2a7a982125..a976b7caf0 100644 --- a/nsspursrc/vm/interp.h +++ b/nsspursrc/vm/interp.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ #define VM_PROXY_MAJOR 1 diff --git a/nsspursrc/vm/nssendcache.h b/nsspursrc/vm/nssendcache.h index 33b8a87d63..06e1462c76 100644 --- a/nsspursrc/vm/nssendcache.h +++ b/nsspursrc/vm/nssendcache.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ typedef struct { diff --git a/nsspursrc/vm/vmCallback.h b/nsspursrc/vm/vmCallback.h index 421c4e448a..6ccb4003fd 100644 --- a/nsspursrc/vm/vmCallback.h +++ b/nsspursrc/vm/vmCallback.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ #define VM_CALLBACK_INC 1 diff --git a/nsspurstack64src/vm/gcc3x-interp.c b/nsspurstack64src/vm/gcc3x-interp.c index 55bf868e11..42034b0fe3 100644 --- a/nsspurstack64src/vm/gcc3x-interp.c +++ b/nsspurstack64src/vm/gcc3x-interp.c @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - StackInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + StackInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2196,7 +2196,7 @@ static void (*primitiveTable[MaxPrimitiveIndex + 2 /* 577 */])(void) = { 0 }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscogLLP64-nice.1919"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscogLLP64-nice.1920"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -65694,7 +65694,7 @@ printMethodCacheFor(sqInt thing) /* begin tab */ putchar(' '); if (((((usqInt)(longAt(s))) >> (formatShift())) & (formatMask())) >= (firstByteFormat())) { - printf("%" PRIxPTR " %.*s\n", s, (int)(numBytesOf(s)), (char *)firstIndexableField(s)); + printf("%" PRIxSQPTR " %.*s\n", s, (int)(numBytesOf(s)), (char *)firstIndexableField(s)); } else { shortPrintOop(s); diff --git a/nsspurstack64src/vm/interp.c b/nsspurstack64src/vm/interp.c index ada4daaa93..0fc76fb708 100644 --- a/nsspurstack64src/vm/interp.c +++ b/nsspurstack64src/vm/interp.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - StackInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + StackInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2193,7 +2193,7 @@ static void (*primitiveTable[MaxPrimitiveIndex + 2 /* 577 */])(void) = { 0 }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscogLLP64-nice.1919"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscogLLP64-nice.1920"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -65685,7 +65685,7 @@ printMethodCacheFor(sqInt thing) /* begin tab */ putchar(' '); if (((((usqInt)(longAt(s))) >> (formatShift())) & (formatMask())) >= (firstByteFormat())) { - printf("%" PRIxPTR " %.*s\n", s, (int)(numBytesOf(s)), (char *)firstIndexableField(s)); + printf("%" PRIxSQPTR " %.*s\n", s, (int)(numBytesOf(s)), (char *)firstIndexableField(s)); } else { shortPrintOop(s); diff --git a/nsspurstack64src/vm/interp.h b/nsspurstack64src/vm/interp.h index 7f50650137..f080e96d68 100644 --- a/nsspurstack64src/vm/interp.h +++ b/nsspurstack64src/vm/interp.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ #define VM_PROXY_MAJOR 1 diff --git a/nsspurstack64src/vm/vmCallback.h b/nsspurstack64src/vm/vmCallback.h index 421c4e448a..6ccb4003fd 100644 --- a/nsspurstack64src/vm/vmCallback.h +++ b/nsspurstack64src/vm/vmCallback.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ #define VM_CALLBACK_INC 1 diff --git a/nsspurstacksrc/vm/gcc3x-interp.c b/nsspurstacksrc/vm/gcc3x-interp.c index 3800241d62..a462d34136 100644 --- a/nsspurstacksrc/vm/gcc3x-interp.c +++ b/nsspurstacksrc/vm/gcc3x-interp.c @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - StackInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + StackInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2173,7 +2173,7 @@ static void (*primitiveTable[MaxPrimitiveIndex + 2 /* 577 */])(void) = { 0 }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscogLLP64-nice.1919"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscogLLP64-nice.1920"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -64249,7 +64249,7 @@ printMethodCacheFor(sqInt thing) /* begin tab */ putchar(' '); if (((((usqInt)(longAt(s))) >> (formatShift())) & (formatMask())) >= (firstByteFormat())) { - printf("%" PRIxPTR " %.*s\n", s, (int)(numBytesOf(s)), (char *)firstIndexableField(s)); + printf("%" PRIxSQPTR " %.*s\n", s, (int)(numBytesOf(s)), (char *)firstIndexableField(s)); } else { shortPrintOop(s); diff --git a/nsspurstacksrc/vm/interp.c b/nsspurstacksrc/vm/interp.c index b8df407dc7..464ace51ab 100644 --- a/nsspurstacksrc/vm/interp.c +++ b/nsspurstacksrc/vm/interp.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - StackInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + StackInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2170,7 +2170,7 @@ static void (*primitiveTable[MaxPrimitiveIndex + 2 /* 577 */])(void) = { 0 }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscogLLP64-nice.1919"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscogLLP64-nice.1920"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -64240,7 +64240,7 @@ printMethodCacheFor(sqInt thing) /* begin tab */ putchar(' '); if (((((usqInt)(longAt(s))) >> (formatShift())) & (formatMask())) >= (firstByteFormat())) { - printf("%" PRIxPTR " %.*s\n", s, (int)(numBytesOf(s)), (char *)firstIndexableField(s)); + printf("%" PRIxSQPTR " %.*s\n", s, (int)(numBytesOf(s)), (char *)firstIndexableField(s)); } else { shortPrintOop(s); diff --git a/nsspurstacksrc/vm/interp.h b/nsspurstacksrc/vm/interp.h index a50cb7b170..5fa7a8bc1a 100644 --- a/nsspurstacksrc/vm/interp.h +++ b/nsspurstacksrc/vm/interp.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ #define VM_PROXY_MAJOR 1 diff --git a/nsspurstacksrc/vm/vmCallback.h b/nsspurstacksrc/vm/vmCallback.h index 421c4e448a..6ccb4003fd 100644 --- a/nsspurstacksrc/vm/vmCallback.h +++ b/nsspurstacksrc/vm/vmCallback.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ #define VM_CALLBACK_INC 1 diff --git a/spur64src/vm/cogit.h b/spur64src/vm/cogit.h index 47e4be4f30..db2cef5cb0 100644 --- a/spur64src/vm/cogit.h +++ b/spur64src/vm/cogit.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ diff --git a/spur64src/vm/cogitX64.c b/spur64src/vm/cogitX64.c index bf517d8773..d6cf23fdd2 100644 --- a/spur64src/vm/cogitX64.c +++ b/spur64src/vm/cogitX64.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -2473,7 +2473,7 @@ bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod) sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - sqInt endbcpc; + usqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -7494,7 +7494,7 @@ mcPCForBackwardBranchstartBcpcin(sqInt bcpc, sqInt startbcpc, CogBlockMethod *co sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - sqInt endbcpc; + usqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -21119,7 +21119,7 @@ mapPCDataForinto(CogMethod *cogMethod, sqInt arrayObj) CogBlockMethod *cogMethod1; BytecodeDescriptor *descriptor; sqInt distance; - sqInt endbcpc; + usqInt endbcpc; sqInt errCode; CogMethod *homeMethod; sqInt isBackwardBranch; diff --git a/spur64src/vm/cogmethod.h b/spur64src/vm/cogmethod.h index 4f8f90c26f..60511754f3 100644 --- a/spur64src/vm/cogmethod.h +++ b/spur64src/vm/cogmethod.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ typedef struct { diff --git a/spur64src/vm/cointerp.c b/spur64src/vm/cointerp.c index f860486b0a..6daf57d284 100644 --- a/spur64src/vm/cointerp.c +++ b/spur64src/vm/cointerp.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - CoInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CoInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2419,7 +2419,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 577 */] }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscogLLP64-nice.1919]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscogLLP64-nice.1920]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -17784,11 +17784,11 @@ printFrameWithSP(char *theFP, char *theSP) usqInt index; sqInt methodField; usqInt numArgs; - sqInt numTemps; + usqInt numTemps; char *rcvrAddress; sqInt rcvrOrClosure; sqInt theMethod; - usqInt theMethodEnd; + sqInt theMethodEnd; sqInt topThing; if (!((((((usqInt)theFP)) & (BytesPerWord - 1)) == 0) @@ -36788,7 +36788,7 @@ changeClassOfto(sqInt rcvr, sqInt argClass) sqInt fmt; usqInt instBytes; sqInt instFormat; - sqInt newFormat; + usqInt newFormat; sqInt normalizedInstFormat; usqInt numBytes; usqInt numSlots; @@ -36957,7 +36957,7 @@ changeClassOfto(sqInt rcvr, sqInt argClass) /* begin set:classIndexTo:formatTo: */ assert(((classIndex >= 0) && (classIndex <= (classIndexMask())))); assert(((newFormat >= 0) && (newFormat <= (formatMask())))); - longAtput(rcvr, ((longAt(rcvr)) & (~((((sqInt)((usqInt)((formatMask())) << (formatShift())))) + (classIndexMask())))) + (classIndex + (((sqInt)((usqInt)(newFormat) << (formatShift())))))); + longAtput(rcvr, ((longAt(rcvr)) & (~((((sqInt)((usqInt)((formatMask())) << (formatShift())))) + (classIndexMask())))) + (classIndex + (newFormat << (formatShift())))); return 0; } @@ -38779,7 +38779,7 @@ scavengeFutureSurvivorSpaceStartingAt(sqInt initialAddress) usqInt numSlots1; usqInt numSlots2; sqInt obj; - sqInt ptr; + usqInt ptr; usqInt slotBytes; ptr = initialAddress; @@ -43959,7 +43959,7 @@ eliminateAndFreeForwardersForPigCompact(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt address; sqInt address1; - sqInt bytes; + usqInt bytes; sqInt endOfFreeRun; sqInt f; sqInt firstOfFreeRun; @@ -55660,7 +55660,7 @@ maybeSplObj(sqInt index) static sqInt NoDbgRegParms moveARunOfObjectsStartingAtupTo(usqInt startAddress, usqInt limit) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt chunkBytes; + usqInt chunkBytes; sqInt classIndex; sqInt classIndex1; sqInt dest; @@ -61666,7 +61666,7 @@ nextNonEmptySegmentAfter(sqInt i) static void postSnapshot(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt address; + sqInt address; sqInt bytes; usqInt freeChunk; sqInt i; diff --git a/spur64src/vm/cointerp.h b/spur64src/vm/cointerp.h index a9eb3949da..462885972b 100644 --- a/spur64src/vm/cointerp.h +++ b/spur64src/vm/cointerp.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ diff --git a/spur64src/vm/gcc3x-cointerp.c b/spur64src/vm/gcc3x-cointerp.c index caee82a65a..5d5691b86b 100644 --- a/spur64src/vm/gcc3x-cointerp.c +++ b/spur64src/vm/gcc3x-cointerp.c @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - CoInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CoInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2422,7 +2422,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 577 */] }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscogLLP64-nice.1919]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscogLLP64-nice.1920]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -17793,11 +17793,11 @@ printFrameWithSP(char *theFP, char *theSP) usqInt index; sqInt methodField; usqInt numArgs; - sqInt numTemps; + usqInt numTemps; char *rcvrAddress; sqInt rcvrOrClosure; sqInt theMethod; - usqInt theMethodEnd; + sqInt theMethodEnd; sqInt topThing; if (!((((((usqInt)theFP)) & (BytesPerWord - 1)) == 0) @@ -36797,7 +36797,7 @@ changeClassOfto(sqInt rcvr, sqInt argClass) sqInt fmt; usqInt instBytes; sqInt instFormat; - sqInt newFormat; + usqInt newFormat; sqInt normalizedInstFormat; usqInt numBytes; usqInt numSlots; @@ -36966,7 +36966,7 @@ changeClassOfto(sqInt rcvr, sqInt argClass) /* begin set:classIndexTo:formatTo: */ assert(((classIndex >= 0) && (classIndex <= (classIndexMask())))); assert(((newFormat >= 0) && (newFormat <= (formatMask())))); - longAtput(rcvr, ((longAt(rcvr)) & (~((((sqInt)((usqInt)((formatMask())) << (formatShift())))) + (classIndexMask())))) + (classIndex + (((sqInt)((usqInt)(newFormat) << (formatShift())))))); + longAtput(rcvr, ((longAt(rcvr)) & (~((((sqInt)((usqInt)((formatMask())) << (formatShift())))) + (classIndexMask())))) + (classIndex + (newFormat << (formatShift())))); return 0; } @@ -38788,7 +38788,7 @@ scavengeFutureSurvivorSpaceStartingAt(sqInt initialAddress) usqInt numSlots1; usqInt numSlots2; sqInt obj; - sqInt ptr; + usqInt ptr; usqInt slotBytes; ptr = initialAddress; @@ -43968,7 +43968,7 @@ eliminateAndFreeForwardersForPigCompact(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt address; sqInt address1; - sqInt bytes; + usqInt bytes; sqInt endOfFreeRun; sqInt f; sqInt firstOfFreeRun; @@ -55669,7 +55669,7 @@ maybeSplObj(sqInt index) static sqInt NoDbgRegParms moveARunOfObjectsStartingAtupTo(usqInt startAddress, usqInt limit) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt chunkBytes; + usqInt chunkBytes; sqInt classIndex; sqInt classIndex1; sqInt dest; @@ -61675,7 +61675,7 @@ nextNonEmptySegmentAfter(sqInt i) static void postSnapshot(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt address; + sqInt address; sqInt bytes; usqInt freeChunk; sqInt i; diff --git a/spur64src/vm/interp.h b/spur64src/vm/interp.h index c7bfd2cd13..5f0081427e 100644 --- a/spur64src/vm/interp.h +++ b/spur64src/vm/interp.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ #define VM_PROXY_MAJOR 1 diff --git a/spur64src/vm/vmCallback.h b/spur64src/vm/vmCallback.h index 421c4e448a..6ccb4003fd 100644 --- a/spur64src/vm/vmCallback.h +++ b/spur64src/vm/vmCallback.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ #define VM_CALLBACK_INC 1 diff --git a/spursistasrc/vm/cogit.h b/spursistasrc/vm/cogit.h index d9fe10f968..26270af1b0 100644 --- a/spursistasrc/vm/cogit.h +++ b/spursistasrc/vm/cogit.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ diff --git a/spursistasrc/vm/cogitARMv5.c b/spursistasrc/vm/cogitARMv5.c index 00b36751f3..6299dd076c 100644 --- a/spursistasrc/vm/cogitARMv5.c +++ b/spursistasrc/vm/cogitARMv5.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - SistaCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + SistaCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "SistaCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "SistaCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -10820,12 +10820,12 @@ static sqInt NoDbgRegParms generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - usqIntptr_t delta; + sqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - usqIntptr_t location; - usqIntptr_t mapEntry; + sqInt location; + sqInt mapEntry; sqInt maxDelta; usqIntptr_t mcpc; diff --git a/spursistasrc/vm/cogitIA32.c b/spursistasrc/vm/cogitIA32.c index e3fd43dfea..fb0e6d4932 100644 --- a/spursistasrc/vm/cogitIA32.c +++ b/spursistasrc/vm/cogitIA32.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - SistaCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + SistaCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "SistaCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "SistaCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -6653,7 +6653,7 @@ static sqInt NoDbgRegParms blockDispatchTargetsForperformarg(CogMethod *cogMethod, usqInt (*binaryFunction)(sqInt mcpc, sqInt arg), sqInt arg) { sqInt blockEntry; - usqInt end; + sqInt end; sqInt pc; sqInt result; usqInt targetpc; @@ -6697,7 +6697,7 @@ bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod) sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -11771,7 +11771,7 @@ mcPCForBackwardBranchstartBcpcin(sqInt bcpc, sqInt startbcpc, CogBlockMethod *co sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -21420,7 +21420,7 @@ mapPCDataForinto(CogMethod *cogMethod, sqInt arrayObj) CogBlockMethod *cogMethod1; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; sqInt errCode; CogMethod *homeMethod; sqInt isBackwardBranch; @@ -24340,7 +24340,7 @@ picDataForBlockEntryMethod(sqInt blockEntryMcpc, sqInt cogMethod) CogBlockMethod *cogBlockMethod; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -24661,7 +24661,7 @@ picDataForinto(CogMethod *cogMethod, sqInt arrayObj) CogBlockMethod *cogMethod1; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; sqInt errCode; CogMethod *homeMethod; sqInt isBackwardBranch; diff --git a/spursistasrc/vm/cogitMIPSEL.c b/spursistasrc/vm/cogitMIPSEL.c index 47813f898b..18666e04ef 100644 --- a/spursistasrc/vm/cogitMIPSEL.c +++ b/spursistasrc/vm/cogitMIPSEL.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - SistaCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + SistaCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "SistaCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "SistaCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -2707,7 +2707,7 @@ bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod) sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - sqInt endbcpc; + usqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -4800,7 +4800,7 @@ cPICHasForwardedClass(CogMethod *cPIC) static sqInt NoDbgRegParms cPICHasFreedTargets(CogMethod *cPIC) { - usqInt entryPoint; + sqInt entryPoint; sqInt i; sqInt pc; CogMethod *targetMethod; @@ -5862,12 +5862,12 @@ static sqInt NoDbgRegParms generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - sqInt delta; + usqIntptr_t delta; sqInt i; AbstractInstruction *instruction; sqInt length; - sqInt location; - sqInt mapEntry; + usqIntptr_t location; + usqIntptr_t mapEntry; sqInt maxDelta; usqIntptr_t mcpc; @@ -7818,7 +7818,7 @@ mcPCForBackwardBranchstartBcpcin(sqInt bcpc, sqInt startbcpc, CogBlockMethod *co sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - sqInt endbcpc; + usqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -14178,7 +14178,7 @@ relocateCallBeforeReturnPCby(AbstractInstruction * self_in_relocateCallBeforeRet static AbstractInstruction * NoDbgRegParms relocateJumpLongBeforeFollowingAddressby(AbstractInstruction * self_in_relocateJumpLongBeforeFollowingAddressby, sqInt pc, sqInt delta) { - sqInt newTarget; + usqInt newTarget; usqInt oldTarget; assert((delta % 4) == 0); @@ -14231,7 +14231,7 @@ relocateJumpLongConditionalBeforeFollowingAddressby(AbstractInstruction * self_i static AbstractInstruction * NoDbgRegParms relocateMethodReferenceBeforeAddressby(AbstractInstruction * self_in_relocateMethodReferenceBeforeAddressby, sqInt pc, sqInt delta) { - sqInt newValue; + usqInt newValue; usqInt oldValue; if (((opcodeAtAddress(self_in_relocateMethodReferenceBeforeAddressby, pc - 8)) == ADDIU) @@ -21582,7 +21582,7 @@ mapPCDataForinto(CogMethod *cogMethod, sqInt arrayObj) CogBlockMethod *cogMethod1; BytecodeDescriptor *descriptor; sqInt distance; - sqInt endbcpc; + usqInt endbcpc; sqInt errCode; CogMethod *homeMethod; sqInt isBackwardBranch; @@ -24491,7 +24491,7 @@ picDataForBlockEntryMethod(sqInt blockEntryMcpc, sqInt cogMethod) CogBlockMethod *cogBlockMethod; BytecodeDescriptor *descriptor; sqInt distance; - sqInt endbcpc; + usqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -24812,7 +24812,7 @@ picDataForinto(CogMethod *cogMethod, sqInt arrayObj) CogBlockMethod *cogMethod1; BytecodeDescriptor *descriptor; sqInt distance; - sqInt endbcpc; + usqInt endbcpc; sqInt errCode; CogMethod *homeMethod; sqInt isBackwardBranch; diff --git a/spursistasrc/vm/cogmethod.h b/spursistasrc/vm/cogmethod.h index b0a8e83296..47f995d158 100644 --- a/spursistasrc/vm/cogmethod.h +++ b/spursistasrc/vm/cogmethod.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ typedef struct { diff --git a/spursistasrc/vm/cointerp.c b/spursistasrc/vm/cointerp.c index c51bb30e46..9c88260978 100644 --- a/spursistasrc/vm/cointerp.c +++ b/spursistasrc/vm/cointerp.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - CoInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CoInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2416,7 +2416,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 577 */] }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscogLLP64-nice.1919]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscogLLP64-nice.1920]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -16731,7 +16731,7 @@ checkStackIntegrity(void) sqInt i; sqInt methodField; sqInt ok; - sqInt oop; + usqInt oop; char *theFP; StackPage *thePage; char *theSP; @@ -42048,7 +42048,7 @@ changeClassOfto(sqInt rcvr, sqInt argClass) sqInt fmt; usqInt instBytes; sqInt instFormat; - usqInt newFormat; + sqInt newFormat; sqInt normalizedInstFormat; usqInt numBytes; usqInt numSlots; @@ -42215,7 +42215,7 @@ changeClassOfto(sqInt rcvr, sqInt argClass) assert(((classIndex >= 0) && (classIndex <= (classIndexMask())))); assert(((newFormat >= 0) && (newFormat <= (formatMask())))); flag("endianness"); - longAtput(rcvr, ((longAt(rcvr)) & ((unsigned int)~((((sqInt)((usqInt)((formatMask())) << (formatShift())))) + (classIndexMask())))) + (classIndex + (newFormat << (formatShift())))); + longAtput(rcvr, ((longAt(rcvr)) & ((unsigned int)~((((sqInt)((usqInt)((formatMask())) << (formatShift())))) + (classIndexMask())))) + (classIndex + (((sqInt)((usqInt)(newFormat) << (formatShift())))))); return 0; } @@ -49133,7 +49133,7 @@ eliminateAndFreeForwardersForPigCompact(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt address; sqInt address1; - sqInt bytes; + usqInt bytes; sqInt endOfFreeRun; sqInt f; sqInt firstOfFreeRun; @@ -60647,7 +60647,7 @@ maybeSplObj(sqInt index) static sqInt NoDbgRegParms moveARunOfObjectsStartingAtupTo(usqInt startAddress, usqInt limit) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt chunkBytes; + usqInt chunkBytes; sqInt classIndex; sqInt classIndex1; sqInt dest; diff --git a/spursistasrc/vm/cointerp.h b/spursistasrc/vm/cointerp.h index 4253f80c87..28b6cd855c 100644 --- a/spursistasrc/vm/cointerp.h +++ b/spursistasrc/vm/cointerp.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ diff --git a/spursistasrc/vm/gcc3x-cointerp.c b/spursistasrc/vm/gcc3x-cointerp.c index 9074001035..c0572c04ba 100644 --- a/spursistasrc/vm/gcc3x-cointerp.c +++ b/spursistasrc/vm/gcc3x-cointerp.c @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - CoInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CoInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2419,7 +2419,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 577 */] }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscogLLP64-nice.1919]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscogLLP64-nice.1920]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -16740,7 +16740,7 @@ checkStackIntegrity(void) sqInt i; sqInt methodField; sqInt ok; - sqInt oop; + usqInt oop; char *theFP; StackPage *thePage; char *theSP; @@ -42057,7 +42057,7 @@ changeClassOfto(sqInt rcvr, sqInt argClass) sqInt fmt; usqInt instBytes; sqInt instFormat; - usqInt newFormat; + sqInt newFormat; sqInt normalizedInstFormat; usqInt numBytes; usqInt numSlots; @@ -42224,7 +42224,7 @@ changeClassOfto(sqInt rcvr, sqInt argClass) assert(((classIndex >= 0) && (classIndex <= (classIndexMask())))); assert(((newFormat >= 0) && (newFormat <= (formatMask())))); flag("endianness"); - longAtput(rcvr, ((longAt(rcvr)) & ((unsigned int)~((((sqInt)((usqInt)((formatMask())) << (formatShift())))) + (classIndexMask())))) + (classIndex + (newFormat << (formatShift())))); + longAtput(rcvr, ((longAt(rcvr)) & ((unsigned int)~((((sqInt)((usqInt)((formatMask())) << (formatShift())))) + (classIndexMask())))) + (classIndex + (((sqInt)((usqInt)(newFormat) << (formatShift())))))); return 0; } @@ -49142,7 +49142,7 @@ eliminateAndFreeForwardersForPigCompact(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt address; sqInt address1; - sqInt bytes; + usqInt bytes; sqInt endOfFreeRun; sqInt f; sqInt firstOfFreeRun; @@ -60656,7 +60656,7 @@ maybeSplObj(sqInt index) static sqInt NoDbgRegParms moveARunOfObjectsStartingAtupTo(usqInt startAddress, usqInt limit) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt chunkBytes; + usqInt chunkBytes; sqInt classIndex; sqInt classIndex1; sqInt dest; diff --git a/spursistasrc/vm/interp.h b/spursistasrc/vm/interp.h index 1fc7d088d7..eb6db6e89c 100644 --- a/spursistasrc/vm/interp.h +++ b/spursistasrc/vm/interp.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ #define VM_PROXY_MAJOR 1 diff --git a/spursistasrc/vm/vmCallback.h b/spursistasrc/vm/vmCallback.h index 421c4e448a..6ccb4003fd 100644 --- a/spursistasrc/vm/vmCallback.h +++ b/spursistasrc/vm/vmCallback.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ #define VM_CALLBACK_INC 1 diff --git a/spursrc/vm/cogit.h b/spursrc/vm/cogit.h index 47e4be4f30..db2cef5cb0 100644 --- a/spursrc/vm/cogit.h +++ b/spursrc/vm/cogit.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ diff --git a/spursrc/vm/cogitARMv5.c b/spursrc/vm/cogitARMv5.c index 1194b86717..1c99718f9f 100644 --- a/spursrc/vm/cogitARMv5.c +++ b/spursrc/vm/cogitARMv5.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -2464,7 +2464,7 @@ concretizeConditionalInstruction(AbstractInstruction * self_in_concretizeConditi { sqInt aWord; sqInt i; - usqInt instr; + sqInt instr; unsigned char savedCond; assert(((self_in_concretizeConditionalInstruction->conditionOrNil)) != null); @@ -7240,7 +7240,7 @@ bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod) sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - sqInt endbcpc; + usqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -12352,7 +12352,7 @@ mcPCForBackwardBranchstartBcpcin(sqInt bcpc, sqInt startbcpc, CogBlockMethod *co sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - sqInt endbcpc; + usqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -22689,7 +22689,7 @@ mapPCDataForinto(CogMethod *cogMethod, sqInt arrayObj) CogBlockMethod *cogMethod1; BytecodeDescriptor *descriptor; sqInt distance; - sqInt endbcpc; + usqInt endbcpc; sqInt errCode; CogMethod *homeMethod; sqInt isBackwardBranch; diff --git a/spursrc/vm/cogitIA32.c b/spursrc/vm/cogitIA32.c index 10f598995b..3ccf1cecbe 100644 --- a/spursrc/vm/cogitIA32.c +++ b/spursrc/vm/cogitIA32.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -636,7 +636,7 @@ static AbstractInstruction * NoDbgRegParms gMoveCwR(sqInt wordConstant, sqInt re static AbstractInstruction * NoDbgRegParms gMoveMwrR(sqInt offset, sqInt baseReg, sqInt destReg); static AbstractInstruction * NoDbgRegParms gMoveRMwr(sqInt sourceReg, sqInt offset, sqInt baseReg); static AbstractInstruction * NoDbgRegParms gMoveRR(sqInt reg1, sqInt reg2); -static sqInt NoDbgRegParms mapEndFor(CogMethod *cogMethod); +static usqInt NoDbgRegParms mapEndFor(CogMethod *cogMethod); static sqInt NoDbgRegParms mapForperformUntilarg(CogMethod *cogMethod, sqInt (*functionSymbol)(sqInt annotation, char *mcpc, sqInt arg), sqInt arg); static sqInt NoDbgRegParms mapObjectReferencesInClosedPIC(CogMethod *cPIC); static void mapObjectReferencesInGeneratedRuntime(void); @@ -10370,7 +10370,7 @@ gMoveRR(sqInt reg1, sqInt reg2) /* Answer the address of the null byte at the end of the method map. */ /* Cogit>>#mapEndFor: */ -static sqInt NoDbgRegParms +static usqInt NoDbgRegParms mapEndFor(CogMethod *cogMethod) { usqInt end; diff --git a/spursrc/vm/cogitMIPSEL.c b/spursrc/vm/cogitMIPSEL.c index bb802d793e..4b6b67f1c3 100644 --- a/spursrc/vm/cogitMIPSEL.c +++ b/spursrc/vm/cogitMIPSEL.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -2356,7 +2356,7 @@ bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod) sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -4303,7 +4303,7 @@ cPICHasForwardedClass(CogMethod *cPIC) static sqInt NoDbgRegParms cPICHasFreedTargets(CogMethod *cPIC) { - sqInt entryPoint; + usqInt entryPoint; sqInt i; sqInt pc; CogMethod *targetMethod; @@ -7339,7 +7339,7 @@ mcPCForBackwardBranchstartBcpcin(sqInt bcpc, sqInt startbcpc, CogBlockMethod *co sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -8008,7 +8008,7 @@ static void NoDbgRegParms relocateCallsInClosedPIC(CogMethod *cPIC) { sqLong callDelta; - sqInt entryPoint; + usqInt entryPoint; sqInt i; sqInt pc; sqLong refDelta; @@ -13587,7 +13587,7 @@ relocateCallBeforeReturnPCby(AbstractInstruction * self_in_relocateCallBeforeRet static AbstractInstruction * NoDbgRegParms relocateJumpLongBeforeFollowingAddressby(AbstractInstruction * self_in_relocateJumpLongBeforeFollowingAddressby, sqInt pc, sqInt delta) { - usqInt newTarget; + sqInt newTarget; usqInt oldTarget; assert((delta % 4) == 0); @@ -13640,7 +13640,7 @@ relocateJumpLongConditionalBeforeFollowingAddressby(AbstractInstruction * self_i static AbstractInstruction * NoDbgRegParms relocateMethodReferenceBeforeAddressby(AbstractInstruction * self_in_relocateMethodReferenceBeforeAddressby, sqInt pc, sqInt delta) { - usqInt newValue; + sqInt newValue; usqInt oldValue; if (((opcodeAtAddress(self_in_relocateMethodReferenceBeforeAddressby, pc - 8)) == ADDIU) @@ -20136,7 +20136,7 @@ mapPCDataForinto(CogMethod *cogMethod, sqInt arrayObj) CogBlockMethod *cogMethod1; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; sqInt errCode; CogMethod *homeMethod; sqInt isBackwardBranch; diff --git a/spursrc/vm/cogmethod.h b/spursrc/vm/cogmethod.h index 4f8f90c26f..60511754f3 100644 --- a/spursrc/vm/cogmethod.h +++ b/spursrc/vm/cogmethod.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ typedef struct { diff --git a/spursrc/vm/cointerp.c b/spursrc/vm/cointerp.c index 9cb8f5c784..a40935b9ef 100644 --- a/spursrc/vm/cointerp.c +++ b/spursrc/vm/cointerp.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - CoInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CoInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2395,7 +2395,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 577 */] }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscogLLP64-nice.1919]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscogLLP64-nice.1920]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -11700,7 +11700,7 @@ checkStackIntegrity(void) sqInt i; sqInt methodField; sqInt ok; - sqInt oop; + usqInt oop; char *theFP; StackPage *thePage; char *theSP; @@ -36168,7 +36168,7 @@ changeClassOfto(sqInt rcvr, sqInt argClass) sqInt fmt; usqInt instBytes; sqInt instFormat; - sqInt newFormat; + usqInt newFormat; sqInt normalizedInstFormat; usqInt numBytes; usqInt numSlots; @@ -36335,7 +36335,7 @@ changeClassOfto(sqInt rcvr, sqInt argClass) assert(((classIndex >= 0) && (classIndex <= (classIndexMask())))); assert(((newFormat >= 0) && (newFormat <= (formatMask())))); flag("endianness"); - longAtput(rcvr, ((longAt(rcvr)) & ((unsigned int)~((((sqInt)((usqInt)((formatMask())) << (formatShift())))) + (classIndexMask())))) + (classIndex + (((sqInt)((usqInt)(newFormat) << (formatShift())))))); + longAtput(rcvr, ((longAt(rcvr)) & ((unsigned int)~((((sqInt)((usqInt)((formatMask())) << (formatShift())))) + (classIndexMask())))) + (classIndex + (newFormat << (formatShift())))); return 0; } @@ -43253,7 +43253,7 @@ eliminateAndFreeForwardersForPigCompact(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt address; sqInt address1; - usqInt bytes; + sqInt bytes; sqInt endOfFreeRun; sqInt f; sqInt firstOfFreeRun; @@ -54759,7 +54759,7 @@ maybeSplObj(sqInt index) static sqInt NoDbgRegParms moveARunOfObjectsStartingAtupTo(usqInt startAddress, usqInt limit) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt chunkBytes; + usqInt chunkBytes; sqInt classIndex; sqInt classIndex1; sqInt dest; @@ -60565,7 +60565,7 @@ static void NoDbgRegParms bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { usqInt bridgeSpan; - sqInt clifton; + usqInt clifton; usqInt segEnd; segEnd = ((aSegment->segSize)) + ((aSegment->segStart)); @@ -61152,8 +61152,8 @@ writeSegmentnextSegmenttoFile(SpurSegmentInfo *segment, SpurSegmentInfo *nextSeg { usqLong firstSavedBridgeWord; sqInt nWritten; - sqInt pier1; - sqInt pier2; + usqInt pier1; + usqInt pier2; usqLong secondSavedBridgeWord; pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); @@ -71051,7 +71051,7 @@ removeFirstLinkOfList(sqInt aList) static sqInt retryPrimitiveOnFailure(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - signed char accessorDepth; + sqInt accessorDepth; sqInt canRetry; sqInt firstBytecode; sqInt followDone; diff --git a/spursrc/vm/cointerp.h b/spursrc/vm/cointerp.h index 162bfbe409..7de8f22c18 100644 --- a/spursrc/vm/cointerp.h +++ b/spursrc/vm/cointerp.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ diff --git a/spursrc/vm/gcc3x-cointerp.c b/spursrc/vm/gcc3x-cointerp.c index d1f62c7fa2..5bc1ae711e 100644 --- a/spursrc/vm/gcc3x-cointerp.c +++ b/spursrc/vm/gcc3x-cointerp.c @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - CoInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CoInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2398,7 +2398,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 577 */] }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscogLLP64-nice.1919]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscogLLP64-nice.1920]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -11709,7 +11709,7 @@ checkStackIntegrity(void) sqInt i; sqInt methodField; sqInt ok; - sqInt oop; + usqInt oop; char *theFP; StackPage *thePage; char *theSP; @@ -36177,7 +36177,7 @@ changeClassOfto(sqInt rcvr, sqInt argClass) sqInt fmt; usqInt instBytes; sqInt instFormat; - sqInt newFormat; + usqInt newFormat; sqInt normalizedInstFormat; usqInt numBytes; usqInt numSlots; @@ -36344,7 +36344,7 @@ changeClassOfto(sqInt rcvr, sqInt argClass) assert(((classIndex >= 0) && (classIndex <= (classIndexMask())))); assert(((newFormat >= 0) && (newFormat <= (formatMask())))); flag("endianness"); - longAtput(rcvr, ((longAt(rcvr)) & ((unsigned int)~((((sqInt)((usqInt)((formatMask())) << (formatShift())))) + (classIndexMask())))) + (classIndex + (((sqInt)((usqInt)(newFormat) << (formatShift())))))); + longAtput(rcvr, ((longAt(rcvr)) & ((unsigned int)~((((sqInt)((usqInt)((formatMask())) << (formatShift())))) + (classIndexMask())))) + (classIndex + (newFormat << (formatShift())))); return 0; } @@ -43262,7 +43262,7 @@ eliminateAndFreeForwardersForPigCompact(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt address; sqInt address1; - usqInt bytes; + sqInt bytes; sqInt endOfFreeRun; sqInt f; sqInt firstOfFreeRun; @@ -54768,7 +54768,7 @@ maybeSplObj(sqInt index) static sqInt NoDbgRegParms moveARunOfObjectsStartingAtupTo(usqInt startAddress, usqInt limit) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt chunkBytes; + usqInt chunkBytes; sqInt classIndex; sqInt classIndex1; sqInt dest; @@ -60574,7 +60574,7 @@ static void NoDbgRegParms bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { usqInt bridgeSpan; - sqInt clifton; + usqInt clifton; usqInt segEnd; segEnd = ((aSegment->segSize)) + ((aSegment->segStart)); @@ -61161,8 +61161,8 @@ writeSegmentnextSegmenttoFile(SpurSegmentInfo *segment, SpurSegmentInfo *nextSeg { usqLong firstSavedBridgeWord; sqInt nWritten; - sqInt pier1; - sqInt pier2; + usqInt pier1; + usqInt pier2; usqLong secondSavedBridgeWord; pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); @@ -71060,7 +71060,7 @@ removeFirstLinkOfList(sqInt aList) static sqInt retryPrimitiveOnFailure(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - signed char accessorDepth; + sqInt accessorDepth; sqInt canRetry; sqInt firstBytecode; sqInt followDone; diff --git a/spursrc/vm/interp.h b/spursrc/vm/interp.h index 7fb01e4d92..758dd7244e 100644 --- a/spursrc/vm/interp.h +++ b/spursrc/vm/interp.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ #define VM_PROXY_MAJOR 1 diff --git a/spursrc/vm/vmCallback.h b/spursrc/vm/vmCallback.h index 421c4e448a..6ccb4003fd 100644 --- a/spursrc/vm/vmCallback.h +++ b/spursrc/vm/vmCallback.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ #define VM_CALLBACK_INC 1 diff --git a/spurstack64src/vm/gcc3x-interp.c b/spurstack64src/vm/gcc3x-interp.c index a061d13bf7..6940c26c2e 100644 --- a/spurstack64src/vm/gcc3x-interp.c +++ b/spurstack64src/vm/gcc3x-interp.c @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - StackInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + StackInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2160,7 +2160,7 @@ static void (*primitiveTable[MaxPrimitiveIndex + 2 /* 577 */])(void) = { 0 }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscogLLP64-nice.1919]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscogLLP64-nice.1920]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -59670,7 +59670,7 @@ printMethodCacheFor(sqInt thing) /* begin tab */ putchar(' '); if (((((usqInt)(longAt(s))) >> (formatShift())) & (formatMask())) >= (firstByteFormat())) { - printf("%" PRIxPTR " %.*s\n", s, (int)(numBytesOf(s)), (char *)firstIndexableField(s)); + printf("%" PRIxSQPTR " %.*s\n", s, (int)(numBytesOf(s)), (char *)firstIndexableField(s)); } else { shortPrintOop(s); diff --git a/spurstack64src/vm/interp.c b/spurstack64src/vm/interp.c index 95ecd30331..4a33108443 100644 --- a/spurstack64src/vm/interp.c +++ b/spurstack64src/vm/interp.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - StackInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + StackInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2157,7 +2157,7 @@ static void (*primitiveTable[MaxPrimitiveIndex + 2 /* 577 */])(void) = { 0 }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscogLLP64-nice.1919]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscogLLP64-nice.1920]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -59661,7 +59661,7 @@ printMethodCacheFor(sqInt thing) /* begin tab */ putchar(' '); if (((((usqInt)(longAt(s))) >> (formatShift())) & (formatMask())) >= (firstByteFormat())) { - printf("%" PRIxPTR " %.*s\n", s, (int)(numBytesOf(s)), (char *)firstIndexableField(s)); + printf("%" PRIxSQPTR " %.*s\n", s, (int)(numBytesOf(s)), (char *)firstIndexableField(s)); } else { shortPrintOop(s); diff --git a/spurstack64src/vm/interp.h b/spurstack64src/vm/interp.h index ada27ab19b..575b789a20 100644 --- a/spurstack64src/vm/interp.h +++ b/spurstack64src/vm/interp.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ #define VM_PROXY_MAJOR 1 diff --git a/spurstack64src/vm/vmCallback.h b/spurstack64src/vm/vmCallback.h index 421c4e448a..6ccb4003fd 100644 --- a/spurstack64src/vm/vmCallback.h +++ b/spurstack64src/vm/vmCallback.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ #define VM_CALLBACK_INC 1 diff --git a/spurstacksrc/vm/gcc3x-interp.c b/spurstacksrc/vm/gcc3x-interp.c index ac10c638fe..902e4fb4fe 100644 --- a/spurstacksrc/vm/gcc3x-interp.c +++ b/spurstacksrc/vm/gcc3x-interp.c @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - StackInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + StackInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2137,7 +2137,7 @@ static void (*primitiveTable[MaxPrimitiveIndex + 2 /* 577 */])(void) = { 0 }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscogLLP64-nice.1919]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscogLLP64-nice.1920]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -58543,7 +58543,7 @@ printMethodCacheFor(sqInt thing) /* begin tab */ putchar(' '); if (((((usqInt)(longAt(s))) >> (formatShift())) & (formatMask())) >= (firstByteFormat())) { - printf("%" PRIxPTR " %.*s\n", s, (int)(numBytesOf(s)), (char *)firstIndexableField(s)); + printf("%" PRIxSQPTR " %.*s\n", s, (int)(numBytesOf(s)), (char *)firstIndexableField(s)); } else { shortPrintOop(s); diff --git a/spurstacksrc/vm/interp.c b/spurstacksrc/vm/interp.c index 337a056699..df0d339b02 100644 --- a/spurstacksrc/vm/interp.c +++ b/spurstacksrc/vm/interp.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - StackInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + StackInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2134,7 +2134,7 @@ static void (*primitiveTable[MaxPrimitiveIndex + 2 /* 577 */])(void) = { 0 }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscogLLP64-nice.1919]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscogLLP64-nice.1920]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -58534,7 +58534,7 @@ printMethodCacheFor(sqInt thing) /* begin tab */ putchar(' '); if (((((usqInt)(longAt(s))) >> (formatShift())) & (formatMask())) >= (firstByteFormat())) { - printf("%" PRIxPTR " %.*s\n", s, (int)(numBytesOf(s)), (char *)firstIndexableField(s)); + printf("%" PRIxSQPTR " %.*s\n", s, (int)(numBytesOf(s)), (char *)firstIndexableField(s)); } else { shortPrintOop(s); diff --git a/spurstacksrc/vm/interp.h b/spurstacksrc/vm/interp.h index 66f4f36d02..0455c7dbb9 100644 --- a/spurstacksrc/vm/interp.h +++ b/spurstacksrc/vm/interp.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ #define VM_PROXY_MAJOR 1 diff --git a/spurstacksrc/vm/vmCallback.h b/spurstacksrc/vm/vmCallback.h index 421c4e448a..6ccb4003fd 100644 --- a/spurstacksrc/vm/vmCallback.h +++ b/spurstacksrc/vm/vmCallback.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ #define VM_CALLBACK_INC 1 diff --git a/src/vm/cogit.h b/src/vm/cogit.h index fe59478ad1..0f98067ca6 100644 --- a/src/vm/cogit.h +++ b/src/vm/cogit.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ diff --git a/src/vm/cogitARMv5.c b/src/vm/cogitARMv5.c index 0627255b66..3d8ba11055 100644 --- a/src/vm/cogitARMv5.c +++ b/src/vm/cogitARMv5.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -2401,7 +2401,7 @@ concretizeConditionalInstruction(AbstractInstruction * self_in_concretizeConditi { sqInt aWord; sqInt i; - sqInt instr; + usqInt instr; unsigned char savedCond; assert(((self_in_concretizeConditionalInstruction->conditionOrNil)) != null); diff --git a/src/vm/cogitIA32.c b/src/vm/cogitIA32.c index 77fcdfdebc..aa9912b30f 100644 --- a/src/vm/cogitIA32.c +++ b/src/vm/cogitIA32.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -626,7 +626,7 @@ static AbstractInstruction * NoDbgRegParms gMoveAwR(sqInt address, sqInt reg); static AbstractInstruction * NoDbgRegParms gMoveCwR(sqInt wordConstant, sqInt reg); static AbstractInstruction * NoDbgRegParms gMoveMwrR(sqInt offset, sqInt baseReg, sqInt destReg); static AbstractInstruction * NoDbgRegParms gMoveRMwr(sqInt sourceReg, sqInt offset, sqInt baseReg); -static sqInt NoDbgRegParms mapEndFor(CogMethod *cogMethod); +static usqInt NoDbgRegParms mapEndFor(CogMethod *cogMethod); static sqInt NoDbgRegParms mapForperformUntilarg(CogMethod *cogMethod, sqInt (*functionSymbol)(sqInt annotation, char *mcpc, sqInt arg), sqInt arg); static sqInt NoDbgRegParms mapObjectReferencesInClosedPIC(CogMethod *cPIC); static void mapObjectReferencesInGeneratedRuntime(void); @@ -8966,12 +8966,12 @@ static sqInt NoDbgRegParms generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - usqIntptr_t delta; + sqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - usqIntptr_t location; - usqIntptr_t mapEntry; + sqInt location; + sqInt mapEntry; sqInt maxDelta; usqIntptr_t mcpc; @@ -10057,7 +10057,7 @@ gMoveRMwr(sqInt sourceReg, sqInt offset, sqInt baseReg) /* Answer the address of the null byte at the end of the method map. */ /* Cogit>>#mapEndFor: */ -static sqInt NoDbgRegParms +static usqInt NoDbgRegParms mapEndFor(CogMethod *cogMethod) { usqInt end; diff --git a/src/vm/cogitMIPSEL.c b/src/vm/cogitMIPSEL.c index b2744b5ac8..11cae723df 100644 --- a/src/vm/cogitMIPSEL.c +++ b/src/vm/cogitMIPSEL.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -612,7 +612,7 @@ static AbstractInstruction * NoDbgRegParms gMoveAwR(sqInt address, sqInt reg); static AbstractInstruction * NoDbgRegParms gMoveCwR(sqInt wordConstant, sqInt reg); static AbstractInstruction * NoDbgRegParms gMoveMwrR(sqInt offset, sqInt baseReg, sqInt destReg); static AbstractInstruction * NoDbgRegParms gMoveRMwr(sqInt sourceReg, sqInt offset, sqInt baseReg); -static usqInt NoDbgRegParms mapEndFor(CogMethod *cogMethod); +static sqInt NoDbgRegParms mapEndFor(CogMethod *cogMethod); static sqInt NoDbgRegParms mapForperformUntilarg(CogMethod *cogMethod, sqInt (*functionSymbol)(sqInt annotation, char *mcpc, sqInt arg), sqInt arg); static sqInt NoDbgRegParms mapObjectReferencesInClosedPIC(CogMethod *cPIC); static void mapObjectReferencesInGeneratedRuntime(void); @@ -4152,7 +4152,7 @@ configureMNUCPICmethodOperandnumArgsdelta(CogMethod *cPIC, sqInt methodOperand, static sqInt NoDbgRegParms cPICHasFreedTargets(CogMethod *cPIC) { - sqInt entryPoint; + usqInt entryPoint; sqInt i; sqInt pc; CogMethod *targetMethod; @@ -6077,7 +6077,7 @@ gMoveRMwr(sqInt sourceReg, sqInt offset, sqInt baseReg) /* Answer the address of the null byte at the end of the method map. */ /* Cogit>>#mapEndFor: */ -static usqInt NoDbgRegParms +static sqInt NoDbgRegParms mapEndFor(CogMethod *cogMethod) { usqInt end; @@ -13140,7 +13140,7 @@ relocateCallBeforeReturnPCby(AbstractInstruction * self_in_relocateCallBeforeRet static AbstractInstruction * NoDbgRegParms relocateJumpLongBeforeFollowingAddressby(AbstractInstruction * self_in_relocateJumpLongBeforeFollowingAddressby, sqInt pc, sqInt delta) { - usqInt newTarget; + sqInt newTarget; usqInt oldTarget; assert((delta % 4) == 0); @@ -13193,7 +13193,7 @@ relocateJumpLongConditionalBeforeFollowingAddressby(AbstractInstruction * self_i static AbstractInstruction * NoDbgRegParms relocateMethodReferenceBeforeAddressby(AbstractInstruction * self_in_relocateMethodReferenceBeforeAddressby, sqInt pc, sqInt delta) { - usqInt newValue; + sqInt newValue; usqInt oldValue; if (((opcodeAtAddress(self_in_relocateMethodReferenceBeforeAddressby, pc - 8)) == ADDIU) diff --git a/src/vm/cogmethod.h b/src/vm/cogmethod.h index 48a84fef46..a79ddd7898 100644 --- a/src/vm/cogmethod.h +++ b/src/vm/cogmethod.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ typedef struct { diff --git a/src/vm/cointerp.c b/src/vm/cointerp.c index 7faea3affd..cf4de55d46 100644 --- a/src/vm/cointerp.c +++ b/src/vm/cointerp.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - CoInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CoInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -848,9 +848,9 @@ extern void fullGC(void); static usqInt NoDbgRegParms fwdTableInit(sqInt blkSize); static usqInt NoDbgRegParms fwdTableSize(sqInt blkSize); static usqInt imageSegmentVersion(void); -static sqInt incCompBody(void); +static usqInt incCompBody(void); static sqInt incCompMakeFwd(void); -static sqInt NoDbgRegParms incCompMove(sqInt bytesFreed); +static usqInt NoDbgRegParms incCompMove(sqInt bytesFreed); extern void incrementalGC(void); static void NoDbgRegParms initializeMemoryFirstFree(sqInt firstFree); static void NoDbgRegParms initializeObjectMemory(sqInt bytesToShift); @@ -2130,7 +2130,7 @@ static void (*primitiveTable[MaxPrimitiveIndex + 2 /* 577 */])(void) = { 0 }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscogLLP64-nice.1919]"; +const char *interpreterVersion = "Croquet Closure Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscogLLP64-nice.1920]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -13925,7 +13925,7 @@ printFrameWithSP(char *theFP, char *theSP) usqInt index; sqInt methodField; usqInt numArgs; - usqInt numTemps; + sqInt numTemps; char *rcvrAddress; sqInt rcvrOrClosure; sqInt theMethod; @@ -14405,7 +14405,7 @@ readImageFromFileHeapSizeStartingAt(sqImageFile f, usqInt desiredHeapSize, squea sqInt aValue2; sqInt baseOfHeap; sqInt bytesRead; - sqInt bytesToShift; + usqInt bytesToShift; sqInt ccIndex; sqInt classArrayClass; sqInt classArrayObj; @@ -31542,14 +31542,14 @@ eeInstantiateAndInitializeClassindexableSize(sqInt classPointer, sqInt size) sqInt binc; sqInt bm1; sqInt byteSize; - usqInt cClass; + sqInt cClass; sqInt classFormat; usqInt end; sqInt fillWord; sqInt format; usqInt hash; int hdrSize; - usqInt header1; + sqInt header1; sqInt header2; sqInt header3; usqInt i; @@ -31706,7 +31706,7 @@ eeInstantiateClassIndexformatnumSlots(sqInt compactClassIndex, sqInt objFormat, sqInt byteSize; usqInt hash; sqInt hdrSize; - sqInt header1; + usqInt header1; sqInt header2; sqInt header3; usqInt newChunk; @@ -31809,12 +31809,12 @@ eeInstantiateClassindexableSize(sqInt classPointer, sqInt size) sqInt binc; sqInt bm1; sqInt byteSize; - usqInt cClass; + sqInt cClass; sqInt classFormat; sqInt format; usqInt hash; int hdrSize; - usqInt header1; + sqInt header1; sqInt header2; sqInt header3; usqInt newChunk; @@ -32024,7 +32024,7 @@ static sqInt NoDbgRegParms eeInstantiateSmallClassIndexformatnumSlots(sqInt compactClassIndex, sqInt objFormat, sqInt numSlots) { DECL_MAYBE_SQ_GLOBAL_STRUCT usqInt hash; - usqInt header1; + sqInt header1; usqInt newChunk; usqInt newFreeStart; sqInt newObj; @@ -32094,7 +32094,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; @@ -32498,7 +32498,7 @@ imageSegmentVersion(void) */ /* NewObjectMemory>>#incCompBody */ -static sqInt +static usqInt incCompBody(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt bytesToBeFreed; @@ -32623,7 +32623,7 @@ incCompMakeFwd(void) free space bubble up to the end of memory. */ /* NewObjectMemory>>#incCompMove: */ -static sqInt NoDbgRegParms +static usqInt NoDbgRegParms incCompMove(sqInt bytesFreed) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt bytesToMove; diff --git a/src/vm/cointerp.h b/src/vm/cointerp.h index 4eaade953b..d327020e10 100644 --- a/src/vm/cointerp.h +++ b/src/vm/cointerp.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ diff --git a/src/vm/cointerpmt.c b/src/vm/cointerpmt.c index 70c5251f34..b787c647f5 100644 --- a/src/vm/cointerpmt.c +++ b/src/vm/cointerpmt.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - CoInterpreterMT VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CoInterpreterMT VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2228,7 +2228,7 @@ static void (*primitiveTable[MaxPrimitiveIndex + 2 /* 577 */])(void) = { 0 }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscogLLP64-nice.1919]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscogLLP64-nice.1920]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -14699,7 +14699,7 @@ readImageFromFileHeapSizeStartingAt(sqImageFile f, usqInt desiredHeapSize, squea sqInt aValue2; sqInt baseOfHeap; sqInt bytesRead; - usqInt bytesToShift; + sqInt bytesToShift; sqInt ccIndex; sqInt classArrayClass; sqInt classArrayObj; @@ -33805,7 +33805,7 @@ clone(sqInt obj) sqInt extraHdrBytes; usqInt fromIndex; usqInt hash; - sqInt header; + usqInt header; sqInt header1; usqInt lastFrom; sqInt newChunk; @@ -33878,7 +33878,7 @@ clone(sqInt obj) header = (longAt(newOop)) & 0x1FFFF; header = header | ((hash << HashBitsOffset) & HashBits); longAtput(newOop, header); - if (((((usqInt)header) >> (instFormatFieldLSB())) & 15) >= (firstCompiledMethodFormat())) { + if (((header >> (instFormatFieldLSB())) & 15) >= (firstCompiledMethodFormat())) { /* begin maybeFixClonedCompiledMethod: */ assert(isOopCompiledMethod(newOop)); rawHeader = longAt((newOop + BaseHeaderSize) + (((int)((usqInt)(HeaderIndex) << (shiftForWord()))))); @@ -33960,14 +33960,14 @@ eeInstantiateAndInitializeClassindexableSize(sqInt classPointer, sqInt size) sqInt binc; sqInt bm1; sqInt byteSize; - usqInt cClass; + sqInt cClass; sqInt classFormat; usqInt end; sqInt fillWord; sqInt format; usqInt hash; int hdrSize; - usqInt header1; + sqInt header1; sqInt header2; sqInt header3; usqInt i; @@ -34227,12 +34227,12 @@ eeInstantiateClassindexableSize(sqInt classPointer, sqInt size) sqInt binc; sqInt bm1; sqInt byteSize; - usqInt cClass; + sqInt cClass; sqInt classFormat; sqInt format; usqInt hash; int hdrSize; - usqInt header1; + sqInt header1; sqInt header2; sqInt header3; usqInt newChunk; @@ -34442,7 +34442,7 @@ static sqInt NoDbgRegParms eeInstantiateSmallClassIndexformatnumSlots(sqInt compactClassIndex, sqInt objFormat, sqInt numSlots) { DECL_MAYBE_SQ_GLOBAL_STRUCT usqInt hash; - sqInt header1; + usqInt header1; usqInt newChunk; usqInt newFreeStart; sqInt newObj; @@ -34512,7 +34512,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; @@ -39653,7 +39653,7 @@ instantiateClassindexableSize(sqInt classPointer, sqInt size) sqInt bm1; sqInt byteSize; sqInt byteSize1; - usqInt cClass; + sqInt cClass; sqInt classFormat; sqInt classOop; usqInt end; @@ -39662,7 +39662,7 @@ instantiateClassindexableSize(sqInt classPointer, sqInt size) sqInt format; usqInt hash; sqInt hdrSize; - usqInt header1; + sqInt header1; sqInt header2; sqInt header3; usqInt i; diff --git a/src/vm/cointerpmt.h b/src/vm/cointerpmt.h index 7542367487..d85a321c23 100644 --- a/src/vm/cointerpmt.h +++ b/src/vm/cointerpmt.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ diff --git a/src/vm/gcc3x-cointerp.c b/src/vm/gcc3x-cointerp.c index b2aa899cc3..a365e44806 100644 --- a/src/vm/gcc3x-cointerp.c +++ b/src/vm/gcc3x-cointerp.c @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - CoInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CoInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -851,9 +851,9 @@ extern void fullGC(void); static usqInt NoDbgRegParms fwdTableInit(sqInt blkSize); static usqInt NoDbgRegParms fwdTableSize(sqInt blkSize); static usqInt imageSegmentVersion(void); -static sqInt incCompBody(void); +static usqInt incCompBody(void); static sqInt incCompMakeFwd(void); -static sqInt NoDbgRegParms incCompMove(sqInt bytesFreed); +static usqInt NoDbgRegParms incCompMove(sqInt bytesFreed); extern void incrementalGC(void); static void NoDbgRegParms initializeMemoryFirstFree(sqInt firstFree); static void NoDbgRegParms initializeObjectMemory(sqInt bytesToShift); @@ -2133,7 +2133,7 @@ static void (*primitiveTable[MaxPrimitiveIndex + 2 /* 577 */])(void) = { 0 }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscogLLP64-nice.1919]"; +const char *interpreterVersion = "Croquet Closure Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscogLLP64-nice.1920]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -13934,7 +13934,7 @@ printFrameWithSP(char *theFP, char *theSP) usqInt index; sqInt methodField; usqInt numArgs; - usqInt numTemps; + sqInt numTemps; char *rcvrAddress; sqInt rcvrOrClosure; sqInt theMethod; @@ -14414,7 +14414,7 @@ readImageFromFileHeapSizeStartingAt(sqImageFile f, usqInt desiredHeapSize, squea sqInt aValue2; sqInt baseOfHeap; sqInt bytesRead; - sqInt bytesToShift; + usqInt bytesToShift; sqInt ccIndex; sqInt classArrayClass; sqInt classArrayObj; @@ -31551,14 +31551,14 @@ eeInstantiateAndInitializeClassindexableSize(sqInt classPointer, sqInt size) sqInt binc; sqInt bm1; sqInt byteSize; - usqInt cClass; + sqInt cClass; sqInt classFormat; usqInt end; sqInt fillWord; sqInt format; usqInt hash; int hdrSize; - usqInt header1; + sqInt header1; sqInt header2; sqInt header3; usqInt i; @@ -31715,7 +31715,7 @@ eeInstantiateClassIndexformatnumSlots(sqInt compactClassIndex, sqInt objFormat, sqInt byteSize; usqInt hash; sqInt hdrSize; - sqInt header1; + usqInt header1; sqInt header2; sqInt header3; usqInt newChunk; @@ -31818,12 +31818,12 @@ eeInstantiateClassindexableSize(sqInt classPointer, sqInt size) sqInt binc; sqInt bm1; sqInt byteSize; - usqInt cClass; + sqInt cClass; sqInt classFormat; sqInt format; usqInt hash; int hdrSize; - usqInt header1; + sqInt header1; sqInt header2; sqInt header3; usqInt newChunk; @@ -32033,7 +32033,7 @@ static sqInt NoDbgRegParms eeInstantiateSmallClassIndexformatnumSlots(sqInt compactClassIndex, sqInt objFormat, sqInt numSlots) { DECL_MAYBE_SQ_GLOBAL_STRUCT usqInt hash; - usqInt header1; + sqInt header1; usqInt newChunk; usqInt newFreeStart; sqInt newObj; @@ -32103,7 +32103,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; @@ -32507,7 +32507,7 @@ imageSegmentVersion(void) */ /* NewObjectMemory>>#incCompBody */ -static sqInt +static usqInt incCompBody(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt bytesToBeFreed; @@ -32632,7 +32632,7 @@ incCompMakeFwd(void) free space bubble up to the end of memory. */ /* NewObjectMemory>>#incCompMove: */ -static sqInt NoDbgRegParms +static usqInt NoDbgRegParms incCompMove(sqInt bytesFreed) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt bytesToMove; diff --git a/src/vm/gcc3x-cointerpmt.c b/src/vm/gcc3x-cointerpmt.c index 2dc0038834..91f43959f7 100644 --- a/src/vm/gcc3x-cointerpmt.c +++ b/src/vm/gcc3x-cointerpmt.c @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - CoInterpreterMT VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CoInterpreterMT VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2231,7 +2231,7 @@ static void (*primitiveTable[MaxPrimitiveIndex + 2 /* 577 */])(void) = { 0 }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscogLLP64-nice.1919]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscogLLP64-nice.1920]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -14708,7 +14708,7 @@ readImageFromFileHeapSizeStartingAt(sqImageFile f, usqInt desiredHeapSize, squea sqInt aValue2; sqInt baseOfHeap; sqInt bytesRead; - usqInt bytesToShift; + sqInt bytesToShift; sqInt ccIndex; sqInt classArrayClass; sqInt classArrayObj; @@ -33814,7 +33814,7 @@ clone(sqInt obj) sqInt extraHdrBytes; usqInt fromIndex; usqInt hash; - sqInt header; + usqInt header; sqInt header1; usqInt lastFrom; sqInt newChunk; @@ -33887,7 +33887,7 @@ clone(sqInt obj) header = (longAt(newOop)) & 0x1FFFF; header = header | ((hash << HashBitsOffset) & HashBits); longAtput(newOop, header); - if (((((usqInt)header) >> (instFormatFieldLSB())) & 15) >= (firstCompiledMethodFormat())) { + if (((header >> (instFormatFieldLSB())) & 15) >= (firstCompiledMethodFormat())) { /* begin maybeFixClonedCompiledMethod: */ assert(isOopCompiledMethod(newOop)); rawHeader = longAt((newOop + BaseHeaderSize) + (((int)((usqInt)(HeaderIndex) << (shiftForWord()))))); @@ -33969,14 +33969,14 @@ eeInstantiateAndInitializeClassindexableSize(sqInt classPointer, sqInt size) sqInt binc; sqInt bm1; sqInt byteSize; - usqInt cClass; + sqInt cClass; sqInt classFormat; usqInt end; sqInt fillWord; sqInt format; usqInt hash; int hdrSize; - usqInt header1; + sqInt header1; sqInt header2; sqInt header3; usqInt i; @@ -34236,12 +34236,12 @@ eeInstantiateClassindexableSize(sqInt classPointer, sqInt size) sqInt binc; sqInt bm1; sqInt byteSize; - usqInt cClass; + sqInt cClass; sqInt classFormat; sqInt format; usqInt hash; int hdrSize; - usqInt header1; + sqInt header1; sqInt header2; sqInt header3; usqInt newChunk; @@ -34451,7 +34451,7 @@ static sqInt NoDbgRegParms eeInstantiateSmallClassIndexformatnumSlots(sqInt compactClassIndex, sqInt objFormat, sqInt numSlots) { DECL_MAYBE_SQ_GLOBAL_STRUCT usqInt hash; - sqInt header1; + usqInt header1; usqInt newChunk; usqInt newFreeStart; sqInt newObj; @@ -34521,7 +34521,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; @@ -39662,7 +39662,7 @@ instantiateClassindexableSize(sqInt classPointer, sqInt size) sqInt bm1; sqInt byteSize; sqInt byteSize1; - usqInt cClass; + sqInt cClass; sqInt classFormat; sqInt classOop; usqInt end; @@ -39671,7 +39671,7 @@ instantiateClassindexableSize(sqInt classPointer, sqInt size) sqInt format; usqInt hash; sqInt hdrSize; - usqInt header1; + sqInt header1; sqInt header2; sqInt header3; usqInt i; diff --git a/src/vm/interp.h b/src/vm/interp.h index c2349f38cf..aa833d9e2e 100644 --- a/src/vm/interp.h +++ b/src/vm/interp.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ #define VM_PROXY_MAJOR 1 diff --git a/src/vm/vmCallback.h b/src/vm/vmCallback.h index 421c4e448a..6ccb4003fd 100644 --- a/src/vm/vmCallback.h +++ b/src/vm/vmCallback.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ #define VM_CALLBACK_INC 1 diff --git a/stacksrc/vm/gcc3x-interp.c b/stacksrc/vm/gcc3x-interp.c index ccd79bbc08..33bd260585 100644 --- a/stacksrc/vm/gcc3x-interp.c +++ b/stacksrc/vm/gcc3x-interp.c @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - StackInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + StackInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1898,7 +1898,7 @@ static void (*primitiveTable[MaxPrimitiveIndex + 2 /* 577 */])(void) = { 0 }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscogLLP64-nice.1919]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscogLLP64-nice.1920]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -37453,7 +37453,7 @@ printMethodCacheFor(sqInt thing) /* begin tab */ putchar(' '); if (((((usqInt)(longAt(s))) >> (instFormatFieldLSB())) & 15) >= (firstByteFormat())) { - printf("%" PRIxPTR " %.*s\n", s, (int)(numBytesOf(s)), (char *)firstIndexableField(s)); + printf("%" PRIxSQPTR " %.*s\n", s, (int)(numBytesOf(s)), (char *)firstIndexableField(s)); } else { shortPrintOop(s); diff --git a/stacksrc/vm/interp.c b/stacksrc/vm/interp.c index 4ebf3d2d8d..003d1c14fb 100644 --- a/stacksrc/vm/interp.c +++ b/stacksrc/vm/interp.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 from - StackInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + StackInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1895,7 +1895,7 @@ static void (*primitiveTable[MaxPrimitiveIndex + 2 /* 577 */])(void) = { 0 }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscogLLP64-nice.1919]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscogLLP64-nice.1920]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -37444,7 +37444,7 @@ printMethodCacheFor(sqInt thing) /* begin tab */ putchar(' '); if (((((usqInt)(longAt(s))) >> (instFormatFieldLSB())) & 15) >= (firstByteFormat())) { - printf("%" PRIxPTR " %.*s\n", s, (int)(numBytesOf(s)), (char *)firstIndexableField(s)); + printf("%" PRIxSQPTR " %.*s\n", s, (int)(numBytesOf(s)), (char *)firstIndexableField(s)); } else { shortPrintOop(s); diff --git a/stacksrc/vm/interp.h b/stacksrc/vm/interp.h index c6434dbf13..ca33c67d06 100644 --- a/stacksrc/vm/interp.h +++ b/stacksrc/vm/interp.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ #define VM_PROXY_MAJOR 1 diff --git a/stacksrc/vm/vmCallback.h b/stacksrc/vm/vmCallback.h index 421c4e448a..6ccb4003fd 100644 --- a/stacksrc/vm/vmCallback.h +++ b/stacksrc/vm/vmCallback.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c + CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 */ #define VM_CALLBACK_INC 1