[Vm-dev] [commit][3145] CogVM source as per VMMaker.oscog-eem.951
commits at squeakvm.org
commits at squeakvm.org
Sat Nov 22 02:27:34 UTC 2014
Revision: 3145
Author: eliot
Date: 2014-11-21 18:27:30 -0800 (Fri, 21 Nov 2014)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.951
Fix positive64BitIntegerFor: by fixing new generateSignedShiftRight:on:indent:.
Symptom is LargePositiveInteger results from primGetPosition: for SmallInteger
values.
Modified Paths:
--------------
branches/Cog/nscogsrc/vm/cointerp.c
branches/Cog/nscogsrc/vm/cointerp.h
branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
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/sistasrc/vm/cointerp.c
branches/Cog/sistasrc/vm/cointerp.h
branches/Cog/sistasrc/vm/gcc3x-cointerp.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/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/nscogsrc/vm/cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.c 2014-11-21 23:07:35 UTC (rev 3144)
+++ branches/Cog/nscogsrc/vm/cointerp.c 2014-11-22 02:27:30 UTC (rev 3145)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
from
- CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2093,7 +2093,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.950";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.951";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -48452,7 +48452,7 @@
sqInt newLargeInteger;
sqInt sz;
- if (((highWord = ((sqInt) integerValue) >> 32)) == 0) {
+ if (((highWord = ((sqLong) integerValue) >> 32)) == 0) {
return positive32BitIntegerFor(integerValue);
}
sz = 5;
Modified: branches/Cog/nscogsrc/vm/cointerp.h
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.h 2014-11-21 23:07:35 UTC (rev 3144)
+++ branches/Cog/nscogsrc/vm/cointerp.h 2014-11-22 02:27:30 UTC (rev 3145)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
*/
Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-11-21 23:07:35 UTC (rev 3144)
+++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-11-22 02:27:30 UTC (rev 3145)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
from
- CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2096,7 +2096,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.950";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.951";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -48461,7 +48461,7 @@
sqInt newLargeInteger;
sqInt sz;
- if (((highWord = ((sqInt) integerValue) >> 32)) == 0) {
+ if (((highWord = ((sqLong) integerValue) >> 32)) == 0) {
return positive32BitIntegerFor(integerValue);
}
sz = 5;
Modified: branches/Cog/nsspursrc/vm/cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.c 2014-11-21 23:07:35 UTC (rev 3144)
+++ branches/Cog/nsspursrc/vm/cointerp.c 2014-11-22 02:27:30 UTC (rev 3145)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
from
- CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2343,7 +2343,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.950";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.951";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -69040,7 +69040,7 @@
sqInt objFormat;
sqInt sz;
- if (((highWord = ((sqInt) integerValue) >> 32)) == 0) {
+ if (((highWord = ((sqLong) integerValue) >> 32)) == 0) {
return positive32BitIntegerFor(integerValue);
}
sz = 5;
Modified: branches/Cog/nsspursrc/vm/cointerp.h
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.h 2014-11-21 23:07:35 UTC (rev 3144)
+++ branches/Cog/nsspursrc/vm/cointerp.h 2014-11-22 02:27:30 UTC (rev 3145)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
*/
Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-11-21 23:07:35 UTC (rev 3144)
+++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-11-22 02:27:30 UTC (rev 3145)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
from
- CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2346,7 +2346,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.950";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.951";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -69049,7 +69049,7 @@
sqInt objFormat;
sqInt sz;
- if (((highWord = ((sqInt) integerValue) >> 32)) == 0) {
+ if (((highWord = ((sqLong) integerValue) >> 32)) == 0) {
return positive32BitIntegerFor(integerValue);
}
sz = 5;
Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-11-21 23:07:35 UTC (rev 3144)
+++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-11-22 02:27:30 UTC (rev 3145)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
from
- StackInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ StackInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2093,7 +2093,7 @@
0 };
char * breakSelector;
sqInt breakSelectorLength = -1;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.950";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.951";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -57323,7 +57323,7 @@
sqInt objFormat;
sqInt sz;
- if (((highWord = ((sqInt) integerValue) >> 32)) == 0) {
+ if (((highWord = ((sqLong) integerValue) >> 32)) == 0) {
return positive32BitIntegerFor(integerValue);
}
sz = 5;
Modified: branches/Cog/nsspurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/interp.c 2014-11-21 23:07:35 UTC (rev 3144)
+++ branches/Cog/nsspurstacksrc/vm/interp.c 2014-11-22 02:27:30 UTC (rev 3145)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
from
- StackInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ StackInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2090,7 +2090,7 @@
0 };
char * breakSelector;
sqInt breakSelectorLength = -1;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.950";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.951";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -57314,7 +57314,7 @@
sqInt objFormat;
sqInt sz;
- if (((highWord = ((sqInt) integerValue) >> 32)) == 0) {
+ if (((highWord = ((sqLong) integerValue) >> 32)) == 0) {
return positive32BitIntegerFor(integerValue);
}
sz = 5;
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Fri Nov 21 15:06:48 PST 2014
+ Fri Nov 21 18:27:16 PST 2014
Modified: branches/Cog/sistasrc/vm/cointerp.c
===================================================================
--- branches/Cog/sistasrc/vm/cointerp.c 2014-11-21 23:07:35 UTC (rev 3144)
+++ branches/Cog/sistasrc/vm/cointerp.c 2014-11-22 02:27:30 UTC (rev 3145)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
from
- CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2090,7 +2090,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.950]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.951]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -7925,7 +7925,7 @@
/* bytecodePrimBitShift */
{
sqInt integerArgument;
- sqLong integerReceiver;
+ usqInt integerReceiver;
sqInt shifted;
char *sp;
@@ -7985,7 +7985,7 @@
null;
goto l88;
}
- shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument);
+ shifted = ((usqInt) integerReceiver) >> (0 - integerArgument);
}
shifted = positive32BitIntegerFor(shifted);
/* begin pop:thenPush: */
@@ -10891,7 +10891,7 @@
/* bytecodePrimBitShift */
{
sqInt integerArgument;
- sqLong integerReceiver;
+ usqInt integerReceiver;
sqInt shifted;
char *sp;
@@ -10951,7 +10951,7 @@
null;
goto l202;
}
- shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument);
+ shifted = ((usqInt) integerReceiver) >> (0 - integerArgument);
}
shifted = positive32BitIntegerFor(shifted);
/* begin pop:thenPush: */
@@ -24535,7 +24535,7 @@
primitiveBitShift(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt integerArgument;
- sqLong integerReceiver;
+ usqInt integerReceiver;
sqInt shifted;
char *sp;
@@ -24582,7 +24582,7 @@
}
return;
}
- shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument);
+ shifted = ((usqInt) integerReceiver) >> (0 - integerArgument);
}
shifted = positive32BitIntegerFor(shifted);
/* begin pop:thenPush: */
@@ -48429,7 +48429,7 @@
sqInt newLargeInteger;
sqInt sz;
- if (((highWord = ((sqInt) integerValue) >> 32)) == 0) {
+ if (((highWord = ((sqLong) integerValue) >> 32)) == 0) {
return positive32BitIntegerFor(integerValue);
}
sz = 5;
Modified: branches/Cog/sistasrc/vm/cointerp.h
===================================================================
--- branches/Cog/sistasrc/vm/cointerp.h 2014-11-21 23:07:35 UTC (rev 3144)
+++ branches/Cog/sistasrc/vm/cointerp.h 2014-11-22 02:27:30 UTC (rev 3145)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
*/
Modified: branches/Cog/sistasrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-11-21 23:07:35 UTC (rev 3144)
+++ branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-11-22 02:27:30 UTC (rev 3145)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
from
- CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2093,7 +2093,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.950]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.951]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -7934,7 +7934,7 @@
/* bytecodePrimBitShift */
{
sqInt integerArgument;
- sqLong integerReceiver;
+ usqInt integerReceiver;
sqInt shifted;
char *sp;
@@ -7994,7 +7994,7 @@
null;
goto l88;
}
- shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument);
+ shifted = ((usqInt) integerReceiver) >> (0 - integerArgument);
}
shifted = positive32BitIntegerFor(shifted);
/* begin pop:thenPush: */
@@ -10900,7 +10900,7 @@
/* bytecodePrimBitShift */
{
sqInt integerArgument;
- sqLong integerReceiver;
+ usqInt integerReceiver;
sqInt shifted;
char *sp;
@@ -10960,7 +10960,7 @@
null;
goto l202;
}
- shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument);
+ shifted = ((usqInt) integerReceiver) >> (0 - integerArgument);
}
shifted = positive32BitIntegerFor(shifted);
/* begin pop:thenPush: */
@@ -24544,7 +24544,7 @@
primitiveBitShift(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt integerArgument;
- sqLong integerReceiver;
+ usqInt integerReceiver;
sqInt shifted;
char *sp;
@@ -24591,7 +24591,7 @@
}
return;
}
- shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument);
+ shifted = ((usqInt) integerReceiver) >> (0 - integerArgument);
}
shifted = positive32BitIntegerFor(shifted);
/* begin pop:thenPush: */
@@ -48438,7 +48438,7 @@
sqInt newLargeInteger;
sqInt sz;
- if (((highWord = ((sqInt) integerValue) >> 32)) == 0) {
+ if (((highWord = ((sqLong) integerValue) >> 32)) == 0) {
return positive32BitIntegerFor(integerValue);
}
sz = 5;
Modified: branches/Cog/spursistasrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.c 2014-11-21 23:07:35 UTC (rev 3144)
+++ branches/Cog/spursistasrc/vm/cointerp.c 2014-11-22 02:27:30 UTC (rev 3145)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
from
- CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2339,7 +2339,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.950]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.951]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -9389,7 +9389,7 @@
/* bytecodePrimBitShift */
{
sqInt integerArgument;
- usqInt integerReceiver;
+ sqLong integerReceiver;
sqInt shifted;
char *sp;
@@ -9449,7 +9449,7 @@
null;
goto l97;
}
- shifted = ((usqInt) integerReceiver) >> (0 - integerArgument);
+ shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument);
}
shifted = positive32BitIntegerFor(shifted);
/* begin pop:thenPush: */
@@ -12426,7 +12426,7 @@
/* bytecodePrimBitShift */
{
sqInt integerArgument;
- usqInt integerReceiver;
+ sqLong integerReceiver;
sqInt shifted;
char *sp;
@@ -12486,7 +12486,7 @@
null;
goto l223;
}
- shifted = ((usqInt) integerReceiver) >> (0 - integerArgument);
+ shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument);
}
shifted = positive32BitIntegerFor(shifted);
/* begin pop:thenPush: */
@@ -30129,7 +30129,7 @@
primitiveBitShift(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt integerArgument;
- usqInt integerReceiver;
+ sqLong integerReceiver;
sqInt shifted;
char *sp;
@@ -30176,7 +30176,7 @@
}
return;
}
- shifted = ((usqInt) integerReceiver) >> (0 - integerArgument);
+ shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument);
}
shifted = positive32BitIntegerFor(shifted);
/* begin pop:thenPush: */
@@ -69155,7 +69155,7 @@
sqInt objFormat;
sqInt sz;
- if (((highWord = ((sqInt) integerValue) >> 32)) == 0) {
+ if (((highWord = ((sqLong) integerValue) >> 32)) == 0) {
return positive32BitIntegerFor(integerValue);
}
sz = 5;
Modified: branches/Cog/spursistasrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.h 2014-11-21 23:07:35 UTC (rev 3144)
+++ branches/Cog/spursistasrc/vm/cointerp.h 2014-11-22 02:27:30 UTC (rev 3145)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
*/
Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-11-21 23:07:35 UTC (rev 3144)
+++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-11-22 02:27:30 UTC (rev 3145)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
from
- CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2342,7 +2342,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.950]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.951]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -9398,7 +9398,7 @@
/* bytecodePrimBitShift */
{
sqInt integerArgument;
- usqInt integerReceiver;
+ sqLong integerReceiver;
sqInt shifted;
char *sp;
@@ -9458,7 +9458,7 @@
null;
goto l97;
}
- shifted = ((usqInt) integerReceiver) >> (0 - integerArgument);
+ shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument);
}
shifted = positive32BitIntegerFor(shifted);
/* begin pop:thenPush: */
@@ -12435,7 +12435,7 @@
/* bytecodePrimBitShift */
{
sqInt integerArgument;
- usqInt integerReceiver;
+ sqLong integerReceiver;
sqInt shifted;
char *sp;
@@ -12495,7 +12495,7 @@
null;
goto l223;
}
- shifted = ((usqInt) integerReceiver) >> (0 - integerArgument);
+ shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument);
}
shifted = positive32BitIntegerFor(shifted);
/* begin pop:thenPush: */
@@ -30138,7 +30138,7 @@
primitiveBitShift(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt integerArgument;
- usqInt integerReceiver;
+ sqLong integerReceiver;
sqInt shifted;
char *sp;
@@ -30185,7 +30185,7 @@
}
return;
}
- shifted = ((usqInt) integerReceiver) >> (0 - integerArgument);
+ shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument);
}
shifted = positive32BitIntegerFor(shifted);
/* begin pop:thenPush: */
@@ -69164,7 +69164,7 @@
sqInt objFormat;
sqInt sz;
- if (((highWord = ((sqInt) integerValue) >> 32)) == 0) {
+ if (((highWord = ((sqLong) integerValue) >> 32)) == 0) {
return positive32BitIntegerFor(integerValue);
}
sz = 5;
Modified: branches/Cog/spursrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/cointerp.c 2014-11-21 23:07:35 UTC (rev 3144)
+++ branches/Cog/spursrc/vm/cointerp.c 2014-11-22 02:27:30 UTC (rev 3145)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
from
- CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2330,7 +2330,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.950]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.951]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -18912,12 +18912,12 @@
sqInt classTablePage;
size_t dataSize;
sqInt edenBytes;
- sqInt firstSegSize;
+ long firstSegSize;
sqInt hdrCogCodeSize;
sqInt hdrEdenBytes;
sqInt hdrMaxExtSemTabSize;
sqInt hdrNumStackPages;
- sqInt headerFlags;
+ long headerFlags;
sqInt headerSize;
squeakFileOffsetType headerStart;
usqInt heapSize;
@@ -18936,7 +18936,7 @@
usqInt minimumMemory;
usqInt numSlots;
sqInt objOop;
- sqInt oldBaseAddr;
+ long oldBaseAddr;
sqInt oldStart;
sqInt oop;
sqInt p;
@@ -18979,9 +18979,9 @@
/* begin getLongFromFile:swap: */
w1 = 0;
sqImageFileRead((&w1), sizeof(long), 1, f);
- dataSize = (swapBytes
- ? ((((((usqInt) w1 >> 24)) & Byte0Mask) + ((((usqInt) w1 >> 8)) & Byte1Mask)) + ((((usqInt) w1 << 8)) & Byte2Mask)) + ((((usqInt) w1 << 24)) & Byte3Mask)
- : w1);
+ dataSize = ((long) ((swapBytes
+ ? ((((((usqInt) w1 >> 24)) & Byte0Mask) + ((((usqInt) w1 >> 8)) & Byte1Mask)) + ((((usqInt) w1 << 8)) & Byte2Mask)) + ((((usqInt) w1 << 24)) & Byte3Mask)
+ : w1)));
/* begin getLongFromFile:swap: */
w2 = 0;
sqImageFileRead((&w2), sizeof(long), 1, f);
@@ -18992,24 +18992,24 @@
/* begin getLongFromFile:swap: */
w3 = 0;
sqImageFileRead((&w3), sizeof(long), 1, f);
- anObject = (swapBytes
- ? ((((((usqInt) w3 >> 24)) & Byte0Mask) + ((((usqInt) w3 >> 8)) & Byte1Mask)) + ((((usqInt) w3 << 8)) & Byte2Mask)) + ((((usqInt) w3 << 24)) & Byte3Mask)
- : w3);
+ anObject = ((long) ((swapBytes
+ ? ((((((usqInt) w3 >> 24)) & Byte0Mask) + ((((usqInt) w3 >> 8)) & Byte1Mask)) + ((((usqInt) w3 << 8)) & Byte2Mask)) + ((((usqInt) w3 << 24)) & Byte3Mask)
+ : w3)));
GIV(specialObjectsOop) = anObject;
/* begin lastHash: */
/* begin getLongFromFile:swap: */
w4 = 0;
sqImageFileRead((&w4), sizeof(long), 1, f);
- seed = (swapBytes
- ? ((((((usqInt) w4 >> 24)) & Byte0Mask) + ((((usqInt) w4 >> 8)) & Byte1Mask)) + ((((usqInt) w4 << 8)) & Byte2Mask)) + ((((usqInt) w4 << 24)) & Byte3Mask)
- : w4);
+ seed = ((long) ((swapBytes
+ ? ((((((usqInt) w4 >> 24)) & Byte0Mask) + ((((usqInt) w4 >> 8)) & Byte1Mask)) + ((((usqInt) w4 << 8)) & Byte2Mask)) + ((((usqInt) w4 << 24)) & Byte3Mask)
+ : w4)));
GIV(lastHash) = seed;
/* begin getLongFromFile:swap: */
w5 = 0;
sqImageFileRead((&w5), sizeof(long), 1, f);
- GIV(savedWindowSize) = (swapBytes
- ? ((((((usqInt) w5 >> 24)) & Byte0Mask) + ((((usqInt) w5 >> 8)) & Byte1Mask)) + ((((usqInt) w5 << 8)) & Byte2Mask)) + ((((usqInt) w5 << 24)) & Byte3Mask)
- : w5);
+ GIV(savedWindowSize) = ((long) ((swapBytes
+ ? ((((((usqInt) w5 >> 24)) & Byte0Mask) + ((((usqInt) w5 >> 8)) & Byte1Mask)) + ((((usqInt) w5 << 8)) & Byte2Mask)) + ((((usqInt) w5 << 24)) & Byte3Mask)
+ : w5)));
/* begin getLongFromFile:swap: */
w6 = 0;
sqImageFileRead((&w6), sizeof(long), 1, f);
@@ -63799,7 +63799,7 @@
sqInt objFormat;
sqInt sz;
- if (((highWord = ((sqInt) integerValue) >> 32)) == 0) {
+ if (((highWord = ((sqLong) integerValue) >> 32)) == 0) {
return positive32BitIntegerFor(integerValue);
}
sz = 5;
Modified: branches/Cog/spursrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursrc/vm/cointerp.h 2014-11-21 23:07:35 UTC (rev 3144)
+++ branches/Cog/spursrc/vm/cointerp.h 2014-11-22 02:27:30 UTC (rev 3145)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
*/
Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-11-21 23:07:35 UTC (rev 3144)
+++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-11-22 02:27:30 UTC (rev 3145)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
from
- CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2333,7 +2333,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.950]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.951]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -18921,12 +18921,12 @@
sqInt classTablePage;
size_t dataSize;
sqInt edenBytes;
- sqInt firstSegSize;
+ long firstSegSize;
sqInt hdrCogCodeSize;
sqInt hdrEdenBytes;
sqInt hdrMaxExtSemTabSize;
sqInt hdrNumStackPages;
- sqInt headerFlags;
+ long headerFlags;
sqInt headerSize;
squeakFileOffsetType headerStart;
usqInt heapSize;
@@ -18945,7 +18945,7 @@
usqInt minimumMemory;
usqInt numSlots;
sqInt objOop;
- sqInt oldBaseAddr;
+ long oldBaseAddr;
sqInt oldStart;
sqInt oop;
sqInt p;
@@ -18988,9 +18988,9 @@
/* begin getLongFromFile:swap: */
w1 = 0;
sqImageFileRead((&w1), sizeof(long), 1, f);
- dataSize = (swapBytes
- ? ((((((usqInt) w1 >> 24)) & Byte0Mask) + ((((usqInt) w1 >> 8)) & Byte1Mask)) + ((((usqInt) w1 << 8)) & Byte2Mask)) + ((((usqInt) w1 << 24)) & Byte3Mask)
- : w1);
+ dataSize = ((long) ((swapBytes
+ ? ((((((usqInt) w1 >> 24)) & Byte0Mask) + ((((usqInt) w1 >> 8)) & Byte1Mask)) + ((((usqInt) w1 << 8)) & Byte2Mask)) + ((((usqInt) w1 << 24)) & Byte3Mask)
+ : w1)));
/* begin getLongFromFile:swap: */
w2 = 0;
sqImageFileRead((&w2), sizeof(long), 1, f);
@@ -19001,24 +19001,24 @@
/* begin getLongFromFile:swap: */
w3 = 0;
sqImageFileRead((&w3), sizeof(long), 1, f);
- anObject = (swapBytes
- ? ((((((usqInt) w3 >> 24)) & Byte0Mask) + ((((usqInt) w3 >> 8)) & Byte1Mask)) + ((((usqInt) w3 << 8)) & Byte2Mask)) + ((((usqInt) w3 << 24)) & Byte3Mask)
- : w3);
+ anObject = ((long) ((swapBytes
+ ? ((((((usqInt) w3 >> 24)) & Byte0Mask) + ((((usqInt) w3 >> 8)) & Byte1Mask)) + ((((usqInt) w3 << 8)) & Byte2Mask)) + ((((usqInt) w3 << 24)) & Byte3Mask)
+ : w3)));
GIV(specialObjectsOop) = anObject;
/* begin lastHash: */
/* begin getLongFromFile:swap: */
w4 = 0;
sqImageFileRead((&w4), sizeof(long), 1, f);
- seed = (swapBytes
- ? ((((((usqInt) w4 >> 24)) & Byte0Mask) + ((((usqInt) w4 >> 8)) & Byte1Mask)) + ((((usqInt) w4 << 8)) & Byte2Mask)) + ((((usqInt) w4 << 24)) & Byte3Mask)
- : w4);
+ seed = ((long) ((swapBytes
+ ? ((((((usqInt) w4 >> 24)) & Byte0Mask) + ((((usqInt) w4 >> 8)) & Byte1Mask)) + ((((usqInt) w4 << 8)) & Byte2Mask)) + ((((usqInt) w4 << 24)) & Byte3Mask)
+ : w4)));
GIV(lastHash) = seed;
/* begin getLongFromFile:swap: */
w5 = 0;
sqImageFileRead((&w5), sizeof(long), 1, f);
- GIV(savedWindowSize) = (swapBytes
- ? ((((((usqInt) w5 >> 24)) & Byte0Mask) + ((((usqInt) w5 >> 8)) & Byte1Mask)) + ((((usqInt) w5 << 8)) & Byte2Mask)) + ((((usqInt) w5 << 24)) & Byte3Mask)
- : w5);
+ GIV(savedWindowSize) = ((long) ((swapBytes
+ ? ((((((usqInt) w5 >> 24)) & Byte0Mask) + ((((usqInt) w5 >> 8)) & Byte1Mask)) + ((((usqInt) w5 << 8)) & Byte2Mask)) + ((((usqInt) w5 << 24)) & Byte3Mask)
+ : w5)));
/* begin getLongFromFile:swap: */
w6 = 0;
sqImageFileRead((&w6), sizeof(long), 1, f);
@@ -63808,7 +63808,7 @@
sqInt objFormat;
sqInt sz;
- if (((highWord = ((sqInt) integerValue) >> 32)) == 0) {
+ if (((highWord = ((sqLong) integerValue) >> 32)) == 0) {
return positive32BitIntegerFor(integerValue);
}
sz = 5;
Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-11-21 23:07:35 UTC (rev 3144)
+++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-11-22 02:27:30 UTC (rev 3145)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
from
- StackInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ StackInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2083,7 +2083,7 @@
0 };
char * breakSelector;
sqInt breakSelectorLength = -1;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.950]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.951]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -52428,7 +52428,7 @@
sqInt objFormat;
sqInt sz;
- if (((highWord = ((sqInt) integerValue) >> 32)) == 0) {
+ if (((highWord = ((sqLong) integerValue) >> 32)) == 0) {
return positive32BitIntegerFor(integerValue);
}
sz = 5;
Modified: branches/Cog/spurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/spurstacksrc/vm/interp.c 2014-11-21 23:07:35 UTC (rev 3144)
+++ branches/Cog/spurstacksrc/vm/interp.c 2014-11-22 02:27:30 UTC (rev 3145)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
from
- StackInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ StackInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2080,7 +2080,7 @@
0 };
char * breakSelector;
sqInt breakSelectorLength = -1;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.950]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.951]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -52419,7 +52419,7 @@
sqInt objFormat;
sqInt sz;
- if (((highWord = ((sqInt) integerValue) >> 32)) == 0) {
+ if (((highWord = ((sqLong) integerValue) >> 32)) == 0) {
return positive32BitIntegerFor(integerValue);
}
sz = 5;
Modified: branches/Cog/src/vm/cointerp.c
===================================================================
--- branches/Cog/src/vm/cointerp.c 2014-11-21 23:07:35 UTC (rev 3144)
+++ branches/Cog/src/vm/cointerp.c 2014-11-22 02:27:30 UTC (rev 3145)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
from
- CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -846,7 +846,7 @@
void printWronglySizedContexts(sqInt printContexts);
static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) NoDbgRegParms;
static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms;
-static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms;
+static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms;
static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms;
static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms;
static sqInt sizeBitsOfSafe(sqInt oop) NoDbgRegParms;
@@ -2081,7 +2081,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.950]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.951]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -14648,13 +14648,13 @@
sqInt classArrayClass;
sqInt classArrayObj;
size_t dataSize;
- sqInt firstSegSize;
+ long firstSegSize;
sqInt hdrCogCodeSize;
sqInt hdrEdenBytes;
sqInt hdrMaxExtSemTabSize;
sqInt hdrNumStackPages;
sqInt header;
- sqInt headerFlags;
+ long headerFlags;
sqInt headerSize;
squeakFileOffsetType headerStart;
usqInt heapSize;
@@ -14671,7 +14671,7 @@
sqInt memEnd;
sqInt memLimit;
usqInt minimumMemory;
- sqInt oldBaseAddr;
+ long oldBaseAddr;
sqInt oop;
sqInt swapBytes;
sqInt sz;
@@ -14711,9 +14711,9 @@
/* begin getLongFromFile:swap: */
w1 = 0;
sqImageFileRead((&w1), sizeof(long), 1, f);
- dataSize = (swapBytes
- ? byteSwapped(w1)
- : w1);
+ dataSize = ((long) ((swapBytes
+ ? byteSwapped(w1)
+ : w1)));
/* begin getLongFromFile:swap: */
w2 = 0;
sqImageFileRead((&w2), sizeof(long), 1, f);
@@ -14724,24 +14724,24 @@
/* begin getLongFromFile:swap: */
w11 = 0;
sqImageFileRead((&w11), sizeof(long), 1, f);
- anObject = (swapBytes
- ? byteSwapped(w11)
- : w11);
+ anObject = ((long) ((swapBytes
+ ? byteSwapped(w11)
+ : w11)));
GIV(specialObjectsOop) = anObject;
/* begin lastHash: */
/* begin getLongFromFile:swap: */
w12 = 0;
sqImageFileRead((&w12), sizeof(long), 1, f);
- aValue = (swapBytes
- ? byteSwapped(w12)
- : w12);
+ aValue = ((long) ((swapBytes
+ ? byteSwapped(w12)
+ : w12)));
lastHash = aValue;
/* begin getLongFromFile:swap: */
w3 = 0;
sqImageFileRead((&w3), sizeof(long), 1, f);
- GIV(savedWindowSize) = (swapBytes
- ? byteSwapped(w3)
- : w3);
+ GIV(savedWindowSize) = ((long) ((swapBytes
+ ? byteSwapped(w3)
+ : w3)));
/* begin getLongFromFile:swap: */
w4 = 0;
sqImageFileRead((&w4), sizeof(long), 1, f);
@@ -32243,15 +32243,17 @@
sqInt header1;
sqInt header2;
sqInt header3;
+ sqInt header4;
usqInt lastWord;
sqInt newFreeChunk;
sqInt newOop;
- usqInt next;
+ sqInt next;
sqInt oop;
sqInt realHeader;
sqInt sz;
sqInt sz1;
sqInt sz2;
+ sqInt sz3;
sqInt target;
usqInt w;
@@ -32262,7 +32264,21 @@
/* begin objectAfterWhileForwarding: */
header2 = longAt(oop);
if ((header2 & MarkBit) == 0) {
- next = ((sqInt) (objectAfter(oop)));
+ /* begin objectAfter: */
+ if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) {
+ error("no objects after the end of memory");
+ }
+ if (((longAt(oop)) & TypeMask) == HeaderTypeFree) {
+ sz2 = (longAt(oop)) & AllButTypeMask;
+ }
+ else {
+ /* begin sizeBitsOf: */
+ header3 = longAt(oop);
+ sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass
+ ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask
+ : header3 & SizeMask);
+ }
+ next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]);
goto l1;
}
fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1;
@@ -32277,7 +32293,7 @@
else {
sz1 = realHeader & SizeMask;
}
- next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask])));
+ next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]);
l1: /* end objectAfterWhileForwarding: */;
if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) {
@@ -32331,18 +32347,18 @@
}
/* begin safeObjectAfter: */
if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) {
- sz2 = (longAt(newFreeChunk)) & AllButTypeMask;
+ sz3 = (longAt(newFreeChunk)) & AllButTypeMask;
}
else {
/* begin sizeBitsOf: */
- header3 = longAt(newFreeChunk);
- sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass
+ header4 = longAt(newFreeChunk);
+ sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass
? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask
- : header3 & SizeMask);
+ : header4 & SizeMask);
}
- next = ((((usqInt)(newFreeChunk + sz2))) >= GIV(freeStart)
+ next = ((((usqInt)(newFreeChunk + sz3))) >= GIV(freeStart)
? GIV(freeStart)
- : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask]));
+ : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask]));
assert((next == GIV(freeStart))
|| (next == (oopFromChunk(GIV(compEnd)))));
if (next == GIV(freeStart)) {
@@ -34219,7 +34235,7 @@
given object or free chunk in memory. Return freeStart when
enumeration is complete. This is for assertion checking only. */
-static usqInt
+static sqInt
safeObjectAfter(sqInt oop)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt header;
@@ -43790,7 +43806,7 @@
sqInt newLargeInteger;
sqInt sz;
- if (((highWord = ((sqInt) integerValue) >> 32)) == 0) {
+ if (((highWord = ((sqLong) integerValue) >> 32)) == 0) {
return positive32BitIntegerFor(integerValue);
}
sz = 5;
Modified: branches/Cog/src/vm/cointerp.h
===================================================================
--- branches/Cog/src/vm/cointerp.h 2014-11-21 23:07:35 UTC (rev 3144)
+++ branches/Cog/src/vm/cointerp.h 2014-11-22 02:27:30 UTC (rev 3145)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
*/
Modified: branches/Cog/src/vm/cointerpmt.c
===================================================================
--- branches/Cog/src/vm/cointerpmt.c 2014-11-21 23:07:35 UTC (rev 3144)
+++ branches/Cog/src/vm/cointerpmt.c 2014-11-22 02:27:30 UTC (rev 3145)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
from
- CoInterpreterMT VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CoInterpreterMT VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
*/
-static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2178,7 +2178,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.950]";
+const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.951]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
sqInt willNotThreadWarnCount;
@@ -4815,6 +4815,7 @@
GIV(framePointer) = localFP;
ceEnterCogCodePopReceiverReg();
+ null;
goto l133;
}
localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -4829,7 +4830,7 @@
/* begin fetchNextBytecode */
currentBytecode = byteAtPointer(++localIP);
- /* return self */
+ null;
l133: /* end baseFrameReturn */;
goto l132;
}
@@ -7862,7 +7863,7 @@
/* bytecodePrimBitShift */
{
sqInt integerArgument;
- sqLong integerReceiver;
+ usqInt integerReceiver;
sqInt shifted;
char *sp;
@@ -7922,7 +7923,7 @@
null;
goto l88;
}
- shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument);
+ shifted = ((usqInt) integerReceiver) >> (0 - integerArgument);
}
shifted = positive32BitIntegerFor(shifted);
/* begin pop:thenPush: */
@@ -14936,13 +14937,13 @@
sqInt classArrayClass;
sqInt classArrayObj;
size_t dataSize;
- sqInt firstSegSize;
+ long firstSegSize;
sqInt hdrCogCodeSize;
sqInt hdrEdenBytes;
sqInt hdrMaxExtSemTabSize;
sqInt hdrNumStackPages;
sqInt header;
- sqInt headerFlags;
+ long headerFlags;
sqInt headerSize;
squeakFileOffsetType headerStart;
usqInt heapSize;
@@ -14959,7 +14960,7 @@
sqInt memEnd;
sqInt memLimit;
usqInt minimumMemory;
- sqInt oldBaseAddr;
+ long oldBaseAddr;
sqInt oop;
sqInt swapBytes;
sqInt sz;
@@ -14999,9 +15000,9 @@
/* begin getLongFromFile:swap: */
w1 = 0;
sqImageFileRead((&w1), sizeof(long), 1, f);
- dataSize = (swapBytes
- ? byteSwapped(w1)
- : w1);
+ dataSize = ((long) ((swapBytes
+ ? byteSwapped(w1)
+ : w1)));
/* begin getLongFromFile:swap: */
w2 = 0;
sqImageFileRead((&w2), sizeof(long), 1, f);
@@ -15012,24 +15013,24 @@
/* begin getLongFromFile:swap: */
w11 = 0;
sqImageFileRead((&w11), sizeof(long), 1, f);
- anObject = (swapBytes
- ? byteSwapped(w11)
- : w11);
+ anObject = ((long) ((swapBytes
+ ? byteSwapped(w11)
+ : w11)));
GIV(specialObjectsOop) = anObject;
/* begin lastHash: */
/* begin getLongFromFile:swap: */
w12 = 0;
sqImageFileRead((&w12), sizeof(long), 1, f);
- aValue = (swapBytes
- ? byteSwapped(w12)
- : w12);
+ aValue = ((long) ((swapBytes
+ ? byteSwapped(w12)
+ : w12)));
lastHash = aValue;
/* begin getLongFromFile:swap: */
w3 = 0;
sqImageFileRead((&w3), sizeof(long), 1, f);
- GIV(savedWindowSize) = (swapBytes
- ? byteSwapped(w3)
- : w3);
+ GIV(savedWindowSize) = ((long) ((swapBytes
+ ? byteSwapped(w3)
+ : w3)));
/* begin getLongFromFile:swap: */
w4 = 0;
sqImageFileRead((&w4), sizeof(long), 1, f);
@@ -22377,7 +22378,7 @@
primitiveBitShift(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt integerArgument;
- sqLong integerReceiver;
+ usqInt integerReceiver;
sqInt shifted;
char *sp;
@@ -22424,7 +22425,7 @@
}
return;
}
- shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument);
+ shifted = ((usqInt) integerReceiver) >> (0 - integerArgument);
}
shifted = positive32BitIntegerFor(shifted);
/* begin pop:thenPush: */
@@ -45878,7 +45879,7 @@
sqInt newLargeInteger;
sqInt sz;
- if (((highWord = ((sqInt) integerValue) >> 32)) == 0) {
+ if (((highWord = ((sqLong) integerValue) >> 32)) == 0) {
return positive32BitIntegerFor(integerValue);
}
sz = 5;
Modified: branches/Cog/src/vm/cointerpmt.h
===================================================================
--- branches/Cog/src/vm/cointerpmt.h 2014-11-21 23:07:35 UTC (rev 3144)
+++ branches/Cog/src/vm/cointerpmt.h 2014-11-22 02:27:30 UTC (rev 3145)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
*/
Modified: branches/Cog/src/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/src/vm/gcc3x-cointerp.c 2014-11-21 23:07:35 UTC (rev 3144)
+++ branches/Cog/src/vm/gcc3x-cointerp.c 2014-11-22 02:27:30 UTC (rev 3145)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
from
- CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7
+ CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -849,7 +849,7 @@
void printWronglySizedContexts(sqInt printContexts);
@@ Diff output truncated at 50000 characters. @@
More information about the Vm-dev
mailing list