Revision: 3224 Author: eliot Date: 2015-01-09 13:02:25 -0800 (Fri, 09 Jan 2015) Log Message: ----------- CogVm source as per VMMaker.oscog-eem.1015
Fix some C typing slips in recent Sista JIT code.
Fix inclusion of reConfig.h in RePlugin's internal.h
Modified Paths: -------------- branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h
Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Jan 9 12:26:53 PST 2015 + Fri Jan 9 13:02:24 PST 2015
Modified: branches/Cog/sistasrc/vm/cogit.c =================================================================== --- branches/Cog/sistasrc/vm/cogit.c 2015-01-09 20:47:30 UTC (rev 3223) +++ branches/Cog/sistasrc/vm/cogit.c 2015-01-09 21:02:25 UTC (rev 3224) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CCodeGenerator VMMaker.oscog-eem.1015 uuid: cc6ec010-1b1d-4ba3-8a4d-1c31b2931fbd from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1015 uuid: cc6ec010-1b1d-4ba3-8a4d-1c31b2931fbd */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1015 uuid: cc6ec010-1b1d-4ba3-8a4d-1c31b2931fbd " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
@@ -952,7 +952,7 @@ static sqInt genPrimitiveNewMethod(void); static sqInt genPrimitiveNotEqual(void); static void genPrimReturnEnterCogCodeEnilopmart(sqInt profiling) NoDbgRegParms; -static void genPushClosureTempsBytecode(void); +static sqInt genPushClosureTempsBytecode(void); static sqInt genPushConstantFalseBytecode(void); static sqInt genPushConstantNilBytecode(void); static sqInt genPushConstantOneBytecode(void); @@ -17485,7 +17485,7 @@
/* SistaV1: 230 11100110 iiiiiiii PushNClosureTemps iiiiiiii */
-static void +static sqInt genPushClosureTempsBytecode(void) { sqInt i; @@ -17493,6 +17493,7 @@ for (i = 1; i <= byte1; i += 1) { genPushLiteral(nilObject()); } + return 0; }
static sqInt
Modified: branches/Cog/sistasrc/vm/cogit.h =================================================================== --- branches/Cog/sistasrc/vm/cogit.h 2015-01-09 20:47:30 UTC (rev 3223) +++ branches/Cog/sistasrc/vm/cogit.h 2015-01-09 21:02:25 UTC (rev 3224) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CCodeGenerator VMMaker.oscog-eem.1015 uuid: cc6ec010-1b1d-4ba3-8a4d-1c31b2931fbd */
Modified: branches/Cog/spursistasrc/vm/cogit.c =================================================================== --- branches/Cog/spursistasrc/vm/cogit.c 2015-01-09 20:47:30 UTC (rev 3223) +++ branches/Cog/spursistasrc/vm/cogit.c 2015-01-09 21:02:25 UTC (rev 3224) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CCodeGenerator VMMaker.oscog-eem.1015 uuid: cc6ec010-1b1d-4ba3-8a4d-1c31b2931fbd from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1015 uuid: cc6ec010-1b1d-4ba3-8a4d-1c31b2931fbd */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1015 uuid: cc6ec010-1b1d-4ba3-8a4d-1c31b2931fbd " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
@@ -970,7 +970,7 @@ static sqInt genPrimitiveNewMethod(void); static sqInt genPrimitiveNotEqual(void); static void genPrimReturnEnterCogCodeEnilopmart(sqInt profiling) NoDbgRegParms; -static void genPushClosureTempsBytecode(void); +static sqInt genPushClosureTempsBytecode(void); static sqInt genPushConstantFalseBytecode(void); static sqInt genPushConstantNilBytecode(void); static sqInt genPushConstantOneBytecode(void); @@ -15534,7 +15534,7 @@ static sqInt genGetNumBytesOfinto(sqInt srcReg, sqInt destReg) { - AbstractInstruction jmp; + AbstractInstruction *jmp; sqInt quickConstant; sqInt quickConstant1;
@@ -15543,10 +15543,10 @@ quickConstant = numSlotsMask(); genoperandoperand(CmpCqR, quickConstant, TempReg); /* begin JumpLess: */ - jmp = ((AbstractInstruction *) (genoperand(JumpLess, ((sqInt)0)))); + jmp = genoperand(JumpLess, ((sqInt)0)); /* begin MoveMw:r:R: */ genoperandoperandoperand(MoveMwrR, -BytesPerWord, srcReg, destReg); - jmpTarget(&jmp, gLogicalShiftLeftCqR(shiftForWord(), destReg)); + jmpTarget(jmp, gLogicalShiftLeftCqR(shiftForWord(), destReg)); /* begin MoveMw:r:R: */ genoperandoperandoperand(MoveMwrR, 0, srcReg, TempReg); /* begin LogicalShiftRightCq:R: */ @@ -15566,7 +15566,7 @@ static sqInt genGetNumSlotsOfinto(sqInt srcReg, sqInt destReg) { - AbstractInstruction jmp; + AbstractInstruction *jmp; sqInt quickConstant;
genGetRawSlotSizeOfNonImminto(srcReg, TempReg); @@ -15574,10 +15574,10 @@ quickConstant = numSlotsMask(); genoperandoperand(CmpCqR, quickConstant, TempReg); /* begin JumpLess: */ - jmp = ((AbstractInstruction *) (genoperand(JumpLess, ((sqInt)0)))); + jmp = genoperand(JumpLess, ((sqInt)0)); /* begin MoveMw:r:R: */ genoperandoperandoperand(MoveMwrR, -BytesPerWord, srcReg, TempReg); - jmpTarget(&jmp, gMoveRR(TempReg, destReg)); + jmpTarget(jmp, gMoveRR(TempReg, destReg)); return 0; }
@@ -18922,7 +18922,7 @@
/* SistaV1: 230 11100110 iiiiiiii PushNClosureTemps iiiiiiii */
-static void +static sqInt genPushClosureTempsBytecode(void) { sqInt i; @@ -18930,6 +18930,7 @@ for (i = 1; i <= byte1; i += 1) { genPushLiteral(nilObject()); } + return 0; }
static sqInt
Modified: branches/Cog/spursistasrc/vm/cogit.h =================================================================== --- branches/Cog/spursistasrc/vm/cogit.h 2015-01-09 20:47:30 UTC (rev 3223) +++ branches/Cog/spursistasrc/vm/cogit.h 2015-01-09 21:02:25 UTC (rev 3224) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CCodeGenerator VMMaker.oscog-eem.1015 uuid: cc6ec010-1b1d-4ba3-8a4d-1c31b2931fbd */
vm-dev@lists.squeakfoundation.org