[Vm-dev] [commit][3519] CogVm source as per VMMaker.oscog-eem.1582
commits at squeakvm.org
commits at squeakvm.org
Sat Dec 12 18:27:53 UTC 2015
Revision: 3519
Author: eliot
Date: 2015-12-12 10:27:51 -0800 (Sat, 12 Dec 2015)
Log Message:
-----------
CogVm source as per VMMaker.oscog-eem.1582
Fix compilation from regressions in the previous commit.
Modified Paths:
--------------
branches/Cog/nsspursrc/vm/cogit.h
branches/Cog/nsspursrc/vm/cogitARMv5.c
branches/Cog/nsspursrc/vm/cogitIA32.c
branches/Cog/nsspursrc/vm/cointerp.c
branches/Cog/nsspursrc/vm/cointerp.h
branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
branches/Cog/spur64src/vm/cogit.h
branches/Cog/spur64src/vm/cogitX64.c
branches/Cog/spur64src/vm/cointerp.c
branches/Cog/spur64src/vm/cointerp.h
branches/Cog/spur64src/vm/gcc3x-cointerp.c
branches/Cog/spursistasrc/vm/cogit.h
branches/Cog/spursistasrc/vm/cogitARMv5.c
branches/Cog/spursistasrc/vm/cogitIA32.c
branches/Cog/spursistasrc/vm/cointerp.c
branches/Cog/spursistasrc/vm/cointerp.h
branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
branches/Cog/spursrc/vm/cogit.h
branches/Cog/spursrc/vm/cogitARMv5.c
branches/Cog/spursrc/vm/cogitIA32.c
branches/Cog/spursrc/vm/cointerp.c
branches/Cog/spursrc/vm/cointerp.h
branches/Cog/spursrc/vm/gcc3x-cointerp.c
branches/Cog/src/vm/cogit.h
branches/Cog/src/vm/cogitARMv5.c
branches/Cog/src/vm/cogitIA32.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
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nsspursrc/vm/cogit.h
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.h 2015-12-12 08:23:17 UTC (rev 3518)
+++ branches/Cog/nsspursrc/vm/cogit.h 2015-12-12 18:27:51 UTC (rev 3519)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ CCodeGenerator VMMaker.oscog-eem.1582 uuid: ca77fb29-c2fc-44bd-8ca0-dfa5e8951b19
*/
Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c
===================================================================
--- branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-12-12 08:23:17 UTC (rev 3518)
+++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-12-12 18:27:51 UTC (rev 3519)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ CCodeGenerator VMMaker.oscog-eem.1581 uuid: ceb64363-bb65-4efc-a5c9-ad90ef4fc645
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1581 uuid: ceb64363-bb65-4efc-a5c9-ad90ef4fc645
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1581 uuid: ceb64363-bb65-4efc-a5c9-ad90ef4fc645 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -659,7 +659,7 @@
extern void freeUnmarkedMachineCode(void);
static sqInt genCheckForInterruptsTrampoline(void);
static AbstractInstruction * NoDbgRegParms genConditionalBranchoperand(sqInt opcode, sqInt operandOne);
-static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2, sqInt regArg3, sqInt forCall, char *trampolineName))(void) ;
+static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2OrNone, sqInt regArg3OrNone, sqInt forCall, char *trampolineName))(void) ;
static void NoDbgRegParms genEnilopmartReturn(sqInt forCall);
static void NoDbgRegParms generateCaptureCStackPointers(sqInt captureFramePointer);
static void generateClosedPICPrototype(void);
@@ -10731,7 +10731,7 @@
stackPointer -> reg3val */
/* Cogit>>#genEnilopmartFor:and:and:forCall:called: */
-static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2, sqInt regArg3, sqInt forCall, char *trampolineName))(void)
+static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2OrNone, sqInt regArg3OrNone, sqInt forCall, char *trampolineName))(void)
{
sqInt endAddress;
Modified: branches/Cog/nsspursrc/vm/cogitIA32.c
===================================================================
--- branches/Cog/nsspursrc/vm/cogitIA32.c 2015-12-12 08:23:17 UTC (rev 3518)
+++ branches/Cog/nsspursrc/vm/cogitIA32.c 2015-12-12 18:27:51 UTC (rev 3519)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ CCodeGenerator VMMaker.oscog-eem.1581 uuid: ceb64363-bb65-4efc-a5c9-ad90ef4fc645
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1581 uuid: ceb64363-bb65-4efc-a5c9-ad90ef4fc645
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1581 uuid: ceb64363-bb65-4efc-a5c9-ad90ef4fc645 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -599,7 +599,7 @@
extern void freeUnmarkedMachineCode(void);
static sqInt genCheckForInterruptsTrampoline(void);
static AbstractInstruction * NoDbgRegParms genConditionalBranchoperand(sqInt opcode, sqInt operandOne);
-static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2, sqInt regArg3, sqInt forCall, char *trampolineName))(void) ;
+static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2OrNone, sqInt regArg3OrNone, sqInt forCall, char *trampolineName))(void) ;
static void NoDbgRegParms genEnilopmartReturn(sqInt forCall);
static void NoDbgRegParms generateCaptureCStackPointers(sqInt captureFramePointer);
static void generateClosedPICPrototype(void);
@@ -9837,7 +9837,7 @@
stackPointer -> reg3val */
/* Cogit>>#genEnilopmartFor:and:and:forCall:called: */
-static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2, sqInt regArg3, sqInt forCall, char *trampolineName))(void)
+static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2OrNone, sqInt regArg3OrNone, sqInt forCall, char *trampolineName))(void)
{
sqInt endAddress;
Modified: branches/Cog/nsspursrc/vm/cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.c 2015-12-12 08:23:17 UTC (rev 3518)
+++ branches/Cog/nsspursrc/vm/cointerp.c 2015-12-12 18:27:51 UTC (rev 3519)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1582 uuid: ca77fb29-c2fc-44bd-8ca0-dfa5e8951b19
from
- CoInterpreter VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ CoInterpreter VMMaker.oscog-eem.1582 uuid: ca77fb29-c2fc-44bd-8ca0-dfa5e8951b19
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1582 uuid: ca77fb29-c2fc-44bd-8ca0-dfa5e8951b19 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1209,7 +1209,7 @@
static sqInt NoDbgRegParms storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots);
extern sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
extern sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
-extern usqInt stringForCString(const char *aCString);
+extern sqInt stringForCString(const char *aCString);
static sqInt NoDbgRegParms sufficientSpaceAfterGC(sqInt numBytes);
static sqInt NoDbgRegParms swizzleObjStackAt(sqInt objStackRootIndex);
extern void tenuringIncrementalGC(void);
@@ -2411,7 +2411,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.1580";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1582";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -18323,7 +18323,7 @@
static sqInt
checkForAndFollowForwardedPrimitiveState(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- signed char accessorDepth;
+ sqInt accessorDepth;
sqInt firstBytecode;
sqInt found;
sqInt found1;
@@ -32302,7 +32302,7 @@
usqInt newObj;
usqInt numBytes;
sqInt numSlots;
- usqInt s;
+ sqInt s;
char *sp;
sqInt sz;
@@ -37997,7 +37997,7 @@
sqInt err;
sqInt hash;
sqInt instSpec;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -38123,7 +38123,7 @@
sqInt i;
usqInt instSpec;
sqInt literalCount;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -43997,7 +43997,7 @@
sqInt fillValue;
sqInt hash;
usqInt instSpec;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -46131,7 +46131,7 @@
sqInt entry;
sqInt expectedIndex;
sqInt expectedIndex1;
- usqInt freeChunk;
+ sqInt freeChunk;
sqInt i;
sqInt i1;
sqInt index;
@@ -46170,8 +46170,8 @@
sqInt ptr1;
sqInt ptr2;
sqInt slotBytes;
- usqInt smallObj;
- usqInt start;
+ sqInt smallObj;
+ sqInt start;
classIndex = (long32At(aClass + 4)) & 0x3FFFFF;
if (classIndex == 0) {
@@ -49105,7 +49105,7 @@
sqInt fmt;
sqInt hasYoung;
sqInt i;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -53447,7 +53447,7 @@
sqInt hash;
sqInt i;
sqInt iLimiT;
- usqInt loadedObjectsArray;
+ sqInt loadedObjectsArray;
sqInt mappedOop;
usqInt newObj;
usqInt numBytes;
@@ -63900,8 +63900,8 @@
sqInt prevPrevObj;
sqInt prevPrevObj1;
sqInt ptr;
- usqInt savedInHashes;
- usqInt savedOutHashes;
+ sqInt savedInHashes;
+ sqInt savedOutHashes;
sqInt segAddr;
sqInt segStart;
sqInt slotBytes;
@@ -64371,13 +64371,13 @@
or nil if out of memory. */
/* SpurMemoryManager>>#stringForCString: */
-usqInt
+sqInt
stringForCString(const char *aCString)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt formatField;
sqInt len;
usqInt newObj;
- usqInt newString;
+ sqInt newString;
usqInt numBytes;
sqInt numSlots;
@@ -65432,7 +65432,7 @@
static sqInt NoDbgRegParms
readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt bridge;
+ usqInt bridge;
usqInt bridgehead;
usqInt bridgeSpan;
sqInt bytesRead;
Modified: branches/Cog/nsspursrc/vm/cointerp.h
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.h 2015-12-12 08:23:17 UTC (rev 3518)
+++ branches/Cog/nsspursrc/vm/cointerp.h 2015-12-12 18:27:51 UTC (rev 3519)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1582 uuid: ca77fb29-c2fc-44bd-8ca0-dfa5e8951b19
*/
@@ -255,7 +255,7 @@
extern sqInt splObj(sqInt index);
extern usqInt storeCheckBoundary(void);
extern sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
-extern usqInt stringForCString(const char *aCString);
+extern sqInt stringForCString(const char *aCString);
extern void tenuringIncrementalGC(void);
extern sqInt topRemappableOop(void);
extern sqInt validFreeTree(void);
Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-12-12 08:23:17 UTC (rev 3518)
+++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-12-12 18:27:51 UTC (rev 3519)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1582 uuid: ca77fb29-c2fc-44bd-8ca0-dfa5e8951b19
from
- CoInterpreter VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ CoInterpreter VMMaker.oscog-eem.1582 uuid: ca77fb29-c2fc-44bd-8ca0-dfa5e8951b19
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1582 uuid: ca77fb29-c2fc-44bd-8ca0-dfa5e8951b19 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1212,7 +1212,7 @@
static sqInt NoDbgRegParms storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots);
extern sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
extern sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
-extern usqInt stringForCString(const char *aCString);
+extern sqInt stringForCString(const char *aCString);
static sqInt NoDbgRegParms sufficientSpaceAfterGC(sqInt numBytes);
static sqInt NoDbgRegParms swizzleObjStackAt(sqInt objStackRootIndex);
extern void tenuringIncrementalGC(void);
@@ -2414,7 +2414,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.1580";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1582";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -18332,7 +18332,7 @@
static sqInt
checkForAndFollowForwardedPrimitiveState(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- signed char accessorDepth;
+ sqInt accessorDepth;
sqInt firstBytecode;
sqInt found;
sqInt found1;
@@ -32311,7 +32311,7 @@
usqInt newObj;
usqInt numBytes;
sqInt numSlots;
- usqInt s;
+ sqInt s;
char *sp;
sqInt sz;
@@ -38006,7 +38006,7 @@
sqInt err;
sqInt hash;
sqInt instSpec;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -38132,7 +38132,7 @@
sqInt i;
usqInt instSpec;
sqInt literalCount;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -44006,7 +44006,7 @@
sqInt fillValue;
sqInt hash;
usqInt instSpec;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -46140,7 +46140,7 @@
sqInt entry;
sqInt expectedIndex;
sqInt expectedIndex1;
- usqInt freeChunk;
+ sqInt freeChunk;
sqInt i;
sqInt i1;
sqInt index;
@@ -46179,8 +46179,8 @@
sqInt ptr1;
sqInt ptr2;
sqInt slotBytes;
- usqInt smallObj;
- usqInt start;
+ sqInt smallObj;
+ sqInt start;
classIndex = (long32At(aClass + 4)) & 0x3FFFFF;
if (classIndex == 0) {
@@ -49114,7 +49114,7 @@
sqInt fmt;
sqInt hasYoung;
sqInt i;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -53456,7 +53456,7 @@
sqInt hash;
sqInt i;
sqInt iLimiT;
- usqInt loadedObjectsArray;
+ sqInt loadedObjectsArray;
sqInt mappedOop;
usqInt newObj;
usqInt numBytes;
@@ -63909,8 +63909,8 @@
sqInt prevPrevObj;
sqInt prevPrevObj1;
sqInt ptr;
- usqInt savedInHashes;
- usqInt savedOutHashes;
+ sqInt savedInHashes;
+ sqInt savedOutHashes;
sqInt segAddr;
sqInt segStart;
sqInt slotBytes;
@@ -64380,13 +64380,13 @@
or nil if out of memory. */
/* SpurMemoryManager>>#stringForCString: */
-usqInt
+sqInt
stringForCString(const char *aCString)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt formatField;
sqInt len;
usqInt newObj;
- usqInt newString;
+ sqInt newString;
usqInt numBytes;
sqInt numSlots;
@@ -65441,7 +65441,7 @@
static sqInt NoDbgRegParms
readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt bridge;
+ usqInt bridge;
usqInt bridgehead;
usqInt bridgeSpan;
sqInt bytesRead;
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Sat Dec 12 00:09:31 PST 2015
+ Sat Dec 12 10:26:17 PST 2015
Modified: branches/Cog/spur64src/vm/cogit.h
===================================================================
--- branches/Cog/spur64src/vm/cogit.h 2015-12-12 08:23:17 UTC (rev 3518)
+++ branches/Cog/spur64src/vm/cogit.h 2015-12-12 18:27:51 UTC (rev 3519)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ CCodeGenerator VMMaker.oscog-eem.1582 uuid: ca77fb29-c2fc-44bd-8ca0-dfa5e8951b19
*/
Modified: branches/Cog/spur64src/vm/cogitX64.c
===================================================================
--- branches/Cog/spur64src/vm/cogitX64.c 2015-12-12 08:23:17 UTC (rev 3518)
+++ branches/Cog/spur64src/vm/cogitX64.c 2015-12-12 18:27:51 UTC (rev 3519)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ CCodeGenerator VMMaker.oscog-eem.1581 uuid: ceb64363-bb65-4efc-a5c9-ad90ef4fc645
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1581 uuid: ceb64363-bb65-4efc-a5c9-ad90ef4fc645
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1581 uuid: ceb64363-bb65-4efc-a5c9-ad90ef4fc645 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -557,7 +557,7 @@
extern void freeUnmarkedMachineCode(void);
static sqInt genCheckForInterruptsTrampoline(void);
static AbstractInstruction * NoDbgRegParms genConditionalBranchoperand(sqInt opcode, sqInt operandOne);
-static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2, sqInt regArg3, sqInt forCall, char *trampolineName))(void) ;
+static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2OrNone, sqInt regArg3OrNone, sqInt forCall, char *trampolineName))(void) ;
static void NoDbgRegParms genEnilopmartReturn(sqInt forCall);
static void NoDbgRegParms generateCaptureCStackPointers(sqInt captureFramePointer);
static void generateClosedPICPrototype(void);
@@ -5302,7 +5302,7 @@
stackPointer -> reg3val */
/* Cogit>>#genEnilopmartFor:and:and:forCall:called: */
-static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2, sqInt regArg3, sqInt forCall, char *trampolineName))(void)
+static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2OrNone, sqInt regArg3OrNone, sqInt forCall, char *trampolineName))(void)
{
sqInt endAddress;
Modified: branches/Cog/spur64src/vm/cointerp.c
===================================================================
--- branches/Cog/spur64src/vm/cointerp.c 2015-12-12 08:23:17 UTC (rev 3518)
+++ branches/Cog/spur64src/vm/cointerp.c 2015-12-12 18:27:51 UTC (rev 3519)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1582 uuid: ca77fb29-c2fc-44bd-8ca0-dfa5e8951b19
from
- CoInterpreter VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ CoInterpreter VMMaker.oscog-eem.1582 uuid: ca77fb29-c2fc-44bd-8ca0-dfa5e8951b19
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1582 uuid: ca77fb29-c2fc-44bd-8ca0-dfa5e8951b19 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -130,7 +130,7 @@
#define ActiveProcessIndex 1
#define AlternateHeaderHasPrimFlag 0x80000
#define AlternateHeaderNumLiteralsMask 0x7FFF
-#define AltLongStoreBytecode 129
+#define AltLongStoreBytecode 234
#define AtCacheFixedFields 4
#define AtCacheFmt 3
#define AtCacheMask 0x1C
@@ -533,6 +533,7 @@
extern sqInt methodShouldBeCogged(sqInt aMethodObj);
static sqInt NoDbgRegParms methodWithHeaderShouldBeCogged(sqInt methodHeader);
static CogBlockMethod * NoDbgRegParms mframeCogMethod(char *theFP);
+extern CogMethod * mframeHomeMethodExport(void);
extern CogMethod * mframeHomeMethod(char *theFP);
static sqInt NoDbgRegParms mframeIsBlockActivation(char *theFP);
static sqInt NoDbgRegParms mframeReceiver(char *theFP);
@@ -2403,7 +2404,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[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1580]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1582]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -12626,7 +12627,7 @@
static sqInt
checkForAndFollowForwardedPrimitiveState(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt accessorDepth;
+ signed char accessorDepth;
sqInt firstBytecode;
sqInt found;
sqInt found1;
@@ -17891,7 +17892,21 @@
return ((CogBlockMethod *) ((longAt(theFP + FoxMethod)) & MFMethodMask));
}
+ /* CoInterpreter>>#mframeHomeMethodExport */
+CogMethod *
+mframeHomeMethodExport(void)
+{ DECL_MAYBE_SQ_GLOBAL_STRUCT
+ sqInt methodField;
+ /* begin mframeHomeMethod: */
+ methodField = longAt(GIV(framePointer) + FoxMethod);
+ if ((methodField & MFMethodFlagIsBlockFlag) != 0) {
+ return ((CogMethod *) ((((usqInt)(((CogBlockMethod *) (methodField & MFMethodMask))))) - (((((CogBlockMethod *) (methodField & MFMethodMask)))->homeOffset))));
+ }
+ return ((CogMethod *) (methodField & MFMethodMask));
+}
+
+
/* Answer the home method for a machine code frame. From a block frame we
find the home method through the block's homeOffset field which is the
delta to it.
@@ -62530,7 +62545,7 @@
sqInt limit;
sqInt newEndOfMemory;
sqInt next;
- sqInt node;
+ usqInt node;
usqInt numSlots;
usqInt numSlots1;
SpurSegmentInfo *seg;
@@ -62877,7 +62892,7 @@
usqLong firstSavedBridgeWord;
sqInt nWritten;
usqInt pier1;
- sqInt pier2;
+ usqInt pier2;
usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
Modified: branches/Cog/spur64src/vm/cointerp.h
===================================================================
--- branches/Cog/spur64src/vm/cointerp.h 2015-12-12 08:23:17 UTC (rev 3518)
+++ branches/Cog/spur64src/vm/cointerp.h 2015-12-12 18:27:51 UTC (rev 3519)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1582 uuid: ca77fb29-c2fc-44bd-8ca0-dfa5e8951b19
*/
@@ -69,6 +69,7 @@
extern sqInt methodHasCogMethod(sqInt aMethodOop);
extern sqInt methodNeedsLargeContext(sqInt methodObj);
extern sqInt methodShouldBeCogged(sqInt aMethodObj);
+extern CogMethod * mframeHomeMethodExport(void);
extern CogMethod * mframeHomeMethod(char *theFP);
extern sqInt mMethodClass(void);
extern void mnuCompilationBreakpointFor(sqInt selectorOop);
Modified: branches/Cog/spur64src/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spur64src/vm/gcc3x-cointerp.c 2015-12-12 08:23:17 UTC (rev 3518)
+++ branches/Cog/spur64src/vm/gcc3x-cointerp.c 2015-12-12 18:27:51 UTC (rev 3519)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1582 uuid: ca77fb29-c2fc-44bd-8ca0-dfa5e8951b19
from
- CoInterpreter VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ CoInterpreter VMMaker.oscog-eem.1582 uuid: ca77fb29-c2fc-44bd-8ca0-dfa5e8951b19
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1582 uuid: ca77fb29-c2fc-44bd-8ca0-dfa5e8951b19 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -133,7 +133,7 @@
#define ActiveProcessIndex 1
#define AlternateHeaderHasPrimFlag 0x80000
#define AlternateHeaderNumLiteralsMask 0x7FFF
-#define AltLongStoreBytecode 129
+#define AltLongStoreBytecode 234
#define AtCacheFixedFields 4
#define AtCacheFmt 3
#define AtCacheMask 0x1C
@@ -536,6 +536,7 @@
extern sqInt methodShouldBeCogged(sqInt aMethodObj);
static sqInt NoDbgRegParms methodWithHeaderShouldBeCogged(sqInt methodHeader);
static CogBlockMethod * NoDbgRegParms mframeCogMethod(char *theFP);
+extern CogMethod * mframeHomeMethodExport(void);
extern CogMethod * mframeHomeMethod(char *theFP);
static sqInt NoDbgRegParms mframeIsBlockActivation(char *theFP);
static sqInt NoDbgRegParms mframeReceiver(char *theFP);
@@ -2406,7 +2407,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[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1580]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1582]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -12635,7 +12636,7 @@
static sqInt
checkForAndFollowForwardedPrimitiveState(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt accessorDepth;
+ signed char accessorDepth;
sqInt firstBytecode;
sqInt found;
sqInt found1;
@@ -17900,7 +17901,21 @@
return ((CogBlockMethod *) ((longAt(theFP + FoxMethod)) & MFMethodMask));
}
+ /* CoInterpreter>>#mframeHomeMethodExport */
+CogMethod *
+mframeHomeMethodExport(void)
+{ DECL_MAYBE_SQ_GLOBAL_STRUCT
+ sqInt methodField;
+ /* begin mframeHomeMethod: */
+ methodField = longAt(GIV(framePointer) + FoxMethod);
+ if ((methodField & MFMethodFlagIsBlockFlag) != 0) {
+ return ((CogMethod *) ((((usqInt)(((CogBlockMethod *) (methodField & MFMethodMask))))) - (((((CogBlockMethod *) (methodField & MFMethodMask)))->homeOffset))));
+ }
+ return ((CogMethod *) (methodField & MFMethodMask));
+}
+
+
/* Answer the home method for a machine code frame. From a block frame we
find the home method through the block's homeOffset field which is the
delta to it.
@@ -62539,7 +62554,7 @@
sqInt limit;
sqInt newEndOfMemory;
sqInt next;
- sqInt node;
+ usqInt node;
usqInt numSlots;
usqInt numSlots1;
SpurSegmentInfo *seg;
@@ -62886,7 +62901,7 @@
usqLong firstSavedBridgeWord;
sqInt nWritten;
usqInt pier1;
- sqInt pier2;
+ usqInt pier2;
usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
Modified: branches/Cog/spursistasrc/vm/cogit.h
===================================================================
--- branches/Cog/spursistasrc/vm/cogit.h 2015-12-12 08:23:17 UTC (rev 3518)
+++ branches/Cog/spursistasrc/vm/cogit.h 2015-12-12 18:27:51 UTC (rev 3519)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ CCodeGenerator VMMaker.oscog-eem.1582 uuid: ca77fb29-c2fc-44bd-8ca0-dfa5e8951b19
*/
Modified: branches/Cog/spursistasrc/vm/cogitARMv5.c
===================================================================
--- branches/Cog/spursistasrc/vm/cogitARMv5.c 2015-12-12 08:23:17 UTC (rev 3518)
+++ branches/Cog/spursistasrc/vm/cogitARMv5.c 2015-12-12 18:27:51 UTC (rev 3519)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ CCodeGenerator VMMaker.oscog-eem.1581 uuid: ceb64363-bb65-4efc-a5c9-ad90ef4fc645
from
- SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1581 uuid: ceb64363-bb65-4efc-a5c9-ad90ef4fc645
*/
-static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8 " __DATE__ ;
+static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1581 uuid: ceb64363-bb65-4efc-a5c9-ad90ef4fc645 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -652,7 +652,7 @@
extern void freeUnmarkedMachineCode(void);
static sqInt genCheckForInterruptsTrampoline(void);
static AbstractInstruction * NoDbgRegParms genConditionalBranchoperand(sqInt opcode, sqInt operandOne);
-static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2, sqInt regArg3, sqInt forCall, char *trampolineName))(void) ;
+static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2OrNone, sqInt regArg3OrNone, sqInt forCall, char *trampolineName))(void) ;
static void NoDbgRegParms genEnilopmartReturn(sqInt forCall);
static void NoDbgRegParms generateCaptureCStackPointers(sqInt captureFramePointer);
static void generateClosedPICPrototype(void);
@@ -10589,7 +10589,7 @@
stackPointer -> reg3val */
/* Cogit>>#genEnilopmartFor:and:and:forCall:called: */
-static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2, sqInt regArg3, sqInt forCall, char *trampolineName))(void)
+static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2OrNone, sqInt regArg3OrNone, sqInt forCall, char *trampolineName))(void)
{
sqInt endAddress;
Modified: branches/Cog/spursistasrc/vm/cogitIA32.c
===================================================================
--- branches/Cog/spursistasrc/vm/cogitIA32.c 2015-12-12 08:23:17 UTC (rev 3518)
+++ branches/Cog/spursistasrc/vm/cogitIA32.c 2015-12-12 18:27:51 UTC (rev 3519)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ CCodeGenerator VMMaker.oscog-eem.1581 uuid: ceb64363-bb65-4efc-a5c9-ad90ef4fc645
from
- SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1581 uuid: ceb64363-bb65-4efc-a5c9-ad90ef4fc645
*/
-static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8 " __DATE__ ;
+static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1581 uuid: ceb64363-bb65-4efc-a5c9-ad90ef4fc645 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -591,7 +591,7 @@
extern void freeUnmarkedMachineCode(void);
static sqInt genCheckForInterruptsTrampoline(void);
static AbstractInstruction * NoDbgRegParms genConditionalBranchoperand(sqInt opcode, sqInt operandOne);
-static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2, sqInt regArg3, sqInt forCall, char *trampolineName))(void) ;
+static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2OrNone, sqInt regArg3OrNone, sqInt forCall, char *trampolineName))(void) ;
static void NoDbgRegParms genEnilopmartReturn(sqInt forCall);
static void NoDbgRegParms generateCaptureCStackPointers(sqInt captureFramePointer);
static void generateClosedPICPrototype(void);
@@ -9685,7 +9685,7 @@
stackPointer -> reg3val */
/* Cogit>>#genEnilopmartFor:and:and:forCall:called: */
-static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2, sqInt regArg3, sqInt forCall, char *trampolineName))(void)
+static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2OrNone, sqInt regArg3OrNone, sqInt forCall, char *trampolineName))(void)
{
sqInt endAddress;
@@ -10052,12 +10052,12 @@
generateMapAtstart(sqInt addressOrNull, sqInt startAddress)
{
unsigned char annotation;
- sqInt delta;
+ usqInt delta;
sqInt i;
AbstractInstruction *instruction;
sqInt length;
- sqInt location;
- sqInt mapEntry;
+ usqInt location;
+ usqInt mapEntry;
sqInt maxDelta;
usqInt mcpc;
Modified: branches/Cog/spursistasrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.c 2015-12-12 08:23:17 UTC (rev 3518)
+++ branches/Cog/spursistasrc/vm/cointerp.c 2015-12-12 18:27:51 UTC (rev 3519)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1582 uuid: ca77fb29-c2fc-44bd-8ca0-dfa5e8951b19
from
- CoInterpreter VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ CoInterpreter VMMaker.oscog-eem.1582 uuid: ca77fb29-c2fc-44bd-8ca0-dfa5e8951b19
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1582 uuid: ca77fb29-c2fc-44bd-8ca0-dfa5e8951b19 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -530,6 +530,7 @@
extern sqInt methodShouldBeCogged(sqInt aMethodObj);
static sqInt NoDbgRegParms methodWithHeaderShouldBeCogged(sqInt methodHeader);
static CogBlockMethod * NoDbgRegParms mframeCogMethod(char *theFP);
+extern CogMethod * mframeHomeMethodExport(void);
extern CogMethod * mframeHomeMethod(char *theFP);
static sqInt NoDbgRegParms mframeIsBlockActivation(char *theFP);
static sqInt NoDbgRegParms mframeReceiver(char *theFP);
@@ -1195,7 +1196,7 @@
static sqInt NoDbgRegParms storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots);
extern sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
extern sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
-extern sqInt stringForCString(const char *aCString);
+extern usqInt stringForCString(const char *aCString);
static sqInt NoDbgRegParms sufficientSpaceAfterGC(sqInt numBytes);
static sqInt NoDbgRegParms swizzleObjStackAt(sqInt objStackRootIndex);
extern void tenuringIncrementalGC(void);
@@ -2386,7 +2387,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[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1580]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1582]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -22456,7 +22457,21 @@
return ((CogBlockMethod *) ((longAt(theFP + FoxMethod)) & MFMethodMask));
}
+ /* CoInterpreter>>#mframeHomeMethodExport */
+CogMethod *
+mframeHomeMethodExport(void)
+{ DECL_MAYBE_SQ_GLOBAL_STRUCT
+ sqInt methodField;
+ /* begin mframeHomeMethod: */
+ methodField = longAt(GIV(framePointer) + FoxMethod);
+ if ((methodField & MFMethodFlagIsBlockFlag) != 0) {
+ return ((CogMethod *) ((((usqInt)(((CogBlockMethod *) (methodField & MFMethodMask))))) - (((((CogBlockMethod *) (methodField & MFMethodMask)))->homeOffset))));
+ }
+ return ((CogMethod *) (methodField & MFMethodMask));
+}
+
+
/* Answer the home method for a machine code frame. From a block frame we
find the home method through the block's homeOffset field which is the
delta to it.
@@ -30876,7 +30891,7 @@
usqInt newObj;
usqInt numBytes;
sqInt numSlots;
- sqInt s;
+ usqInt s;
char *sp;
sqInt sz;
@@ -30925,7 +30940,7 @@
GIV(needGCFlag) = 1;
forceInterruptCheck();
}
- s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex)));
+ s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex);
goto l1;
}
if (numSlots >= 0xFF) {
@@ -59066,7 +59081,7 @@
usqInt prevFree;
usqInt prevFreeChunk;
usqInt prevPrevFree;
- usqInt prevPrevFreeChunk;
+ sqInt prevPrevFreeChunk;
sqInt slotBytes;
sqInt slotBytes1;
usqInt there;
@@ -62932,7 +62947,7 @@
or nil if out of memory. */
/* SpurMemoryManager>>#stringForCString: */
-sqInt
+usqInt
stringForCString(const char *aCString)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt formatField;
@@ -63889,7 +63904,7 @@
sqInt largeChild;
sqInt newEndOfMemory;
sqInt next;
- usqInt node;
+ sqInt node;
SpurSegmentInfo *seg;
sqInt smallChild;
sqInt treeNode;
Modified: branches/Cog/spursistasrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.h 2015-12-12 08:23:17 UTC (rev 3518)
+++ branches/Cog/spursistasrc/vm/cointerp.h 2015-12-12 18:27:51 UTC (rev 3519)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1582 uuid: ca77fb29-c2fc-44bd-8ca0-dfa5e8951b19
*/
@@ -72,6 +72,7 @@
extern sqInt methodHasCogMethod(sqInt aMethodOop);
extern sqInt methodNeedsLargeContext(sqInt methodObj);
extern sqInt methodShouldBeCogged(sqInt aMethodObj);
+extern CogMethod * mframeHomeMethodExport(void);
extern CogMethod * mframeHomeMethod(char *theFP);
extern sqInt mMethodClass(void);
extern void mnuCompilationBreakpointFor(sqInt selectorOop);
@@ -251,7 +252,7 @@
extern sqInt splObj(sqInt index);
extern usqInt storeCheckBoundary(void);
extern sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
-extern sqInt stringForCString(const char *aCString);
+extern usqInt stringForCString(const char *aCString);
extern void tenuringIncrementalGC(void);
extern sqInt topRemappableOop(void);
extern sqInt validFreeTree(void);
Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-12-12 08:23:17 UTC (rev 3518)
+++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-12-12 18:27:51 UTC (rev 3519)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1582 uuid: ca77fb29-c2fc-44bd-8ca0-dfa5e8951b19
from
- CoInterpreter VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ CoInterpreter VMMaker.oscog-eem.1582 uuid: ca77fb29-c2fc-44bd-8ca0-dfa5e8951b19
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1582 uuid: ca77fb29-c2fc-44bd-8ca0-dfa5e8951b19 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -533,6 +533,7 @@
extern sqInt methodShouldBeCogged(sqInt aMethodObj);
static sqInt NoDbgRegParms methodWithHeaderShouldBeCogged(sqInt methodHeader);
static CogBlockMethod * NoDbgRegParms mframeCogMethod(char *theFP);
+extern CogMethod * mframeHomeMethodExport(void);
extern CogMethod * mframeHomeMethod(char *theFP);
static sqInt NoDbgRegParms mframeIsBlockActivation(char *theFP);
static sqInt NoDbgRegParms mframeReceiver(char *theFP);
@@ -1198,7 +1199,7 @@
static sqInt NoDbgRegParms storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots);
extern sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
extern sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
-extern sqInt stringForCString(const char *aCString);
+extern usqInt stringForCString(const char *aCString);
static sqInt NoDbgRegParms sufficientSpaceAfterGC(sqInt numBytes);
static sqInt NoDbgRegParms swizzleObjStackAt(sqInt objStackRootIndex);
extern void tenuringIncrementalGC(void);
@@ -2389,7 +2390,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[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1580]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1582]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -22465,7 +22466,21 @@
return ((CogBlockMethod *) ((longAt(theFP + FoxMethod)) & MFMethodMask));
}
+ /* CoInterpreter>>#mframeHomeMethodExport */
+CogMethod *
+mframeHomeMethodExport(void)
+{ DECL_MAYBE_SQ_GLOBAL_STRUCT
+ sqInt methodField;
+ /* begin mframeHomeMethod: */
+ methodField = longAt(GIV(framePointer) + FoxMethod);
+ if ((methodField & MFMethodFlagIsBlockFlag) != 0) {
+ return ((CogMethod *) ((((usqInt)(((CogBlockMethod *) (methodField & MFMethodMask))))) - (((((CogBlockMethod *) (methodField & MFMethodMask)))->homeOffset))));
+ }
+ return ((CogMethod *) (methodField & MFMethodMask));
+}
+
+
/* Answer the home method for a machine code frame. From a block frame we
find the home method through the block's homeOffset field which is the
delta to it.
@@ -30885,7 +30900,7 @@
usqInt newObj;
usqInt numBytes;
sqInt numSlots;
- sqInt s;
+ usqInt s;
char *sp;
sqInt sz;
@@ -30934,7 +30949,7 @@
GIV(needGCFlag) = 1;
forceInterruptCheck();
}
- s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex)));
+ s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex);
goto l1;
}
if (numSlots >= 0xFF) {
@@ -59075,7 +59090,7 @@
usqInt prevFree;
usqInt prevFreeChunk;
usqInt prevPrevFree;
- usqInt prevPrevFreeChunk;
+ sqInt prevPrevFreeChunk;
sqInt slotBytes;
sqInt slotBytes1;
usqInt there;
@@ -62941,7 +62956,7 @@
or nil if out of memory. */
/* SpurMemoryManager>>#stringForCString: */
-sqInt
+usqInt
stringForCString(const char *aCString)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt formatField;
@@ -63898,7 +63913,7 @@
sqInt largeChild;
sqInt newEndOfMemory;
sqInt next;
- usqInt node;
+ sqInt node;
SpurSegmentInfo *seg;
sqInt smallChild;
sqInt treeNode;
Modified: branches/Cog/spursrc/vm/cogit.h
===================================================================
--- branches/Cog/spursrc/vm/cogit.h 2015-12-12 08:23:17 UTC (rev 3518)
+++ branches/Cog/spursrc/vm/cogit.h 2015-12-12 18:27:51 UTC (rev 3519)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ CCodeGenerator VMMaker.oscog-eem.1582 uuid: ca77fb29-c2fc-44bd-8ca0-dfa5e8951b19
*/
Modified: branches/Cog/spursrc/vm/cogitARMv5.c
===================================================================
--- branches/Cog/spursrc/vm/cogitARMv5.c 2015-12-12 08:23:17 UTC (rev 3518)
+++ branches/Cog/spursrc/vm/cogitARMv5.c 2015-12-12 18:27:51 UTC (rev 3519)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ CCodeGenerator VMMaker.oscog-eem.1581 uuid: ceb64363-bb65-4efc-a5c9-ad90ef4fc645
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1581 uuid: ceb64363-bb65-4efc-a5c9-ad90ef4fc645
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1581 uuid: ceb64363-bb65-4efc-a5c9-ad90ef4fc645 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -647,7 +647,7 @@
extern void freeUnmarkedMachineCode(void);
static sqInt genCheckForInterruptsTrampoline(void);
static AbstractInstruction * NoDbgRegParms genConditionalBranchoperand(sqInt opcode, sqInt operandOne);
-static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2, sqInt regArg3, sqInt forCall, char *trampolineName))(void) ;
+static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2OrNone, sqInt regArg3OrNone, sqInt forCall, char *trampolineName))(void) ;
static void NoDbgRegParms genEnilopmartReturn(sqInt forCall);
static void NoDbgRegParms generateCaptureCStackPointers(sqInt captureFramePointer);
static void generateClosedPICPrototype(void);
@@ -10247,7 +10247,7 @@
stackPointer -> reg3val */
/* Cogit>>#genEnilopmartFor:and:and:forCall:called: */
-static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2, sqInt regArg3, sqInt forCall, char *trampolineName))(void)
+static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2OrNone, sqInt regArg3OrNone, sqInt forCall, char *trampolineName))(void)
{
sqInt endAddress;
Modified: branches/Cog/spursrc/vm/cogitIA32.c
===================================================================
--- branches/Cog/spursrc/vm/cogitIA32.c 2015-12-12 08:23:17 UTC (rev 3518)
+++ branches/Cog/spursrc/vm/cogitIA32.c 2015-12-12 18:27:51 UTC (rev 3519)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ CCodeGenerator VMMaker.oscog-eem.1581 uuid: ceb64363-bb65-4efc-a5c9-ad90ef4fc645
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1581 uuid: ceb64363-bb65-4efc-a5c9-ad90ef4fc645
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1581 uuid: ceb64363-bb65-4efc-a5c9-ad90ef4fc645 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -586,7 +586,7 @@
extern void freeUnmarkedMachineCode(void);
static sqInt genCheckForInterruptsTrampoline(void);
static AbstractInstruction * NoDbgRegParms genConditionalBranchoperand(sqInt opcode, sqInt operandOne);
-static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2, sqInt regArg3, sqInt forCall, char *trampolineName))(void) ;
+static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2OrNone, sqInt regArg3OrNone, sqInt forCall, char *trampolineName))(void) ;
static void NoDbgRegParms genEnilopmartReturn(sqInt forCall);
static void NoDbgRegParms generateCaptureCStackPointers(sqInt captureFramePointer);
static void generateClosedPICPrototype(void);
@@ -9341,7 +9341,7 @@
stackPointer -> reg3val */
/* Cogit>>#genEnilopmartFor:and:and:forCall:called: */
-static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2, sqInt regArg3, sqInt forCall, char *trampolineName))(void)
+static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2OrNone, sqInt regArg3OrNone, sqInt forCall, char *trampolineName))(void)
{
sqInt endAddress;
@@ -9708,12 +9708,12 @@
generateMapAtstart(sqInt addressOrNull, sqInt startAddress)
{
unsigned char annotation;
- sqInt delta;
+ usqInt delta;
sqInt i;
AbstractInstruction *instruction;
sqInt length;
- sqInt location;
- sqInt mapEntry;
+ usqInt location;
+ usqInt mapEntry;
sqInt maxDelta;
usqInt mcpc;
Modified: branches/Cog/spursrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/cointerp.c 2015-12-12 08:23:17 UTC (rev 3518)
+++ branches/Cog/spursrc/vm/cointerp.c 2015-12-12 18:27:51 UTC (rev 3519)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1582 uuid: ca77fb29-c2fc-44bd-8ca0-dfa5e8951b19
from
- CoInterpreter VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+ CoInterpreter VMMaker.oscog-eem.1582 uuid: ca77fb29-c2fc-44bd-8ca0-dfa5e8951b19
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1582 uuid: ca77fb29-c2fc-44bd-8ca0-dfa5e8951b19 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -524,6 +524,7 @@
extern sqInt methodShouldBeCogged(sqInt aMethodObj);
static sqInt NoDbgRegParms methodWithHeaderShouldBeCogged(sqInt methodHeader);
static CogBlockMethod * NoDbgRegParms mframeCogMethod(char *theFP);
+extern CogMethod * mframeHomeMethodExport(void);
extern CogMethod * mframeHomeMethod(char *theFP);
static sqInt NoDbgRegParms mframeIsBlockActivation(char *theFP);
static sqInt NoDbgRegParms mframeReceiver(char *theFP);
@@ -1184,7 +1185,7 @@
static sqInt NoDbgRegParms storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots);
extern sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
extern sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
-extern sqInt stringForCString(const char *aCString);
+extern usqInt stringForCString(const char *aCString);
static sqInt NoDbgRegParms sufficientSpaceAfterGC(sqInt numBytes);
static sqInt NoDbgRegParms swizzleObjStackAt(sqInt objStackRootIndex);
extern void tenuringIncrementalGC(void);
@@ -2373,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 = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1580]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1582]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -12283,7 +12284,7 @@
static sqInt
checkForAndFollowForwardedPrimitiveState(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- signed char accessorDepth;
+ sqInt accessorDepth;
sqInt firstBytecode;
sqInt found;
sqInt found1;
@@ -17498,7 +17499,21 @@
return ((CogBlockMethod *) ((longAt(theFP + FoxMethod)) & MFMethodMask));
}
+ /* CoInterpreter>>#mframeHomeMethodExport */
+CogMethod *
+mframeHomeMethodExport(void)
+{ DECL_MAYBE_SQ_GLOBAL_STRUCT
+ sqInt methodField;
+ /* begin mframeHomeMethod: */
+ methodField = longAt(GIV(framePointer) + FoxMethod);
+ if ((methodField & MFMethodFlagIsBlockFlag) != 0) {
+ return ((CogMethod *) ((((usqInt)(((CogBlockMethod *) (methodField & MFMethodMask))))) - (((((CogBlockMethod *) (methodField & MFMethodMask)))->homeOffset))));
+ }
+ return ((CogMethod *) (methodField & MFMethodMask));
+}
+
+
/* Answer the home method for a machine code frame. From a block frame we
find the home method through the block's homeOffset field which is the
delta to it.
@@ -25878,7 +25893,7 @@
GIV(needGCFlag) = 1;
forceInterruptCheck();
}
- s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex);
+ s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex)));
goto l1;
}
if (numSlots >= 0xFF) {
@@ -31515,7 +31530,7 @@
sqInt err;
sqInt hash;
sqInt instSpec;
- sqInt newObj;
+ usqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -31633,7 +31648,7 @@
sqInt i;
usqInt instSpec;
sqInt literalCount;
- sqInt newObj;
+ usqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -37487,7 +37502,7 @@
sqInt fillValue;
sqInt hash;
usqInt instSpec;
- sqInt newObj;
+ usqInt newObj;
@@ Diff output truncated at 50000 characters. @@
More information about the Vm-dev
mailing list