Revision: 2625 Author: eliot Date: 2012-11-30 15:56:37 -0800 (Fri, 30 Nov 2012) Log Message: ----------- Fix a type typo in the Cogit.
Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h
Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2012-11-30 23:16:14 UTC (rev 2624) +++ branches/Cog/nscogsrc/vm/cogit.c 2012-11-30 23:56:37 UTC (rev 2625) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.225 uuid: 222bea80-06c8-4893-b1e1-d191688f36e6 + CCodeGenerator VMMaker.oscog-eem.226 uuid: 55513140-771d-4f43-931c-b61a61832d23 from - StackToRegisterMappingCogit VMMaker.oscog-eem.225 uuid: 222bea80-06c8-4893-b1e1-d191688f36e6 + StackToRegisterMappingCogit VMMaker.oscog-eem.226 uuid: 55513140-771d-4f43-931c-b61a61832d23 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.225 uuid: 222bea80-06c8-4893-b1e1-d191688f36e6 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.226 uuid: 55513140-771d-4f43-931c-b61a61832d23 " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
@@ -368,7 +368,7 @@ static sqInt allocate(sqInt numBytes); static sqInt allYoungObjectsAgeInFullGC(void); static AbstractInstruction * annotateAbsolutePCRef(AbstractInstruction *abstractInstruction); -static void annotateBytecodeIfAnnotated(SimStackEntry aSimStackEntry); +static void annotateBytecodeIfAnnotated(CogSimStackEntry aSimStackEntry); static AbstractInstruction * annotateBytecode(AbstractInstruction *abstractInstruction); static AbstractInstruction * annotateobjRef(AbstractInstruction *abstractInstruction, sqInt anOop); static AbstractInstruction * annotatewith(AbstractInstruction *abstractInstruction, sqInt annotationFlag); @@ -2272,11 +2272,11 @@ }
static void -annotateBytecodeIfAnnotated(SimStackEntry aSimStackEntry) +annotateBytecodeIfAnnotated(CogSimStackEntry aSimStackEntry) { AbstractInstruction *abstractInstruction;
- if (annotateUse(aSimStackEntry)) { + if ((aSimStackEntry.annotateUse)) { /* begin annotateBytecode: */ abstractInstruction = (prevInstIsPCAnnotated() ? (/* begin Nop */ @@ -2284,7 +2284,7 @@ : (/* begin Label */ genoperandoperand(Label, (labelCounter += 1), bytecodePC))); annotatewith(abstractInstruction, HasBytecodePC); - annotateUse(aSimStackEntry, 0); + (aSimStackEntry.annotateUse = 0); } }
Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2012-11-30 23:16:14 UTC (rev 2624) +++ branches/Cog/nscogsrc/vm/cogit.h 2012-11-30 23:56:37 UTC (rev 2625) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.225 uuid: 222bea80-06c8-4893-b1e1-d191688f36e6 + CCodeGenerator VMMaker.oscog-eem.226 uuid: 55513140-771d-4f43-931c-b61a61832d23 */
Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2012-11-30 23:16:14 UTC (rev 2624) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2012-11-30 23:56:37 UTC (rev 2625) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.225 uuid: 222bea80-06c8-4893-b1e1-d191688f36e6 + CCodeGenerator VMMaker.oscog-eem.226 uuid: 55513140-771d-4f43-931c-b61a61832d23 */
typedef struct {
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Nov 30 15:13:46 PST 2012 + Fri Nov 30 15:56:10 PST 2012
Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2012-11-30 23:16:14 UTC (rev 2624) +++ branches/Cog/src/vm/cogit.c 2012-11-30 23:56:37 UTC (rev 2625) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.225 uuid: 222bea80-06c8-4893-b1e1-d191688f36e6 + CCodeGenerator VMMaker.oscog-eem.226 uuid: 55513140-771d-4f43-931c-b61a61832d23 from - StackToRegisterMappingCogit VMMaker.oscog-eem.225 uuid: 222bea80-06c8-4893-b1e1-d191688f36e6 + StackToRegisterMappingCogit VMMaker.oscog-eem.226 uuid: 55513140-771d-4f43-931c-b61a61832d23 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.225 uuid: 222bea80-06c8-4893-b1e1-d191688f36e6 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.226 uuid: 55513140-771d-4f43-931c-b61a61832d23 " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
@@ -368,7 +368,7 @@ static sqInt allocate(sqInt numBytes); static sqInt allYoungObjectsAgeInFullGC(void); static AbstractInstruction * annotateAbsolutePCRef(AbstractInstruction *abstractInstruction); -static void annotateBytecodeIfAnnotated(SimStackEntry aSimStackEntry); +static void annotateBytecodeIfAnnotated(CogSimStackEntry aSimStackEntry); static AbstractInstruction * annotateBytecode(AbstractInstruction *abstractInstruction); static AbstractInstruction * annotateobjRef(AbstractInstruction *abstractInstruction, sqInt anOop); static AbstractInstruction * annotatewith(AbstractInstruction *abstractInstruction, sqInt annotationFlag); @@ -1964,11 +1964,11 @@ }
static void -annotateBytecodeIfAnnotated(SimStackEntry aSimStackEntry) +annotateBytecodeIfAnnotated(CogSimStackEntry aSimStackEntry) { AbstractInstruction *abstractInstruction;
- if (annotateUse(aSimStackEntry)) { + if ((aSimStackEntry.annotateUse)) { /* begin annotateBytecode: */ abstractInstruction = (prevInstIsPCAnnotated() ? (/* begin Nop */ @@ -1976,7 +1976,7 @@ : (/* begin Label */ genoperandoperand(Label, (labelCounter += 1), bytecodePC))); annotatewith(abstractInstruction, HasBytecodePC); - annotateUse(aSimStackEntry, 0); + (aSimStackEntry.annotateUse = 0); } }
Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2012-11-30 23:16:14 UTC (rev 2624) +++ branches/Cog/src/vm/cogit.h 2012-11-30 23:56:37 UTC (rev 2625) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.225 uuid: 222bea80-06c8-4893-b1e1-d191688f36e6 + CCodeGenerator VMMaker.oscog-eem.226 uuid: 55513140-771d-4f43-931c-b61a61832d23 */
Modified: branches/Cog/src/vm/cogmethod.h =================================================================== --- branches/Cog/src/vm/cogmethod.h 2012-11-30 23:16:14 UTC (rev 2624) +++ branches/Cog/src/vm/cogmethod.h 2012-11-30 23:56:37 UTC (rev 2625) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.225 uuid: 222bea80-06c8-4893-b1e1-d191688f36e6 + CCodeGenerator VMMaker.oscog-eem.226 uuid: 55513140-771d-4f43-931c-b61a61832d23 */
typedef struct {
vm-dev@lists.squeakfoundation.org