[Vm-dev] [commit][3003] CogVM source as per VMMaker.oscog-eem.774
commits at squeakvm.org
commits at squeakvm.org
Sun Jun 15 22:17:33 UTC 2014
Revision: 3003
Author: eliot
Date: 2014-06-15 15:17:31 -0700 (Sun, 15 Jun 2014)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.774
Remember to regenerate the cogit.c's from the non-Spur configurations to fix the
"relocating call to invalid address" bug.
Add a hack to link the XDisplayControlPlugin against vm-display-X11 (a hack
because it assumes paths etc). But at least the plugin works.
Add an initial revision of platforms/unix/plugins/UUIDPlugin/acinclude.m4 to
search for uuid.h in either /usr/include/uuid or /usr/include and use either
uuidgenerate or uuidgen.
Spur: Restore accuracy of followForwarded:'s comment back to Igor's original.
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
branches/Cog/nsspursrc/vm/cointerp.c
branches/Cog/nsspursrc/vm/cointerp.h
branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
branches/Cog/nsspursrc/vm/interp.h
branches/Cog/nsspursrc/vm/vmCallback.h
branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
branches/Cog/nsspurstacksrc/vm/interp.c
branches/Cog/nsspurstacksrc/vm/interp.h
branches/Cog/nsspurstacksrc/vm/vmCallback.h
branches/Cog/platforms/unix/plugins/UUIDPlugin/acinclude.m4
branches/Cog/platforms/unix/plugins/XDisplayControlPlugin/Makefile.inc
branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c
branches/Cog/sistasrc/vm/cogit.c
branches/Cog/sistasrc/vm/cogit.h
branches/Cog/sistasrc/vm/cogmethod.h
branches/Cog/spursistasrc/vm/cointerp.c
branches/Cog/spursistasrc/vm/cointerp.h
branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
branches/Cog/spursistasrc/vm/interp.h
branches/Cog/spursistasrc/vm/vmCallback.h
branches/Cog/spursrc/vm/cointerp.c
branches/Cog/spursrc/vm/cointerp.h
branches/Cog/spursrc/vm/gcc3x-cointerp.c
branches/Cog/spursrc/vm/interp.h
branches/Cog/spursrc/vm/vmCallback.h
branches/Cog/spurstacksrc/vm/gcc3x-interp.c
branches/Cog/spurstacksrc/vm/interp.c
branches/Cog/spurstacksrc/vm/interp.h
branches/Cog/spurstacksrc/vm/vmCallback.h
branches/Cog/src/vm/cogit.c
branches/Cog/src/vm/cogit.h
branches/Cog/src/vm/cogmethod.h
Added Paths:
-----------
branches/Cog/platforms/unix/plugins/XDisplayControlPlugin/build.cmake
branches/Cog/platforms/unix/plugins/XDisplayControlPlugin/config.cmake
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nscogsrc/vm/cogit.c
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.c 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/nscogsrc/vm/cogit.c 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.766 uuid: 3045c341-cfbf-494c-a7b1-fb29c26a7340
+ CCodeGenerator VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.766 uuid: 3045c341-cfbf-494c-a7b1-fb29c26a7340
+ StackToRegisterMappingCogit VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.766 uuid: 3045c341-cfbf-494c-a7b1-fb29c26a7340 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -20219,9 +20219,6 @@
byteAtput(retpc - 2, (((usqInt) distance) >> 16) & 0xFF);
byteAtput(retpc - 3, (((usqInt) distance) >> 8) & 0xFF);
byteAtput(retpc - 4, distance & 0xFF);
- if (!(asserta((callTargetFromReturnAddress(self_in_relocateCallBeforeReturnPCby, retpc)) >= (minCallAddress())))) {
- error("relocating call to invalid address");
- }
}
return self_in_relocateCallBeforeReturnPCby;
}
Modified: branches/Cog/nscogsrc/vm/cogit.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.h 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/nscogsrc/vm/cogit.h 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.766 uuid: 3045c341-cfbf-494c-a7b1-fb29c26a7340
+ CCodeGenerator VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
Modified: branches/Cog/nscogsrc/vm/cogmethod.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogmethod.h 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/nscogsrc/vm/cogmethod.h 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.766 uuid: 3045c341-cfbf-494c-a7b1-fb29c26a7340
+ CCodeGenerator VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
typedef struct {
Modified: branches/Cog/nsspursrc/vm/cogit.c
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.c 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/nsspursrc/vm/cogit.c 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator * VMMaker.oscog-eem.771 uuid: aab62250-6fd1-4267-95f5-a270cf86aad7
+ CCodeGenerator VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
from
- StackToRegisterMappingCogit * VMMaker.oscog-eem.771 uuid: aab62250-6fd1-4267-95f5-a270cf86aad7
+ StackToRegisterMappingCogit VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit * VMMaker.oscog-eem.771 uuid: aab62250-6fd1-4267-95f5-a270cf86aad7 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
Modified: branches/Cog/nsspursrc/vm/cogit.h
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.h 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/nsspursrc/vm/cogit.h 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator * VMMaker.oscog-eem.771 uuid: aab62250-6fd1-4267-95f5-a270cf86aad7
+ CCodeGenerator VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
Modified: branches/Cog/nsspursrc/vm/cogmethod.h
===================================================================
--- branches/Cog/nsspursrc/vm/cogmethod.h 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/nsspursrc/vm/cogmethod.h 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.766 uuid: 3045c341-cfbf-494c-a7b1-fb29c26a7340
+ CCodeGenerator VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
typedef struct {
Modified: branches/Cog/nsspursrc/vm/cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.c 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/nsspursrc/vm/cointerp.c 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
from
- CoInterpreter VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ CoInterpreter VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2238,7 +2238,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.772";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.774";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -5531,7 +5531,6 @@
GIV(framePointer) = localFP;
ceEnterCogCodePopReceiverReg();
- null;
goto l290;
}
localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -5549,7 +5548,7 @@
/* begin fetchNextBytecode */
currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector);
- null;
+ /* return self */
l290: /* end baseFrameReturn */;
goto l287;
}
@@ -28226,12 +28225,13 @@
}
-/* Follow a forwarding pointer. Alas we cannot prevent forwarders to
+/* Follow a forwarding pointer. THis must be a loop because we cannot prevent
+ forwarders to
forwarders being created by lazy become. Consider the following example by
Igor Stasenko:
array := { a. b. c }.
- array at: 1 points to &a. array at: 2 points to &b. array at: 3 points
- to &c Ó
+ to &c
a becomeForward: b
- array at: 1 still points to &a. array at: 2 still points to &b. array
at: 3 still points to &c
Modified: branches/Cog/nsspursrc/vm/cointerp.h
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.h 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/nsspursrc/vm/cointerp.h 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-06-15 22:17:31 UTC (rev 3003)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
from
- CoInterpreter VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ CoInterpreter VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2241,7 +2241,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.772";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.774";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -5540,7 +5540,6 @@
GIV(framePointer) = localFP;
ceEnterCogCodePopReceiverReg();
- null;
goto l290;
}
localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -5558,7 +5557,7 @@
/* begin fetchNextBytecode */
currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector);
- null;
+ /* return self */
l290: /* end baseFrameReturn */;
goto l287;
}
@@ -28235,12 +28234,13 @@
}
-/* Follow a forwarding pointer. Alas we cannot prevent forwarders to
+/* Follow a forwarding pointer. THis must be a loop because we cannot prevent
+ forwarders to
forwarders being created by lazy become. Consider the following example by
Igor Stasenko:
array := { a. b. c }.
- array at: 1 points to &a. array at: 2 points to &b. array at: 3 points
- to &c Ó
+ to &c
a becomeForward: b
- array at: 1 still points to &a. array at: 2 still points to &b. array
at: 3 still points to &c
Modified: branches/Cog/nsspursrc/vm/interp.h
===================================================================
--- branches/Cog/nsspursrc/vm/interp.h 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/nsspursrc/vm/interp.h 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/nsspursrc/vm/vmCallback.h
===================================================================
--- branches/Cog/nsspursrc/vm/vmCallback.h 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/nsspursrc/vm/vmCallback.h 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
#define VM_CALLBACK_INC 1
Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-06-15 22:17:31 UTC (rev 3003)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
from
- StackInterpreter VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ StackInterpreter VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2024,7 +2024,7 @@
0 };
char * breakSelector;
sqInt breakSelectorLength = -1;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.772";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.774";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -24187,12 +24187,13 @@
}
-/* Follow a forwarding pointer. Alas we cannot prevent forwarders to
+/* Follow a forwarding pointer. THis must be a loop because we cannot prevent
+ forwarders to
forwarders being created by lazy become. Consider the following example by
Igor Stasenko:
array := { a. b. c }.
- array at: 1 points to &a. array at: 2 points to &b. array at: 3 points
- to &c Ó
+ to &c
a becomeForward: b
- array at: 1 still points to &a. array at: 2 still points to &b. array
at: 3 still points to &c
Modified: branches/Cog/nsspurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/interp.c 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/nsspurstacksrc/vm/interp.c 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
from
- StackInterpreter VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ StackInterpreter VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2021,7 +2021,7 @@
0 };
char * breakSelector;
sqInt breakSelectorLength = -1;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.772";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.774";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -24178,12 +24178,13 @@
}
-/* Follow a forwarding pointer. Alas we cannot prevent forwarders to
+/* Follow a forwarding pointer. THis must be a loop because we cannot prevent
+ forwarders to
forwarders being created by lazy become. Consider the following example by
Igor Stasenko:
array := { a. b. c }.
- array at: 1 points to &a. array at: 2 points to &b. array at: 3 points
- to &c Ó
+ to &c
a becomeForward: b
- array at: 1 still points to &a. array at: 2 still points to &b. array
at: 3 still points to &c
Modified: branches/Cog/nsspurstacksrc/vm/interp.h
===================================================================
--- branches/Cog/nsspurstacksrc/vm/interp.h 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/nsspurstacksrc/vm/interp.h 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/nsspurstacksrc/vm/vmCallback.h
===================================================================
--- branches/Cog/nsspurstacksrc/vm/vmCallback.h 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/nsspurstacksrc/vm/vmCallback.h 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
#define VM_CALLBACK_INC 1
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Fri Jun 13 20:35:33 PDT 2014
+ Sun Jun 15 15:16:26 PDT 2014
Modified: branches/Cog/platforms/unix/plugins/UUIDPlugin/acinclude.m4
===================================================================
--- branches/Cog/platforms/unix/plugins/UUIDPlugin/acinclude.m4 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/platforms/unix/plugins/UUIDPlugin/acinclude.m4 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,14 +1,16 @@
# -*- sh -*-
-AC_MSG_CHECKING([for UUID support])
-AC_TRY_COMPILE([#include <uuid/uuid.h>],[uuid_generate;],[
- AC_MSG_RESULT(yes)
- AC_CHECK_LIB(uuid, uuid_generate,
- LIB_UUID="-luuid"
- )
-],[
- AC_MSG_RESULT(no)
- AC_PLUGIN_DISABLE
-])
+AC_MSG_CHECKING([for UUID support uuid/uuid.h & uuid_generate])
+AC_TRY_COMPILE([#include <uuid/uuid.h>],[uuid_generate;],
+ [AC_MSG_RESULT(yes)
+ AC_CHECK_LIB(uuid, uuid_generate, LIB_UUID="-luuid")],
+ [AC_MSG_RESULT(no)
+ AC_MSG_CHECKING([for UUID uuid.h & uuidgen])
+ AC_TRY_COMPILE([#include <uuid.h>],[uuidgen;],
+ [AC_MSG_RESULT(yes)
+ AC_CHECK_LIB(uuid, uuidgen, LIB_UUID="-luuid" )],
+ [AC_MSG_RESULT(no)
+ AC_PLUGIN_DISABLE])])
+
AC_SUBST(LIB_UUID)
Modified: branches/Cog/platforms/unix/plugins/XDisplayControlPlugin/Makefile.inc
===================================================================
--- branches/Cog/platforms/unix/plugins/XDisplayControlPlugin/Makefile.inc 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/platforms/unix/plugins/XDisplayControlPlugin/Makefile.inc 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,3 +1,8 @@
XCPPFLAGS= -I$(topdir)/platforms/Cross/plugins/FilePlugin -I$(topdir)/platforms/Cross/plugins/SocketPlugin
XINCLUDES= $(X_INCLUDES)
-XLDFLAGS= $(X_LIBS)
+XLDFLAGS= $(X_LIBS) -L. -lvm-display-X11
+
+$(TARGET): libvm-display-X11.so
+
+libvm-display-X11.so:
+ ln -s ../vm-display-X11/.libs/vm-display-X11 libvm-display-X11.so
Added: branches/Cog/platforms/unix/plugins/XDisplayControlPlugin/build.cmake
===================================================================
--- branches/Cog/platforms/unix/plugins/XDisplayControlPlugin/build.cmake (rev 0)
+++ branches/Cog/platforms/unix/plugins/XDisplayControlPlugin/build.cmake 2014-06-15 22:17:31 UTC (rev 3003)
@@ -0,0 +1 @@
+EXPECT_UNDEFINED_SYMBOLS ()
Added: branches/Cog/platforms/unix/plugins/XDisplayControlPlugin/config.cmake
===================================================================
--- branches/Cog/platforms/unix/plugins/XDisplayControlPlugin/config.cmake (rev 0)
+++ branches/Cog/platforms/unix/plugins/XDisplayControlPlugin/config.cmake 2014-06-15 22:17:31 UTC (rev 3003)
@@ -0,0 +1,5 @@
+IF (NOT X11_FOUND)
+ PLUGIN_DISABLE ()
+ELSE ()
+ PLUGIN_INCLUDE_DIRECTORIES (${cross}/plugins/FilePlugin ${cross}/plugins/SocketPlugin)
+ENDIF ()
Modified: branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c
===================================================================
--- branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c 2014-06-15 22:17:31 UTC (rev 3003)
@@ -4174,7 +4174,7 @@
}
-static void initWindow(char *displayName)
+void initWindow(char *displayName)
{
XRectangle windowBounds= { 0, 0, 640, 480 }; /* default window bounds */
int right, bottom;
@@ -6662,7 +6662,7 @@
/*** display connection ***/
-static int openXDisplay(void)
+int openXDisplay(void)
{
/* open the Squeak window. */
if (!isConnectedToXServer)
@@ -6701,7 +6701,7 @@
}
}
-static int forgetXDisplay(void)
+int forgetXDisplay(void)
{
/* Initialise variables related to the X connection, and
make the existing connection to the X Display invalid
Modified: branches/Cog/sistasrc/vm/cogit.c
===================================================================
--- branches/Cog/sistasrc/vm/cogit.c 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/sistasrc/vm/cogit.c 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.766 uuid: 3045c341-cfbf-494c-a7b1-fb29c26a7340
+ CCodeGenerator VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
from
- SistaStackToRegisterMappingCogit VMMaker.oscog-eem.766 uuid: 3045c341-cfbf-494c-a7b1-fb29c26a7340
+ SistaStackToRegisterMappingCogit VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
-static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.766 uuid: 3045c341-cfbf-494c-a7b1-fb29c26a7340 " __DATE__ ;
+static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -19536,9 +19536,6 @@
byteAtput(retpc - 2, (((usqInt) distance) >> 16) & 0xFF);
byteAtput(retpc - 3, (((usqInt) distance) >> 8) & 0xFF);
byteAtput(retpc - 4, distance & 0xFF);
- if (!(asserta((callTargetFromReturnAddress(self_in_relocateCallBeforeReturnPCby, retpc)) >= (minCallAddress())))) {
- error("relocating call to invalid address");
- }
}
return self_in_relocateCallBeforeReturnPCby;
}
Modified: branches/Cog/sistasrc/vm/cogit.h
===================================================================
--- branches/Cog/sistasrc/vm/cogit.h 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/sistasrc/vm/cogit.h 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.766 uuid: 3045c341-cfbf-494c-a7b1-fb29c26a7340
+ CCodeGenerator VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
Modified: branches/Cog/sistasrc/vm/cogmethod.h
===================================================================
--- branches/Cog/sistasrc/vm/cogmethod.h 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/sistasrc/vm/cogmethod.h 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.766 uuid: 3045c341-cfbf-494c-a7b1-fb29c26a7340
+ CCodeGenerator VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
typedef struct {
Modified: branches/Cog/spursistasrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.c 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/spursistasrc/vm/cointerp.c 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
from
- CoInterpreter VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ CoInterpreter VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2233,7 +2233,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.772]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.774]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -5424,6 +5424,7 @@
GIV(framePointer) = localFP;
ceEnterCogCodePopReceiverReg();
+ null;
goto l148;
}
localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -5438,7 +5439,7 @@
/* begin fetchNextBytecode */
currentBytecode = byteAtPointer(++localIP);
- /* return self */
+ null;
l148: /* end baseFrameReturn */;
goto l145;
}
@@ -23449,12 +23450,13 @@
}
-/* Follow a forwarding pointer. Alas we cannot prevent forwarders to
+/* Follow a forwarding pointer. THis must be a loop because we cannot prevent
+ forwarders to
forwarders being created by lazy become. Consider the following example by
Igor Stasenko:
array := { a. b. c }.
- array at: 1 points to &a. array at: 2 points to &b. array at: 3 points
- to &c Ó
+ to &c
a becomeForward: b
- array at: 1 still points to &a. array at: 2 still points to &b. array
at: 3 still points to &c
Modified: branches/Cog/spursistasrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.h 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/spursistasrc/vm/cointerp.h 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-06-15 22:17:31 UTC (rev 3003)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
from
- CoInterpreter VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ CoInterpreter VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2236,7 +2236,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.772]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.774]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -5433,6 +5433,7 @@
GIV(framePointer) = localFP;
ceEnterCogCodePopReceiverReg();
+ null;
goto l148;
}
localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -5447,7 +5448,7 @@
/* begin fetchNextBytecode */
currentBytecode = byteAtPointer(++localIP);
- /* return self */
+ null;
l148: /* end baseFrameReturn */;
goto l145;
}
@@ -23458,12 +23459,13 @@
}
-/* Follow a forwarding pointer. Alas we cannot prevent forwarders to
+/* Follow a forwarding pointer. THis must be a loop because we cannot prevent
+ forwarders to
forwarders being created by lazy become. Consider the following example by
Igor Stasenko:
array := { a. b. c }.
- array at: 1 points to &a. array at: 2 points to &b. array at: 3 points
- to &c Ó
+ to &c
a becomeForward: b
- array at: 1 still points to &a. array at: 2 still points to &b. array
at: 3 still points to &c
Modified: branches/Cog/spursistasrc/vm/interp.h
===================================================================
--- branches/Cog/spursistasrc/vm/interp.h 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/spursistasrc/vm/interp.h 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/spursistasrc/vm/vmCallback.h
===================================================================
--- branches/Cog/spursistasrc/vm/vmCallback.h 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/spursistasrc/vm/vmCallback.h 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
#define VM_CALLBACK_INC 1
Modified: branches/Cog/spursrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/cointerp.c 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/spursrc/vm/cointerp.c 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
from
- CoInterpreter VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ CoInterpreter VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2228,7 +2228,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.772]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.774]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -23311,12 +23311,13 @@
}
-/* Follow a forwarding pointer. Alas we cannot prevent forwarders to
+/* Follow a forwarding pointer. THis must be a loop because we cannot prevent
+ forwarders to
forwarders being created by lazy become. Consider the following example by
Igor Stasenko:
array := { a. b. c }.
- array at: 1 points to &a. array at: 2 points to &b. array at: 3 points
- to &c Ó
+ to &c
a becomeForward: b
- array at: 1 still points to &a. array at: 2 still points to &b. array
at: 3 still points to &c
Modified: branches/Cog/spursrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursrc/vm/cointerp.h 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/spursrc/vm/cointerp.h 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-06-15 22:17:31 UTC (rev 3003)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
from
- CoInterpreter VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ CoInterpreter VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2231,7 +2231,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.772]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.774]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -23320,12 +23320,13 @@
}
-/* Follow a forwarding pointer. Alas we cannot prevent forwarders to
+/* Follow a forwarding pointer. THis must be a loop because we cannot prevent
+ forwarders to
forwarders being created by lazy become. Consider the following example by
Igor Stasenko:
array := { a. b. c }.
- array at: 1 points to &a. array at: 2 points to &b. array at: 3 points
- to &c Ó
+ to &c
a becomeForward: b
- array at: 1 still points to &a. array at: 2 still points to &b. array
at: 3 still points to &c
Modified: branches/Cog/spursrc/vm/interp.h
===================================================================
--- branches/Cog/spursrc/vm/interp.h 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/spursrc/vm/interp.h 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/spursrc/vm/vmCallback.h
===================================================================
--- branches/Cog/spursrc/vm/vmCallback.h 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/spursrc/vm/vmCallback.h 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
#define VM_CALLBACK_INC 1
Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-06-15 22:17:31 UTC (rev 3003)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
from
- StackInterpreter VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ StackInterpreter VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2017,7 +2017,7 @@
0 };
char * breakSelector;
sqInt breakSelectorLength = -1;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.772]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.774]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -19610,12 +19610,13 @@
}
-/* Follow a forwarding pointer. Alas we cannot prevent forwarders to
+/* Follow a forwarding pointer. THis must be a loop because we cannot prevent
+ forwarders to
forwarders being created by lazy become. Consider the following example by
Igor Stasenko:
array := { a. b. c }.
- array at: 1 points to &a. array at: 2 points to &b. array at: 3 points
- to &c Ó
+ to &c
a becomeForward: b
- array at: 1 still points to &a. array at: 2 still points to &b. array
at: 3 still points to &c
Modified: branches/Cog/spurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/spurstacksrc/vm/interp.c 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/spurstacksrc/vm/interp.c 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
from
- StackInterpreter VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ StackInterpreter VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2014,7 +2014,7 @@
0 };
char * breakSelector;
sqInt breakSelectorLength = -1;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.772]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.774]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -19601,12 +19601,13 @@
}
-/* Follow a forwarding pointer. Alas we cannot prevent forwarders to
+/* Follow a forwarding pointer. THis must be a loop because we cannot prevent
+ forwarders to
forwarders being created by lazy become. Consider the following example by
Igor Stasenko:
array := { a. b. c }.
- array at: 1 points to &a. array at: 2 points to &b. array at: 3 points
- to &c Ó
+ to &c
a becomeForward: b
- array at: 1 still points to &a. array at: 2 still points to &b. array
at: 3 still points to &c
Modified: branches/Cog/spurstacksrc/vm/interp.h
===================================================================
--- branches/Cog/spurstacksrc/vm/interp.h 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/spurstacksrc/vm/interp.h 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/spurstacksrc/vm/vmCallback.h
===================================================================
--- branches/Cog/spurstacksrc/vm/vmCallback.h 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/spurstacksrc/vm/vmCallback.h 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.772 uuid: c15ccff3-56a1-484d-af3b-0ee906a7a24b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
#define VM_CALLBACK_INC 1
Modified: branches/Cog/src/vm/cogit.c
===================================================================
--- branches/Cog/src/vm/cogit.c 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/src/vm/cogit.c 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.766 uuid: 3045c341-cfbf-494c-a7b1-fb29c26a7340
+ CCodeGenerator VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.766 uuid: 3045c341-cfbf-494c-a7b1-fb29c26a7340
+ StackToRegisterMappingCogit VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.766 uuid: 3045c341-cfbf-494c-a7b1-fb29c26a7340 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -18853,9 +18853,6 @@
byteAtput(retpc - 2, (((usqInt) distance) >> 16) & 0xFF);
byteAtput(retpc - 3, (((usqInt) distance) >> 8) & 0xFF);
byteAtput(retpc - 4, distance & 0xFF);
- if (!(asserta((callTargetFromReturnAddress(self_in_relocateCallBeforeReturnPCby, retpc)) >= (minCallAddress())))) {
- error("relocating call to invalid address");
- }
}
return self_in_relocateCallBeforeReturnPCby;
}
Modified: branches/Cog/src/vm/cogit.h
===================================================================
--- branches/Cog/src/vm/cogit.h 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/src/vm/cogit.h 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.766 uuid: 3045c341-cfbf-494c-a7b1-fb29c26a7340
+ CCodeGenerator VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
Modified: branches/Cog/src/vm/cogmethod.h
===================================================================
--- branches/Cog/src/vm/cogmethod.h 2014-06-14 04:45:19 UTC (rev 3002)
+++ branches/Cog/src/vm/cogmethod.h 2014-06-15 22:17:31 UTC (rev 3003)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.766 uuid: 3045c341-cfbf-494c-a7b1-fb29c26a7340
+ CCodeGenerator VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422
*/
typedef struct {
More information about the Vm-dev
mailing list