Revision: 3058 Author: eliot Date: 2014-08-04 19:15:28 -0700 (Mon, 04 Aug 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.842
Fix typo in initializeCTranslationDictionary and hence rescue Newspeak cogits
Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/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 2014-08-05 01:55:33 UTC (rev 3057) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-08-05 02:15:28 UTC (rev 3058) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGenerator VMMaker.oscog-eem.842 uuid: 1355259a-aa6e-48eb-8348-f0890328e7a6 from - StackToRegisterMappingCogit VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + StackToRegisterMappingCogit VMMaker.oscog-eem.842 uuid: 1355259a-aa6e-48eb-8348-f0890328e7a6 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.842 uuid: 1355259a-aa6e-48eb-8348-f0890328e7a6 " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
@@ -13092,7 +13092,7 @@ if (cacheTagIsMarked(class)) { if (((mixin = unalignedLongAt(backEnd, cacheAddress + BytesPerOop))) != 0) { /* begin markAndTraceLiteral:in:at: */ - address1 = asAddressput(cacheAddress + BytesPerOop, unalignedLongAtput(backEnd, cacheAddress + BytesPerOop, val)); + address1 = (cacheAddress + BytesPerOop); markAndTraceLiteral(mixin); } } @@ -13173,7 +13173,7 @@ if (cacheTagIsMarked(class)) { if (((mixin = unalignedLongAt(backEnd, cacheAddress + BytesPerOop))) != 0) { /* begin markAndTraceLiteral:in:at: */ - address = asAddressput(cacheAddress + BytesPerOop, unalignedLongAtput(backEnd, cacheAddress + BytesPerOop, val)); + address = (cacheAddress + BytesPerOop); markAndTraceLiteral(mixin); } }
Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-08-05 01:55:33 UTC (rev 3057) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-08-05 02:15:28 UTC (rev 3058) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGenerator VMMaker.oscog-eem.842 uuid: 1355259a-aa6e-48eb-8348-f0890328e7a6 */
Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2014-08-05 01:55:33 UTC (rev 3057) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2014-08-05 02:15:28 UTC (rev 3058) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGenerator VMMaker.oscog-eem.842 uuid: 1355259a-aa6e-48eb-8348-f0890328e7a6 */
typedef struct {
Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2014-08-05 01:55:33 UTC (rev 3057) +++ branches/Cog/nsspursrc/vm/cogit.c 2014-08-05 02:15:28 UTC (rev 3058) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGenerator VMMaker.oscog-eem.842 uuid: 1355259a-aa6e-48eb-8348-f0890328e7a6 from - StackToRegisterMappingCogit VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + StackToRegisterMappingCogit VMMaker.oscog-eem.842 uuid: 1355259a-aa6e-48eb-8348-f0890328e7a6 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.842 uuid: 1355259a-aa6e-48eb-8348-f0890328e7a6 " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
@@ -12843,7 +12843,7 @@ cacheAddress = implicitReceiveCacheAt(backEnd, mcpc); if (((class = unalignedLongAt(backEnd, cacheAddress))) != 0) { if (((mixin = unalignedLongAt(backEnd, cacheAddress + BytesPerOop))) != 0) { - markAndTraceLiteralinat(mixin, ((CogMethod *) cogMethod), asAddressput(cacheAddress + BytesPerOop, unalignedLongAtput(backEnd, cacheAddress + BytesPerOop, val))); + markAndTraceLiteralinat(mixin, ((CogMethod *) cogMethod), (cacheAddress + BytesPerOop)); }
}
Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2014-08-05 01:55:33 UTC (rev 3057) +++ branches/Cog/nsspursrc/vm/cogit.h 2014-08-05 02:15:28 UTC (rev 3058) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGenerator VMMaker.oscog-eem.842 uuid: 1355259a-aa6e-48eb-8348-f0890328e7a6 */
Modified: branches/Cog/nsspursrc/vm/cogmethod.h =================================================================== --- branches/Cog/nsspursrc/vm/cogmethod.h 2014-08-05 01:55:33 UTC (rev 3057) +++ branches/Cog/nsspursrc/vm/cogmethod.h 2014-08-05 02:15:28 UTC (rev 3058) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGenerator VMMaker.oscog-eem.842 uuid: 1355259a-aa6e-48eb-8348-f0890328e7a6 */
typedef struct {
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon Aug 4 18:47:31 PDT 2014 + Mon Aug 4 19:14:37 PDT 2014
vm-dev@lists.squeakfoundation.org