[Vm-dev] [commit][3304] CogVM source as per VMMaker.oscog-eem.1153
commits at squeakvm.org
commits at squeakvm.org
Thu Apr 2 18:11:57 UTC 2015
Revision: 3304
Author: eliot
Date: 2015-04-02 11:11:56 -0700 (Thu, 02 Apr 2015)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.1153
Rename the inconsistently-named and hence confusing frameReceiverOffset: to
frameReceiverLocation:. Fix the slip in followForwardingPointersInStackZone:
that was due to this confusion.
Modified Paths:
--------------
branches/Cog/nsspursrc/vm/cointerp.c
branches/Cog/nsspursrc/vm/cointerp.h
branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
branches/Cog/nsspurstacksrc/vm/interp.c
branches/Cog/spursistasrc/vm/cointerp.c
branches/Cog/spursistasrc/vm/cointerp.h
branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
branches/Cog/spursrc/vm/cointerp.c
branches/Cog/spursrc/vm/cointerp.h
branches/Cog/spursrc/vm/gcc3x-cointerp.c
branches/Cog/spurstack64src/vm/gcc3x-interp.c
branches/Cog/spurstack64src/vm/interp.c
branches/Cog/spurstacksrc/vm/gcc3x-interp.c
branches/Cog/spurstacksrc/vm/interp.c
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/stacksrc/vm/gcc3x-interp.c
branches/Cog/stacksrc/vm/interp.c
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nsspursrc/vm/cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.c 2015-04-02 17:48:13 UTC (rev 3303)
+++ branches/Cog/nsspursrc/vm/cointerp.c 2015-04-02 18:11:56 UTC (rev 3304)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1153 uuid: 078f2fbd-0bb3-4773-a8b7-73a06a398a24
from
- CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
+ CoInterpreter VMMaker.oscog-eem.1153 uuid: 078f2fbd-0bb3-4773-a8b7-73a06a398a24
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1153 uuid: 078f2fbd-0bb3-4773-a8b7-73a06a398a24 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -474,7 +474,7 @@
static sqInt frameMethodObject(char *theFP) NoDbgRegParms;
static sqInt frameNumArgs(char *theFP) NoDbgRegParms;
usqInt framePointerAddress(void);
-static char * frameReceiverOffset(char *theFP) NoDbgRegParms;
+static char * frameReceiverLocation(char *theFP) NoDbgRegParms;
static sqInt frameReceiver(char *theFP) NoDbgRegParms;
void (*functionPointerForCompiledMethodprimitiveIndex(sqInt methodObj, sqInt primIndex))(void) ;
sqInt getCheckAllocFiller(void);
@@ -2371,7 +2371,7 @@
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1152";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1153";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -16508,7 +16508,7 @@
theSP += BytesPerWord;
}
while (1) {
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
frameRcvrOffset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? theFP + FoxMFReceiver
: theFP + FoxIFReceiver);
@@ -17429,9 +17429,10 @@
assert(addressIsInPage(thePage, theFP));
assert((theIPPtr == 0)
|| (addressIsInPage(thePage, ((void *)theIPPtr))));
- offset = theFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
- ? ((mframeCogMethod(theFP))->cmNumArgs)
- : byteAt((theFP + FoxIFrameFlags) + 1))));
+ /* begin frameReceiverLocation: */
+ offset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
+ ? theFP + FoxMFReceiver
+ : theFP + FoxIFReceiver);
while (theSP <= offset) {
oop = longAt(theSP);
if (((oop & 3) == 0)
@@ -17626,7 +17627,7 @@
}
static char *
-frameReceiverOffset(char *theFP)
+frameReceiverLocation(char *theFP)
{
return ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? theFP + FoxMFReceiver
@@ -18603,7 +18604,7 @@
assert(addressIsInPage(thePage, theSP));
assert((theIPPtr == 0)
|| (addressIsInPage(thePage, theIPPtr)));
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
frameRcvrOffset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? theFP + FoxMFReceiver
: theFP + FoxIFReceiver);
@@ -19405,7 +19406,7 @@
theSP += BytesPerWord;
}
while (1) {
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
frameRcvrOffset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? theFP + FoxMFReceiver
: theFP + FoxIFReceiver);
@@ -22353,7 +22354,7 @@
int index;
sqInt methodField;
usqInt numArgs;
- sqInt numTemps;
+ usqInt numTemps;
char *rcvrAddress;
sqInt rcvrOrClosure;
sqInt theMethod;
@@ -29909,7 +29910,7 @@
usqInt newObj;
usqInt numBytes;
sqInt numSlots;
- sqInt s;
+ usqInt s;
char *sp;
sqInt sz;
@@ -29958,7 +29959,7 @@
GIV(needGCFlag) = 1;
forceInterruptCheck();
}
- s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex)));
+ s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex);
goto l1;
}
if (numSlots >= 0xFF) {
@@ -31274,7 +31275,7 @@
sqInt arg;
sqInt fmt;
sqInt i;
- usqInt length;
+ sqInt length;
usqInt numBytes;
usqInt numSlots;
usqInt numSlots1;
@@ -31315,18 +31316,18 @@
/* bytes (the common case), including CompiledMethod */
- length = ((sqInt) (numBytes - (fmt & 7)));
+ length = numBytes - (fmt & 7);
goto l1;
}
if (fmt <= 9) {
- length = ((sqInt) numBytes);
+ length = numBytes;
goto l1;
}
if (fmt >= 12) {
- length = ((sqInt) (numBytes - ((fmt & 3) << 1)));
+ length = numBytes - ((fmt & 3) << 1);
goto l1;
}
- length = ((sqInt) (numBytes - ((fmt & 1) << 2)));
+ length = numBytes - ((fmt & 1) << 2);
l1: /* end numBytesOf: */;
if (!((((((usqInt) (longAt(rcvr))) >> 24) & 0x1F) == ((((usqInt) (longAt(arg))) >> 24) & 0x1F))
&& (length == (numBytesOf(arg))))) {
@@ -31344,9 +31345,9 @@
flag("endianness");
assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun()));
numSlots1 = byteAt(rcvr + 7);
- length = (numSlots1 == 0xFF
- ? longAt(rcvr - BaseHeaderSize)
- : numSlots1);
+ length = ((usqInt) ((numSlots1 == 0xFF
+ ? longAt(rcvr - BaseHeaderSize)
+ : numSlots1)));
if (!((isAppropriateForCopyObject(arg))
&& (length == (lengthOfformat(arg, (((usqInt) (longAt(arg))) >> 24) & 0x1F))))) {
(GIV(primFailCode) = PrimErrBadArgument);
@@ -41253,7 +41254,7 @@
sqInt fillValue;
sqInt hash;
sqInt instSpec;
- sqInt newObj;
+ usqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -41354,7 +41355,7 @@
GIV(needGCFlag) = 1;
forceInterruptCheck();
}
- newObj = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex)));
+ newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex);
goto l1;
}
if (numSlots >= 0xFF) {
@@ -57156,13 +57157,13 @@
sqInt obj21;
sqInt pigBytes;
usqInt prevFree;
- sqInt prevFreeChunk;
+ usqInt prevFreeChunk;
usqInt prevPrevFree;
- sqInt prevPrevFreeChunk;
+ usqInt prevPrevFreeChunk;
sqInt slotBytes;
sqInt slotBytes1;
usqInt there;
- sqInt thisFreeChunk;
+ usqInt thisFreeChunk;
sqInt usedChunk;
here = startAddress;
@@ -61552,7 +61553,7 @@
bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
{
sqInt bridgeSpan;
- usqInt clifton;
+ sqInt clifton;
usqInt segEnd;
segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -61783,7 +61784,7 @@
sqInt largeChild;
sqInt newEndOfMemory;
sqInt next;
- usqInt node;
+ sqInt node;
SpurSegmentInfo *seg;
sqInt smallChild;
sqInt treeNode;
@@ -63060,7 +63061,7 @@
theSP += BytesPerWord;
}
while (1) {
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
frameRcvrOffset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? theFP + FoxMFReceiver
: theFP + FoxIFReceiver);
@@ -65184,10 +65185,10 @@
/* If the SP is invalid return the pointer to the receiver field. */
- /* begin frameReceiverOffset: */
- theSP = ((((usqInt)(longAt(aFrame + FoxMethod)))) < (startOfMemory())
- ? aFrame + FoxMFReceiver
- : aFrame + FoxIFReceiver);
+ /* begin frameReceiverLocation: */
+ theSP = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
+ ? theFP + FoxMFReceiver
+ : theFP + FoxIFReceiver);
goto l1;
}
theSP = (thePage == GIV(stackPage)
@@ -65381,7 +65382,7 @@
longAtput(ptr, followForwarded(oop));
}
}
- for (ptr = theSP; ptr <= (frameReceiverOffset(theFP)); ptr += BytesPerWord) {
+ for (ptr = theSP; ptr <= (frameReceiverLocation(theFP)); ptr += BytesPerWord) {
oop = longAt(ptr);
if (((oop & 3) == 0)
&& (((longAt(oop)) & (0x3FFFFF - 8)) == 0)) {
@@ -67620,7 +67621,7 @@
}
}
}
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
rcvrOffset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? theFP + FoxMFReceiver
: theFP + FoxIFReceiver);
@@ -69396,7 +69397,7 @@
print("could not find sp; using bogus value");
/* begin cr */
printf("\n");
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
theSP = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? theFP + FoxMFReceiver
: theFP + FoxIFReceiver);
@@ -70899,7 +70900,7 @@
theSP += BytesPerWord;
}
while (1) {
- while (theSP <= (frameReceiverOffset(theFP))) {
+ while (theSP <= (frameReceiverLocation(theFP))) {
if (oop == (longAt(theSP))) {
print("FP: ");
/* begin printHexnp: */
@@ -78415,7 +78416,7 @@
EXPORT(void)
primitiveVoidReceiver(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- longAtPointerput(frameReceiverOffset(GIV(framePointer)), 0);
+ longAtPointerput(frameReceiverLocation(GIV(framePointer)), 0);
}
Modified: branches/Cog/nsspursrc/vm/cointerp.h
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.h 2015-04-02 17:48:13 UTC (rev 3303)
+++ branches/Cog/nsspursrc/vm/cointerp.h 2015-04-02 18:11:56 UTC (rev 3304)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1153 uuid: 078f2fbd-0bb3-4773-a8b7-73a06a398a24
*/
Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-04-02 17:48:13 UTC (rev 3303)
+++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-04-02 18:11:56 UTC (rev 3304)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1153 uuid: 078f2fbd-0bb3-4773-a8b7-73a06a398a24
from
- CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
+ CoInterpreter VMMaker.oscog-eem.1153 uuid: 078f2fbd-0bb3-4773-a8b7-73a06a398a24
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1153 uuid: 078f2fbd-0bb3-4773-a8b7-73a06a398a24 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -477,7 +477,7 @@
static sqInt frameMethodObject(char *theFP) NoDbgRegParms;
static sqInt frameNumArgs(char *theFP) NoDbgRegParms;
usqInt framePointerAddress(void);
-static char * frameReceiverOffset(char *theFP) NoDbgRegParms;
+static char * frameReceiverLocation(char *theFP) NoDbgRegParms;
static sqInt frameReceiver(char *theFP) NoDbgRegParms;
void (*functionPointerForCompiledMethodprimitiveIndex(sqInt methodObj, sqInt primIndex))(void) ;
sqInt getCheckAllocFiller(void);
@@ -2374,7 +2374,7 @@
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1152";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1153";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -16517,7 +16517,7 @@
theSP += BytesPerWord;
}
while (1) {
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
frameRcvrOffset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? theFP + FoxMFReceiver
: theFP + FoxIFReceiver);
@@ -17438,7 +17438,10 @@
assert(addressIsInPage(thePage, theFP));
assert((theIPPtr == 0)
|| (addressIsInPage(thePage, ((void *)theIPPtr))));
- offset = frameReceiverOffset(theFP);
+ /* begin frameReceiverLocation: */
+ offset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
+ ? theFP + FoxMFReceiver
+ : theFP + FoxIFReceiver);
while (theSP <= offset) {
oop = longAt(theSP);
if (((oop & 3) == 0)
@@ -17633,7 +17636,7 @@
}
static char *
-frameReceiverOffset(char *theFP)
+frameReceiverLocation(char *theFP)
{
return ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? theFP + FoxMFReceiver
@@ -18610,7 +18613,7 @@
assert(addressIsInPage(thePage, theSP));
assert((theIPPtr == 0)
|| (addressIsInPage(thePage, theIPPtr)));
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
frameRcvrOffset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? theFP + FoxMFReceiver
: theFP + FoxIFReceiver);
@@ -19412,7 +19415,7 @@
theSP += BytesPerWord;
}
while (1) {
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
frameRcvrOffset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? theFP + FoxMFReceiver
: theFP + FoxIFReceiver);
@@ -22360,7 +22363,7 @@
int index;
sqInt methodField;
usqInt numArgs;
- sqInt numTemps;
+ usqInt numTemps;
char *rcvrAddress;
sqInt rcvrOrClosure;
sqInt theMethod;
@@ -29916,7 +29919,7 @@
usqInt newObj;
usqInt numBytes;
sqInt numSlots;
- sqInt s;
+ usqInt s;
char *sp;
sqInt sz;
@@ -29965,7 +29968,7 @@
GIV(needGCFlag) = 1;
forceInterruptCheck();
}
- s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex)));
+ s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex);
goto l1;
}
if (numSlots >= 0xFF) {
@@ -31281,7 +31284,7 @@
sqInt arg;
sqInt fmt;
sqInt i;
- usqInt length;
+ sqInt length;
usqInt numBytes;
usqInt numSlots;
usqInt numSlots1;
@@ -31322,18 +31325,18 @@
/* bytes (the common case), including CompiledMethod */
- length = ((sqInt) (numBytes - (fmt & 7)));
+ length = numBytes - (fmt & 7);
goto l1;
}
if (fmt <= 9) {
- length = ((sqInt) numBytes);
+ length = numBytes;
goto l1;
}
if (fmt >= 12) {
- length = ((sqInt) (numBytes - ((fmt & 3) << 1)));
+ length = numBytes - ((fmt & 3) << 1);
goto l1;
}
- length = ((sqInt) (numBytes - ((fmt & 1) << 2)));
+ length = numBytes - ((fmt & 1) << 2);
l1: /* end numBytesOf: */;
if (!((((((usqInt) (longAt(rcvr))) >> 24) & 0x1F) == ((((usqInt) (longAt(arg))) >> 24) & 0x1F))
&& (length == (numBytesOf(arg))))) {
@@ -31351,9 +31354,9 @@
flag("endianness");
assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun()));
numSlots1 = byteAt(rcvr + 7);
- length = (numSlots1 == 0xFF
- ? longAt(rcvr - BaseHeaderSize)
- : numSlots1);
+ length = ((usqInt) ((numSlots1 == 0xFF
+ ? longAt(rcvr - BaseHeaderSize)
+ : numSlots1)));
if (!((isAppropriateForCopyObject(arg))
&& (length == (lengthOfformat(arg, (((usqInt) (longAt(arg))) >> 24) & 0x1F))))) {
(GIV(primFailCode) = PrimErrBadArgument);
@@ -41260,7 +41263,7 @@
sqInt fillValue;
sqInt hash;
sqInt instSpec;
- sqInt newObj;
+ usqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -41361,7 +41364,7 @@
GIV(needGCFlag) = 1;
forceInterruptCheck();
}
- newObj = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex)));
+ newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex);
goto l1;
}
if (numSlots >= 0xFF) {
@@ -57163,13 +57166,13 @@
sqInt obj21;
sqInt pigBytes;
usqInt prevFree;
- sqInt prevFreeChunk;
+ usqInt prevFreeChunk;
usqInt prevPrevFree;
- sqInt prevPrevFreeChunk;
+ usqInt prevPrevFreeChunk;
sqInt slotBytes;
sqInt slotBytes1;
usqInt there;
- sqInt thisFreeChunk;
+ usqInt thisFreeChunk;
sqInt usedChunk;
here = startAddress;
@@ -61559,7 +61562,7 @@
bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
{
sqInt bridgeSpan;
- usqInt clifton;
+ sqInt clifton;
usqInt segEnd;
segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -61790,7 +61793,7 @@
sqInt largeChild;
sqInt newEndOfMemory;
sqInt next;
- usqInt node;
+ sqInt node;
SpurSegmentInfo *seg;
sqInt smallChild;
sqInt treeNode;
@@ -63067,7 +63070,7 @@
theSP += BytesPerWord;
}
while (1) {
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
frameRcvrOffset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? theFP + FoxMFReceiver
: theFP + FoxIFReceiver);
@@ -65191,10 +65194,10 @@
/* If the SP is invalid return the pointer to the receiver field. */
- /* begin frameReceiverOffset: */
- theSP = ((((usqInt)(longAt(aFrame + FoxMethod)))) < (startOfMemory())
- ? aFrame + FoxMFReceiver
- : aFrame + FoxIFReceiver);
+ /* begin frameReceiverLocation: */
+ theSP = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
+ ? theFP + FoxMFReceiver
+ : theFP + FoxIFReceiver);
goto l1;
}
theSP = (thePage == GIV(stackPage)
@@ -65388,7 +65391,7 @@
longAtput(ptr, followForwarded(oop));
}
}
- for (ptr = theSP; ptr <= (frameReceiverOffset(theFP)); ptr += BytesPerWord) {
+ for (ptr = theSP; ptr <= (frameReceiverLocation(theFP)); ptr += BytesPerWord) {
oop = longAt(ptr);
if (((oop & 3) == 0)
&& (((longAt(oop)) & (0x3FFFFF - 8)) == 0)) {
@@ -67627,7 +67630,7 @@
}
}
}
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
rcvrOffset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? theFP + FoxMFReceiver
: theFP + FoxIFReceiver);
@@ -69403,7 +69406,7 @@
print("could not find sp; using bogus value");
/* begin cr */
printf("\n");
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
theSP = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? theFP + FoxMFReceiver
: theFP + FoxIFReceiver);
@@ -70906,7 +70909,7 @@
theSP += BytesPerWord;
}
while (1) {
- while (theSP <= (frameReceiverOffset(theFP))) {
+ while (theSP <= (frameReceiverLocation(theFP))) {
if (oop == (longAt(theSP))) {
print("FP: ");
/* begin printHexnp: */
@@ -78422,7 +78425,7 @@
EXPORT(void)
primitiveVoidReceiver(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- longAtPointerput(frameReceiverOffset(GIV(framePointer)), 0);
+ longAtPointerput(frameReceiverLocation(GIV(framePointer)), 0);
}
Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-04-02 17:48:13 UTC (rev 3303)
+++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-04-02 18:11:56 UTC (rev 3304)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1153 uuid: 078f2fbd-0bb3-4773-a8b7-73a06a398a24
from
- StackInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
+ StackInterpreter VMMaker.oscog-eem.1153 uuid: 078f2fbd-0bb3-4773-a8b7-73a06a398a24
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1153 uuid: 078f2fbd-0bb3-4773-a8b7-73a06a398a24 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1059,7 +1059,7 @@
static sqInt frameMethod(char *theFP) NoDbgRegParms;
static sqInt frameNumArgs(char *theFP) NoDbgRegParms;
static char * frameOfMarriedContext(sqInt aContext) NoDbgRegParms;
-static char * frameReceiverOffset(char *theFP) NoDbgRegParms;
+static char * frameReceiverLocation(char *theFP) NoDbgRegParms;
static sqInt frameReceiver(char *theFP) NoDbgRegParms;
static void freeUntracedStackPages(void);
sqInt fullDisplayUpdate(void);
@@ -2117,7 +2117,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1152";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1153";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -49138,7 +49138,7 @@
theSP += BytesPerWord;
}
while (1) {
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
frameRcvrOffset = theFP + FoxReceiver;
while (theSP <= frameRcvrOffset) {
oop = longAt(theSP);
@@ -51301,8 +51301,8 @@
/* If the SP is invalid return the pointer to the receiver field. */
- /* begin frameReceiverOffset: */
- theSP = aFrame + FoxReceiver;
+ /* begin frameReceiverLocation: */
+ theSP = theFP + FoxReceiver;
goto l1;
}
theSP = (thePage == GIV(stackPage)
@@ -51404,7 +51404,7 @@
longAtput(ptr, followForwarded(oop));
}
}
- for (ptr = theSP; ptr <= (frameReceiverOffset(theFP)); ptr += BytesPerWord) {
+ for (ptr = theSP; ptr <= (frameReceiverLocation(theFP)); ptr += BytesPerWord) {
oop = longAt(ptr);
if (((oop & 3) == 0)
&& (((longAt(oop)) & (0x3FFFFF - 8)) == 0)) {
@@ -51718,7 +51718,7 @@
}
static char *
-frameReceiverOffset(char *theFP)
+frameReceiverLocation(char *theFP)
{
return theFP + FoxReceiver;
}
@@ -54274,7 +54274,7 @@
theSP += BytesPerWord;
}
while (1) {
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
frameRcvrOffset = theFP + FoxReceiver;
while (theSP <= frameRcvrOffset) {
oop = longAt(theSP);
@@ -55390,7 +55390,7 @@
}
}
}
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
rcvrOffset = theFP + FoxReceiver;
while (theSP <= rcvrOffset) {
if (anOop == (longAt(theSP))) {
@@ -57196,7 +57196,7 @@
print("could not find sp; using bogus value");
/* begin cr */
printf("\n");
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
theSP = theFP + FoxReceiver;
}
printFrameWithSP(theFP, theSP);
@@ -58814,7 +58814,7 @@
theSP += BytesPerWord;
}
while (1) {
- while (theSP <= (frameReceiverOffset(theFP))) {
+ while (theSP <= (frameReceiverLocation(theFP))) {
if (oop == (longAt(theSP))) {
print("FP: ");
/* begin printHexnp: */
@@ -69001,7 +69001,7 @@
EXPORT(void)
primitiveVoidReceiver(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- longAtPointerput(frameReceiverOffset(GIV(framePointer)), 0);
+ longAtPointerput(frameReceiverLocation(GIV(framePointer)), 0);
}
Modified: branches/Cog/nsspurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/interp.c 2015-04-02 17:48:13 UTC (rev 3303)
+++ branches/Cog/nsspurstacksrc/vm/interp.c 2015-04-02 18:11:56 UTC (rev 3304)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1153 uuid: 078f2fbd-0bb3-4773-a8b7-73a06a398a24
from
- StackInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
+ StackInterpreter VMMaker.oscog-eem.1153 uuid: 078f2fbd-0bb3-4773-a8b7-73a06a398a24
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1153 uuid: 078f2fbd-0bb3-4773-a8b7-73a06a398a24 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1056,7 +1056,7 @@
static sqInt frameMethod(char *theFP) NoDbgRegParms;
static sqInt frameNumArgs(char *theFP) NoDbgRegParms;
static char * frameOfMarriedContext(sqInt aContext) NoDbgRegParms;
-static char * frameReceiverOffset(char *theFP) NoDbgRegParms;
+static char * frameReceiverLocation(char *theFP) NoDbgRegParms;
static sqInt frameReceiver(char *theFP) NoDbgRegParms;
static void freeUntracedStackPages(void);
sqInt fullDisplayUpdate(void);
@@ -2114,7 +2114,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1152";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1153";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -49129,7 +49129,7 @@
theSP += BytesPerWord;
}
while (1) {
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
frameRcvrOffset = theFP + FoxReceiver;
while (theSP <= frameRcvrOffset) {
oop = longAt(theSP);
@@ -51292,8 +51292,8 @@
/* If the SP is invalid return the pointer to the receiver field. */
- /* begin frameReceiverOffset: */
- theSP = aFrame + FoxReceiver;
+ /* begin frameReceiverLocation: */
+ theSP = theFP + FoxReceiver;
goto l1;
}
theSP = (thePage == GIV(stackPage)
@@ -51395,7 +51395,7 @@
longAtput(ptr, followForwarded(oop));
}
}
- for (ptr = theSP; ptr <= (frameReceiverOffset(theFP)); ptr += BytesPerWord) {
+ for (ptr = theSP; ptr <= (frameReceiverLocation(theFP)); ptr += BytesPerWord) {
oop = longAt(ptr);
if (((oop & 3) == 0)
&& (((longAt(oop)) & (0x3FFFFF - 8)) == 0)) {
@@ -51709,7 +51709,7 @@
}
static char *
-frameReceiverOffset(char *theFP)
+frameReceiverLocation(char *theFP)
{
return theFP + FoxReceiver;
}
@@ -54265,7 +54265,7 @@
theSP += BytesPerWord;
}
while (1) {
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
frameRcvrOffset = theFP + FoxReceiver;
while (theSP <= frameRcvrOffset) {
oop = longAt(theSP);
@@ -55381,7 +55381,7 @@
}
}
}
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
rcvrOffset = theFP + FoxReceiver;
while (theSP <= rcvrOffset) {
if (anOop == (longAt(theSP))) {
@@ -57187,7 +57187,7 @@
print("could not find sp; using bogus value");
/* begin cr */
printf("\n");
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
theSP = theFP + FoxReceiver;
}
printFrameWithSP(theFP, theSP);
@@ -58805,7 +58805,7 @@
theSP += BytesPerWord;
}
while (1) {
- while (theSP <= (frameReceiverOffset(theFP))) {
+ while (theSP <= (frameReceiverLocation(theFP))) {
if (oop == (longAt(theSP))) {
print("FP: ");
/* begin printHexnp: */
@@ -68992,7 +68992,7 @@
EXPORT(void)
primitiveVoidReceiver(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- longAtPointerput(frameReceiverOffset(GIV(framePointer)), 0);
+ longAtPointerput(frameReceiverLocation(GIV(framePointer)), 0);
}
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Thu Apr 2 10:02:32 PDT 2015
+ Thu Apr 2 11:11:59 PDT 2015
Modified: branches/Cog/spursistasrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.c 2015-04-02 17:48:13 UTC (rev 3303)
+++ branches/Cog/spursistasrc/vm/cointerp.c 2015-04-02 18:11:56 UTC (rev 3304)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1153 uuid: 078f2fbd-0bb3-4773-a8b7-73a06a398a24
from
- CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
+ CoInterpreter VMMaker.oscog-eem.1153 uuid: 078f2fbd-0bb3-4773-a8b7-73a06a398a24
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1153 uuid: 078f2fbd-0bb3-4773-a8b7-73a06a398a24 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -471,7 +471,7 @@
static sqInt frameMethodObject(char *theFP) NoDbgRegParms;
static sqInt frameNumArgs(char *theFP) NoDbgRegParms;
usqInt framePointerAddress(void);
-static char * frameReceiverOffset(char *theFP) NoDbgRegParms;
+static char * frameReceiverLocation(char *theFP) NoDbgRegParms;
static sqInt frameReceiver(char *theFP) NoDbgRegParms;
void (*functionPointerForCompiledMethodprimitiveIndex(sqInt methodObj, sqInt primIndex))(void) ;
sqInt getCheckAllocFiller(void);
@@ -2368,7 +2368,7 @@
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1152]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1153]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -14899,7 +14899,7 @@
CogMethod *cogMethod;
sqInt methodField;
sqInt methodField1;
- usqInt theIP;
+ sqInt theIP;
assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln);
assertl(addressIsInPage(GIV(stackPage), lifp), ln);
@@ -16954,7 +16954,7 @@
theSP += BytesPerWord;
}
while (1) {
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
frameRcvrOffset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? theFP + FoxMFReceiver
: theFP + FoxIFReceiver);
@@ -17875,9 +17875,10 @@
assert(addressIsInPage(thePage, theFP));
assert((theIPPtr == 0)
|| (addressIsInPage(thePage, ((void *)theIPPtr))));
- offset = theFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
- ? ((mframeCogMethod(theFP))->cmNumArgs)
- : byteAt((theFP + FoxIFrameFlags) + 1))));
+ /* begin frameReceiverLocation: */
+ offset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
+ ? theFP + FoxMFReceiver
+ : theFP + FoxIFReceiver);
while (theSP <= offset) {
oop = longAt(theSP);
if (((oop & 3) == 0)
@@ -18072,7 +18073,7 @@
}
static char *
-frameReceiverOffset(char *theFP)
+frameReceiverLocation(char *theFP)
{
return ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? theFP + FoxMFReceiver
@@ -18839,7 +18840,7 @@
assert(addressIsInPage(thePage, theSP));
assert((theIPPtr == 0)
|| (addressIsInPage(thePage, theIPPtr)));
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
frameRcvrOffset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? theFP + FoxMFReceiver
: theFP + FoxIFReceiver);
@@ -19641,7 +19642,7 @@
theSP += BytesPerWord;
}
while (1) {
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
frameRcvrOffset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? theFP + FoxMFReceiver
: theFP + FoxIFReceiver);
@@ -30230,7 +30231,7 @@
GIV(needGCFlag) = 1;
forceInterruptCheck();
}
- s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex);
+ s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex)));
goto l1;
}
if (numSlots >= 0xFF) {
@@ -31546,7 +31547,7 @@
sqInt arg;
sqInt fmt;
sqInt i;
- sqInt length;
+ usqInt length;
usqInt numBytes;
usqInt numSlots;
usqInt numSlots1;
@@ -31587,18 +31588,18 @@
/* bytes (the common case), including CompiledMethod */
- length = numBytes - (fmt & 7);
+ length = ((sqInt) (numBytes - (fmt & 7)));
goto l1;
}
if (fmt <= 9) {
- length = numBytes;
+ length = ((sqInt) numBytes);
goto l1;
}
if (fmt >= 12) {
- length = numBytes - ((fmt & 3) << 1);
+ length = ((sqInt) (numBytes - ((fmt & 3) << 1)));
goto l1;
}
- length = numBytes - ((fmt & 1) << 2);
+ length = ((sqInt) (numBytes - ((fmt & 1) << 2)));
l1: /* end numBytesOf: */;
if (!((((((usqInt) (longAt(rcvr))) >> 24) & 0x1F) == ((((usqInt) (longAt(arg))) >> 24) & 0x1F))
&& (length == (numBytesOf(arg))))) {
@@ -31616,9 +31617,9 @@
flag("endianness");
assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun()));
numSlots1 = byteAt(rcvr + 7);
- length = ((usqInt) ((numSlots1 == 0xFF
- ? longAt(rcvr - BaseHeaderSize)
- : numSlots1)));
+ length = (numSlots1 == 0xFF
+ ? longAt(rcvr - BaseHeaderSize)
+ : numSlots1);
if (!((isAppropriateForCopyObject(arg))
&& (length == (lengthOfformat(arg, (((usqInt) (longAt(arg))) >> 24) & 0x1F))))) {
(GIV(primFailCode) = PrimErrBadArgument);
@@ -35619,7 +35620,7 @@
sqInt err;
sqInt hash;
sqInt instSpec;
- sqInt newObj;
+ usqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -35809,7 +35810,7 @@
GIV(needGCFlag) = 1;
forceInterruptCheck();
}
- newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex);
+ newObj = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex)));
goto l1;
}
if (numSlots >= 0xFF) {
@@ -41515,7 +41516,7 @@
sqInt fillValue;
sqInt hash;
sqInt instSpec;
- sqInt newObj;
+ usqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -43408,7 +43409,7 @@
sqInt entry;
sqInt expectedIndex;
sqInt expectedIndex1;
- sqInt freeChunk;
+ usqInt freeChunk;
sqInt i;
sqInt i1;
sqInt index;
@@ -43447,7 +43448,7 @@
sqInt ptr1;
sqInt ptr2;
sqInt slotBytes;
- sqInt smallObj;
+ usqInt smallObj;
sqInt start;
classIndex = (long32At(aClass + 4)) & 0x3FFFFF;
@@ -46367,7 +46368,7 @@
GIV(needGCFlag) = 1;
forceInterruptCheck();
}
- newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, fmt, (longAt(objOop)) & 0x3FFFFF);
+ newObj = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, fmt, (longAt(objOop)) & 0x3FFFFF)));
goto l1;
}
if (numSlots >= 0xFF) {
@@ -57425,13 +57426,13 @@
sqInt obj21;
sqInt pigBytes;
usqInt prevFree;
- usqInt prevFreeChunk;
+ sqInt prevFreeChunk;
usqInt prevPrevFree;
- usqInt prevPrevFreeChunk;
+ sqInt prevPrevFreeChunk;
sqInt slotBytes;
sqInt slotBytes1;
usqInt there;
- usqInt thisFreeChunk;
+ sqInt thisFreeChunk;
sqInt usedChunk;
here = startAddress;
@@ -60656,8 +60657,8 @@
sqInt prevPrevObj;
sqInt prevPrevObj1;
sqInt ptr;
- sqInt savedInHashes;
- sqInt savedOutHashes;
+ usqInt savedInHashes;
+ usqInt savedOutHashes;
sqInt segAddr;
sqInt segStart;
sqInt slotBytes;
@@ -61130,7 +61131,7 @@
sqInt formatField;
sqInt len;
usqInt newObj;
- sqInt newString;
+ usqInt newString;
usqInt numBytes;
sqInt numSlots;
@@ -61815,7 +61816,7 @@
bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
{
sqInt bridgeSpan;
- usqInt clifton;
+ sqInt clifton;
usqInt segEnd;
segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -62046,7 +62047,7 @@
sqInt largeChild;
sqInt newEndOfMemory;
sqInt next;
- sqInt node;
+ usqInt node;
SpurSegmentInfo *seg;
sqInt smallChild;
sqInt treeNode;
@@ -63302,7 +63303,7 @@
theSP += BytesPerWord;
}
while (1) {
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
frameRcvrOffset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? theFP + FoxMFReceiver
: theFP + FoxIFReceiver);
@@ -65369,10 +65370,10 @@
/* If the SP is invalid return the pointer to the receiver field. */
- /* begin frameReceiverOffset: */
- theSP = ((((usqInt)(longAt(aFrame + FoxMethod)))) < (startOfMemory())
- ? aFrame + FoxMFReceiver
- : aFrame + FoxIFReceiver);
+ /* begin frameReceiverLocation: */
+ theSP = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
+ ? theFP + FoxMFReceiver
+ : theFP + FoxIFReceiver);
goto l1;
}
theSP = (thePage == GIV(stackPage)
@@ -65566,7 +65567,7 @@
longAtput(ptr, followForwarded(oop));
}
}
- for (ptr = theSP; ptr <= (frameReceiverOffset(theFP)); ptr += BytesPerWord) {
+ for (ptr = theSP; ptr <= (frameReceiverLocation(theFP)); ptr += BytesPerWord) {
oop = longAt(ptr);
if (((oop & 3) == 0)
&& (((longAt(oop)) & (0x3FFFFF - 8)) == 0)) {
@@ -67826,7 +67827,7 @@
}
}
}
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
rcvrOffset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? theFP + FoxMFReceiver
: theFP + FoxIFReceiver);
@@ -69602,7 +69603,7 @@
print("could not find sp; using bogus value");
/* begin cr */
printf("\n");
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
theSP = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? theFP + FoxMFReceiver
: theFP + FoxIFReceiver);
@@ -71105,7 +71106,7 @@
theSP += BytesPerWord;
}
while (1) {
- while (theSP <= (frameReceiverOffset(theFP))) {
+ while (theSP <= (frameReceiverLocation(theFP))) {
if (oop == (longAt(theSP))) {
print("FP: ");
/* begin printHexnp: */
@@ -76849,7 +76850,7 @@
sqInt header1;
sqInt i;
sqInt methodHeader;
- sqInt numSlots;
+ usqInt numSlots;
usqInt numSlots1;
sqInt rcvr;
char *sp;
@@ -76905,9 +76906,9 @@
flag("endianness");
assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun()));
numSlots1 = byteAt(rcvr + 7);
- numSlots = ((usqInt) ((numSlots1 == 0xFF
- ? longAt(rcvr - BaseHeaderSize)
- : numSlots1)));
+ numSlots = (numSlots1 == 0xFF
+ ? longAt(rcvr - BaseHeaderSize)
+ : numSlots1);
}
}
else {
@@ -78621,7 +78622,7 @@
EXPORT(void)
primitiveVoidReceiver(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- longAtPointerput(frameReceiverOffset(GIV(framePointer)), 0);
+ longAtPointerput(frameReceiverLocation(GIV(framePointer)), 0);
}
Modified: branches/Cog/spursistasrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.h 2015-04-02 17:48:13 UTC (rev 3303)
+++ branches/Cog/spursistasrc/vm/cointerp.h 2015-04-02 18:11:56 UTC (rev 3304)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1153 uuid: 078f2fbd-0bb3-4773-a8b7-73a06a398a24
*/
Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-04-02 17:48:13 UTC (rev 3303)
+++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-04-02 18:11:56 UTC (rev 3304)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1153 uuid: 078f2fbd-0bb3-4773-a8b7-73a06a398a24
from
- CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
+ CoInterpreter VMMaker.oscog-eem.1153 uuid: 078f2fbd-0bb3-4773-a8b7-73a06a398a24
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1153 uuid: 078f2fbd-0bb3-4773-a8b7-73a06a398a24 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -474,7 +474,7 @@
static sqInt frameMethodObject(char *theFP) NoDbgRegParms;
static sqInt frameNumArgs(char *theFP) NoDbgRegParms;
usqInt framePointerAddress(void);
-static char * frameReceiverOffset(char *theFP) NoDbgRegParms;
+static char * frameReceiverLocation(char *theFP) NoDbgRegParms;
static sqInt frameReceiver(char *theFP) NoDbgRegParms;
void (*functionPointerForCompiledMethodprimitiveIndex(sqInt methodObj, sqInt primIndex))(void) ;
sqInt getCheckAllocFiller(void);
@@ -2371,7 +2371,7 @@
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1152]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1153]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -14908,7 +14908,7 @@
CogMethod *cogMethod;
sqInt methodField;
sqInt methodField1;
- usqInt theIP;
+ sqInt theIP;
assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln);
assertl(addressIsInPage(GIV(stackPage), lifp), ln);
@@ -16963,7 +16963,7 @@
theSP += BytesPerWord;
}
while (1) {
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
frameRcvrOffset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? theFP + FoxMFReceiver
: theFP + FoxIFReceiver);
@@ -17884,7 +17884,10 @@
assert(addressIsInPage(thePage, theFP));
assert((theIPPtr == 0)
|| (addressIsInPage(thePage, ((void *)theIPPtr))));
- offset = frameReceiverOffset(theFP);
+ /* begin frameReceiverLocation: */
+ offset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
+ ? theFP + FoxMFReceiver
+ : theFP + FoxIFReceiver);
while (theSP <= offset) {
oop = longAt(theSP);
if (((oop & 3) == 0)
@@ -18079,7 +18082,7 @@
}
static char *
-frameReceiverOffset(char *theFP)
+frameReceiverLocation(char *theFP)
{
return ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? theFP + FoxMFReceiver
@@ -18846,7 +18849,7 @@
assert(addressIsInPage(thePage, theSP));
assert((theIPPtr == 0)
|| (addressIsInPage(thePage, theIPPtr)));
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
frameRcvrOffset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? theFP + FoxMFReceiver
: theFP + FoxIFReceiver);
@@ -19648,7 +19651,7 @@
theSP += BytesPerWord;
}
while (1) {
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
frameRcvrOffset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? theFP + FoxMFReceiver
: theFP + FoxIFReceiver);
@@ -30237,7 +30240,7 @@
GIV(needGCFlag) = 1;
forceInterruptCheck();
}
- s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex);
+ s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex)));
goto l1;
}
if (numSlots >= 0xFF) {
@@ -31553,7 +31556,7 @@
sqInt arg;
sqInt fmt;
sqInt i;
- sqInt length;
+ usqInt length;
usqInt numBytes;
usqInt numSlots;
usqInt numSlots1;
@@ -31594,18 +31597,18 @@
/* bytes (the common case), including CompiledMethod */
- length = numBytes - (fmt & 7);
+ length = ((sqInt) (numBytes - (fmt & 7)));
goto l1;
}
if (fmt <= 9) {
- length = numBytes;
+ length = ((sqInt) numBytes);
goto l1;
}
if (fmt >= 12) {
- length = numBytes - ((fmt & 3) << 1);
+ length = ((sqInt) (numBytes - ((fmt & 3) << 1)));
goto l1;
}
- length = numBytes - ((fmt & 1) << 2);
+ length = ((sqInt) (numBytes - ((fmt & 1) << 2)));
l1: /* end numBytesOf: */;
if (!((((((usqInt) (longAt(rcvr))) >> 24) & 0x1F) == ((((usqInt) (longAt(arg))) >> 24) & 0x1F))
&& (length == (numBytesOf(arg))))) {
@@ -31623,9 +31626,9 @@
flag("endianness");
assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun()));
numSlots1 = byteAt(rcvr + 7);
- length = ((usqInt) ((numSlots1 == 0xFF
- ? longAt(rcvr - BaseHeaderSize)
- : numSlots1)));
+ length = (numSlots1 == 0xFF
+ ? longAt(rcvr - BaseHeaderSize)
+ : numSlots1);
if (!((isAppropriateForCopyObject(arg))
&& (length == (lengthOfformat(arg, (((usqInt) (longAt(arg))) >> 24) & 0x1F))))) {
(GIV(primFailCode) = PrimErrBadArgument);
@@ -35626,7 +35629,7 @@
sqInt err;
sqInt hash;
sqInt instSpec;
- sqInt newObj;
+ usqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -35816,7 +35819,7 @@
GIV(needGCFlag) = 1;
forceInterruptCheck();
}
- newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex);
+ newObj = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex)));
goto l1;
}
if (numSlots >= 0xFF) {
@@ -41522,7 +41525,7 @@
sqInt fillValue;
sqInt hash;
sqInt instSpec;
- sqInt newObj;
+ usqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -43415,7 +43418,7 @@
sqInt entry;
sqInt expectedIndex;
sqInt expectedIndex1;
- sqInt freeChunk;
+ usqInt freeChunk;
sqInt i;
sqInt i1;
sqInt index;
@@ -43454,7 +43457,7 @@
sqInt ptr1;
sqInt ptr2;
sqInt slotBytes;
- sqInt smallObj;
+ usqInt smallObj;
sqInt start;
classIndex = (long32At(aClass + 4)) & 0x3FFFFF;
@@ -46374,7 +46377,7 @@
GIV(needGCFlag) = 1;
forceInterruptCheck();
}
- newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, fmt, (longAt(objOop)) & 0x3FFFFF);
+ newObj = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, fmt, (longAt(objOop)) & 0x3FFFFF)));
goto l1;
}
if (numSlots >= 0xFF) {
@@ -57432,13 +57435,13 @@
sqInt obj21;
sqInt pigBytes;
usqInt prevFree;
- usqInt prevFreeChunk;
+ sqInt prevFreeChunk;
usqInt prevPrevFree;
- usqInt prevPrevFreeChunk;
+ sqInt prevPrevFreeChunk;
sqInt slotBytes;
sqInt slotBytes1;
usqInt there;
- usqInt thisFreeChunk;
+ sqInt thisFreeChunk;
sqInt usedChunk;
here = startAddress;
@@ -60663,8 +60666,8 @@
sqInt prevPrevObj;
sqInt prevPrevObj1;
sqInt ptr;
- sqInt savedInHashes;
- sqInt savedOutHashes;
+ usqInt savedInHashes;
+ usqInt savedOutHashes;
sqInt segAddr;
sqInt segStart;
sqInt slotBytes;
@@ -61137,7 +61140,7 @@
sqInt formatField;
sqInt len;
usqInt newObj;
- sqInt newString;
+ usqInt newString;
usqInt numBytes;
sqInt numSlots;
@@ -61822,7 +61825,7 @@
bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
{
sqInt bridgeSpan;
- usqInt clifton;
+ sqInt clifton;
usqInt segEnd;
segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -62053,7 +62056,7 @@
sqInt largeChild;
sqInt newEndOfMemory;
sqInt next;
- sqInt node;
+ usqInt node;
SpurSegmentInfo *seg;
sqInt smallChild;
sqInt treeNode;
@@ -63309,7 +63312,7 @@
theSP += BytesPerWord;
}
while (1) {
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
frameRcvrOffset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? theFP + FoxMFReceiver
: theFP + FoxIFReceiver);
@@ -65376,10 +65379,10 @@
/* If the SP is invalid return the pointer to the receiver field. */
- /* begin frameReceiverOffset: */
- theSP = ((((usqInt)(longAt(aFrame + FoxMethod)))) < (startOfMemory())
- ? aFrame + FoxMFReceiver
- : aFrame + FoxIFReceiver);
+ /* begin frameReceiverLocation: */
+ theSP = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
+ ? theFP + FoxMFReceiver
+ : theFP + FoxIFReceiver);
goto l1;
}
theSP = (thePage == GIV(stackPage)
@@ -65573,7 +65576,7 @@
longAtput(ptr, followForwarded(oop));
}
}
- for (ptr = theSP; ptr <= (frameReceiverOffset(theFP)); ptr += BytesPerWord) {
+ for (ptr = theSP; ptr <= (frameReceiverLocation(theFP)); ptr += BytesPerWord) {
oop = longAt(ptr);
if (((oop & 3) == 0)
&& (((longAt(oop)) & (0x3FFFFF - 8)) == 0)) {
@@ -67833,7 +67836,7 @@
}
}
}
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
rcvrOffset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? theFP + FoxMFReceiver
: theFP + FoxIFReceiver);
@@ -69609,7 +69612,7 @@
print("could not find sp; using bogus value");
/* begin cr */
printf("\n");
- /* begin frameReceiverOffset: */
+ /* begin frameReceiverLocation: */
theSP = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? theFP + FoxMFReceiver
: theFP + FoxIFReceiver);
@@ -71112,7 +71115,7 @@
theSP += BytesPerWord;
}
while (1) {
- while (theSP <= (frameReceiverOffset(theFP))) {
+ while (theSP <= (frameReceiverLocation(theFP))) {
if (oop == (longAt(theSP))) {
print("FP: ");
/* begin printHexnp: */
@@ -76856,7 +76859,7 @@
sqInt header1;
sqInt i;
sqInt methodHeader;
- sqInt numSlots;
+ usqInt numSlots;
usqInt numSlots1;
sqInt rcvr;
char *sp;
@@ -76912,9 +76915,9 @@
flag("endianness");
assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun()));
numSlots1 = byteAt(rcvr + 7);
- numSlots = ((usqInt) ((numSlots1 == 0xFF
- ? longAt(rcvr - BaseHeaderSize)
- : numSlots1)));
+ numSlots = (numSlots1 == 0xFF
+ ? longAt(rcvr - BaseHeaderSize)
+ : numSlots1);
}
}
else {
@@ -78628,7 +78631,7 @@
EXPORT(void)
primitiveVoidReceiver(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- longAtPointerput(frameReceiverOffset(GIV(framePointer)), 0);
+ longAtPointerput(frameReceiverLocation(GIV(framePointer)), 0);
}
Modified: branches/Cog/spursrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/cointerp.c 2015-04-02 17:48:13 UTC (rev 3303)
+++ branches/Cog/spursrc/vm/cointerp.c 2015-04-02 18:11:56 UTC (rev 3304)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1153 uuid: 078f2fbd-0bb3-4773-a8b7-73a06a398a24
from
- CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
+ CoInterpreter VMMaker.oscog-eem.1153 uuid: 078f2fbd-0bb3-4773-a8b7-73a06a398a24
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1153 uuid: 078f2fbd-0bb3-4773-a8b7-73a06a398a24 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -466,7 +466,7 @@
static sqInt frameMethodObject(char *theFP) NoDbgRegParms;
static sqInt frameNumArgs(char *theFP) NoDbgRegParms;
usqInt framePointerAddress(void);
-static char * frameReceiverOffset(char *theFP) NoDbgRegParms;
+static char * frameReceiverLocation(char *theFP) NoDbgRegParms;
static sqInt frameReceiver(char *theFP) NoDbgRegParms;
void (*functionPointerForCompiledMethodprimitiveIndex(sqInt methodObj, sqInt primIndex))(void) ;
@@ Diff output truncated at 50000 characters. @@
More information about the Vm-dev
mailing list