[Vm-dev] [commit][2837] CogVM source as per VMMaker.oscog-eem.570.
commits at squeakvm.org
commits at squeakvm.org
Wed Dec 25 05:01:32 UTC 2013
Revision: 2837
Author: eliot
Date: 2013-12-24 21:01:29 -0800 (Tue, 24 Dec 2013)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.570.
Fix references to memory for use-a-structure configurations to match the
change made to ObjectMemory class>>mustBeGlobal: in VMMaker.oscog-eem.547.
Modified Paths:
--------------
branches/Cog/nscogsrc/vm/cointerp.c
branches/Cog/nscogsrc/vm/cointerp.h
branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
branches/Cog/nscogsrc/vm/interp.h
branches/Cog/nscogsrc/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/cointerp.c
branches/Cog/src/vm/cointerp.h
branches/Cog/src/vm/cointerpmt.c
branches/Cog/src/vm/cointerpmt.h
branches/Cog/src/vm/gcc3x-cointerp.c
branches/Cog/src/vm/gcc3x-cointerpmt.c
branches/Cog/src/vm/interp.h
branches/Cog/src/vm/vmCallback.h
branches/Cog/stacksrc/vm/gcc3x-interp.c
branches/Cog/stacksrc/vm/interp.c
branches/Cog/stacksrc/vm/interp.h
branches/Cog/stacksrc/vm/vmCallback.h
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nscogsrc/vm/cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.c 2013-12-25 04:06:57 UTC (rev 2836)
+++ branches/Cog/nscogsrc/vm/cointerp.c 2013-12-25 05:01:29 UTC (rev 2837)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
from
- CoInterpreter VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ CoInterpreter VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1143,7 +1143,7 @@
static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void));
static sqInt roomToPushNArgs(sqInt n);
static void runLeakCheckerForFullGC(sqInt fullGCFlag);
-static usqInt safeObjectAfter(sqInt oop);
+static sqInt safeObjectAfter(sqInt oop);
static sqInt safePrintStringOf(sqInt oop);
usqInt scavengeThresholdAddress(void);
EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext);
@@ -2030,7 +2030,7 @@
/* 575 */ (void (*)(void))0,
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.569";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.570";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -2060,7 +2060,7 @@
#define instFormatFieldLSB() 8
#define instFormatFieldWidth() 4
#define isForwarded(oop) false
-#define memory() memory
+#define memory() GIV(memory)
#define mostRecentlyUsedPage() GIV(mostRecentlyUsedPage)
#define nextOpenPIC methodObject
#define nextOpenPICHack hack hack hack i.e. the getter macro does all the work
@@ -4824,7 +4824,6 @@
GIV(framePointer) = localFP;
ceEnterCogCodePopReceiverReg();
- null;
goto l307;
}
localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -4842,7 +4841,7 @@
/* begin fetchNextBytecode */
currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector);
- null;
+ /* return self */
l307: /* end baseFrameReturn */;
goto l304;
}
@@ -23724,15 +23723,17 @@
sqInt header1;
sqInt header2;
sqInt header3;
+ sqInt header4;
usqInt lastWord;
sqInt newFreeChunk;
sqInt newOop;
- usqInt next;
+ sqInt next;
sqInt oop;
sqInt realHeader;
sqInt sz;
sqInt sz1;
sqInt sz2;
+ sqInt sz3;
sqInt target;
usqInt w;
@@ -23743,7 +23744,21 @@
/* begin objectAfterWhileForwarding: */
header2 = longAt(oop);
if ((header2 & MarkBit) == 0) {
- next = ((sqInt) (objectAfter(oop)));
+ /* begin objectAfter: */
+ if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) {
+ error("no objects after the end of memory");
+ }
+ if (((longAt(oop)) & TypeMask) == HeaderTypeFree) {
+ sz2 = (longAt(oop)) & AllButTypeMask;
+ }
+ else {
+ /* begin sizeBitsOf: */
+ header3 = longAt(oop);
+ sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass
+ ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask
+ : header3 & SizeMask);
+ }
+ next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]);
goto l1;
}
fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1;
@@ -23758,7 +23773,7 @@
else {
sz1 = realHeader & SizeMask;
}
- next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask])));
+ next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]);
l1: /* end objectAfterWhileForwarding: */;
if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) {
@@ -23812,18 +23827,18 @@
}
/* begin safeObjectAfter: */
if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) {
- sz2 = (longAt(newFreeChunk)) & AllButTypeMask;
+ sz3 = (longAt(newFreeChunk)) & AllButTypeMask;
}
else {
/* begin sizeBitsOf: */
- header3 = longAt(newFreeChunk);
- sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass
+ header4 = longAt(newFreeChunk);
+ sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass
? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask
- : header3 & SizeMask);
+ : header4 & SizeMask);
}
- next = ((newFreeChunk + sz2) >= GIV(freeStart)
+ next = ((newFreeChunk + sz3) >= GIV(freeStart)
? GIV(freeStart)
- : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask]));
+ : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask]));
assert((next == GIV(freeStart))
|| (next == (oopFromChunk(GIV(compEnd)))));
if (next == GIV(freeStart)) {
@@ -50031,7 +50046,7 @@
given object or free chunk in memory. Return freeStart when
enumeration is complete. This is for assertion checking only. */
-static usqInt
+static sqInt
safeObjectAfter(sqInt oop)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt header;
Modified: branches/Cog/nscogsrc/vm/cointerp.h
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.h 2013-12-25 04:06:57 UTC (rev 2836)
+++ branches/Cog/nscogsrc/vm/cointerp.h 2013-12-25 05:01:29 UTC (rev 2837)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
*/
Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-12-25 04:06:57 UTC (rev 2836)
+++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-12-25 05:01:29 UTC (rev 2837)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
from
- CoInterpreter VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ CoInterpreter VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1146,7 +1146,7 @@
static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void));
static sqInt roomToPushNArgs(sqInt n);
static void runLeakCheckerForFullGC(sqInt fullGCFlag);
-static usqInt safeObjectAfter(sqInt oop);
+static sqInt safeObjectAfter(sqInt oop);
static sqInt safePrintStringOf(sqInt oop);
usqInt scavengeThresholdAddress(void);
EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext);
@@ -2033,7 +2033,7 @@
/* 575 */ (void (*)(void))0,
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.569";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.570";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -2063,7 +2063,7 @@
#define instFormatFieldLSB() 8
#define instFormatFieldWidth() 4
#define isForwarded(oop) false
-#define memory() memory
+#define memory() GIV(memory)
#define mostRecentlyUsedPage() GIV(mostRecentlyUsedPage)
#define nextOpenPIC methodObject
#define nextOpenPICHack hack hack hack i.e. the getter macro does all the work
@@ -4833,7 +4833,6 @@
GIV(framePointer) = localFP;
ceEnterCogCodePopReceiverReg();
- null;
goto l307;
}
localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -4851,7 +4850,7 @@
/* begin fetchNextBytecode */
currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector);
- null;
+ /* return self */
l307: /* end baseFrameReturn */;
goto l304;
}
@@ -23733,15 +23732,17 @@
sqInt header1;
sqInt header2;
sqInt header3;
+ sqInt header4;
usqInt lastWord;
sqInt newFreeChunk;
sqInt newOop;
- usqInt next;
+ sqInt next;
sqInt oop;
sqInt realHeader;
sqInt sz;
sqInt sz1;
sqInt sz2;
+ sqInt sz3;
sqInt target;
usqInt w;
@@ -23752,7 +23753,21 @@
/* begin objectAfterWhileForwarding: */
header2 = longAt(oop);
if ((header2 & MarkBit) == 0) {
- next = ((sqInt) (objectAfter(oop)));
+ /* begin objectAfter: */
+ if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) {
+ error("no objects after the end of memory");
+ }
+ if (((longAt(oop)) & TypeMask) == HeaderTypeFree) {
+ sz2 = (longAt(oop)) & AllButTypeMask;
+ }
+ else {
+ /* begin sizeBitsOf: */
+ header3 = longAt(oop);
+ sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass
+ ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask
+ : header3 & SizeMask);
+ }
+ next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]);
goto l1;
}
fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1;
@@ -23767,7 +23782,7 @@
else {
sz1 = realHeader & SizeMask;
}
- next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask])));
+ next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]);
l1: /* end objectAfterWhileForwarding: */;
if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) {
@@ -23821,18 +23836,18 @@
}
/* begin safeObjectAfter: */
if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) {
- sz2 = (longAt(newFreeChunk)) & AllButTypeMask;
+ sz3 = (longAt(newFreeChunk)) & AllButTypeMask;
}
else {
/* begin sizeBitsOf: */
- header3 = longAt(newFreeChunk);
- sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass
+ header4 = longAt(newFreeChunk);
+ sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass
? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask
- : header3 & SizeMask);
+ : header4 & SizeMask);
}
- next = ((newFreeChunk + sz2) >= GIV(freeStart)
+ next = ((newFreeChunk + sz3) >= GIV(freeStart)
? GIV(freeStart)
- : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask]));
+ : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask]));
assert((next == GIV(freeStart))
|| (next == (oopFromChunk(GIV(compEnd)))));
if (next == GIV(freeStart)) {
@@ -50040,7 +50055,7 @@
given object or free chunk in memory. Return freeStart when
enumeration is complete. This is for assertion checking only. */
-static usqInt
+static sqInt
safeObjectAfter(sqInt oop)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt header;
Modified: branches/Cog/nscogsrc/vm/interp.h
===================================================================
--- branches/Cog/nscogsrc/vm/interp.h 2013-12-25 04:06:57 UTC (rev 2836)
+++ branches/Cog/nscogsrc/vm/interp.h 2013-12-25 05:01:29 UTC (rev 2837)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/nscogsrc/vm/vmCallback.h
===================================================================
--- branches/Cog/nscogsrc/vm/vmCallback.h 2013-12-25 04:06:57 UTC (rev 2836)
+++ branches/Cog/nscogsrc/vm/vmCallback.h 2013-12-25 05:01:29 UTC (rev 2837)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
*/
#define VM_CALLBACK_INC 1
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Tue Dec 24 20:04:40 PST 2013
+ Tue Dec 24 21:00:48 PST 2013
Modified: branches/Cog/spursrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/cointerp.c 2013-12-25 04:06:57 UTC (rev 2836)
+++ branches/Cog/spursrc/vm/cointerp.c 2013-12-25 05:01:29 UTC (rev 2837)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
from
- CoInterpreter VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ CoInterpreter VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2162,7 +2162,7 @@
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
usqInt heapBase;
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.569]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.570]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -2189,7 +2189,7 @@
#define getCogCodeSize() integerObjectOf(GIV(cogCodeSize))
#define getDesiredCogCodeSize() integerObjectOf(desiredCogCodeSize)
#define initialEnterSmalltalkExecutive() enterSmalltalkExecutiveImplementation()
-#define memory() memory
+#define memory() GIV(memory)
#define mostRecentlyUsedPage() GIV(mostRecentlyUsedPage)
#define newSpaceLimit() GIV(newSpaceLimit)
#define nextOpenPIC methodObject
Modified: branches/Cog/spursrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursrc/vm/cointerp.h 2013-12-25 04:06:57 UTC (rev 2836)
+++ branches/Cog/spursrc/vm/cointerp.h 2013-12-25 05:01:29 UTC (rev 2837)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
*/
Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2013-12-25 04:06:57 UTC (rev 2836)
+++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2013-12-25 05:01:29 UTC (rev 2837)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
from
- CoInterpreter VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ CoInterpreter VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2165,7 +2165,7 @@
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
usqInt heapBase;
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.569]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.570]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -2192,7 +2192,7 @@
#define getCogCodeSize() integerObjectOf(GIV(cogCodeSize))
#define getDesiredCogCodeSize() integerObjectOf(desiredCogCodeSize)
#define initialEnterSmalltalkExecutive() enterSmalltalkExecutiveImplementation()
-#define memory() memory
+#define memory() GIV(memory)
#define mostRecentlyUsedPage() GIV(mostRecentlyUsedPage)
#define newSpaceLimit() GIV(newSpaceLimit)
#define nextOpenPIC methodObject
Modified: branches/Cog/spursrc/vm/interp.h
===================================================================
--- branches/Cog/spursrc/vm/interp.h 2013-12-25 04:06:57 UTC (rev 2836)
+++ branches/Cog/spursrc/vm/interp.h 2013-12-25 05:01:29 UTC (rev 2837)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/spursrc/vm/vmCallback.h
===================================================================
--- branches/Cog/spursrc/vm/vmCallback.h 2013-12-25 04:06:57 UTC (rev 2836)
+++ branches/Cog/spursrc/vm/vmCallback.h 2013-12-25 05:01:29 UTC (rev 2837)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
*/
#define VM_CALLBACK_INC 1
Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2013-12-25 04:06:57 UTC (rev 2836)
+++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2013-12-25 05:01:29 UTC (rev 2837)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
from
- StackInterpreter VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ StackInterpreter VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1955,7 +1955,7 @@
0 };
char * breakSelector;
sqInt breakSelectorLength = -1;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.569]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.570]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -1967,7 +1967,7 @@
#define flush() fflush(stdout)
#define freeStart() GIV(freeStart)
#define futureSpace() GIV(futureSpace)
-#define memory() memory
+#define memory() GIV(memory)
#define mostRecentlyUsedPage() GIV(mostRecentlyUsedPage)
#define newSpaceLimit() GIV(newSpaceLimit)
#define numElementsIn(anArray) (sizeof(anArray)/sizeof(anArray[0]))
@@ -1978,7 +1978,7 @@
#define printFloat(f) printf("%g", f)
#define rememberedSetSize() GIV(rememberedSetSize)
#define stackPageAtpages(index,pages) ((pages) + (index))
-#define startOfMemory() memory
+#define startOfMemory() GIV(memory)
#define wordSize() 4
Modified: branches/Cog/spurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/spurstacksrc/vm/interp.c 2013-12-25 04:06:57 UTC (rev 2836)
+++ branches/Cog/spurstacksrc/vm/interp.c 2013-12-25 05:01:29 UTC (rev 2837)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
from
- StackInterpreter VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ StackInterpreter VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1952,7 +1952,7 @@
0 };
char * breakSelector;
sqInt breakSelectorLength = -1;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.569]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.570]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -1964,7 +1964,7 @@
#define flush() fflush(stdout)
#define freeStart() GIV(freeStart)
#define futureSpace() GIV(futureSpace)
-#define memory() memory
+#define memory() GIV(memory)
#define mostRecentlyUsedPage() GIV(mostRecentlyUsedPage)
#define newSpaceLimit() GIV(newSpaceLimit)
#define numElementsIn(anArray) (sizeof(anArray)/sizeof(anArray[0]))
@@ -1975,7 +1975,7 @@
#define printFloat(f) printf("%g", f)
#define rememberedSetSize() GIV(rememberedSetSize)
#define stackPageAtpages(index,pages) ((pages) + (index))
-#define startOfMemory() memory
+#define startOfMemory() GIV(memory)
#define wordSize() 4
Modified: branches/Cog/spurstacksrc/vm/interp.h
===================================================================
--- branches/Cog/spurstacksrc/vm/interp.h 2013-12-25 04:06:57 UTC (rev 2836)
+++ branches/Cog/spurstacksrc/vm/interp.h 2013-12-25 05:01:29 UTC (rev 2837)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/spurstacksrc/vm/vmCallback.h
===================================================================
--- branches/Cog/spurstacksrc/vm/vmCallback.h 2013-12-25 04:06:57 UTC (rev 2836)
+++ branches/Cog/spurstacksrc/vm/vmCallback.h 2013-12-25 05:01:29 UTC (rev 2837)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
*/
#define VM_CALLBACK_INC 1
Modified: branches/Cog/src/vm/cointerp.c
===================================================================
--- branches/Cog/src/vm/cointerp.c 2013-12-25 04:06:57 UTC (rev 2836)
+++ branches/Cog/src/vm/cointerp.c 2013-12-25 05:01:29 UTC (rev 2837)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
from
- CoInterpreter VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ CoInterpreter VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2020,7 +2020,7 @@
/* 575 */ (void (*)(void))0,
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.569]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.570]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -2050,7 +2050,7 @@
#define instFormatFieldLSB() 8
#define instFormatFieldWidth() 4
#define isForwarded(oop) false
-#define memory() memory
+#define memory() GIV(memory)
#define mostRecentlyUsedPage() GIV(mostRecentlyUsedPage)
#define nextOpenPIC methodObject
#define nextOpenPICHack hack hack hack i.e. the getter macro does all the work
Modified: branches/Cog/src/vm/cointerp.h
===================================================================
--- branches/Cog/src/vm/cointerp.h 2013-12-25 04:06:57 UTC (rev 2836)
+++ branches/Cog/src/vm/cointerp.h 2013-12-25 05:01:29 UTC (rev 2837)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
*/
Modified: branches/Cog/src/vm/cointerpmt.c
===================================================================
--- branches/Cog/src/vm/cointerpmt.c 2013-12-25 04:06:57 UTC (rev 2836)
+++ branches/Cog/src/vm/cointerpmt.c 2013-12-25 05:01:29 UTC (rev 2837)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
from
- CoInterpreterMT VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ CoInterpreterMT VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
*/
-static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2118,7 +2118,7 @@
/* 575 */ (void (*)(void))0,
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
-const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.569]";
+const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.570]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
sqInt willNotThreadWarnCount;
@@ -2150,7 +2150,7 @@
#define instFormatFieldLSB() 8
#define instFormatFieldWidth() 4
#define isForwarded(oop) false
-#define memory() memory
+#define memory() GIV(memory)
#define mostRecentlyUsedPage() GIV(mostRecentlyUsedPage)
#define nextOpenPIC methodObject
#define nextOpenPICHack hack hack hack i.e. the getter macro does all the work
@@ -4812,7 +4812,6 @@
GIV(framePointer) = localFP;
ceEnterCogCodePopReceiverReg();
- null;
goto l158;
}
localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -4827,7 +4826,7 @@
/* begin fetchNextBytecode */
currentBytecode = byteAtPointer(++localIP);
- null;
+ /* return self */
l158: /* end baseFrameReturn */;
goto l155;
}
@@ -5633,7 +5632,6 @@
/* begin internalPush: */
longAtPointerput((localSP -= BytesPerOop), longAt((rcvr + BaseHeaderSize) + (byte3 << ShiftForWord)));
}
- null;
goto l4;
}
if (opType == 3) {
@@ -5643,7 +5641,6 @@
assert(GIV(method) == (iframeMethod(localFP)));
object = longAt((GIV(method) + BaseHeaderSize) + ((byte3 + LiteralStart) << ShiftForWord));
longAtPointerput((localSP -= BytesPerOop), object);
- null;
goto l4;
}
if (opType == 4) {
@@ -5657,7 +5654,6 @@
object2 = longAt((oop + BaseHeaderSize) + (ValueIndex << ShiftForWord));
longAtPointerput((localSP -= BytesPerOop), object2);
- null;
goto l4;
}
top = longAtPointer(localSP);
Modified: branches/Cog/src/vm/cointerpmt.h
===================================================================
--- branches/Cog/src/vm/cointerpmt.h 2013-12-25 04:06:57 UTC (rev 2836)
+++ branches/Cog/src/vm/cointerpmt.h 2013-12-25 05:01:29 UTC (rev 2837)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
*/
Modified: branches/Cog/src/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/src/vm/gcc3x-cointerp.c 2013-12-25 04:06:57 UTC (rev 2836)
+++ branches/Cog/src/vm/gcc3x-cointerp.c 2013-12-25 05:01:29 UTC (rev 2837)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
from
- CoInterpreter VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ CoInterpreter VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2023,7 +2023,7 @@
/* 575 */ (void (*)(void))0,
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.569]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.570]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -2053,7 +2053,7 @@
#define instFormatFieldLSB() 8
#define instFormatFieldWidth() 4
#define isForwarded(oop) false
-#define memory() memory
+#define memory() GIV(memory)
#define mostRecentlyUsedPage() GIV(mostRecentlyUsedPage)
#define nextOpenPIC methodObject
#define nextOpenPICHack hack hack hack i.e. the getter macro does all the work
Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c
===================================================================
--- branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-12-25 04:06:57 UTC (rev 2836)
+++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-12-25 05:01:29 UTC (rev 2837)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
from
- CoInterpreterMT VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ CoInterpreterMT VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
*/
-static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2121,7 +2121,7 @@
/* 575 */ (void (*)(void))0,
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
-const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.569]";
+const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.570]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
sqInt willNotThreadWarnCount;
@@ -2153,7 +2153,7 @@
#define instFormatFieldLSB() 8
#define instFormatFieldWidth() 4
#define isForwarded(oop) false
-#define memory() memory
+#define memory() GIV(memory)
#define mostRecentlyUsedPage() GIV(mostRecentlyUsedPage)
#define nextOpenPIC methodObject
#define nextOpenPICHack hack hack hack i.e. the getter macro does all the work
@@ -4821,7 +4821,6 @@
GIV(framePointer) = localFP;
ceEnterCogCodePopReceiverReg();
- null;
goto l158;
}
localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -4836,7 +4835,7 @@
/* begin fetchNextBytecode */
currentBytecode = byteAtPointer(++localIP);
- null;
+ /* return self */
l158: /* end baseFrameReturn */;
goto l155;
}
@@ -5642,7 +5641,6 @@
/* begin internalPush: */
longAtPointerput((localSP -= BytesPerOop), longAt((rcvr + BaseHeaderSize) + (byte3 << ShiftForWord)));
}
- null;
goto l4;
}
if (opType == 3) {
@@ -5652,7 +5650,6 @@
assert(GIV(method) == (iframeMethod(localFP)));
object = longAt((GIV(method) + BaseHeaderSize) + ((byte3 + LiteralStart) << ShiftForWord));
longAtPointerput((localSP -= BytesPerOop), object);
- null;
goto l4;
}
if (opType == 4) {
@@ -5666,7 +5663,6 @@
object2 = longAt((oop + BaseHeaderSize) + (ValueIndex << ShiftForWord));
longAtPointerput((localSP -= BytesPerOop), object2);
- null;
goto l4;
}
top = longAtPointer(localSP);
Modified: branches/Cog/src/vm/interp.h
===================================================================
--- branches/Cog/src/vm/interp.h 2013-12-25 04:06:57 UTC (rev 2836)
+++ branches/Cog/src/vm/interp.h 2013-12-25 05:01:29 UTC (rev 2837)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/src/vm/vmCallback.h
===================================================================
--- branches/Cog/src/vm/vmCallback.h 2013-12-25 04:06:57 UTC (rev 2836)
+++ branches/Cog/src/vm/vmCallback.h 2013-12-25 05:01:29 UTC (rev 2837)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
*/
#define VM_CALLBACK_INC 1
Modified: branches/Cog/stacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/stacksrc/vm/gcc3x-interp.c 2013-12-25 04:06:57 UTC (rev 2836)
+++ branches/Cog/stacksrc/vm/gcc3x-interp.c 2013-12-25 05:01:29 UTC (rev 2837)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
from
- StackInterpreter VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379
+ StackInterpreter VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1809,7 +1809,7 @@
0 };
char * breakSelector;
sqInt breakSelectorLength = -1;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.565]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.570]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -1824,14 +1824,14 @@
#define instFormatFieldLSB() 8
#define instFormatFieldWidth() 4
#define isForwarded(oop) false
-#define memory() memory
+#define memory() GIV(memory)
#define mostRecentlyUsedPage() GIV(mostRecentlyUsedPage)
#define numElementsIn(anArray) (sizeof(anArray)/sizeof(anArray[0]))
#define pageIndexForstackMemorybytesPerPage(pointer,stackmem,pageByteSize) (((char *)(pointer) - (stackmem) - 1) / (pageByteSize))
#define printFloat(f) printf("%g", f)
#define remapBufferCount() GIV(remapBufferCount)
#define stackPageAtpages(index,pages) ((pages) + (index))
-#define startOfMemory() memory
+#define startOfMemory() GIV(memory)
#define validate() 0
#define youngStart() GIV(youngStart)
Modified: branches/Cog/stacksrc/vm/interp.c
===================================================================
--- branches/Cog/stacksrc/vm/interp.c 2013-12-25 04:06:57 UTC (rev 2836)
+++ branches/Cog/stacksrc/vm/interp.c 2013-12-25 05:01:29 UTC (rev 2837)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
from
- StackInterpreter VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379
+ StackInterpreter VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1806,7 +1806,7 @@
0 };
char * breakSelector;
sqInt breakSelectorLength = -1;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.565]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.570]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -1821,14 +1821,14 @@
#define instFormatFieldLSB() 8
#define instFormatFieldWidth() 4
#define isForwarded(oop) false
-#define memory() memory
+#define memory() GIV(memory)
#define mostRecentlyUsedPage() GIV(mostRecentlyUsedPage)
#define numElementsIn(anArray) (sizeof(anArray)/sizeof(anArray[0]))
#define pageIndexForstackMemorybytesPerPage(pointer,stackmem,pageByteSize) (((char *)(pointer) - (stackmem) - 1) / (pageByteSize))
#define printFloat(f) printf("%g", f)
#define remapBufferCount() GIV(remapBufferCount)
#define stackPageAtpages(index,pages) ((pages) + (index))
-#define startOfMemory() memory
+#define startOfMemory() GIV(memory)
#define validate() 0
#define youngStart() GIV(youngStart)
Modified: branches/Cog/stacksrc/vm/interp.h
===================================================================
--- branches/Cog/stacksrc/vm/interp.h 2013-12-25 04:06:57 UTC (rev 2836)
+++ branches/Cog/stacksrc/vm/interp.h 2013-12-25 05:01:29 UTC (rev 2837)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/stacksrc/vm/vmCallback.h
===================================================================
--- branches/Cog/stacksrc/vm/vmCallback.h 2013-12-25 04:06:57 UTC (rev 2836)
+++ branches/Cog/stacksrc/vm/vmCallback.h 2013-12-25 05:01:29 UTC (rev 2837)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.570 uuid: 193cb05d-73a5-4efa-833f-126ca02695d8
*/
#define VM_CALLBACK_INC 1
More information about the Vm-dev
mailing list