[Vm-dev] [commit][2973] CogVM source as per VMMaker.oscog-eem.767
commits at squeakvm.org
commits at squeakvm.org
Tue Jun 10 22:59:41 UTC 2014
Revision: 2973
Author: eliot
Date: 2014-06-10 15:59:41 -0700 (Tue, 10 Jun 2014)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.767
Spur: fix some compilation warnings in the cointerp.
Newspeak linux builds: fix the plugins argument to configure.
Modified Paths:
--------------
branches/Cog/build.linux32x86/newspeak.stack.spur/build/mvm
branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert/mvm
branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug/mvm
branches/Cog/build.linux32x86/newspeak.stack.v3/build/mvm
branches/Cog/build.linux32x86/newspeak.stack.v3/build.assert/mvm
branches/Cog/build.linux32x86/newspeak.stack.v3/build.debug/mvm
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/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
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/build.linux32x86/newspeak.stack.spur/build/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.stack.spur/build/mvm 2014-06-10 22:33:41 UTC (rev 2972)
+++ branches/Cog/build.linux32x86/newspeak.stack.spur/build/mvm 2014-06-10 22:59:41 UTC (rev 2973)
@@ -21,7 +21,7 @@
*) rm config.h; test -f Makefile && make reallyclean
esac
test -f config.h || ../../../platforms/unix/config/configure \
- --with-src=nsspurstacksrc --with-plugin-src=nscogsrc/plugins --disable-cogit \
+ --with-src=nsspurstacksrc --with-plugins=nscogsrc/plugins --disable-cogit \
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
CXX="g++ -m32" \
Modified: branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert/mvm 2014-06-10 22:33:41 UTC (rev 2972)
+++ branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert/mvm 2014-06-10 22:59:41 UTC (rev 2973)
@@ -17,7 +17,7 @@
*) rm config.h; test -f Makefile && make reallyclean
esac
test -f config.h || ../../../platforms/unix/config/configure \
- --with-src=nsspurstacksrc --with-plugin-src=nscogsrc/plugins --disable-cogit \
+ --with-src=nsspurstacksrc --with-plugins=nscogsrc/plugins --disable-cogit \
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
CXX="g++ -m32" \
Modified: branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug/mvm 2014-06-10 22:33:41 UTC (rev 2972)
+++ branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug/mvm 2014-06-10 22:59:41 UTC (rev 2973)
@@ -17,7 +17,7 @@
*) rm config.h; test -f Makefile && make reallyclean
esac
test -f config.h || ../../../platforms/unix/config/configure \
- --with-src=nsspurstacksrc --with-plugin-src=nscogsrc/plugins --disable-cogit \
+ --with-src=nsspurstacksrc --with-plugins=nscogsrc/plugins --disable-cogit \
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
CXX="g++ -m32" \
Modified: branches/Cog/build.linux32x86/newspeak.stack.v3/build/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.stack.v3/build/mvm 2014-06-10 22:33:41 UTC (rev 2972)
+++ branches/Cog/build.linux32x86/newspeak.stack.v3/build/mvm 2014-06-10 22:59:41 UTC (rev 2973)
@@ -21,7 +21,7 @@
*) rm config.h; test -f Makefile && make reallyclean
esac
test -f config.h || ../../../platforms/unix/config/configure \
- --with-src=nsstacksrc --with-plugin-src=nscogsrc/plugins --disable-cogit \
+ --with-src=nsstacksrc --with-plugins=nscogsrc/plugins --disable-cogit \
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
CXX="g++ -m32" \
Modified: branches/Cog/build.linux32x86/newspeak.stack.v3/build.assert/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.stack.v3/build.assert/mvm 2014-06-10 22:33:41 UTC (rev 2972)
+++ branches/Cog/build.linux32x86/newspeak.stack.v3/build.assert/mvm 2014-06-10 22:59:41 UTC (rev 2973)
@@ -17,7 +17,7 @@
*) rm config.h; test -f Makefile && make reallyclean
esac
test -f config.h || ../../../platforms/unix/config/configure \
- --with-src=nsstacksrc --with-plugin-src=nscogsrc/plugins --disable-cogit \
+ --with-src=nsstacksrc --with-plugins=nscogsrc/plugins --disable-cogit \
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
CXX="g++ -m32" \
Modified: branches/Cog/build.linux32x86/newspeak.stack.v3/build.debug/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.stack.v3/build.debug/mvm 2014-06-10 22:33:41 UTC (rev 2972)
+++ branches/Cog/build.linux32x86/newspeak.stack.v3/build.debug/mvm 2014-06-10 22:59:41 UTC (rev 2973)
@@ -17,7 +17,7 @@
*) rm config.h; test -f Makefile && make reallyclean
esac
test -f config.h || ../../../platforms/unix/config/configure \
- --with-src=nsstacksrc --with-plugin-src=nscogsrc/plugins --disable-cogit \
+ --with-src=nsstacksrc --with-plugins=nscogsrc/plugins --disable-cogit \
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
CXX="g++ -m32" \
Modified: branches/Cog/nsspursrc/vm/cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.c 2014-06-10 22:33:41 UTC (rev 2972)
+++ branches/Cog/nsspursrc/vm/cointerp.c 2014-06-10 22:59:41 UTC (rev 2973)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
from
- CoInterpreter VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+ CoInterpreter VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05 " __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.755";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.767";
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;
}
@@ -38364,7 +38363,7 @@
static void
postGCAction(sqInt gcModeArg)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt best;
+ SpurSegmentInfo *best;
usqInt currentEnd;
sqInt delta1;
SpurSegmentInfo *emptySeg;
@@ -38409,7 +38408,7 @@
}
}
}
- emptySeg = ((sqInt) best);
+ emptySeg = best;
if (!(emptySeg != null)) break;
shrinkage -= (emptySeg->segSize);
detachFreeObject(objectStartingAt((emptySeg->segStart)));
@@ -38424,7 +38423,7 @@
error("segment not found");
l1: /* end indexOfSegment: */;
assert(i2 > 0);
- sqDeallocateMemorySegmentAtOfSize((emptySeg->segStart), (emptySeg->segSize));
+ sqDeallocateMemorySegmentAtOfSize(((void *)((emptySeg->segStart))), (emptySeg->segSize));
for (j = i2; j < GIV(numSegments); j += 1) {
GIV(segments)[j] = (GIV(segments)[j + 1]);
}
Modified: branches/Cog/nsspursrc/vm/cointerp.h
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.h 2014-06-10 22:33:41 UTC (rev 2972)
+++ branches/Cog/nsspursrc/vm/cointerp.h 2014-06-10 22:59:41 UTC (rev 2973)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
*/
Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-06-10 22:33:41 UTC (rev 2972)
+++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-06-10 22:59:41 UTC (rev 2973)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
from
- CoInterpreter VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+ CoInterpreter VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05 " __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.755";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.767";
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;
}
@@ -38373,7 +38372,7 @@
static void
postGCAction(sqInt gcModeArg)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt best;
+ SpurSegmentInfo *best;
usqInt currentEnd;
sqInt delta1;
SpurSegmentInfo *emptySeg;
@@ -38418,7 +38417,7 @@
}
}
}
- emptySeg = ((sqInt) best);
+ emptySeg = best;
if (!(emptySeg != null)) break;
shrinkage -= (emptySeg->segSize);
detachFreeObject(objectStartingAt((emptySeg->segStart)));
@@ -38433,7 +38432,7 @@
error("segment not found");
l1: /* end indexOfSegment: */;
assert(i2 > 0);
- sqDeallocateMemorySegmentAtOfSize((emptySeg->segStart), (emptySeg->segSize));
+ sqDeallocateMemorySegmentAtOfSize(((void *)((emptySeg->segStart))), (emptySeg->segSize));
for (j = i2; j < GIV(numSegments); j += 1) {
GIV(segments)[j] = (GIV(segments)[j + 1]);
}
Modified: branches/Cog/nsspursrc/vm/interp.h
===================================================================
--- branches/Cog/nsspursrc/vm/interp.h 2014-06-10 22:33:41 UTC (rev 2972)
+++ branches/Cog/nsspursrc/vm/interp.h 2014-06-10 22:59:41 UTC (rev 2973)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.759 uuid: 988e84e2-8576-4edb-984a-98c755c8e2e8
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/nsspursrc/vm/vmCallback.h
===================================================================
--- branches/Cog/nsspursrc/vm/vmCallback.h 2014-06-10 22:33:41 UTC (rev 2972)
+++ branches/Cog/nsspursrc/vm/vmCallback.h 2014-06-10 22:59:41 UTC (rev 2973)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
*/
#define VM_CALLBACK_INC 1
Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-06-10 22:33:41 UTC (rev 2972)
+++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-06-10 22:59:41 UTC (rev 2973)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
from
- StackInterpreter VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+ StackInterpreter VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2024,7 +2024,7 @@
0 };
char * breakSelector;
sqInt breakSelectorLength = -1;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.755";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.767";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -24990,7 +24990,7 @@
usqLong
fullGC(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt best;
+ SpurSegmentInfo *best;
usqInt currentEnd;
sqInt delta1;
SpurSegmentInfo *emptySeg;
@@ -25086,7 +25086,7 @@
}
}
}
- emptySeg = ((sqInt) best);
+ emptySeg = best;
if (!(emptySeg != null)) break;
shrinkage -= (emptySeg->segSize);
detachFreeObject(objectStartingAt((emptySeg->segStart)));
@@ -25101,7 +25101,7 @@
error("segment not found");
l1: /* end indexOfSegment: */;
assert(i2 > 0);
- sqDeallocateMemorySegmentAtOfSize((emptySeg->segStart), (emptySeg->segSize));
+ sqDeallocateMemorySegmentAtOfSize(((void *)((emptySeg->segStart))), (emptySeg->segSize));
for (j = i2; j < GIV(numSegments); j += 1) {
GIV(segments)[j] = (GIV(segments)[j + 1]);
}
@@ -55344,7 +55344,7 @@
static void
scavengingGCTenuringIf(sqInt tenuringCriterion)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt best;
+ SpurSegmentInfo *best;
usqInt currentEnd;
sqInt delta1;
SpurSegmentInfo *emptySeg;
Modified: branches/Cog/nsspurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/interp.c 2014-06-10 22:33:41 UTC (rev 2972)
+++ branches/Cog/nsspurstacksrc/vm/interp.c 2014-06-10 22:59:41 UTC (rev 2973)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
from
- StackInterpreter VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+ StackInterpreter VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2021,7 +2021,7 @@
0 };
char * breakSelector;
sqInt breakSelectorLength = -1;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.755";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.767";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -24981,7 +24981,7 @@
usqLong
fullGC(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt best;
+ SpurSegmentInfo *best;
usqInt currentEnd;
sqInt delta1;
SpurSegmentInfo *emptySeg;
@@ -25077,7 +25077,7 @@
}
}
}
- emptySeg = ((sqInt) best);
+ emptySeg = best;
if (!(emptySeg != null)) break;
shrinkage -= (emptySeg->segSize);
detachFreeObject(objectStartingAt((emptySeg->segStart)));
@@ -25092,7 +25092,7 @@
error("segment not found");
l1: /* end indexOfSegment: */;
assert(i2 > 0);
- sqDeallocateMemorySegmentAtOfSize((emptySeg->segStart), (emptySeg->segSize));
+ sqDeallocateMemorySegmentAtOfSize(((void *)((emptySeg->segStart))), (emptySeg->segSize));
for (j = i2; j < GIV(numSegments); j += 1) {
GIV(segments)[j] = (GIV(segments)[j + 1]);
}
@@ -55335,7 +55335,7 @@
static void
scavengingGCTenuringIf(sqInt tenuringCriterion)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt best;
+ SpurSegmentInfo *best;
usqInt currentEnd;
sqInt delta1;
SpurSegmentInfo *emptySeg;
Modified: branches/Cog/nsspurstacksrc/vm/interp.h
===================================================================
--- branches/Cog/nsspurstacksrc/vm/interp.h 2014-06-10 22:33:41 UTC (rev 2972)
+++ branches/Cog/nsspurstacksrc/vm/interp.h 2014-06-10 22:59:41 UTC (rev 2973)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.759 uuid: 988e84e2-8576-4edb-984a-98c755c8e2e8
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/nsspurstacksrc/vm/vmCallback.h
===================================================================
--- branches/Cog/nsspurstacksrc/vm/vmCallback.h 2014-06-10 22:33:41 UTC (rev 2972)
+++ branches/Cog/nsspurstacksrc/vm/vmCallback.h 2014-06-10 22:59:41 UTC (rev 2973)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
*/
#define VM_CALLBACK_INC 1
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Sun Jun 8 09:34:38 PDT 2014
+ Tue Jun 10 15:58:33 PDT 2014
Modified: branches/Cog/spursistasrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.c 2014-06-10 22:33:41 UTC (rev 2972)
+++ branches/Cog/spursistasrc/vm/cointerp.c 2014-06-10 22:59:41 UTC (rev 2973)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.764 uuid: 74cab020-3391-46e3-9cac-b85303b8c1a4
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
from
- CoInterpreter VMMaker.oscog-eem.764 uuid: 74cab020-3391-46e3-9cac-b85303b8c1a4
+ CoInterpreter VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.764 uuid: 74cab020-3391-46e3-9cac-b85303b8c1a4 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1334,7 +1334,7 @@
static void setSignalLowSpaceFlagAndSaveProcess(void);
static void setTraceFlagOnContextsFramesPageIfNeeded(sqInt aContext) NoDbgRegParms;
sqInt shiftForWord(void);
-static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms;
+static usqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms;
static sqInt shortPrintContext(sqInt aContext) NoDbgRegParms;
static sqInt shortPrintFrameAndCallers(char *theFP) NoDbgRegParms;
EXPORT(void) shortPrintFramesInPage(StackPage *thePage);
@@ -2233,7 +2233,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.764]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.767]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -33191,7 +33191,7 @@
static void
postGCAction(sqInt gcModeArg)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt best;
+ SpurSegmentInfo *best;
usqInt currentEnd;
sqInt delta1;
SpurSegmentInfo *emptySeg;
@@ -33236,7 +33236,7 @@
}
}
}
- emptySeg = ((sqInt) best);
+ emptySeg = best;
if (!(emptySeg != null)) break;
shrinkage -= (emptySeg->segSize);
detachFreeObject(objectStartingAt((emptySeg->segStart)));
@@ -33251,7 +33251,7 @@
error("segment not found");
l1: /* end indexOfSegment: */;
assert(i2 > 0);
- sqDeallocateMemorySegmentAtOfSize((emptySeg->segStart), (emptySeg->segSize));
+ sqDeallocateMemorySegmentAtOfSize(((void *)((emptySeg->segStart))), (emptySeg->segSize));
for (j = i2; j < GIV(numSegments); j += 1) {
GIV(segments)[j] = (GIV(segments)[j + 1]);
}
@@ -57637,7 +57637,7 @@
zero if no change
was possible. */
-static sqInt
+static usqInt
shortentoIndexableSize(sqInt objOop, sqInt indexableSize)
{
usqInt bytesAfter;
Modified: branches/Cog/spursistasrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.h 2014-06-10 22:33:41 UTC (rev 2972)
+++ branches/Cog/spursistasrc/vm/cointerp.h 2014-06-10 22:59:41 UTC (rev 2973)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.764 uuid: 74cab020-3391-46e3-9cac-b85303b8c1a4
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
*/
Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-06-10 22:33:41 UTC (rev 2972)
+++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-06-10 22:59:41 UTC (rev 2973)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.764 uuid: 74cab020-3391-46e3-9cac-b85303b8c1a4
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
from
- CoInterpreter VMMaker.oscog-eem.764 uuid: 74cab020-3391-46e3-9cac-b85303b8c1a4
+ CoInterpreter VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.764 uuid: 74cab020-3391-46e3-9cac-b85303b8c1a4 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1337,7 +1337,7 @@
static void setSignalLowSpaceFlagAndSaveProcess(void);
static void setTraceFlagOnContextsFramesPageIfNeeded(sqInt aContext) NoDbgRegParms;
sqInt shiftForWord(void);
-static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms;
+static usqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms;
static sqInt shortPrintContext(sqInt aContext) NoDbgRegParms;
static sqInt shortPrintFrameAndCallers(char *theFP) NoDbgRegParms;
EXPORT(void) shortPrintFramesInPage(StackPage *thePage);
@@ -2236,7 +2236,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.764]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.767]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -33200,7 +33200,7 @@
static void
postGCAction(sqInt gcModeArg)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt best;
+ SpurSegmentInfo *best;
usqInt currentEnd;
sqInt delta1;
SpurSegmentInfo *emptySeg;
@@ -33245,7 +33245,7 @@
}
}
}
- emptySeg = ((sqInt) best);
+ emptySeg = best;
if (!(emptySeg != null)) break;
shrinkage -= (emptySeg->segSize);
detachFreeObject(objectStartingAt((emptySeg->segStart)));
@@ -33260,7 +33260,7 @@
error("segment not found");
l1: /* end indexOfSegment: */;
assert(i2 > 0);
- sqDeallocateMemorySegmentAtOfSize((emptySeg->segStart), (emptySeg->segSize));
+ sqDeallocateMemorySegmentAtOfSize(((void *)((emptySeg->segStart))), (emptySeg->segSize));
for (j = i2; j < GIV(numSegments); j += 1) {
GIV(segments)[j] = (GIV(segments)[j + 1]);
}
@@ -57646,7 +57646,7 @@
zero if no change
was possible. */
-static sqInt
+static usqInt
shortentoIndexableSize(sqInt objOop, sqInt indexableSize)
{
usqInt bytesAfter;
Modified: branches/Cog/spursistasrc/vm/interp.h
===================================================================
--- branches/Cog/spursistasrc/vm/interp.h 2014-06-10 22:33:41 UTC (rev 2972)
+++ branches/Cog/spursistasrc/vm/interp.h 2014-06-10 22:59:41 UTC (rev 2973)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.764 uuid: 74cab020-3391-46e3-9cac-b85303b8c1a4
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/spursistasrc/vm/vmCallback.h
===================================================================
--- branches/Cog/spursistasrc/vm/vmCallback.h 2014-06-10 22:33:41 UTC (rev 2972)
+++ branches/Cog/spursistasrc/vm/vmCallback.h 2014-06-10 22:59:41 UTC (rev 2973)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.764 uuid: 74cab020-3391-46e3-9cac-b85303b8c1a4
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
*/
#define VM_CALLBACK_INC 1
Modified: branches/Cog/spursrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/cointerp.c 2014-06-10 22:33:41 UTC (rev 2972)
+++ branches/Cog/spursrc/vm/cointerp.c 2014-06-10 22:59:41 UTC (rev 2973)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.764 uuid: 74cab020-3391-46e3-9cac-b85303b8c1a4
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
from
- CoInterpreter VMMaker.oscog-eem.764 uuid: 74cab020-3391-46e3-9cac-b85303b8c1a4
+ CoInterpreter VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.764 uuid: 74cab020-3391-46e3-9cac-b85303b8c1a4 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05 " __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.764]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.767]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -33052,7 +33052,7 @@
static void
postGCAction(sqInt gcModeArg)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt best;
+ SpurSegmentInfo *best;
usqInt currentEnd;
sqInt delta1;
SpurSegmentInfo *emptySeg;
@@ -33097,7 +33097,7 @@
}
}
}
- emptySeg = ((sqInt) best);
+ emptySeg = best;
if (!(emptySeg != null)) break;
shrinkage -= (emptySeg->segSize);
detachFreeObject(objectStartingAt((emptySeg->segStart)));
@@ -33112,7 +33112,7 @@
error("segment not found");
l1: /* end indexOfSegment: */;
assert(i2 > 0);
- sqDeallocateMemorySegmentAtOfSize((emptySeg->segStart), (emptySeg->segSize));
+ sqDeallocateMemorySegmentAtOfSize(((void *)((emptySeg->segStart))), (emptySeg->segSize));
for (j = i2; j < GIV(numSegments); j += 1) {
GIV(segments)[j] = (GIV(segments)[j + 1]);
}
Modified: branches/Cog/spursrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursrc/vm/cointerp.h 2014-06-10 22:33:41 UTC (rev 2972)
+++ branches/Cog/spursrc/vm/cointerp.h 2014-06-10 22:59:41 UTC (rev 2973)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.764 uuid: 74cab020-3391-46e3-9cac-b85303b8c1a4
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
*/
Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-06-10 22:33:41 UTC (rev 2972)
+++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-06-10 22:59:41 UTC (rev 2973)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.764 uuid: 74cab020-3391-46e3-9cac-b85303b8c1a4
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
from
- CoInterpreter VMMaker.oscog-eem.764 uuid: 74cab020-3391-46e3-9cac-b85303b8c1a4
+ CoInterpreter VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.764 uuid: 74cab020-3391-46e3-9cac-b85303b8c1a4 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05 " __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.764]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.767]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -33061,7 +33061,7 @@
static void
postGCAction(sqInt gcModeArg)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt best;
+ SpurSegmentInfo *best;
usqInt currentEnd;
sqInt delta1;
SpurSegmentInfo *emptySeg;
@@ -33106,7 +33106,7 @@
}
}
}
- emptySeg = ((sqInt) best);
+ emptySeg = best;
if (!(emptySeg != null)) break;
shrinkage -= (emptySeg->segSize);
detachFreeObject(objectStartingAt((emptySeg->segStart)));
@@ -33121,7 +33121,7 @@
error("segment not found");
l1: /* end indexOfSegment: */;
assert(i2 > 0);
- sqDeallocateMemorySegmentAtOfSize((emptySeg->segStart), (emptySeg->segSize));
+ sqDeallocateMemorySegmentAtOfSize(((void *)((emptySeg->segStart))), (emptySeg->segSize));
for (j = i2; j < GIV(numSegments); j += 1) {
GIV(segments)[j] = (GIV(segments)[j + 1]);
}
Modified: branches/Cog/spursrc/vm/interp.h
===================================================================
--- branches/Cog/spursrc/vm/interp.h 2014-06-10 22:33:41 UTC (rev 2972)
+++ branches/Cog/spursrc/vm/interp.h 2014-06-10 22:59:41 UTC (rev 2973)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.764 uuid: 74cab020-3391-46e3-9cac-b85303b8c1a4
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/spursrc/vm/vmCallback.h
===================================================================
--- branches/Cog/spursrc/vm/vmCallback.h 2014-06-10 22:33:41 UTC (rev 2972)
+++ branches/Cog/spursrc/vm/vmCallback.h 2014-06-10 22:59:41 UTC (rev 2973)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.764 uuid: 74cab020-3391-46e3-9cac-b85303b8c1a4
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
*/
#define VM_CALLBACK_INC 1
Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-06-10 22:33:41 UTC (rev 2972)
+++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-06-10 22:59:41 UTC (rev 2973)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
from
- StackInterpreter VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+ StackInterpreter VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05 " __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.755]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.767]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -20411,7 +20411,7 @@
usqLong
fullGC(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt best;
+ SpurSegmentInfo *best;
usqInt currentEnd;
sqInt delta1;
SpurSegmentInfo *emptySeg;
@@ -20507,7 +20507,7 @@
}
}
}
- emptySeg = ((sqInt) best);
+ emptySeg = best;
if (!(emptySeg != null)) break;
shrinkage -= (emptySeg->segSize);
detachFreeObject(objectStartingAt((emptySeg->segStart)));
@@ -20522,7 +20522,7 @@
error("segment not found");
l1: /* end indexOfSegment: */;
assert(i2 > 0);
- sqDeallocateMemorySegmentAtOfSize((emptySeg->segStart), (emptySeg->segSize));
+ sqDeallocateMemorySegmentAtOfSize(((void *)((emptySeg->segStart))), (emptySeg->segSize));
for (j = i2; j < GIV(numSegments); j += 1) {
GIV(segments)[j] = (GIV(segments)[j + 1]);
}
@@ -50215,7 +50215,7 @@
static void
scavengingGCTenuringIf(sqInt tenuringCriterion)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt best;
+ SpurSegmentInfo *best;
usqInt currentEnd;
sqInt delta1;
SpurSegmentInfo *emptySeg;
Modified: branches/Cog/spurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/spurstacksrc/vm/interp.c 2014-06-10 22:33:41 UTC (rev 2972)
+++ branches/Cog/spurstacksrc/vm/interp.c 2014-06-10 22:59:41 UTC (rev 2973)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
from
- StackInterpreter VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+ StackInterpreter VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05 " __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.755]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.767]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -20402,7 +20402,7 @@
usqLong
fullGC(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt best;
+ SpurSegmentInfo *best;
usqInt currentEnd;
sqInt delta1;
SpurSegmentInfo *emptySeg;
@@ -20498,7 +20498,7 @@
}
}
}
- emptySeg = ((sqInt) best);
+ emptySeg = best;
if (!(emptySeg != null)) break;
shrinkage -= (emptySeg->segSize);
detachFreeObject(objectStartingAt((emptySeg->segStart)));
@@ -20513,7 +20513,7 @@
error("segment not found");
l1: /* end indexOfSegment: */;
assert(i2 > 0);
- sqDeallocateMemorySegmentAtOfSize((emptySeg->segStart), (emptySeg->segSize));
+ sqDeallocateMemorySegmentAtOfSize(((void *)((emptySeg->segStart))), (emptySeg->segSize));
for (j = i2; j < GIV(numSegments); j += 1) {
GIV(segments)[j] = (GIV(segments)[j + 1]);
}
@@ -50206,7 +50206,7 @@
static void
scavengingGCTenuringIf(sqInt tenuringCriterion)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt best;
+ SpurSegmentInfo *best;
usqInt currentEnd;
sqInt delta1;
SpurSegmentInfo *emptySeg;
Modified: branches/Cog/spurstacksrc/vm/interp.h
===================================================================
--- branches/Cog/spurstacksrc/vm/interp.h 2014-06-10 22:33:41 UTC (rev 2972)
+++ branches/Cog/spurstacksrc/vm/interp.h 2014-06-10 22:59:41 UTC (rev 2973)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/spurstacksrc/vm/vmCallback.h
===================================================================
--- branches/Cog/spurstacksrc/vm/vmCallback.h 2014-06-10 22:33:41 UTC (rev 2972)
+++ branches/Cog/spurstacksrc/vm/vmCallback.h 2014-06-10 22:59:41 UTC (rev 2973)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.755 uuid: 3557bde2-30d3-482c-89bf-4b9907ffa49b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.767 uuid: b11544fd-09a4-4469-8ce4-3f2339f08d05
*/
#define VM_CALLBACK_INC 1
More information about the Vm-dev
mailing list