[Vm-dev] [commit][3436] CogVM source as per
VMMaker.oscog-eem.1453/Cog-eem.275.
commits at squeakvm.org
commits at squeakvm.org
Tue Sep 15 01:32:16 UTC 2015
Revision: 3436
Author: eliot
Date: 2015-09-14 18:32:15 -0700 (Mon, 14 Sep 2015)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.1453/Cog-eem.275.
Fix bugs with 4-byte long integers in the 64-bit or machine word on 64-bit
signed integer conversion routines.
Refactor BochsIA32Plugin to admit BochsX64Plugin below BochsPlugin. Use
positiveMachineIntegerFor: when answering the address of the C++ instance.
Avoid adding two header files to the Bochs plugins. Add BochsX64Alien.
Modified Paths:
--------------
branches/Cog/nsspursrc/vm/cogit.h
branches/Cog/nsspursrc/vm/cointerp.c
branches/Cog/nsspursrc/vm/cointerp.h
branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
branches/Cog/nsspurstack64src/vm/gcc3x-interp.c
branches/Cog/nsspurstack64src/vm/interp.c
branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
branches/Cog/nsspurstacksrc/vm/interp.c
branches/Cog/spursistasrc/vm/cogit.h
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/cointerp.c
branches/Cog/spursrc/vm/cointerp.h
branches/Cog/spursrc/vm/gcc3x-cointerp.c
branches/Cog/spurstack64src/vm/gcc3x-interp.c
branches/Cog/spurstack64src/vm/interp.c
branches/Cog/spurstacksrc/vm/gcc3x-interp.c
branches/Cog/spurstacksrc/vm/interp.c
branches/Cog/src/plugins/BochsIA32Plugin/BochsIA32Plugin.c
branches/Cog/src/vm/cogit.h
branches/Cog/src/vm/cointerp.c
branches/Cog/src/vm/cointerp.h
branches/Cog/src/vm/cointerpmt.c
branches/Cog/src/vm/cointerpmt.h
branches/Cog/src/vm/gcc3x-cointerp.c
branches/Cog/src/vm/gcc3x-cointerpmt.c
branches/Cog/stacksrc/vm/gcc3x-interp.c
branches/Cog/stacksrc/vm/interp.c
Added Paths:
-----------
branches/Cog/src/plugins/BochsX64Plugin/
branches/Cog/src/plugins/BochsX64Plugin/BochsX64Plugin.c
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nsspursrc/vm/cogit.h
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.h 2015-09-14 23:00:42 UTC (rev 3435)
+++ branches/Cog/nsspursrc/vm/cogit.h 2015-09-15 01:32:15 UTC (rev 3436)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ CCodeGenerator VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
*/
Modified: branches/Cog/nsspursrc/vm/cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.c 2015-09-14 23:00:42 UTC (rev 3435)
+++ branches/Cog/nsspursrc/vm/cointerp.c 2015-09-15 01:32:15 UTC (rev 3436)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
from
- CoInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ CoInterpreter VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -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.1451";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1453";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -32321,7 +32321,7 @@
usqInt newObj;
usqInt numBytes;
sqInt numSlots;
- sqInt s;
+ usqInt s;
char *sp;
sqInt sz;
@@ -32370,7 +32370,7 @@
GIV(needGCFlag) = 1;
forceInterruptCheck();
}
- s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex)));
+ s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex);
goto l1;
}
if (numSlots >= 0xFF) {
@@ -42817,7 +42817,7 @@
value = long64At((oop + BaseHeaderSize) + (0 << 3));
}
else {
- value = long32At((oop + BaseHeaderSize) + (0 << 2));
+ value = ((usqInt)(long32At((oop + BaseHeaderSize) + (0 << 2))));
}
# endif /* VMBIGENDIAN */
@@ -42947,7 +42947,7 @@
# if VMBIGENDIAN
(((byteAt((oop + BaseHeaderSize))) + ((byteAt((oop + BaseHeaderSize) + 1)) << 8)) + ((byteAt((oop + BaseHeaderSize) + 2)) << 16)) + ((byteAt((oop + BaseHeaderSize) + 3)) << 24)
# else /* VMBIGENDIAN */
- long32At((oop + BaseHeaderSize) + (0 << 2))
+ ((usqInt)(long32At((oop + BaseHeaderSize) + (0 << 2))))
# endif /* VMBIGENDIAN */
;
}
@@ -60577,7 +60577,7 @@
usqInt prevFree;
usqInt prevFreeChunk;
usqInt prevPrevFree;
- sqInt prevPrevFreeChunk;
+ usqInt prevPrevFreeChunk;
sqInt slotBytes;
sqInt slotBytes1;
usqInt there;
@@ -65497,7 +65497,7 @@
static sqInt
readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- usqInt bridge;
+ sqInt bridge;
usqInt bridgehead;
usqInt bridgeSpan;
sqInt bytesRead;
Modified: branches/Cog/nsspursrc/vm/cointerp.h
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.h 2015-09-14 23:00:42 UTC (rev 3435)
+++ branches/Cog/nsspursrc/vm/cointerp.h 2015-09-15 01:32:15 UTC (rev 3436)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
*/
Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-09-14 23:00:42 UTC (rev 3435)
+++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-09-15 01:32:15 UTC (rev 3436)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
from
- CoInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ CoInterpreter VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2417,7 +2417,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.1451";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1453";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -32330,7 +32330,7 @@
usqInt newObj;
usqInt numBytes;
sqInt numSlots;
- sqInt s;
+ usqInt s;
char *sp;
sqInt sz;
@@ -32379,7 +32379,7 @@
GIV(needGCFlag) = 1;
forceInterruptCheck();
}
- s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex)));
+ s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex);
goto l1;
}
if (numSlots >= 0xFF) {
@@ -42826,7 +42826,7 @@
value = long64At((oop + BaseHeaderSize) + (0 << 3));
}
else {
- value = long32At((oop + BaseHeaderSize) + (0 << 2));
+ value = ((usqInt)(long32At((oop + BaseHeaderSize) + (0 << 2))));
}
# endif /* VMBIGENDIAN */
@@ -42956,7 +42956,7 @@
# if VMBIGENDIAN
(((byteAt((oop + BaseHeaderSize))) + ((byteAt((oop + BaseHeaderSize) + 1)) << 8)) + ((byteAt((oop + BaseHeaderSize) + 2)) << 16)) + ((byteAt((oop + BaseHeaderSize) + 3)) << 24)
# else /* VMBIGENDIAN */
- long32At((oop + BaseHeaderSize) + (0 << 2))
+ ((usqInt)(long32At((oop + BaseHeaderSize) + (0 << 2))))
# endif /* VMBIGENDIAN */
;
}
@@ -60586,7 +60586,7 @@
usqInt prevFree;
usqInt prevFreeChunk;
usqInt prevPrevFree;
- sqInt prevPrevFreeChunk;
+ usqInt prevPrevFreeChunk;
sqInt slotBytes;
sqInt slotBytes1;
usqInt there;
@@ -65506,7 +65506,7 @@
static sqInt
readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- usqInt bridge;
+ sqInt bridge;
usqInt bridgehead;
usqInt bridgeSpan;
sqInt bytesRead;
Modified: branches/Cog/nsspurstack64src/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2015-09-14 23:00:42 UTC (rev 3435)
+++ branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2015-09-15 01:32:15 UTC (rev 3436)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
from
- StackInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ StackInterpreter VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2179,7 +2179,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1451";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1453";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -29421,7 +29421,7 @@
value = long64At((oop + BaseHeaderSize) + (0LL << 3));
}
else {
- value = long32At((oop + BaseHeaderSize) + (0LL << 2));
+ value = ((usqInt)(long32At((oop + BaseHeaderSize) + (0LL << 2))));
}
# endif /* VMBIGENDIAN */
@@ -29551,7 +29551,7 @@
# if VMBIGENDIAN
(((byteAt((oop + BaseHeaderSize))) + (((long)(byteAt((oop + BaseHeaderSize) + 1))) << 8)) + (((long)(byteAt((oop + BaseHeaderSize) + 2))) << 16)) + (((long)(byteAt((oop + BaseHeaderSize) + 3))) << 24)
# else /* VMBIGENDIAN */
- long32At((oop + BaseHeaderSize) + (0LL << 2))
+ ((usqInt)(long32At((oop + BaseHeaderSize) + (0LL << 2))))
# endif /* VMBIGENDIAN */
;
}
Modified: branches/Cog/nsspurstack64src/vm/interp.c
===================================================================
--- branches/Cog/nsspurstack64src/vm/interp.c 2015-09-14 23:00:42 UTC (rev 3435)
+++ branches/Cog/nsspurstack64src/vm/interp.c 2015-09-15 01:32:15 UTC (rev 3436)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
from
- StackInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ StackInterpreter VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2176,7 +2176,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1451";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1453";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -29412,7 +29412,7 @@
value = long64At((oop + BaseHeaderSize) + (0LL << 3));
}
else {
- value = long32At((oop + BaseHeaderSize) + (0LL << 2));
+ value = ((usqInt)(long32At((oop + BaseHeaderSize) + (0LL << 2))));
}
# endif /* VMBIGENDIAN */
@@ -29542,7 +29542,7 @@
# if VMBIGENDIAN
(((byteAt((oop + BaseHeaderSize))) + (((long)(byteAt((oop + BaseHeaderSize) + 1))) << 8)) + (((long)(byteAt((oop + BaseHeaderSize) + 2))) << 16)) + (((long)(byteAt((oop + BaseHeaderSize) + 3))) << 24)
# else /* VMBIGENDIAN */
- long32At((oop + BaseHeaderSize) + (0LL << 2))
+ ((usqInt)(long32At((oop + BaseHeaderSize) + (0LL << 2))))
# endif /* VMBIGENDIAN */
;
}
Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-09-14 23:00:42 UTC (rev 3435)
+++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-09-15 01:32:15 UTC (rev 3436)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
from
- StackInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ StackInterpreter VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2150,7 +2150,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1451";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1453";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -27945,7 +27945,7 @@
value = long64At((oop + BaseHeaderSize) + (0 << 3));
}
else {
- value = long32At((oop + BaseHeaderSize) + (0 << 2));
+ value = ((usqInt)(long32At((oop + BaseHeaderSize) + (0 << 2))));
}
# endif /* VMBIGENDIAN */
@@ -28075,7 +28075,7 @@
# if VMBIGENDIAN
(((byteAt((oop + BaseHeaderSize))) + ((byteAt((oop + BaseHeaderSize) + 1)) << 8)) + ((byteAt((oop + BaseHeaderSize) + 2)) << 16)) + ((byteAt((oop + BaseHeaderSize) + 3)) << 24)
# else /* VMBIGENDIAN */
- long32At((oop + BaseHeaderSize) + (0 << 2))
+ ((usqInt)(long32At((oop + BaseHeaderSize) + (0 << 2))))
# endif /* VMBIGENDIAN */
;
}
Modified: branches/Cog/nsspurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/interp.c 2015-09-14 23:00:42 UTC (rev 3435)
+++ branches/Cog/nsspurstacksrc/vm/interp.c 2015-09-15 01:32:15 UTC (rev 3436)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
from
- StackInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ StackInterpreter VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2147,7 +2147,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1451";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1453";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -27936,7 +27936,7 @@
value = long64At((oop + BaseHeaderSize) + (0 << 3));
}
else {
- value = long32At((oop + BaseHeaderSize) + (0 << 2));
+ value = ((usqInt)(long32At((oop + BaseHeaderSize) + (0 << 2))));
}
# endif /* VMBIGENDIAN */
@@ -28066,7 +28066,7 @@
# if VMBIGENDIAN
(((byteAt((oop + BaseHeaderSize))) + ((byteAt((oop + BaseHeaderSize) + 1)) << 8)) + ((byteAt((oop + BaseHeaderSize) + 2)) << 16)) + ((byteAt((oop + BaseHeaderSize) + 3)) << 24)
# else /* VMBIGENDIAN */
- long32At((oop + BaseHeaderSize) + (0 << 2))
+ ((usqInt)(long32At((oop + BaseHeaderSize) + (0 << 2))))
# endif /* VMBIGENDIAN */
;
}
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Mon Sep 14 15:59:41 PDT 2015
+ Mon Sep 14 18:30:29 PDT 2015
Modified: branches/Cog/spursistasrc/vm/cogit.h
===================================================================
--- branches/Cog/spursistasrc/vm/cogit.h 2015-09-14 23:00:42 UTC (rev 3435)
+++ branches/Cog/spursistasrc/vm/cogit.h 2015-09-15 01:32:15 UTC (rev 3436)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ CCodeGenerator VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
*/
Modified: branches/Cog/spursistasrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.c 2015-09-14 23:00:42 UTC (rev 3435)
+++ branches/Cog/spursistasrc/vm/cointerp.c 2015-09-15 01:32:15 UTC (rev 3436)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
from
- CoInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ CoInterpreter VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2389,7 +2389,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.1451]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1453]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -5659,7 +5659,6 @@
GIV(framePointer) = localFP;
ceEnterCogCodePopReceiverReg();
- null;
goto l228;
}
localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -5678,7 +5677,7 @@
/* begin fetchNextBytecode */
currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector);
- null;
+ /* return self */
l228: /* end baseFrameReturn */;
goto l227;
}
@@ -30943,7 +30942,7 @@
GIV(needGCFlag) = 1;
forceInterruptCheck();
}
- s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex)));
+ s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex);
goto l1;
}
if (numSlots >= 0xFF) {
@@ -36589,7 +36588,7 @@
sqInt err;
sqInt hash;
sqInt instSpec;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -36707,7 +36706,7 @@
sqInt i;
usqInt instSpec;
sqInt literalCount;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -41362,7 +41361,7 @@
value = long64At((oop + BaseHeaderSize) + (0 << 3));
}
else {
- value = long32At((oop + BaseHeaderSize) + (0 << 2));
+ value = ((usqInt)(long32At((oop + BaseHeaderSize) + (0 << 2))));
}
# endif /* VMBIGENDIAN */
@@ -41492,7 +41491,7 @@
# if VMBIGENDIAN
(((byteAt((oop + BaseHeaderSize))) + ((byteAt((oop + BaseHeaderSize) + 1)) << 8)) + ((byteAt((oop + BaseHeaderSize) + 2)) << 16)) + ((byteAt((oop + BaseHeaderSize) + 3)) << 24)
# else /* VMBIGENDIAN */
- long32At((oop + BaseHeaderSize) + (0 << 2))
+ ((usqInt)(long32At((oop + BaseHeaderSize) + (0 << 2))))
# endif /* VMBIGENDIAN */
;
}
@@ -42600,7 +42599,7 @@
sqInt fillValue;
sqInt hash;
usqInt instSpec;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -44734,7 +44733,7 @@
sqInt entry;
sqInt expectedIndex;
sqInt expectedIndex1;
- usqInt freeChunk;
+ sqInt freeChunk;
sqInt i;
sqInt i1;
sqInt index;
@@ -44773,7 +44772,7 @@
sqInt ptr1;
sqInt ptr2;
sqInt slotBytes;
- usqInt smallObj;
+ sqInt smallObj;
sqInt start;
classIndex = (long32At(aClass + 4)) & 0x3FFFFF;
@@ -47715,7 +47714,7 @@
sqInt fmt;
sqInt hasYoung;
sqInt i;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -52065,7 +52064,7 @@
sqInt hash;
sqInt i;
sqInt iLimiT;
- usqInt loadedObjectsArray;
+ sqInt loadedObjectsArray;
sqInt mappedOop;
usqInt newObj;
usqInt numBytes;
@@ -59130,7 +59129,7 @@
usqInt prevFree;
usqInt prevFreeChunk;
usqInt prevPrevFree;
- sqInt prevPrevFreeChunk;
+ usqInt prevPrevFreeChunk;
sqInt slotBytes;
sqInt slotBytes1;
usqInt there;
@@ -62525,8 +62524,8 @@
sqInt prevPrevObj;
sqInt prevPrevObj1;
sqInt ptr;
- usqInt savedInHashes;
- usqInt savedOutHashes;
+ sqInt savedInHashes;
+ sqInt savedOutHashes;
sqInt segAddr;
sqInt segStart;
sqInt slotBytes;
@@ -63002,7 +63001,7 @@
sqInt formatField;
sqInt len;
usqInt newObj;
- usqInt newString;
+ sqInt newString;
usqInt numBytes;
sqInt numSlots;
@@ -63953,7 +63952,7 @@
sqInt largeChild;
sqInt newEndOfMemory;
sqInt next;
- usqInt node;
+ sqInt node;
SpurSegmentInfo *seg;
sqInt smallChild;
sqInt treeNode;
@@ -64057,7 +64056,7 @@
static sqInt
readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- usqInt bridge;
+ sqInt bridge;
usqInt bridgehead;
usqInt bridgeSpan;
sqInt bytesRead;
@@ -64273,7 +64272,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/cointerp.h
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.h 2015-09-14 23:00:42 UTC (rev 3435)
+++ branches/Cog/spursistasrc/vm/cointerp.h 2015-09-15 01:32:15 UTC (rev 3436)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
*/
Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-09-14 23:00:42 UTC (rev 3435)
+++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-09-15 01:32:15 UTC (rev 3436)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
from
- CoInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ CoInterpreter VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2392,7 +2392,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.1451]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1453]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -5668,7 +5668,6 @@
GIV(framePointer) = localFP;
ceEnterCogCodePopReceiverReg();
- null;
goto l228;
}
localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -5687,7 +5686,7 @@
/* begin fetchNextBytecode */
currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector);
- null;
+ /* return self */
l228: /* end baseFrameReturn */;
goto l227;
}
@@ -30952,7 +30951,7 @@
GIV(needGCFlag) = 1;
forceInterruptCheck();
}
- s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex)));
+ s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex);
goto l1;
}
if (numSlots >= 0xFF) {
@@ -36598,7 +36597,7 @@
sqInt err;
sqInt hash;
sqInt instSpec;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -36716,7 +36715,7 @@
sqInt i;
usqInt instSpec;
sqInt literalCount;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -41371,7 +41370,7 @@
value = long64At((oop + BaseHeaderSize) + (0 << 3));
}
else {
- value = long32At((oop + BaseHeaderSize) + (0 << 2));
+ value = ((usqInt)(long32At((oop + BaseHeaderSize) + (0 << 2))));
}
# endif /* VMBIGENDIAN */
@@ -41501,7 +41500,7 @@
# if VMBIGENDIAN
(((byteAt((oop + BaseHeaderSize))) + ((byteAt((oop + BaseHeaderSize) + 1)) << 8)) + ((byteAt((oop + BaseHeaderSize) + 2)) << 16)) + ((byteAt((oop + BaseHeaderSize) + 3)) << 24)
# else /* VMBIGENDIAN */
- long32At((oop + BaseHeaderSize) + (0 << 2))
+ ((usqInt)(long32At((oop + BaseHeaderSize) + (0 << 2))))
# endif /* VMBIGENDIAN */
;
}
@@ -42609,7 +42608,7 @@
sqInt fillValue;
sqInt hash;
usqInt instSpec;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -44743,7 +44742,7 @@
sqInt entry;
sqInt expectedIndex;
sqInt expectedIndex1;
- usqInt freeChunk;
+ sqInt freeChunk;
sqInt i;
sqInt i1;
sqInt index;
@@ -44782,7 +44781,7 @@
sqInt ptr1;
sqInt ptr2;
sqInt slotBytes;
- usqInt smallObj;
+ sqInt smallObj;
sqInt start;
classIndex = (long32At(aClass + 4)) & 0x3FFFFF;
@@ -47724,7 +47723,7 @@
sqInt fmt;
sqInt hasYoung;
sqInt i;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -52074,7 +52073,7 @@
sqInt hash;
sqInt i;
sqInt iLimiT;
- usqInt loadedObjectsArray;
+ sqInt loadedObjectsArray;
sqInt mappedOop;
usqInt newObj;
usqInt numBytes;
@@ -59139,7 +59138,7 @@
usqInt prevFree;
usqInt prevFreeChunk;
usqInt prevPrevFree;
- sqInt prevPrevFreeChunk;
+ usqInt prevPrevFreeChunk;
sqInt slotBytes;
sqInt slotBytes1;
usqInt there;
@@ -62534,8 +62533,8 @@
sqInt prevPrevObj;
sqInt prevPrevObj1;
sqInt ptr;
- usqInt savedInHashes;
- usqInt savedOutHashes;
+ sqInt savedInHashes;
+ sqInt savedOutHashes;
sqInt segAddr;
sqInt segStart;
sqInt slotBytes;
@@ -63011,7 +63010,7 @@
sqInt formatField;
sqInt len;
usqInt newObj;
- usqInt newString;
+ sqInt newString;
usqInt numBytes;
sqInt numSlots;
@@ -63962,7 +63961,7 @@
sqInt largeChild;
sqInt newEndOfMemory;
sqInt next;
- usqInt node;
+ sqInt node;
SpurSegmentInfo *seg;
sqInt smallChild;
sqInt treeNode;
@@ -64066,7 +64065,7 @@
static sqInt
readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- usqInt bridge;
+ sqInt bridge;
usqInt bridgehead;
usqInt bridgeSpan;
sqInt bytesRead;
@@ -64282,7 +64281,7 @@
usqLong firstSavedBridgeWord;
sqInt nWritten;
usqInt pier1;
- sqInt pier2;
+ usqInt pier2;
usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
Modified: branches/Cog/spursrc/vm/cogit.h
===================================================================
--- branches/Cog/spursrc/vm/cogit.h 2015-09-14 23:00:42 UTC (rev 3435)
+++ branches/Cog/spursrc/vm/cogit.h 2015-09-15 01:32:15 UTC (rev 3436)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ CCodeGenerator VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
*/
Modified: branches/Cog/spursrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/cointerp.c 2015-09-14 23:00:42 UTC (rev 3435)
+++ branches/Cog/spursrc/vm/cointerp.c 2015-09-15 01:32:15 UTC (rev 3436)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
from
- CoInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ CoInterpreter VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1187,7 +1187,7 @@
static sqInt storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots) NoDbgRegParms;
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 sufficientSpaceAfterGC(sqInt numBytes) NoDbgRegParms;
static sqInt swizzleObjStackAt(sqInt objStackRootIndex) NoDbgRegParms;
extern void tenuringIncrementalGC(void);
@@ -2376,7 +2376,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.1451]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1453]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -25841,7 +25841,7 @@
usqInt newObj;
usqInt numBytes;
sqInt numSlots;
- usqInt s;
+ sqInt s;
char *sp;
sqInt sz;
@@ -31527,7 +31527,7 @@
sqInt err;
sqInt hash;
sqInt instSpec;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -31645,7 +31645,7 @@
sqInt i;
usqInt instSpec;
sqInt literalCount;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -36300,7 +36300,7 @@
value = long64At((oop + BaseHeaderSize) + (0 << 3));
}
else {
- value = long32At((oop + BaseHeaderSize) + (0 << 2));
+ value = ((usqInt)(long32At((oop + BaseHeaderSize) + (0 << 2))));
}
# endif /* VMBIGENDIAN */
@@ -36430,7 +36430,7 @@
# if VMBIGENDIAN
(((byteAt((oop + BaseHeaderSize))) + ((byteAt((oop + BaseHeaderSize) + 1)) << 8)) + ((byteAt((oop + BaseHeaderSize) + 2)) << 16)) + ((byteAt((oop + BaseHeaderSize) + 3)) << 24)
# else /* VMBIGENDIAN */
- long32At((oop + BaseHeaderSize) + (0 << 2))
+ ((usqInt)(long32At((oop + BaseHeaderSize) + (0 << 2))))
# endif /* VMBIGENDIAN */
;
}
@@ -37538,7 +37538,7 @@
sqInt fillValue;
sqInt hash;
usqInt instSpec;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -39672,7 +39672,7 @@
sqInt entry;
sqInt expectedIndex;
sqInt expectedIndex1;
- usqInt freeChunk;
+ sqInt freeChunk;
sqInt i;
sqInt i1;
sqInt index;
@@ -39711,8 +39711,8 @@
sqInt ptr1;
sqInt ptr2;
sqInt slotBytes;
- usqInt smallObj;
- usqInt start;
+ sqInt smallObj;
+ sqInt start;
classIndex = (long32At(aClass + 4)) & 0x3FFFFF;
if (classIndex == 0) {
@@ -42653,7 +42653,7 @@
sqInt fmt;
sqInt hasYoung;
sqInt i;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -46995,7 +46995,7 @@
sqInt hash;
sqInt i;
sqInt iLimiT;
- usqInt loadedObjectsArray;
+ sqInt loadedObjectsArray;
sqInt mappedOop;
usqInt newObj;
usqInt numBytes;
@@ -57429,8 +57429,8 @@
sqInt prevPrevObj;
sqInt prevPrevObj1;
sqInt ptr;
- usqInt savedInHashes;
- usqInt savedOutHashes;
+ sqInt savedInHashes;
+ sqInt savedOutHashes;
sqInt segAddr;
sqInt segStart;
sqInt slotBytes;
@@ -57900,13 +57900,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;
@@ -58961,7 +58961,7 @@
static sqInt
readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- usqInt bridge;
+ sqInt bridge;
usqInt bridgehead;
usqInt bridgeSpan;
sqInt bytesRead;
Modified: branches/Cog/spursrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursrc/vm/cointerp.h 2015-09-14 23:00:42 UTC (rev 3435)
+++ branches/Cog/spursrc/vm/cointerp.h 2015-09-15 01:32:15 UTC (rev 3436)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
*/
@@ -251,7 +251,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/spursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2015-09-14 23:00:42 UTC (rev 3435)
+++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2015-09-15 01:32:15 UTC (rev 3436)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
from
- CoInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ CoInterpreter VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1190,7 +1190,7 @@
static sqInt storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots) NoDbgRegParms;
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 sufficientSpaceAfterGC(sqInt numBytes) NoDbgRegParms;
static sqInt swizzleObjStackAt(sqInt objStackRootIndex) NoDbgRegParms;
extern void tenuringIncrementalGC(void);
@@ -2379,7 +2379,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.1451]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1453]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -25850,7 +25850,7 @@
usqInt newObj;
usqInt numBytes;
sqInt numSlots;
- usqInt s;
+ sqInt s;
char *sp;
sqInt sz;
@@ -31536,7 +31536,7 @@
sqInt err;
sqInt hash;
sqInt instSpec;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -31654,7 +31654,7 @@
sqInt i;
usqInt instSpec;
sqInt literalCount;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -36309,7 +36309,7 @@
value = long64At((oop + BaseHeaderSize) + (0 << 3));
}
else {
- value = long32At((oop + BaseHeaderSize) + (0 << 2));
+ value = ((usqInt)(long32At((oop + BaseHeaderSize) + (0 << 2))));
}
# endif /* VMBIGENDIAN */
@@ -36439,7 +36439,7 @@
# if VMBIGENDIAN
(((byteAt((oop + BaseHeaderSize))) + ((byteAt((oop + BaseHeaderSize) + 1)) << 8)) + ((byteAt((oop + BaseHeaderSize) + 2)) << 16)) + ((byteAt((oop + BaseHeaderSize) + 3)) << 24)
# else /* VMBIGENDIAN */
- long32At((oop + BaseHeaderSize) + (0 << 2))
+ ((usqInt)(long32At((oop + BaseHeaderSize) + (0 << 2))))
# endif /* VMBIGENDIAN */
;
}
@@ -37547,7 +37547,7 @@
sqInt fillValue;
sqInt hash;
usqInt instSpec;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -39681,7 +39681,7 @@
sqInt entry;
sqInt expectedIndex;
sqInt expectedIndex1;
- usqInt freeChunk;
+ sqInt freeChunk;
sqInt i;
sqInt i1;
sqInt index;
@@ -39720,8 +39720,8 @@
sqInt ptr1;
sqInt ptr2;
sqInt slotBytes;
- usqInt smallObj;
- usqInt start;
+ sqInt smallObj;
+ sqInt start;
classIndex = (long32At(aClass + 4)) & 0x3FFFFF;
if (classIndex == 0) {
@@ -42662,7 +42662,7 @@
sqInt fmt;
sqInt hasYoung;
sqInt i;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -47004,7 +47004,7 @@
sqInt hash;
sqInt i;
sqInt iLimiT;
- usqInt loadedObjectsArray;
+ sqInt loadedObjectsArray;
sqInt mappedOop;
usqInt newObj;
usqInt numBytes;
@@ -57438,8 +57438,8 @@
sqInt prevPrevObj;
sqInt prevPrevObj1;
sqInt ptr;
- usqInt savedInHashes;
- usqInt savedOutHashes;
+ sqInt savedInHashes;
+ sqInt savedOutHashes;
sqInt segAddr;
sqInt segStart;
sqInt slotBytes;
@@ -57909,13 +57909,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;
@@ -58970,7 +58970,7 @@
static sqInt
readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- usqInt bridge;
+ sqInt bridge;
usqInt bridgehead;
usqInt bridgeSpan;
sqInt bytesRead;
Modified: branches/Cog/spurstack64src/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/spurstack64src/vm/gcc3x-interp.c 2015-09-14 23:00:42 UTC (rev 3435)
+++ branches/Cog/spurstack64src/vm/gcc3x-interp.c 2015-09-15 01:32:15 UTC (rev 3436)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
from
- StackInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ StackInterpreter VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2143,7 +2143,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1451]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1453]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -24039,7 +24039,7 @@
value = long64At((oop + BaseHeaderSize) + (0LL << 3));
}
else {
- value = long32At((oop + BaseHeaderSize) + (0LL << 2));
+ value = ((usqInt)(long32At((oop + BaseHeaderSize) + (0LL << 2))));
}
# endif /* VMBIGENDIAN */
@@ -24169,7 +24169,7 @@
# if VMBIGENDIAN
(((byteAt((oop + BaseHeaderSize))) + (((long)(byteAt((oop + BaseHeaderSize) + 1))) << 8)) + (((long)(byteAt((oop + BaseHeaderSize) + 2))) << 16)) + (((long)(byteAt((oop + BaseHeaderSize) + 3))) << 24)
# else /* VMBIGENDIAN */
- long32At((oop + BaseHeaderSize) + (0LL << 2))
+ ((usqInt)(long32At((oop + BaseHeaderSize) + (0LL << 2))))
# endif /* VMBIGENDIAN */
;
}
Modified: branches/Cog/spurstack64src/vm/interp.c
===================================================================
--- branches/Cog/spurstack64src/vm/interp.c 2015-09-14 23:00:42 UTC (rev 3435)
+++ branches/Cog/spurstack64src/vm/interp.c 2015-09-15 01:32:15 UTC (rev 3436)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
from
- StackInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ StackInterpreter VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2140,7 +2140,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1451]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1453]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -24030,7 +24030,7 @@
value = long64At((oop + BaseHeaderSize) + (0LL << 3));
}
else {
- value = long32At((oop + BaseHeaderSize) + (0LL << 2));
+ value = ((usqInt)(long32At((oop + BaseHeaderSize) + (0LL << 2))));
}
# endif /* VMBIGENDIAN */
@@ -24160,7 +24160,7 @@
# if VMBIGENDIAN
(((byteAt((oop + BaseHeaderSize))) + (((long)(byteAt((oop + BaseHeaderSize) + 1))) << 8)) + (((long)(byteAt((oop + BaseHeaderSize) + 2))) << 16)) + (((long)(byteAt((oop + BaseHeaderSize) + 3))) << 24)
# else /* VMBIGENDIAN */
- long32At((oop + BaseHeaderSize) + (0LL << 2))
+ ((usqInt)(long32At((oop + BaseHeaderSize) + (0LL << 2))))
# endif /* VMBIGENDIAN */
;
}
Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2015-09-14 23:00:42 UTC (rev 3435)
+++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2015-09-15 01:32:15 UTC (rev 3436)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
from
- StackInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ StackInterpreter VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2114,7 +2114,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1451]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1453]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -22876,7 +22876,7 @@
value = long64At((oop + BaseHeaderSize) + (0 << 3));
}
else {
- value = long32At((oop + BaseHeaderSize) + (0 << 2));
+ value = ((usqInt)(long32At((oop + BaseHeaderSize) + (0 << 2))));
}
# endif /* VMBIGENDIAN */
@@ -23006,7 +23006,7 @@
# if VMBIGENDIAN
(((byteAt((oop + BaseHeaderSize))) + ((byteAt((oop + BaseHeaderSize) + 1)) << 8)) + ((byteAt((oop + BaseHeaderSize) + 2)) << 16)) + ((byteAt((oop + BaseHeaderSize) + 3)) << 24)
# else /* VMBIGENDIAN */
- long32At((oop + BaseHeaderSize) + (0 << 2))
+ ((usqInt)(long32At((oop + BaseHeaderSize) + (0 << 2))))
# endif /* VMBIGENDIAN */
;
}
Modified: branches/Cog/spurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/spurstacksrc/vm/interp.c 2015-09-14 23:00:42 UTC (rev 3435)
+++ branches/Cog/spurstacksrc/vm/interp.c 2015-09-15 01:32:15 UTC (rev 3436)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
from
- StackInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
+ StackInterpreter VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2111,7 +2111,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1451]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1453]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -22867,7 +22867,7 @@
value = long64At((oop + BaseHeaderSize) + (0 << 3));
}
else {
- value = long32At((oop + BaseHeaderSize) + (0 << 2));
+ value = ((usqInt)(long32At((oop + BaseHeaderSize) + (0 << 2))));
}
# endif /* VMBIGENDIAN */
@@ -22997,7 +22997,7 @@
# if VMBIGENDIAN
(((byteAt((oop + BaseHeaderSize))) + ((byteAt((oop + BaseHeaderSize) + 1)) << 8)) + ((byteAt((oop + BaseHeaderSize) + 2)) << 16)) + ((byteAt((oop + BaseHeaderSize) + 3)) << 24)
# else /* VMBIGENDIAN */
- long32At((oop + BaseHeaderSize) + (0 << 2))
+ ((usqInt)(long32At((oop + BaseHeaderSize) + (0 << 2))))
# endif /* VMBIGENDIAN */
;
}
Modified: branches/Cog/src/plugins/BochsIA32Plugin/BochsIA32Plugin.c
===================================================================
--- branches/Cog/src/plugins/BochsIA32Plugin/BochsIA32Plugin.c 2015-09-14 23:00:42 UTC (rev 3435)
+++ branches/Cog/src/plugins/BochsIA32Plugin/BochsIA32Plugin.c 2015-09-15 01:32:15 UTC (rev 3436)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1453 uuid: baf34f5d-4d8d-4f5f-b74a-1d76ecd08695
from
- BochsIA32Plugin Cog-eem.267 uuid: ff1bbadc-a019-45fb-954a-abfba8b25fdf
+ BochsIA32Plugin Cog-eem.275 uuid: cf385fb7-06ee-451f-8752-c60bb4a6d8ed
*/
-static char __buildInfo[] = "BochsIA32Plugin Cog-eem.267 uuid: ff1bbadc-a019-45fb-954a-abfba8b25fdf " __DATE__ ;
+static char __buildInfo[] = "BochsIA32Plugin Cog-eem.275 uuid: cf385fb7-06ee-451f-8752-c60bb4a6d8ed " __DATE__ ;
@@ -46,6 +46,7 @@
/*** Function Prototypes ***/
static sqInt forceStopOnInterrupt(void);
EXPORT(const char*) getModuleName(void);
+static sqInt positiveMachineIntegerFor(unsigned long value);
EXPORT(sqInt) primitiveDisassembleAtInMemory(void);
EXPORT(sqInt) primitiveErrorAndLog(void);
EXPORT(sqInt) primitiveFlushICacheFromTo(void);
@@ -79,6 +80,7 @@
static sqInt (*popRemappableOop)(void);
static sqInt (*positive32BitIntegerFor)(sqInt integerValue);
static usqInt (*positive32BitValueOf)(sqInt oop);
+static sqInt (*positive64BitIntegerFor)(sqLong integerValue);
static usqLong (*positive64BitValueOf)(sqInt oop);
static sqInt (*primitiveFail)(void);
static sqInt (*primitiveFailFor)(sqInt reasonCode);
@@ -103,6 +105,7 @@
extern sqInt popRemappableOop(void);
extern sqInt positive32BitIntegerFor(sqInt integerValue);
extern usqInt positive32BitValueOf(sqInt oop);
+extern sqInt positive64BitIntegerFor(sqLong integerValue);
extern usqLong positive64BitValueOf(sqInt oop);
extern sqInt primitiveFail(void);
extern sqInt primitiveFailFor(sqInt reasonCode);
@@ -116,14 +119,14 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "BochsIA32Plugin Cog-eem.267 (i)"
+ "BochsIA32Plugin Cog-eem.275 (i)"
#else
- "BochsIA32Plugin Cog-eem.267 (e)"
+ "BochsIA32Plugin Cog-eem.275 (e)"
#endif
;
- /* BochsIA32Plugin>>#forceStopOnInterrupt */
+ /* BochsPlugin>>#forceStopOnInterrupt */
static sqInt
forceStopOnInterrupt(void)
{
@@ -145,15 +148,24 @@
return moduleName;
}
+ /* InterpreterPlugin>>#positiveMachineIntegerFor: */
+static sqInt
+positiveMachineIntegerFor(unsigned long value)
+{
+ return (BytesPerWord == 8
+ ? positive64BitIntegerFor(value)
+ : positive32BitIntegerFor(value));
+}
-/* cpuAlien <BochsIA32Alien> */
+
+/* cpuAlien <BochsIA32|X86Alien> */
/* <Integer> */
/* <Bitmap|ByteArray|WordArray> */
/* Return an Array of the instruction length and its decompilation as a
string for the instruction at address in memory.
*/
- /* BochsIA32Plugin>>#primitiveDisassembleAtInMemory */
+ /* BochsPlugin>>#primitiveDisassembleAtInMemory */
EXPORT(sqInt)
primitiveDisassembleAtInMemory(void)
{
@@ -214,7 +226,7 @@
return null;
}
- /* BochsIA32Plugin>>#primitiveErrorAndLog */
+ /* BochsPlugin>>#primitiveErrorAndLog */
EXPORT(sqInt)
primitiveErrorAndLog(void)
{
@@ -253,12 +265,12 @@
}
-/* cpuAlien <BochsIA32Alien> */
+/* cpuAlien <BochsIA32|X86Alien> */
/* <Integer> */
/* <Integer> */
/* Flush the icache in the requested range */
- /* BochsIA32Plugin>>#primitiveFlushICacheFromTo */
+ /* BochsPlugin>>#primitiveFlushICacheFromTo */
EXPORT(sqInt)
primitiveFlushICacheFromTo(void)
{
@@ -291,7 +303,7 @@
return null;
}
- /* BochsIA32Plugin>>#primitiveNewCPU */
+ /* BochsPlugin>>#primitiveNewCPU */
@@ Diff output truncated at 50000 characters. @@
More information about the Vm-dev
mailing list