diff --git a/nsspur64src/vm/cogit.h b/nsspur64src/vm/cogit.h index 5b93ffafc8..372d5c3d26 100644 --- a/nsspur64src/vm/cogit.h +++ b/nsspur64src/vm/cogit.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 */ diff --git a/nsspur64src/vm/cogitX64.c b/nsspur64src/vm/cogitX64.c index 38dc9ab07a..97af96a25a 100644 --- a/nsspur64src/vm/cogitX64.c +++ b/nsspur64src/vm/cogitX64.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -643,7 +643,7 @@ static BytecodeDescriptor * loadBytesAndGetDescriptor(void); static void NoDbgRegParms loadSubsequentBytesForDescriptorat(BytecodeDescriptor *descriptor, sqInt pc); static AbstractInstruction * NoDbgRegParms gMoveAwR(sqInt address, sqInt reg); static AbstractInstruction * NoDbgRegParms gMoveCwR(sqInt wordConstant, sqInt reg); -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); @@ -2814,7 +2814,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; @@ -7265,7 +7265,7 @@ gMoveCwR(sqInt wordConstant, sqInt reg) /* 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; @@ -28748,7 +28748,6 @@ genSpecialSelectorArithmetic(void) genoperandoperand(MoveRR, ReceiverResultReg, TempReg), /* begin AndR:R: */ genoperandoperand(AndRR, Arg0Reg, TempReg), - /* begin genJumpNotSmallIntegerInScratchReg: */ genJumpNotSmallInteger(TempReg)))) : 0); @@ -28993,7 +28992,6 @@ genSpecialSelectorComparison(void) genoperandoperand(MoveRR, ReceiverResultReg, TempReg), /* begin AndR:R: */ genoperandoperand(AndRR, Arg0Reg, TempReg), - /* begin genJumpNotSmallIntegerInScratchReg: */ genJumpNotSmallInteger(TempReg)))) : 0); if (argIsIntConst) { diff --git a/nsspursrc/vm/cogit.h b/nsspursrc/vm/cogit.h index 5b93ffafc8..372d5c3d26 100644 --- a/nsspursrc/vm/cogit.h +++ b/nsspursrc/vm/cogit.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 */ diff --git a/nsspursrc/vm/cogitARMv5.c b/nsspursrc/vm/cogitARMv5.c index 58db132ff3..bdf8e2ef43 100644 --- a/nsspursrc/vm/cogitARMv5.c +++ b/nsspursrc/vm/cogitARMv5.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -7590,7 +7590,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; diff --git a/nsspursrc/vm/cogitIA32.c b/nsspursrc/vm/cogitIA32.c index aa5c8a9c91..44110fb6a4 100644 --- a/nsspursrc/vm/cogitIA32.c +++ b/nsspursrc/vm/cogitIA32.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -707,7 +707,7 @@ static BytecodeDescriptor * loadBytesAndGetDescriptor(void); static void NoDbgRegParms loadSubsequentBytesForDescriptorat(BytecodeDescriptor *descriptor, sqInt pc); static AbstractInstruction * NoDbgRegParms gMoveAwR(sqInt address, sqInt reg); static AbstractInstruction * NoDbgRegParms gMoveCwR(sqInt wordConstant, sqInt reg); -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); @@ -7590,7 +7590,7 @@ bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod) sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -10767,12 +10767,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; @@ -11982,7 +11982,7 @@ gMoveCwR(sqInt wordConstant, sqInt reg) /* 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; @@ -13035,7 +13035,7 @@ mcPCForBackwardBranchstartBcpcin(sqInt bcpc, sqInt startbcpc, CogBlockMethod *co sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -23575,7 +23575,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 e07bed4f43..9bedfc056c 100644 --- a/nsspursrc/vm/cogitMIPSEL.c +++ b/nsspursrc/vm/cogitMIPSEL.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -2728,7 +2728,7 @@ bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod) sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -4781,7 +4781,7 @@ configureMNUCPICmethodOperandnumArgsdelta(CogMethod *cPIC, sqInt methodOperand, static sqInt NoDbgRegParms cPICCompactAndIsNowEmpty(CogMethod *cPIC) { - usqInt entryPoint; + sqInt entryPoint; sqInt followingAddress; sqInt i; sqInt methods[MaxCPICCases]; @@ -5927,12 +5927,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; @@ -6630,7 +6630,7 @@ static sqInt NoDbgRegParms incrementUsageOfTargetIfLinkedSendmcpcignored(sqInt annotation, char *mcpc, sqInt superfluity) { usqInt cacheAddress; - sqInt entryPoint; + usqInt entryPoint; usqInt entryPoint1; char *mcpc1; NSSendCache *nsSendCache; @@ -8159,7 +8159,7 @@ mcPCForBackwardBranchstartBcpcin(sqInt bcpc, sqInt startbcpc, CogBlockMethod *co sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -9392,7 +9392,7 @@ static sqInt NoDbgRegParms unlinkIfFreeOrLinkedSendpcof(sqInt annotation, char *mcpc, sqInt theSelector) { usqInt cacheAddress; - sqInt entryPoint; + usqInt entryPoint; usqInt entryPoint1; char *mcpc1; NSSendCache *nsSendCache; @@ -9696,7 +9696,7 @@ static sqInt NoDbgRegParms unlinkIfLinkedSendpcto(sqInt annotation, char *mcpc, sqInt theCogMethod) { usqInt cacheAddress; - usqInt entryPoint; + sqInt entryPoint; usqInt entryPoint1; char *mcpc1; NSSendCache *nsSendCache; @@ -14858,7 +14858,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); @@ -14911,7 +14911,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) @@ -22837,7 +22837,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/spur64src/vm/cogit.h b/spur64src/vm/cogit.h index 58814e077d..0e5e4e7991 100644 --- a/spur64src/vm/cogit.h +++ b/spur64src/vm/cogit.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 */ diff --git a/spur64src/vm/cogitX64.c b/spur64src/vm/cogitX64.c index 8ddcacc72d..094db294bb 100644 --- a/spur64src/vm/cogitX64.c +++ b/spur64src/vm/cogitX64.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -2794,7 +2794,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; @@ -2838,7 +2838,7 @@ bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod) sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -6091,12 +6091,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; @@ -8080,7 +8080,7 @@ mcPCForBackwardBranchstartBcpcin(sqInt bcpc, sqInt startbcpc, CogBlockMethod *co sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -23778,7 +23778,7 @@ mapPCDataForinto(CogMethod *cogMethod, sqInt arrayObj) CogBlockMethod *cogMethod1; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; sqInt errCode; CogMethod *homeMethod; sqInt isBackwardBranch; @@ -28185,7 +28185,6 @@ genSpecialSelectorArithmetic(void) genoperandoperand(MoveRR, ReceiverResultReg, TempReg), /* begin AndR:R: */ genoperandoperand(AndRR, Arg0Reg, TempReg), - /* begin genJumpNotSmallIntegerInScratchReg: */ genJumpNotSmallInteger(TempReg)))) : 0); @@ -28430,7 +28429,6 @@ genSpecialSelectorComparison(void) genoperandoperand(MoveRR, ReceiverResultReg, TempReg), /* begin AndR:R: */ genoperandoperand(AndRR, Arg0Reg, TempReg), - /* begin genJumpNotSmallIntegerInScratchReg: */ genJumpNotSmallInteger(TempReg)))) : 0); if (argIsIntConst) { diff --git a/spurlowcode64src/vm/cogit.h b/spurlowcode64src/vm/cogit.h index 58814e077d..0e5e4e7991 100644 --- a/spurlowcode64src/vm/cogit.h +++ b/spurlowcode64src/vm/cogit.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 */ diff --git a/spurlowcode64src/vm/cogitX64.c b/spurlowcode64src/vm/cogitX64.c index 786dfa1991..f05f40633d 100644 --- a/spurlowcode64src/vm/cogitX64.c +++ b/spurlowcode64src/vm/cogitX64.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -692,7 +692,7 @@ static BytecodeDescriptor * loadBytesAndGetDescriptor(void); static void NoDbgRegParms loadSubsequentBytesForDescriptorat(BytecodeDescriptor *descriptor, sqInt pc); static AbstractInstruction * NoDbgRegParms gMoveAwR(sqInt address, sqInt reg); static AbstractInstruction * NoDbgRegParms gMoveCwR(sqInt wordConstant, sqInt reg); -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); @@ -4110,7 +4110,7 @@ static sqInt NoDbgRegParms closedPICRefersToUnmarkedObject(CogMethod *cPIC) { sqInt i; - sqInt object; + usqInt object; sqInt pc; if (!((isImmediate((cPIC->selector))) @@ -7024,12 +7024,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; @@ -8236,7 +8236,7 @@ gMoveCwR(sqInt wordConstant, sqInt reg) /* 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; @@ -40023,7 +40023,6 @@ genSpecialSelectorArithmetic(void) genoperandoperand(MoveRR, ReceiverResultReg, TempReg), /* begin AndR:R: */ genoperandoperand(AndRR, Arg0Reg, TempReg), - /* begin genJumpNotSmallIntegerInScratchReg: */ genJumpNotSmallInteger(TempReg)))) : 0); @@ -40268,7 +40267,6 @@ genSpecialSelectorComparison(void) genoperandoperand(MoveRR, ReceiverResultReg, TempReg), /* begin AndR:R: */ genoperandoperand(AndRR, Arg0Reg, TempReg), - /* begin genJumpNotSmallIntegerInScratchReg: */ genJumpNotSmallInteger(TempReg)))) : 0); if (argIsIntConst) { diff --git a/spurlowcodesrc/vm/cogit.h b/spurlowcodesrc/vm/cogit.h index 58814e077d..0e5e4e7991 100644 --- a/spurlowcodesrc/vm/cogit.h +++ b/spurlowcodesrc/vm/cogit.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 */ diff --git a/spurlowcodesrc/vm/cogitARMv5.c b/spurlowcodesrc/vm/cogitARMv5.c index aaf65e39e8..f43a0c85aa 100644 --- a/spurlowcodesrc/vm/cogitARMv5.c +++ b/spurlowcodesrc/vm/cogitARMv5.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -792,7 +792,7 @@ static BytecodeDescriptor * loadBytesAndGetDescriptor(void); static void NoDbgRegParms loadSubsequentBytesForDescriptorat(BytecodeDescriptor *descriptor, sqInt pc); static AbstractInstruction * NoDbgRegParms gMoveAwR(sqInt address, sqInt reg); static AbstractInstruction * NoDbgRegParms gMoveCwR(sqInt wordConstant, sqInt reg); -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); @@ -8079,7 +8079,7 @@ bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod) sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -13068,7 +13068,7 @@ gMoveCwR(sqInt wordConstant, sqInt reg) /* 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; @@ -14013,7 +14013,7 @@ mcPCForBackwardBranchstartBcpcin(sqInt bcpc, sqInt startbcpc, CogBlockMethod *co sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -26983,7 +26983,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/spurlowcodesrc/vm/cogitIA32.c b/spurlowcodesrc/vm/cogitIA32.c index 0ba6fb50a8..7782ec23d8 100644 --- a/spurlowcodesrc/vm/cogitIA32.c +++ b/spurlowcodesrc/vm/cogitIA32.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -752,7 +752,7 @@ static BytecodeDescriptor * loadBytesAndGetDescriptor(void); static void NoDbgRegParms loadSubsequentBytesForDescriptorat(BytecodeDescriptor *descriptor, sqInt pc); static AbstractInstruction * NoDbgRegParms gMoveAwR(sqInt address, sqInt reg); static AbstractInstruction * NoDbgRegParms gMoveCwR(sqInt wordConstant, sqInt reg); -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); @@ -7992,7 +7992,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; @@ -11662,12 +11662,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; @@ -12899,7 +12899,7 @@ gMoveCwR(sqInt wordConstant, sqInt reg) /* 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; diff --git a/spurlowcodesrc/vm/cogitMIPSEL.c b/spurlowcodesrc/vm/cogitMIPSEL.c index 758f1b5d62..7a14c44ae5 100644 --- a/spurlowcodesrc/vm/cogitMIPSEL.c +++ b/spurlowcodesrc/vm/cogitMIPSEL.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -5578,7 +5578,7 @@ configureMNUCPICmethodOperandnumArgsdelta(CogMethod *cPIC, sqInt methodOperand, static sqInt NoDbgRegParms cPICCompactAndIsNowEmpty(CogMethod *cPIC) { - sqInt entryPoint; + usqInt entryPoint; sqInt followingAddress; sqInt i; sqInt methods[MaxCPICCases]; @@ -15348,7 +15348,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); @@ -15401,7 +15401,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/spursista64src/vm/cogit.h b/spursista64src/vm/cogit.h index 3bcc136706..d0317caa20 100644 --- a/spursista64src/vm/cogit.h +++ b/spursista64src/vm/cogit.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 */ diff --git a/spursista64src/vm/cogitX64.c b/spursista64src/vm/cogitX64.c index ff43d805e2..d5379b803f 100644 --- a/spursista64src/vm/cogitX64.c +++ b/spursista64src/vm/cogitX64.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 from - SistaCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + SistaCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 */ -static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 " __DATE__ ; +static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -2897,7 +2897,7 @@ bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod) sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -6121,12 +6121,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; @@ -8057,7 +8057,7 @@ mcPCForBackwardBranchstartBcpcin(sqInt bcpc, sqInt startbcpc, CogBlockMethod *co sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -24528,7 +24528,7 @@ mapPCDataForinto(CogMethod *cogMethod, sqInt arrayObj) CogBlockMethod *cogMethod1; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; sqInt errCode; CogMethod *homeMethod; sqInt isBackwardBranch; @@ -28148,7 +28148,6 @@ genSpecialSelectorComparison(void) genoperandoperand(MoveRR, ReceiverResultReg, TempReg), /* begin AndR:R: */ genoperandoperand(AndRR, Arg0Reg, TempReg), - /* begin genJumpNotSmallIntegerInScratchReg: */ genJumpNotSmallInteger(TempReg)))) : 0); counterReg = allocateRegNotConflictingWith((1U << ReceiverResultReg) | (1U << Arg0Reg)); @@ -28327,7 +28326,6 @@ genSpecialSelectorComparisonWithoutCounters(void) genoperandoperand(MoveRR, ReceiverResultReg, TempReg), /* begin AndR:R: */ genoperandoperand(AndRR, Arg0Reg, TempReg), - /* begin genJumpNotSmallIntegerInScratchReg: */ genJumpNotSmallInteger(TempReg)))) : 0); if (argIsIntConst) { @@ -28689,7 +28687,7 @@ picDataForBlockEntryMethod(sqInt blockEntryMcpc, sqInt cogMethod) CogBlockMethod *cogBlockMethod; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -29026,7 +29024,7 @@ picDataForinto(CogMethod *cogMethod, sqInt arrayObj) CogBlockMethod *cogMethod1; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; sqInt errCode; CogMethod *homeMethod; sqInt isBackwardBranch; @@ -31818,7 +31816,6 @@ genSpecialSelectorArithmetic(void) genoperandoperand(MoveRR, ReceiverResultReg, TempReg), /* begin AndR:R: */ genoperandoperand(AndRR, Arg0Reg, TempReg), - /* begin genJumpNotSmallIntegerInScratchReg: */ genJumpNotSmallInteger(TempReg)))) : 0); diff --git a/spursistasrc/vm/cogit.h b/spursistasrc/vm/cogit.h index 3bcc136706..d0317caa20 100644 --- a/spursistasrc/vm/cogit.h +++ b/spursistasrc/vm/cogit.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 */ diff --git a/spursistasrc/vm/cogitARMv5.c b/spursistasrc/vm/cogitARMv5.c index 17f43bc2b2..ec25b63512 100644 --- a/spursistasrc/vm/cogitARMv5.c +++ b/spursistasrc/vm/cogitARMv5.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 from - SistaCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + SistaCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 */ -static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 " __DATE__ ; +static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -2901,7 +2901,7 @@ concretizeConditionalInstruction(AbstractInstruction * self_in_concretizeConditi { sqInt aWord; sqInt i; - usqInt instr; + sqInt instr; unsigned char savedCond; assert(((self_in_concretizeConditionalInstruction->conditionOrNil)) != null); @@ -7670,7 +7670,7 @@ bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod) sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - sqInt endbcpc; + usqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -12939,7 +12939,7 @@ mcPCForBackwardBranchstartBcpcin(sqInt bcpc, sqInt startbcpc, CogBlockMethod *co sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - sqInt endbcpc; + usqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -24896,7 +24896,7 @@ mapPCDataForinto(CogMethod *cogMethod, sqInt arrayObj) CogBlockMethod *cogMethod1; BytecodeDescriptor *descriptor; sqInt distance; - sqInt endbcpc; + usqInt endbcpc; sqInt errCode; CogMethod *homeMethod; sqInt isBackwardBranch; @@ -28944,7 +28944,7 @@ picDataForBlockEntryMethod(sqInt blockEntryMcpc, sqInt cogMethod) CogBlockMethod *cogBlockMethod; BytecodeDescriptor *descriptor; sqInt distance; - sqInt endbcpc; + usqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -29279,7 +29279,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/cogitIA32.c b/spursistasrc/vm/cogitIA32.c index a96930937e..a3b23ac8c8 100644 --- a/spursistasrc/vm/cogitIA32.c +++ b/spursistasrc/vm/cogitIA32.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 from - SistaCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + SistaCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 */ -static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 " __DATE__ ; +static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -703,7 +703,7 @@ static BytecodeDescriptor * loadBytesAndGetDescriptor(void); static void NoDbgRegParms loadSubsequentBytesForDescriptorat(BytecodeDescriptor *descriptor, sqInt pc); static AbstractInstruction * NoDbgRegParms gMoveAwR(sqInt address, sqInt reg); static AbstractInstruction * NoDbgRegParms gMoveCwR(sqInt wordConstant, sqInt reg); -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); @@ -7570,7 +7570,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; @@ -11785,7 +11785,7 @@ gMoveCwR(sqInt wordConstant, sqInt reg) /* 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; diff --git a/spursistasrc/vm/cogitMIPSEL.c b/spursistasrc/vm/cogitMIPSEL.c index cf4fec17de..09983930ee 100644 --- a/spursistasrc/vm/cogitMIPSEL.c +++ b/spursistasrc/vm/cogitMIPSEL.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 from - SistaCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + SistaCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 */ -static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 " __DATE__ ; +static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -645,7 +645,7 @@ static BytecodeDescriptor * loadBytesAndGetDescriptor(void); static void NoDbgRegParms loadSubsequentBytesForDescriptorat(BytecodeDescriptor *descriptor, sqInt pc); static AbstractInstruction * NoDbgRegParms gMoveAwR(sqInt address, sqInt reg); static AbstractInstruction * NoDbgRegParms gMoveCwR(sqInt wordConstant, sqInt reg); -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); @@ -2718,7 +2718,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; @@ -4825,7 +4825,7 @@ configureMNUCPICmethodOperandnumArgsdelta(CogMethod *cPIC, sqInt methodOperand, static sqInt NoDbgRegParms cPICCompactAndIsNowEmpty(CogMethod *cPIC) { - sqInt entryPoint; + usqInt entryPoint; sqInt followingAddress; sqInt i; sqInt methods[MaxCPICCases]; @@ -4926,7 +4926,7 @@ cPICHasForwardedClass(CogMethod *cPIC) static sqInt NoDbgRegParms cPICHasFreedTargets(CogMethod *cPIC) { - usqInt entryPoint; + sqInt entryPoint; sqInt i; sqInt pc; CogMethod *targetMethod; @@ -5971,12 +5971,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; @@ -6946,7 +6946,7 @@ gMoveCwR(sqInt wordConstant, sqInt reg) /* 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; @@ -14309,7 +14309,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); diff --git a/spursrc/vm/cogit.h b/spursrc/vm/cogit.h index 58814e077d..0e5e4e7991 100644 --- a/spursrc/vm/cogit.h +++ b/spursrc/vm/cogit.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 */ diff --git a/spursrc/vm/cogitARMv5.c b/spursrc/vm/cogitARMv5.c index ea79676d39..60c25ce44a 100644 --- a/spursrc/vm/cogitARMv5.c +++ b/spursrc/vm/cogitARMv5.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -713,7 +713,7 @@ static BytecodeDescriptor * loadBytesAndGetDescriptor(void); static void NoDbgRegParms loadSubsequentBytesForDescriptorat(BytecodeDescriptor *descriptor, sqInt pc); static AbstractInstruction * NoDbgRegParms gMoveAwR(sqInt address, sqInt reg); static AbstractInstruction * NoDbgRegParms gMoveCwR(sqInt wordConstant, sqInt reg); -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); @@ -7571,7 +7571,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; @@ -7615,7 +7615,7 @@ bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod) sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - sqInt endbcpc; + usqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -10940,12 +10940,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; @@ -12021,7 +12021,7 @@ gMoveCwR(sqInt wordConstant, sqInt reg) /* 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; @@ -12966,7 +12966,7 @@ mcPCForBackwardBranchstartBcpcin(sqInt bcpc, sqInt startbcpc, CogBlockMethod *co sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - sqInt endbcpc; + usqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -24271,7 +24271,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 13a42865ee..bc6a980a0f 100644 --- a/spursrc/vm/cogitIA32.c +++ b/spursrc/vm/cogitIA32.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -7559,7 +7559,7 @@ bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod) sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -10772,12 +10772,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; @@ -12778,7 +12778,7 @@ mcPCForBackwardBranchstartBcpcin(sqInt bcpc, sqInt startbcpc, CogBlockMethod *co sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - usqInt endbcpc; + sqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -22491,7 +22491,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/cogitMIPSEL.c b/spursrc/vm/cogitMIPSEL.c index 98db964114..a1b386e58c 100644 --- a/spursrc/vm/cogitMIPSEL.c +++ b/spursrc/vm/cogitMIPSEL.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -642,7 +642,7 @@ static BytecodeDescriptor * loadBytesAndGetDescriptor(void); static void NoDbgRegParms loadSubsequentBytesForDescriptorat(BytecodeDescriptor *descriptor, sqInt pc); static AbstractInstruction * NoDbgRegParms gMoveAwR(sqInt address, sqInt reg); static AbstractInstruction * NoDbgRegParms gMoveCwR(sqInt wordConstant, sqInt reg); -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); @@ -2663,7 +2663,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; @@ -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; @@ -4748,7 +4748,7 @@ configureMNUCPICmethodOperandnumArgsdelta(CogMethod *cPIC, sqInt methodOperand, static sqInt NoDbgRegParms cPICCompactAndIsNowEmpty(CogMethod *cPIC) { - sqInt entryPoint; + usqInt entryPoint; sqInt followingAddress; sqInt i; sqInt methods[MaxCPICCases]; @@ -4849,7 +4849,7 @@ cPICHasForwardedClass(CogMethod *cPIC) static sqInt NoDbgRegParms cPICHasFreedTargets(CogMethod *cPIC) { - sqInt entryPoint; + usqInt entryPoint; sqInt i; sqInt pc; CogMethod *targetMethod; @@ -5945,12 +5945,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; @@ -6975,7 +6975,7 @@ gMoveCwR(sqInt wordConstant, sqInt reg) /* 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; @@ -7919,7 +7919,7 @@ mcPCForBackwardBranchstartBcpcin(sqInt bcpc, sqInt startbcpc, CogBlockMethod *co sqInt byte; BytecodeDescriptor *descriptor; sqInt distance; - sqInt endbcpc; + usqInt endbcpc; CogMethod *homeMethod; sqInt isBackwardBranch; sqInt isInBlock; @@ -8568,7 +8568,7 @@ static void NoDbgRegParms relocateCallsInClosedPIC(CogMethod *cPIC) { sqLong callDelta; - sqInt entryPoint; + usqInt entryPoint; sqInt i; sqInt pc; sqLong refDelta; @@ -21746,7 +21746,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/src/vm/cogit.h b/src/vm/cogit.h index 05606ad0d3..46f495086c 100644 --- a/src/vm/cogit.h +++ b/src/vm/cogit.h @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 */ diff --git a/src/vm/cogitARMv5.c b/src/vm/cogitARMv5.c index 6052c2b31e..b94b7105e3 100644 --- a/src/vm/cogitARMv5.c +++ b/src/vm/cogitARMv5.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -694,7 +694,7 @@ static void NoDbgRegParms loadSubsequentBytesForDescriptorat(BytecodeDescriptor 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 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); @@ -11158,7 +11158,7 @@ gMoveMwrR(sqInt offset, sqInt baseReg, sqInt destReg) /* 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; @@ -22804,7 +22804,11 @@ genSpecialSelectorArithmetic(void) ? genJumpNotSmallInteger(ReceiverResultReg) : (rcvrIsInt ? genJumpNotSmallInteger(Arg0Reg) - : genJumpNotSmallIntegersInandscratch(ReceiverResultReg, Arg0Reg, TempReg))) + : (/* begin genJumpNotSmallIntegersIn:and:scratch: */ + genoperandoperand(MoveRR, ReceiverResultReg, TempReg), + /* begin AndR:R: */ + genoperandoperand(AndRR, Arg0Reg, TempReg), + genJumpNotSmallIntegerInScratchReg(TempReg)))) : 0); switch ((primDescriptor->opcode)) { @@ -23062,7 +23066,11 @@ genSpecialSelectorComparison(void) ? genJumpNotSmallInteger(ReceiverResultReg) : (rcvrIsInt ? genJumpNotSmallInteger(Arg0Reg) - : genJumpNotSmallIntegersInandscratch(ReceiverResultReg, Arg0Reg, TempReg))) + : (/* begin genJumpNotSmallIntegersIn:and:scratch: */ + genoperandoperand(MoveRR, ReceiverResultReg, TempReg), + /* begin AndR:R: */ + genoperandoperand(AndRR, Arg0Reg, TempReg), + genJumpNotSmallIntegerInScratchReg(TempReg)))) : 0); if (argIsIntConst) { /* begin checkQuickConstant:forInstruction: */ diff --git a/src/vm/cogitIA32.c b/src/vm/cogitIA32.c index 78aff0a66b..242b76d195 100644 --- a/src/vm/cogitIA32.c +++ b/src/vm/cogitIA32.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -680,7 +680,7 @@ static void NoDbgRegParms loadSubsequentBytesForDescriptorat(BytecodeDescriptor 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 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); @@ -9915,12 +9915,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; @@ -10991,7 +10991,7 @@ gMoveMwrR(sqInt offset, sqInt baseReg, sqInt destReg) /* 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; @@ -21393,7 +21393,11 @@ genSpecialSelectorArithmetic(void) ? genJumpNotSmallInteger(ReceiverResultReg) : (rcvrIsInt ? genJumpNotSmallInteger(Arg0Reg) - : genJumpNotSmallIntegersInandscratch(ReceiverResultReg, Arg0Reg, TempReg))) + : (/* begin genJumpNotSmallIntegersIn:and:scratch: */ + genoperandoperand(MoveRR, ReceiverResultReg, TempReg), + /* begin AndR:R: */ + genoperandoperand(AndRR, Arg0Reg, TempReg), + genJumpNotSmallIntegerInScratchReg(TempReg)))) : 0); switch ((primDescriptor->opcode)) { @@ -21631,7 +21635,11 @@ genSpecialSelectorComparison(void) ? genJumpNotSmallInteger(ReceiverResultReg) : (rcvrIsInt ? genJumpNotSmallInteger(Arg0Reg) - : genJumpNotSmallIntegersInandscratch(ReceiverResultReg, Arg0Reg, TempReg))) + : (/* begin genJumpNotSmallIntegersIn:and:scratch: */ + genoperandoperand(MoveRR, ReceiverResultReg, TempReg), + /* begin AndR:R: */ + genoperandoperand(AndRR, Arg0Reg, TempReg), + genJumpNotSmallIntegerInScratchReg(TempReg)))) : 0); if (argIsIntConst) { /* begin checkQuickConstant:forInstruction: */ diff --git a/src/vm/cogitMIPSEL.c b/src/vm/cogitMIPSEL.c index 65fc6949e3..0b055dfb1c 100644 --- a/src/vm/cogitMIPSEL.c +++ b/src/vm/cogitMIPSEL.c @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + CCodeGenerator VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 from - StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 + StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2138 uuid: 8b98184c-9061-45e1-b4ce-bd9b8bc8c802 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2139 uuid: a905d032-fb67-4132-a5bf-5d59e668f2e5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -622,7 +622,7 @@ static void NoDbgRegParms loadSubsequentBytesForDescriptorat(BytecodeDescriptor 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 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); @@ -2229,7 +2229,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; @@ -4240,7 +4240,7 @@ cPICCompactAndIsNowEmpty(CogMethod *cPIC) static sqInt NoDbgRegParms cPICHasFreedTargets(CogMethod *cPIC) { - usqInt entryPoint; + sqInt entryPoint; sqInt i; sqInt pc; CogMethod *targetMethod; @@ -5080,12 +5080,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; @@ -6124,7 +6124,7 @@ gMoveMwrR(sqInt offset, sqInt baseReg, sqInt destReg) /* 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; @@ -13207,7 +13207,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); @@ -20644,7 +20644,11 @@ genSpecialSelectorArithmetic(void) ? genJumpNotSmallInteger(ReceiverResultReg) : (rcvrIsInt ? genJumpNotSmallInteger(Arg0Reg) - : genJumpNotSmallIntegersInandscratch(ReceiverResultReg, Arg0Reg, TempReg))) + : (/* begin genJumpNotSmallIntegersIn:and:scratch: */ + genoperandoperand(MoveRR, ReceiverResultReg, TempReg), + /* begin AndR:R: */ + genoperandoperand(AndRR, Arg0Reg, TempReg), + genJumpNotSmallIntegerInScratchReg(TempReg)))) : 0); switch ((primDescriptor->opcode)) { @@ -20882,7 +20886,11 @@ genSpecialSelectorComparison(void) ? genJumpNotSmallInteger(ReceiverResultReg) : (rcvrIsInt ? genJumpNotSmallInteger(Arg0Reg) - : genJumpNotSmallIntegersInandscratch(ReceiverResultReg, Arg0Reg, TempReg))) + : (/* begin genJumpNotSmallIntegersIn:and:scratch: */ + genoperandoperand(MoveRR, ReceiverResultReg, TempReg), + /* begin AndR:R: */ + genoperandoperand(AndRR, Arg0Reg, TempReg), + genJumpNotSmallIntegerInScratchReg(TempReg)))) : 0); if (argIsIntConst) { /* begin checkQuickConstant:forInstruction: */