Revision: 3707 Author: eliot Date: 2016-05-09 19:18:53 -0700 (Mon, 09 May 2016) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1856
Fix two regressions introduced into the ARM cogit in the register allocation changes made recently. a) getSave/RestoreRegs: should do nothing on ARM, and b) Extra0Reg must be distinct from the other registers (!!).
Modified Paths: -------------- branches/Cog/nsspur64src/vm/cogit.h branches/Cog/nsspur64src/vm/cogitX64.c branches/Cog/nsspur64src/vm/cointerp.c branches/Cog/nsspur64src/vm/cointerp.h branches/Cog/nsspur64src/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.c branches/Cog/nsspursrc/vm/cogitMIPSEL.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstack64src/vm/gcc3x-interp.c branches/Cog/nsspurstack64src/vm/interp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/spur64src/vm/cogit.h branches/Cog/spur64src/vm/cogitX64.c branches/Cog/spur64src/vm/cointerp.c branches/Cog/spur64src/vm/cointerp.h branches/Cog/spur64src/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.c branches/Cog/spursistasrc/vm/cogitMIPSEL.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogitARMv5.c branches/Cog/spursrc/vm/cogitIA32.c branches/Cog/spursrc/vm/cogitMIPSEL.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogitARMv5.c branches/Cog/src/vm/cogitIA32.c branches/Cog/src/vm/cogitMIPSEL.c
Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nsspur64src/vm/cogit.h =================================================================== --- branches/Cog/nsspur64src/vm/cogit.h 2016-05-07 02:54:05 UTC (rev 3706) +++ branches/Cog/nsspur64src/vm/cogit.h 2016-05-10 02:18:53 UTC (rev 3707) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 + CCodeGenerator VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 */
Modified: branches/Cog/nsspur64src/vm/cogitX64.c =================================================================== --- branches/Cog/nsspur64src/vm/cogitX64.c 2016-05-07 02:54:05 UTC (rev 3706) +++ branches/Cog/nsspur64src/vm/cogitX64.c 2016-05-10 02:18:53 UTC (rev 3707) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e + CCodeGenerator VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 from - StackToRegisterMappingCogit VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e + StackToRegisterMappingCogit VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
Modified: branches/Cog/nsspur64src/vm/cointerp.c =================================================================== --- branches/Cog/nsspur64src/vm/cointerp.c 2016-05-07 02:54:05 UTC (rev 3706) +++ branches/Cog/nsspur64src/vm/cointerp.c 2016-05-10 02:18:53 UTC (rev 3707) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 from - CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 + CoInterpreter VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2436,7 +2436,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1855"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1856"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace;
@@ -41189,7 +41189,7 @@ sqInt oopRcvr; sqInt oopResult; usqLong result; - sqInt resultIsNegative; + int resultIsNegative; char *sp;
oopArg = longAt(GIV(stackPointer) + (0 * BytesPerWord)); @@ -42991,7 +42991,7 @@ sqInt fmt; usqInt instBytes; sqInt instFormat; - usqInt newFormat; + sqInt newFormat; sqInt normalizedInstFormat; usqInt numBytes; usqInt numSlots; @@ -47095,7 +47095,7 @@ sqInt effectsFlags1; sqInt errCode; sqInt fieldOffset; - sqInt fieldOffset1; + usqInt fieldOffset1; sqInt fmt; sqInt hash; sqInt header; @@ -61362,7 +61362,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - usqInt prevPrevFreeChunk; + sqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -67174,7 +67174,7 @@ bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { usqInt bridgeSpan; - sqInt clifton; + usqInt clifton; usqInt segEnd;
segEnd = ((aSegment->segSize)) + ((aSegment->segStart)); @@ -67355,7 +67355,7 @@ static void postSnapshot(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt address; + usqInt address; sqInt bytes; usqInt freeChunk; sqInt i; @@ -67418,7 +67418,7 @@ sqInt limit; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; usqInt numSlots; usqInt numSlots1; SpurSegmentInfo *seg;
Modified: branches/Cog/nsspur64src/vm/cointerp.h =================================================================== --- branches/Cog/nsspur64src/vm/cointerp.h 2016-05-07 02:54:05 UTC (rev 3706) +++ branches/Cog/nsspur64src/vm/cointerp.h 2016-05-10 02:18:53 UTC (rev 3707) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 */
Modified: branches/Cog/nsspur64src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspur64src/vm/gcc3x-cointerp.c 2016-05-07 02:54:05 UTC (rev 3706) +++ branches/Cog/nsspur64src/vm/gcc3x-cointerp.c 2016-05-10 02:18:53 UTC (rev 3707) @@ -2,11 +2,11 @@
/* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 from - CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 + CoInterpreter VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2439,7 +2439,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1855"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1856"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace;
@@ -41198,7 +41198,7 @@ sqInt oopRcvr; sqInt oopResult; usqLong result; - sqInt resultIsNegative; + int resultIsNegative; char *sp;
oopArg = longAt(GIV(stackPointer) + (0 * BytesPerWord)); @@ -43000,7 +43000,7 @@ sqInt fmt; usqInt instBytes; sqInt instFormat; - usqInt newFormat; + sqInt newFormat; sqInt normalizedInstFormat; usqInt numBytes; usqInt numSlots; @@ -47104,7 +47104,7 @@ sqInt effectsFlags1; sqInt errCode; sqInt fieldOffset; - sqInt fieldOffset1; + usqInt fieldOffset1; sqInt fmt; sqInt hash; sqInt header; @@ -61371,7 +61371,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - usqInt prevPrevFreeChunk; + sqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -67183,7 +67183,7 @@ bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { usqInt bridgeSpan; - sqInt clifton; + usqInt clifton; usqInt segEnd;
segEnd = ((aSegment->segSize)) + ((aSegment->segStart)); @@ -67364,7 +67364,7 @@ static void postSnapshot(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt address; + usqInt address; sqInt bytes; usqInt freeChunk; sqInt i; @@ -67427,7 +67427,7 @@ sqInt limit; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; usqInt numSlots; usqInt numSlots1; SpurSegmentInfo *seg;
Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2016-05-07 02:54:05 UTC (rev 3706) +++ branches/Cog/nsspursrc/vm/cogit.h 2016-05-10 02:18:53 UTC (rev 3707) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 + CCodeGenerator VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 */
Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitARMv5.c 2016-05-07 02:54:05 UTC (rev 3706) +++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2016-05-10 02:18:53 UTC (rev 3707) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e + CCodeGenerator VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 from - StackToRegisterMappingCogit VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e + StackToRegisterMappingCogit VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
@@ -96,7 +96,7 @@ #define DPFPReg2 2 #define EncounteredUnknownBytecode -6 #define EQ 0 -#define Extra0Reg 12 +#define Extra0Reg 9 #define Fill32 4 #define FirstAnnotation 64 #define FirstJump 11 @@ -262,7 +262,6 @@ #define PushCw 75 #define PushR 73 #define R0 0 -#define R12 12 #define ReceiverIndex 5 #define ReceiverResultReg 7 #define RetN 8 @@ -753,7 +752,6 @@ extern sqInt recordPrimTraceFunc(void); static void recordRunTimeObjectReferences(void); static sqInt NoDbgRegParms registerMaskFor(sqInt reg); -static sqInt NoDbgRegParms registerMaskForandandand(sqInt reg1, sqInt reg2, sqInt reg3, sqInt reg4); static void NoDbgRegParms relocateCallsAndSelfReferencesInMethod(CogMethod *cogMethod); static void NoDbgRegParms relocateCallsInClosedPIC(CogMethod *cPIC); static sqInt NoDbgRegParms relocateIfCallOrMethodReferencemcpcdelta(sqInt annotation, char *mcpc, sqInt refDelta); @@ -2795,7 +2793,7 @@ { sqInt aWord; sqInt i; - usqInt instr; + sqInt instr; unsigned char savedCond;
assert(((self_in_concretizeConditionalInstruction->conditionOrNil)) != null); @@ -6101,46 +6099,24 @@
/* Restore the registers in regMask as saved by genSaveRegs:. Restore none, because the ARM ABI only defines callee saved registers, no - caller-saved regs. - But for the future... */ + caller-saved regs. */
/* CogARMCompiler>>#genRestoreRegs: */ static sqInt NoDbgRegParms genRestoreRegs(AbstractInstruction * self_in_genRestoreRegs, sqInt regMask) { - sqInt reg; - - assert(regMask == 0); - assert(!((regMask & (registerMaskForandandand(SP, FPReg, LR, PC))))); - for (reg = R0; reg <= R12; reg += 1) { - if (regMask & (1L << reg)) { - /* begin PopR: */ - genoperand(PopR, reg); - } - } return 0; }
/* Save the registers in regMask for a call into the C run-time from a trampoline. Save none, because the ARM ABI only defines callee saved - registers, no caller-saved regs. - But for the future... */ + registers, no caller-saved regs. */
/* CogARMCompiler>>#genSaveRegs: */ static sqInt NoDbgRegParms genSaveRegs(AbstractInstruction * self_in_genSaveRegs, sqInt regMask) { - sqInt reg; - - assert(regMask == 0); - assert(!((regMask & (registerMaskForandandand(SP, FPReg, LR, PC))))); - for (reg = R12; reg >= R0; reg += -1) { - if (regMask & (1L << reg)) { - /* begin PushR: */ - genoperand(PushR, reg); - } - } return 0; }
@@ -9953,9 +9929,9 @@ findMapLocationForMcpcinMethod(sqInt targetMcpc, CogMethod *cogMethod) { sqInt annotation; - sqInt map; + usqInt map; sqInt mapByte; - sqInt mcpc; + usqInt mcpc;
mcpc = (0 ? (((usqInt)cogMethod)) + cbNoSwitchEntryOffset @@ -10037,7 +10013,7 @@ followForwardedLiteralsIn(CogMethod *cogMethod) { sqInt annotation; - usqInt map; + sqInt map; sqInt mapByte; sqInt mcpc; sqInt result; @@ -11956,7 +11932,7 @@ mapForperformUntilarg(CogMethod *cogMethod, sqInt (*functionSymbol)(sqInt annotation, char *mcpc, sqInt arg), sqInt arg) { sqInt annotation; - usqInt map; + sqInt map; sqInt mapByte; sqInt mcpc; sqInt result; @@ -12061,7 +12037,7 @@ sqInt freedPIC; sqInt hasYoungObj; sqInt hasYoungObjPtr; - usqInt map; + sqInt map; sqInt mapByte; sqInt mcpc; sqInt remappedMethod; @@ -12177,7 +12153,7 @@ { sqInt annotation; CogMethod *cogMethod; - usqInt map; + sqInt map; sqInt mapByte; sqInt mcpc; sqInt result; @@ -12255,7 +12231,7 @@ CogMethod *cogMethod; sqInt hasYoungObj; sqInt hasYoungObjPtr; - usqInt map; + sqInt map; sqInt mapByte; sqInt mcpc; usqInt pointer; @@ -12373,8 +12349,8 @@ sqInt annotation; sqInt annotation1; CogMethod *cogMethod; - usqInt map; - usqInt map1; + sqInt map; + sqInt map1; sqInt mapByte; sqInt mapByte1; sqInt mcpc; @@ -12529,7 +12505,7 @@ markAndTraceOrFreeCogMethodfirstVisit(CogMethod *cogMethod, sqInt firstVisit) { sqInt annotation; - usqInt map; + sqInt map; sqInt mapByte; sqInt mcpc; sqInt result; @@ -12869,7 +12845,7 @@ { sqInt annotation; CogMethod *cogMethod; - usqInt map; + sqInt map; sqInt mapByte; sqInt mcpc; sqInt result; @@ -13601,20 +13577,13 @@ return 1L << reg; }
- /* Cogit>>#registerMaskFor:and:and:and: */ -static sqInt NoDbgRegParms -registerMaskForandandand(sqInt reg1, sqInt reg2, sqInt reg3, sqInt reg4) -{ - return (((1L << reg1) | (1L << reg2)) | (1L << reg3)) | (1L << reg4); -} - /* Cogit>>#relocateCallsAndSelfReferencesInMethod: */ static void NoDbgRegParms relocateCallsAndSelfReferencesInMethod(CogMethod *cogMethod) { sqInt annotation; sqLong callDelta; - usqInt map; + sqInt map; sqInt mapByte; sqInt mcpc; sqLong refDelta; @@ -14168,7 +14137,7 @@ { sqInt annotation; CogMethod *cogMethod; - usqInt map; + sqInt map; sqInt mapByte; sqInt mcpc; sqInt result; @@ -14609,7 +14578,7 @@ sqInt annotation; CogMethod *cogMethod; sqInt freedPIC; - usqInt map; + sqInt map; sqInt mapByte; sqInt mcpc; sqInt result; @@ -14684,7 +14653,7 @@ { sqInt annotation; CogMethod *cogMethod; - usqInt map; + sqInt map; sqInt mapByte; sqInt mcpc; sqInt mustScanAndUnlink; @@ -14781,7 +14750,7 @@ { sqInt annotation; CogMethod *cogMethod; - usqInt map; + sqInt map; sqInt mapByte; sqInt mcpc; sqInt result; @@ -14848,7 +14817,7 @@ sqInt annotation; CogMethod *cogMethod; sqInt freedPIC; - usqInt map; + sqInt map; sqInt mapByte; sqInt mcpc; sqInt result;
Modified: branches/Cog/nsspursrc/vm/cogitIA32.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitIA32.c 2016-05-07 02:54:05 UTC (rev 3706) +++ branches/Cog/nsspursrc/vm/cogitIA32.c 2016-05-10 02:18:53 UTC (rev 3707) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e + CCodeGenerator VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 from - StackToRegisterMappingCogit VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e + StackToRegisterMappingCogit VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
@@ -652,7 +652,7 @@ 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 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); @@ -6584,7 +6584,7 @@ blockDispatchTargetsForperformarg(CogMethod *cogMethod, usqInt (*binaryFunction)(sqInt mcpc, sqInt arg), sqInt arg) { sqInt blockEntry; - usqInt end; + sqInt end; sqInt pc; sqInt result; usqInt targetpc; @@ -6633,7 +6633,7 @@ sqInt isBackwardBranch; sqInt isInBlock; sqInt latestContinuation; - usqInt map; + sqInt map; sqInt mapByte; usqInt mcpc1; sqInt nExts; @@ -9011,7 +9011,7 @@ findMapLocationForMcpcinMethod(sqInt targetMcpc, CogMethod *cogMethod) { sqInt annotation; - usqInt map; + sqInt map; sqInt mapByte; usqInt mcpc;
@@ -9097,7 +9097,7 @@ sqInt annotation; sqInt map; sqInt mapByte; - sqInt mcpc; + usqInt mcpc; sqInt result;
assert((((cogMethod->cmType)) != CMMethod) @@ -9669,12 +9669,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - usqInt delta; + sqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - usqInt location; - usqInt mapEntry; + sqInt location; + sqInt mapEntry; sqInt maxDelta; usqInt mcpc;
@@ -10920,10 +10920,10 @@ /* 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; + sqInt end;
end = ((((usqInt)cogMethod)) + ((cogMethod->blockSize))) - 1; while ((byteAt(end)) != MapEnd) { @@ -10943,7 +10943,7 @@ sqInt annotation; sqInt map; sqInt mapByte; - sqInt mcpc; + usqInt mcpc; sqInt result;
mcpc = (0 @@ -11048,7 +11048,7 @@ sqInt hasYoungObjPtr; sqInt map; sqInt mapByte; - sqInt mcpc; + usqInt mcpc; sqInt remappedMethod; sqInt result; sqInt val; @@ -11164,7 +11164,7 @@ CogMethod *cogMethod; sqInt map; sqInt mapByte; - sqInt mcpc; + usqInt mcpc; sqInt result;
codeModified = 0; @@ -11242,7 +11242,7 @@ sqInt hasYoungObjPtr; sqInt map; sqInt mapByte; - sqInt mcpc; + usqInt mcpc; usqInt pointer; sqInt result; sqInt val; @@ -11362,8 +11362,8 @@ sqInt map1; sqInt mapByte; sqInt mapByte1; - sqInt mcpc; - sqInt mcpc1; + usqInt mcpc; + usqInt mcpc1; sqInt result; sqInt result1; sqInt val; @@ -11516,7 +11516,7 @@ sqInt annotation; sqInt map; sqInt mapByte; - sqInt mcpc; + usqInt mcpc; sqInt result; sqInt val;
@@ -11856,7 +11856,7 @@ CogMethod *cogMethod; sqInt map; sqInt mapByte; - sqInt mcpc; + usqInt mcpc; sqInt result;
assert((((aCogMethod->cmType)) == CMMethod) @@ -11985,7 +11985,7 @@ sqInt isBackwardBranch; sqInt isInBlock; sqInt latestContinuation; - usqInt map; + sqInt map; sqInt mapByte; usqInt mcpc; sqInt nExts; @@ -12428,7 +12428,7 @@ printPCMapPairsFor(CogMethod *cogMethod) { sqInt annotation; - usqInt map; + sqInt map; unsigned char mapByte; usqInt mcpc; sqInt value; @@ -12602,7 +12602,7 @@ sqLong callDelta; sqInt map; sqInt mapByte; - sqInt mcpc; + usqInt mcpc; sqLong refDelta; sqInt result;
@@ -13161,7 +13161,7 @@ CogMethod *cogMethod; sqInt map; sqInt mapByte; - sqInt mcpc; + usqInt mcpc; sqInt result;
if (!(methodZoneBase)) { @@ -13602,7 +13602,7 @@ sqInt freedPIC; sqInt map; sqInt mapByte; - sqInt mcpc; + usqInt mcpc; sqInt result;
if (!(methodZoneBase)) { @@ -13677,7 +13677,7 @@ CogMethod *cogMethod; sqInt map; sqInt mapByte; - sqInt mcpc; + usqInt mcpc; sqInt mustScanAndUnlink; sqInt result;
@@ -13774,7 +13774,7 @@ CogMethod *cogMethod; sqInt map; sqInt mapByte; - sqInt mcpc; + usqInt mcpc; sqInt result;
if (!(methodZoneBase)) { @@ -13841,7 +13841,7 @@ sqInt freedPIC; sqInt map; sqInt mapByte; - sqInt mcpc; + usqInt mcpc; sqInt result; CogMethod *targetMethod;
@@ -22032,7 +22032,7 @@ sqInt isBackwardBranch; sqInt isInBlock; sqInt latestContinuation; - usqInt map; + sqInt map; sqInt mapByte; usqInt mcpc; sqInt nExts;
Modified: branches/Cog/nsspursrc/vm/cogitMIPSEL.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitMIPSEL.c 2016-05-07 02:54:05 UTC (rev 3706) +++ branches/Cog/nsspursrc/vm/cogitMIPSEL.c 2016-05-10 02:18:53 UTC (rev 3707) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e + CCodeGenerator VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 from - StackToRegisterMappingCogit VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e + StackToRegisterMappingCogit VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
@@ -646,7 +646,7 @@ 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); @@ -2643,7 +2643,7 @@ blockDispatchTargetsForperformarg(CogMethod *cogMethod, usqInt (*binaryFunction)(sqInt mcpc, sqInt arg), sqInt arg) { sqInt blockEntry; - sqInt end; + usqInt end; sqInt pc; sqInt result; usqInt targetpc; @@ -2687,12 +2687,12 @@ sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - sqInt endbcpc; + usqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; sqInt latestContinuation; - sqInt map; + usqInt map; sqInt mapByte; usqInt mcpc1; sqInt nExts; @@ -4711,7 +4711,7 @@ static sqInt NoDbgRegParms cPICHasFreedTargets(CogMethod *cPIC) { - sqInt entryPoint; + usqInt entryPoint; sqInt i; sqInt pc; CogMethod *targetMethod; @@ -5096,9 +5096,9 @@ findMapLocationForMcpcinMethod(sqInt targetMcpc, CogMethod *cogMethod) { sqInt annotation; - sqInt map; + usqInt map; sqInt mapByte; - usqInt mcpc; + sqInt mcpc;
mcpc = (0 ? (((usqInt)cogMethod)) + cbNoSwitchEntryOffset @@ -5180,7 +5180,7 @@ followForwardedLiteralsIn(CogMethod *cogMethod) { sqInt annotation; - sqInt map; + usqInt map; sqInt mapByte; sqInt mcpc; sqInt result; @@ -6990,10 +6990,10 @@ /* 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) { - sqInt end; + usqInt end;
end = ((((usqInt)cogMethod)) + ((cogMethod->blockSize))) - 1; while ((byteAt(end)) != MapEnd) { @@ -7011,7 +7011,7 @@ mapForperformUntilarg(CogMethod *cogMethod, sqInt (*functionSymbol)(sqInt annotation, char *mcpc, sqInt arg), sqInt arg) { sqInt annotation; - sqInt map; + usqInt map; sqInt mapByte; sqInt mcpc; sqInt result; @@ -7115,7 +7115,7 @@ sqInt freedPIC; sqInt hasYoungObj; sqInt hasYoungObjPtr; - sqInt map; + usqInt map; sqInt mapByte; sqInt mcpc; sqInt remappedMethod; @@ -7231,7 +7231,7 @@ { sqInt annotation; CogMethod *cogMethod; - sqInt map; + usqInt map; sqInt mapByte; sqInt mcpc; sqInt result; @@ -7309,7 +7309,7 @@ CogMethod *cogMethod; sqInt hasYoungObj; sqInt hasYoungObjPtr; - sqInt map; + usqInt map; sqInt mapByte; sqInt mcpc; usqInt pointer; @@ -7427,8 +7427,8 @@ sqInt annotation; sqInt annotation1; CogMethod *cogMethod; - sqInt map; - sqInt map1; + usqInt map; + usqInt map1; sqInt mapByte; sqInt mapByte1; sqInt mcpc; @@ -7583,7 +7583,7 @@ markAndTraceOrFreeCogMethodfirstVisit(CogMethod *cogMethod, sqInt firstVisit) { sqInt annotation; - sqInt map; + usqInt map; sqInt mapByte; sqInt mcpc; sqInt result; @@ -7923,7 +7923,7 @@ { sqInt annotation; CogMethod *cogMethod; - sqInt map; + usqInt map; sqInt mapByte; sqInt mcpc; sqInt result; @@ -8049,12 +8049,12 @@ sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - sqInt endbcpc; + usqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; sqInt latestContinuation; - sqInt map; + usqInt map; sqInt mapByte; usqInt mcpc; sqInt nExts; @@ -8497,9 +8497,9 @@ printPCMapPairsFor(CogMethod *cogMethod) { sqInt annotation; - sqInt map; + usqInt map; unsigned char mapByte; - sqInt mcpc; + usqInt mcpc; sqInt value;
mcpc = (0 @@ -8669,7 +8669,7 @@ { sqInt annotation; sqLong callDelta; - sqInt map; + usqInt map; sqInt mapByte; sqInt mcpc; sqLong refDelta; @@ -9229,7 +9229,7 @@ { sqInt annotation; CogMethod *cogMethod; - sqInt map; + usqInt map; sqInt mapByte; sqInt mcpc; sqInt result; @@ -9670,7 +9670,7 @@ sqInt annotation; CogMethod *cogMethod; sqInt freedPIC; - sqInt map; + usqInt map; sqInt mapByte; sqInt mcpc; sqInt result; @@ -9745,7 +9745,7 @@ { sqInt annotation; CogMethod *cogMethod; - sqInt map; + usqInt map; sqInt mapByte; sqInt mcpc; sqInt mustScanAndUnlink; @@ -9842,7 +9842,7 @@ { sqInt annotation; CogMethod *cogMethod; - sqInt map; + usqInt map; sqInt mapByte; sqInt mcpc; sqInt result; @@ -9909,7 +9909,7 @@ sqInt annotation; CogMethod *cogMethod; sqInt freedPIC; - sqInt map; + usqInt map; sqInt mapByte; sqInt mcpc; sqInt result; @@ -14758,7 +14758,7 @@ 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) @@ -22249,13 +22249,13 @@ CogBlockMethod *cogMethod1; BytecodeDescriptor *descriptor; sqInt distance; - sqInt endbcpc; + usqInt endbcpc; sqInt errCode; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; sqInt latestContinuation; - sqInt map; + usqInt map; sqInt mapByte; usqInt mcpc; sqInt nExts;
Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2016-05-07 02:54:05 UTC (rev 3706) +++ branches/Cog/nsspursrc/vm/cointerp.c 2016-05-10 02:18:53 UTC (rev 3707) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 from - CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 + CoInterpreter VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2412,7 +2412,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1855"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1856"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace;
@@ -28503,7 +28503,7 @@ sqInt ccIndex1; sqInt fmt; sqInt ok; - sqInt smallIntValue; + int smallIntValue; sqInt sz; usqLong value;
@@ -40373,7 +40373,7 @@ sqInt oopRcvr; sqInt oopResult; usqLong result; - sqInt resultIsNegative; + int resultIsNegative; char *sp;
oopArg = longAt(GIV(stackPointer) + (0 * BytesPerWord)); @@ -60296,7 +60296,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - usqInt prevPrevFreeChunk; + sqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -66092,7 +66092,7 @@ bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { usqInt bridgeSpan; - usqInt clifton; + sqInt clifton; usqInt segEnd;
segEnd = ((aSegment->segSize)) + ((aSegment->segStart)); @@ -66273,7 +66273,7 @@ static void postSnapshot(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt address; + sqInt address; sqInt bytes; usqInt freeChunk; sqInt i; @@ -66679,8 +66679,8 @@ { usqLong firstSavedBridgeWord; sqInt nWritten; - usqInt pier1; - usqInt pier2; + sqInt pier1; + sqInt pier2; usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2016-05-07 02:54:05 UTC (rev 3706) +++ branches/Cog/nsspursrc/vm/cointerp.h 2016-05-10 02:18:53 UTC (rev 3707) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 */
Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2016-05-07 02:54:05 UTC (rev 3706) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2016-05-10 02:18:53 UTC (rev 3707) @@ -2,11 +2,11 @@
/* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 from - CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 + CoInterpreter VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2415,7 +2415,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1855"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1856"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace;
@@ -28512,7 +28512,7 @@ sqInt ccIndex1; sqInt fmt; sqInt ok; - sqInt smallIntValue; + int smallIntValue; sqInt sz; usqLong value;
@@ -40382,7 +40382,7 @@ sqInt oopRcvr; sqInt oopResult; usqLong result; - sqInt resultIsNegative; + int resultIsNegative; char *sp;
oopArg = longAt(GIV(stackPointer) + (0 * BytesPerWord)); @@ -60305,7 +60305,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - usqInt prevPrevFreeChunk; + sqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -66101,7 +66101,7 @@ bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { usqInt bridgeSpan; - usqInt clifton; + sqInt clifton; usqInt segEnd;
segEnd = ((aSegment->segSize)) + ((aSegment->segStart)); @@ -66282,7 +66282,7 @@ static void postSnapshot(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt address; + sqInt address; sqInt bytes; usqInt freeChunk; sqInt i; @@ -66688,8 +66688,8 @@ { usqLong firstSavedBridgeWord; sqInt nWritten; - usqInt pier1; - usqInt pier2; + sqInt pier1; + sqInt pier2; usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
Modified: branches/Cog/nsspurstack64src/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2016-05-07 02:54:05 UTC (rev 3706) +++ branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2016-05-10 02:18:53 UTC (rev 3707) @@ -2,11 +2,11 @@
/* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 from - StackInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 + StackInterpreter VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2178,7 +2178,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1855"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1856"; volatile int sendTrace; sqInt suppressHeartbeatFlag;
Modified: branches/Cog/nsspurstack64src/vm/interp.c =================================================================== --- branches/Cog/nsspurstack64src/vm/interp.c 2016-05-07 02:54:05 UTC (rev 3706) +++ branches/Cog/nsspurstack64src/vm/interp.c 2016-05-10 02:18:53 UTC (rev 3707) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 from - StackInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 + StackInterpreter VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2175,7 +2175,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1855"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1856"; volatile int sendTrace; sqInt suppressHeartbeatFlag;
Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2016-05-07 02:54:05 UTC (rev 3706) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2016-05-10 02:18:53 UTC (rev 3707) @@ -2,11 +2,11 @@
/* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 from - StackInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 + StackInterpreter VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2155,7 +2155,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1855"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1856"; volatile int sendTrace; sqInt suppressHeartbeatFlag;
Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2016-05-07 02:54:05 UTC (rev 3706) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2016-05-10 02:18:53 UTC (rev 3707) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 from - StackInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 + StackInterpreter VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2152,7 +2152,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1855"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1856"; volatile int sendTrace; sqInt suppressHeartbeatFlag;
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sun May 1 22:11:41 PDT 2016 + Mon May 9 19:17:20 PDT 2016
Modified: branches/Cog/spur64src/vm/cogit.h =================================================================== --- branches/Cog/spur64src/vm/cogit.h 2016-05-07 02:54:05 UTC (rev 3706) +++ branches/Cog/spur64src/vm/cogit.h 2016-05-10 02:18:53 UTC (rev 3707) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 + CCodeGenerator VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 */
Modified: branches/Cog/spur64src/vm/cogitX64.c =================================================================== --- branches/Cog/spur64src/vm/cogitX64.c 2016-05-07 02:54:05 UTC (rev 3706) +++ branches/Cog/spur64src/vm/cogitX64.c 2016-05-10 02:18:53 UTC (rev 3707) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e + CCodeGenerator VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 from - StackToRegisterMappingCogit VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e + StackToRegisterMappingCogit VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
@@ -584,7 +584,7 @@ static AbstractInstruction * NoDbgRegParms gMoveCwR(sqInt wordConstant, sqInt reg); 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); @@ -2430,7 +2430,7 @@ blockDispatchTargetsForperformarg(CogMethod *cogMethod, usqInt (*binaryFunction)(sqInt mcpc, sqInt arg), sqInt arg) { sqInt blockEntry; - sqInt end; + usqInt end; sqInt pc; sqInt result; usqInt targetpc; @@ -2474,7 +2474,7 @@ sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -3255,7 +3255,7 @@ closedPICRefersToUnmarkedObject(CogMethod *cPIC) { sqInt i; - sqInt object; + usqInt object; sqInt pc;
if (!((isImmediate((cPIC->selector))) @@ -4781,7 +4781,7 @@ sqInt annotation; usqInt map; sqInt mapByte; - usqInt mcpc; + sqInt mcpc;
mcpc = (0 ? (((usqInt)cogMethod)) + cbNoSwitchEntryOffset @@ -6512,10 +6512,10 @@ /* 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) { - sqInt end; + usqInt end;
end = ((((usqInt)cogMethod)) + ((cogMethod->blockSize))) - 1; while ((byteAt(end)) != MapEnd) { @@ -7459,7 +7459,7 @@ sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -7907,9 +7907,9 @@ printPCMapPairsFor(CogMethod *cogMethod) { sqInt annotation; - sqInt map; + usqInt map; unsigned char mapByte; - usqInt mcpc; + sqInt mcpc; sqInt value;
mcpc = (0 @@ -21003,7 +21003,7 @@ CogBlockMethod *cogMethod1; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; sqInt errCode; CogMethod *homeMethod; sqInt isBackwardBranch;
Modified: branches/Cog/spur64src/vm/cointerp.c =================================================================== --- branches/Cog/spur64src/vm/cointerp.c 2016-05-07 02:54:05 UTC (rev 3706) +++ branches/Cog/spur64src/vm/cointerp.c 2016-05-10 02:18:53 UTC (rev 3707) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 from - CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 + CoInterpreter VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2399,7 +2399,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1855]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1856]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace;
@@ -35179,7 +35179,7 @@ sqInt oopRcvr; sqInt oopResult; usqLong result; - sqInt resultIsNegative; + int resultIsNegative; char *sp;
oopArg = longAt(GIV(stackPointer) + (0 * BytesPerWord)); @@ -36981,7 +36981,7 @@ sqInt fmt; usqInt instBytes; sqInt instFormat; - usqInt newFormat; + sqInt newFormat; sqInt normalizedInstFormat; usqInt numBytes; usqInt numSlots; @@ -55352,7 +55352,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - sqInt prevPrevFreeChunk; + usqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there;
Modified: branches/Cog/spur64src/vm/cointerp.h =================================================================== --- branches/Cog/spur64src/vm/cointerp.h 2016-05-07 02:54:05 UTC (rev 3706) +++ branches/Cog/spur64src/vm/cointerp.h 2016-05-10 02:18:53 UTC (rev 3707) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 */
Modified: branches/Cog/spur64src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spur64src/vm/gcc3x-cointerp.c 2016-05-07 02:54:05 UTC (rev 3706) +++ branches/Cog/spur64src/vm/gcc3x-cointerp.c 2016-05-10 02:18:53 UTC (rev 3707) @@ -2,11 +2,11 @@
/* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 from - CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 + CoInterpreter VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2402,7 +2402,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1855]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1856]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace;
@@ -35188,7 +35188,7 @@ sqInt oopRcvr; sqInt oopResult; usqLong result; - sqInt resultIsNegative; + int resultIsNegative; char *sp;
oopArg = longAt(GIV(stackPointer) + (0 * BytesPerWord)); @@ -36990,7 +36990,7 @@ sqInt fmt; usqInt instBytes; sqInt instFormat; - usqInt newFormat; + sqInt newFormat; sqInt normalizedInstFormat; usqInt numBytes; usqInt numSlots; @@ -55361,7 +55361,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - sqInt prevPrevFreeChunk; + usqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there;
Modified: branches/Cog/spursistasrc/vm/cogit.h =================================================================== --- branches/Cog/spursistasrc/vm/cogit.h 2016-05-07 02:54:05 UTC (rev 3706) +++ branches/Cog/spursistasrc/vm/cogit.h 2016-05-10 02:18:53 UTC (rev 3707) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 + CCodeGenerator VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 */
Modified: branches/Cog/spursistasrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/spursistasrc/vm/cogitARMv5.c 2016-05-07 02:54:05 UTC (rev 3706) +++ branches/Cog/spursistasrc/vm/cogitARMv5.c 2016-05-10 02:18:53 UTC (rev 3707) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e + CCodeGenerator VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 from - SistaCogit VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e + SistaCogit VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 */ -static char __buildInfo[] = "SistaCogit VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e " __DATE__ ; +static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.1856 uuid: ddc1d13f-a8de-4cb1-af85-65ca64ffbe34 " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
@@ -97,7 +97,7 @@ #define DPFPReg2 2 #define EncounteredUnknownBytecode -6 #define EQ 0 -#define Extra0Reg 12 +#define Extra0Reg 9 #define Fill32 4 #define FirstAnnotation 64 #define FirstJump 11 @@ -260,7 +260,6 @@ #define PushCw 75 #define PushR 73 #define R0 0 -#define R12 12 #define ReceiverIndex 5 #define ReceiverResultReg 7 #define RetN 8 @@ -699,7 +698,7 @@ 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); @@ -746,7 +745,6 @@ extern sqInt recordPrimTraceFunc(void); static void recordRunTimeObjectReferences(void); static sqInt NoDbgRegParms registerMaskFor(sqInt reg); -static sqInt NoDbgRegParms registerMaskForandandand(sqInt reg1, sqInt reg2, sqInt reg3, sqInt reg4); static void NoDbgRegParms relocateCallsAndSelfReferencesInMethod(CogMethod *cogMethod);
@@ Diff output truncated at 50000 characters. @@
vm-dev@lists.squeakfoundation.org