[Vm-dev] [commit][3086] CogVM source as per VMMaker.oscog-eem.888
commits at squeakvm.org
commits at squeakvm.org
Tue Sep 30 17:23:26 UTC 2014
Revision: 3086
Author: eliot
Date: 2014-09-30 10:23:24 -0700 (Tue, 30 Sep 2014)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.888
Fix bug in Cogit>>lookup:for:methodAndErrorSelectorInto: which if cogging a
metod found through an MNU would set the cog method's selector to the original
selector that was not understood instead of #doesNotUnderstand:.
Fix the description of the blockonwarn flag (not blockonwarning).
Modified Paths:
--------------
branches/Cog/nscogsrc/vm/cogit.c
branches/Cog/nscogsrc/vm/cogit.h
branches/Cog/nsspursrc/vm/cogit.c
branches/Cog/nsspursrc/vm/cogit.h
branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c
branches/Cog/platforms/unix/vm/sqUnixMain.c
branches/Cog/sistasrc/vm/cogit.c
branches/Cog/sistasrc/vm/cogit.h
branches/Cog/spursistasrc/vm/cogit.c
branches/Cog/spursistasrc/vm/cogit.h
branches/Cog/spursrc/vm/cogit.c
branches/Cog/spursrc/vm/cogit.h
branches/Cog/src/vm/cogit.c
branches/Cog/src/vm/cogit.h
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nscogsrc/vm/cogit.c
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.c 2014-09-30 01:16:34 UTC (rev 3085)
+++ branches/Cog/nscogsrc/vm/cogit.c 2014-09-30 17:23:24 UTC (rev 3086)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a
+ CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a
+ StackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -8622,7 +8622,7 @@
/* We assume cog:selector: will *not* reclaim the method zone */
- cogselector(methodOrSelectorIndex, selector);
+ cogselector(methodOrSelectorIndex, splObj(SelectorDoesNotUnderstand));
}
newTargetMethodOrNil = methodOrSelectorIndex;
errorSelectorOrNil = SelectorDoesNotUnderstand;
@@ -8785,7 +8785,7 @@
/* We assume cog:selector: will *not* reclaim the method zone */
- cogselector(methodOrSelectorIndex, selector);
+ cogselector(methodOrSelectorIndex, splObj(SelectorDoesNotUnderstand));
}
newTargetMethodOrNil = methodOrSelectorIndex;
errorSelectorOrNil = SelectorDoesNotUnderstand;
@@ -12553,7 +12553,7 @@
{
sqInt *address;
sqInt *address1;
- sqInt cacheAddress;
+ usqInt cacheAddress;
sqInt cacheTag;
sqInt cacheTag1;
sqInt cacheTagMarked;
@@ -12723,7 +12723,7 @@
static sqInt
markYoungObjectspcmethod(sqInt annotation, char *mcpc, sqInt cogMethod)
{
- sqInt cacheAddress;
+ usqInt cacheAddress;
sqInt cacheTag;
sqInt cacheTag1;
sqInt class;
@@ -13814,7 +13814,7 @@
static sqInt
remapIfObjectRefpchasYoung(sqInt annotation, char *mcpc, sqInt hasYoungPtr)
{
- sqInt cacheAddress;
+ usqInt cacheAddress;
sqInt cacheTag;
sqInt cacheTag1;
sqInt entryPoint;
@@ -14583,7 +14583,7 @@
static void
voidImplicitReceiverCacheAt(sqInt mcpc)
{
- sqInt cacheAddress;
+ usqInt cacheAddress;
assert(NumOopsPerIRC == 2);
cacheAddress = (((usqInt)mcpc)) + (jumpShortByteSize(backEnd));
Modified: branches/Cog/nscogsrc/vm/cogit.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.h 2014-09-30 01:16:34 UTC (rev 3085)
+++ branches/Cog/nscogsrc/vm/cogit.h 2014-09-30 17:23:24 UTC (rev 3086)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a
+ CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6
*/
Modified: branches/Cog/nsspursrc/vm/cogit.c
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.c 2014-09-30 01:16:34 UTC (rev 3085)
+++ branches/Cog/nsspursrc/vm/cogit.c 2014-09-30 17:23:24 UTC (rev 3086)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a
+ CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a
+ StackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -8648,7 +8648,7 @@
/* We assume cog:selector: will *not* reclaim the method zone */
- cogselector(methodOrSelectorIndex, selector);
+ cogselector(methodOrSelectorIndex, splObj(SelectorDoesNotUnderstand));
}
newTargetMethodOrNil = methodOrSelectorIndex;
errorSelectorOrNil = SelectorDoesNotUnderstand;
@@ -8805,7 +8805,7 @@
/* We assume cog:selector: will *not* reclaim the method zone */
- cogselector(methodOrSelectorIndex, selector);
+ cogselector(methodOrSelectorIndex, splObj(SelectorDoesNotUnderstand));
}
newTargetMethodOrNil = methodOrSelectorIndex;
errorSelectorOrNil = SelectorDoesNotUnderstand;
@@ -12582,7 +12582,7 @@
static sqInt
markLiteralspcmethod(sqInt annotation, char *mcpc, sqInt cogMethod)
{
- usqInt cacheAddress;
+ sqInt cacheAddress;
sqInt cacheTag;
sqInt cacheTag1;
sqInt class;
@@ -13735,7 +13735,7 @@
static sqInt
remapIfObjectRefpchasYoung(sqInt annotation, char *mcpc, sqInt hasYoungPtr)
{
- usqInt cacheAddress;
+ sqInt cacheAddress;
sqInt cacheTag;
sqInt cacheTag1;
sqInt entryPoint;
@@ -14024,7 +14024,7 @@
static sqInt
unlinkIfForwardedSendpcignored(sqInt annotation, char *mcpc, sqInt superfluity)
{
- usqInt cacheAddress;
+ sqInt cacheAddress;
sqInt entryPoint;
sqInt sendTable;
sqInt *sendTable1;
@@ -14611,7 +14611,7 @@
static void
voidImplicitReceiverCacheAt(sqInt mcpc)
{
- usqInt cacheAddress;
+ sqInt cacheAddress;
assert(NumOopsPerIRC == 2);
cacheAddress = implicitReceiveCacheAt(backEnd, mcpc);
Modified: branches/Cog/nsspursrc/vm/cogit.h
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.h 2014-09-30 01:16:34 UTC (rev 3085)
+++ branches/Cog/nsspursrc/vm/cogit.h 2014-09-30 17:23:24 UTC (rev 3086)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a
+ CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6
*/
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Mon Sep 29 18:15:53 PDT 2014
+ Tue Sep 30 10:22:20 PDT 2014
Modified: branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c
===================================================================
--- branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c 2014-09-30 01:16:34 UTC (rev 3085)
+++ branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c 2014-09-30 17:23:24 UTC (rev 3086)
@@ -334,7 +334,7 @@
printf(" -version print version information, then exit\n");
printf(" -blockonerror on error or segv block, not exit. useful for attaching gdb\n");
- printf(" -blockonwarning on warning block, don't warn. useful for attaching gdb\n");
+ printf(" -blockonwarn on warning block, don't warn. useful for attaching gdb\n");
}
static void printUsageNotes(void)
Modified: branches/Cog/platforms/unix/vm/sqUnixMain.c
===================================================================
--- branches/Cog/platforms/unix/vm/sqUnixMain.c 2014-09-30 01:16:34 UTC (rev 3085)
+++ branches/Cog/platforms/unix/vm/sqUnixMain.c 2014-09-30 17:23:24 UTC (rev 3086)
@@ -1520,7 +1520,7 @@
printf(" -reportheadroom report unused stack headroom on exit\n");
#endif
printf(" -blockonerror on error or segv block, not exit. useful for attaching gdb\n");
- printf(" -blockonwarning on warning block, don't warn. useful for attaching gdb\n");
+ printf(" -blockonwarn on warning block, don't warn. useful for attaching gdb\n");
#if 1
printf("Deprecated:\n");
# if !STACKVM
Modified: branches/Cog/sistasrc/vm/cogit.c
===================================================================
--- branches/Cog/sistasrc/vm/cogit.c 2014-09-30 01:16:34 UTC (rev 3085)
+++ branches/Cog/sistasrc/vm/cogit.c 2014-09-30 17:23:24 UTC (rev 3086)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a
+ CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6
from
- SistaStackToRegisterMappingCogit VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a
+ SistaStackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6
*/
-static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a " __DATE__ ;
+static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -8611,7 +8611,7 @@
/* We assume cog:selector: will *not* reclaim the method zone */
- cogselector(methodOrSelectorIndex, selector);
+ cogselector(methodOrSelectorIndex, splObj(SelectorDoesNotUnderstand));
}
newTargetMethodOrNil = methodOrSelectorIndex;
errorSelectorOrNil = SelectorDoesNotUnderstand;
@@ -8723,7 +8723,7 @@
/* We assume cog:selector: will *not* reclaim the method zone */
- cogselector(methodOrSelectorIndex, selector);
+ cogselector(methodOrSelectorIndex, splObj(SelectorDoesNotUnderstand));
}
newTargetMethodOrNil = methodOrSelectorIndex;
errorSelectorOrNil = SelectorDoesNotUnderstand;
Modified: branches/Cog/sistasrc/vm/cogit.h
===================================================================
--- branches/Cog/sistasrc/vm/cogit.h 2014-09-30 01:16:34 UTC (rev 3085)
+++ branches/Cog/sistasrc/vm/cogit.h 2014-09-30 17:23:24 UTC (rev 3086)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a
+ CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6
*/
Modified: branches/Cog/spursistasrc/vm/cogit.c
===================================================================
--- branches/Cog/spursistasrc/vm/cogit.c 2014-09-30 01:16:34 UTC (rev 3085)
+++ branches/Cog/spursistasrc/vm/cogit.c 2014-09-30 17:23:24 UTC (rev 3086)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a
+ CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6
from
- SistaStackToRegisterMappingCogit VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a
+ SistaStackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6
*/
-static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a " __DATE__ ;
+static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -8637,7 +8637,7 @@
/* We assume cog:selector: will *not* reclaim the method zone */
- cogselector(methodOrSelectorIndex, selector);
+ cogselector(methodOrSelectorIndex, splObj(SelectorDoesNotUnderstand));
}
newTargetMethodOrNil = methodOrSelectorIndex;
errorSelectorOrNil = SelectorDoesNotUnderstand;
@@ -8751,7 +8751,7 @@
/* We assume cog:selector: will *not* reclaim the method zone */
- cogselector(methodOrSelectorIndex, selector);
+ cogselector(methodOrSelectorIndex, splObj(SelectorDoesNotUnderstand));
}
newTargetMethodOrNil = methodOrSelectorIndex;
errorSelectorOrNil = SelectorDoesNotUnderstand;
Modified: branches/Cog/spursistasrc/vm/cogit.h
===================================================================
--- branches/Cog/spursistasrc/vm/cogit.h 2014-09-30 01:16:34 UTC (rev 3085)
+++ branches/Cog/spursistasrc/vm/cogit.h 2014-09-30 17:23:24 UTC (rev 3086)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a
+ CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6
*/
Modified: branches/Cog/spursrc/vm/cogit.c
===================================================================
--- branches/Cog/spursrc/vm/cogit.c 2014-09-30 01:16:34 UTC (rev 3085)
+++ branches/Cog/spursrc/vm/cogit.c 2014-09-30 17:23:24 UTC (rev 3086)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a
+ CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a
+ StackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -8298,7 +8298,7 @@
/* We assume cog:selector: will *not* reclaim the method zone */
- cogselector(methodOrSelectorIndex, selector);
+ cogselector(methodOrSelectorIndex, splObj(SelectorDoesNotUnderstand));
}
newTargetMethodOrNil = methodOrSelectorIndex;
errorSelectorOrNil = SelectorDoesNotUnderstand;
@@ -8412,7 +8412,7 @@
/* We assume cog:selector: will *not* reclaim the method zone */
- cogselector(methodOrSelectorIndex, selector);
+ cogselector(methodOrSelectorIndex, splObj(SelectorDoesNotUnderstand));
}
newTargetMethodOrNil = methodOrSelectorIndex;
errorSelectorOrNil = SelectorDoesNotUnderstand;
Modified: branches/Cog/spursrc/vm/cogit.h
===================================================================
--- branches/Cog/spursrc/vm/cogit.h 2014-09-30 01:16:34 UTC (rev 3085)
+++ branches/Cog/spursrc/vm/cogit.h 2014-09-30 17:23:24 UTC (rev 3086)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a
+ CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6
*/
Modified: branches/Cog/src/vm/cogit.c
===================================================================
--- branches/Cog/src/vm/cogit.c 2014-09-30 01:16:34 UTC (rev 3085)
+++ branches/Cog/src/vm/cogit.c 2014-09-30 17:23:24 UTC (rev 3086)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a
+ CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a
+ StackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -8271,7 +8271,7 @@
/* We assume cog:selector: will *not* reclaim the method zone */
- cogselector(methodOrSelectorIndex, selector);
+ cogselector(methodOrSelectorIndex, splObj(SelectorDoesNotUnderstand));
}
newTargetMethodOrNil = methodOrSelectorIndex;
errorSelectorOrNil = SelectorDoesNotUnderstand;
@@ -8383,7 +8383,7 @@
/* We assume cog:selector: will *not* reclaim the method zone */
- cogselector(methodOrSelectorIndex, selector);
+ cogselector(methodOrSelectorIndex, splObj(SelectorDoesNotUnderstand));
}
newTargetMethodOrNil = methodOrSelectorIndex;
errorSelectorOrNil = SelectorDoesNotUnderstand;
Modified: branches/Cog/src/vm/cogit.h
===================================================================
--- branches/Cog/src/vm/cogit.h 2014-09-30 01:16:34 UTC (rev 3085)
+++ branches/Cog/src/vm/cogit.h 2014-09-30 17:23:24 UTC (rev 3086)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a
+ CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6
*/
More information about the Vm-dev
mailing list