[Vm-dev] [commit][3226] CogVM source as per VMMaker.oscog-eem.1016
commits at squeakvm.org
commits at squeakvm.org
Fri Jan 9 22:03:53 UTC 2015
Revision: 3226
Author: eliot
Date: 2015-01-09 14:03:52 -0800 (Fri, 09 Jan 2015)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.1016
Fix some type warnings in the Newspeak cogit.
Fix the log file name confusion in the Mac build scripts.
Modified Paths:
--------------
branches/Cog/build.macos32x86/newspeak.cog.spur/mvm
branches/Cog/build.macos32x86/newspeak.cog.v3/mvm
branches/Cog/build.macos32x86/newspeak.stack.spur/mvm
branches/Cog/build.macos32x86/newspeak.stack.v3/mvm
branches/Cog/build.macos32x86/squeak.cog.spur/mvm
branches/Cog/build.macos32x86/squeak.cog.v3/mvm
branches/Cog/build.macos32x86/squeak.sista.spur/mvm
branches/Cog/build.macos32x86/squeak.sista.v3/mvm
branches/Cog/build.macos32x86/squeak.stack.v3/mvm
branches/Cog/build.macos64x64/newspeak.cog.spur/mvm
branches/Cog/build.macos64x64/newspeak.stack.spur/mvm
branches/Cog/build.macos64x64/squeak.cog.spur/mvm
branches/Cog/build.macos64x64/squeak.sista.spur/mvm
branches/Cog/nscogsrc/vm/cogit.c
branches/Cog/nscogsrc/vm/cogit.h
branches/Cog/nsspursrc/vm/cogit.c
branches/Cog/nsspursrc/vm/cogit.h
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/mvm
===================================================================
--- branches/Cog/build.macos32x86/newspeak.cog.spur/mvm 2015-01-09 21:59:06 UTC (rev 3225)
+++ branches/Cog/build.macos32x86/newspeak.cog.spur/mvm 2015-01-09 22:03:52 UTC (rev 3226)
@@ -5,7 +5,7 @@
H=
while [ -n "$1" ]; do
case $1 in
- -A|-AS) D=LOGD;A=LOGA;F=LOGS;;
+ -A|-AS) D=LOGD;A=LOGA;F=LOGF;;
-d) D=LOGD;;
-a) A=LOGA;;
-f) F=LOGF;;
Modified: branches/Cog/build.macos32x86/newspeak.cog.v3/mvm
===================================================================
--- branches/Cog/build.macos32x86/newspeak.cog.v3/mvm 2015-01-09 21:59:06 UTC (rev 3225)
+++ branches/Cog/build.macos32x86/newspeak.cog.v3/mvm 2015-01-09 22:03:52 UTC (rev 3226)
@@ -5,7 +5,7 @@
H=
while [ -n "$1" ]; do
case $1 in
- -A|-AS) D=LOGD;A=LOGA;F=LOGS;;
+ -A|-AS) D=LOGD;A=LOGA;F=LOGF;;
-d) D=LOGD;;
-a) A=LOGA;;
-f) F=LOGF;;
Modified: branches/Cog/build.macos32x86/newspeak.stack.spur/mvm
===================================================================
--- branches/Cog/build.macos32x86/newspeak.stack.spur/mvm 2015-01-09 21:59:06 UTC (rev 3225)
+++ branches/Cog/build.macos32x86/newspeak.stack.spur/mvm 2015-01-09 22:03:52 UTC (rev 3226)
@@ -5,7 +5,7 @@
H=
while [ -n "$1" ]; do
case $1 in
- -A|-AS) D=LOGD;A=LOGA;F=LOGS;;
+ -A|-AS) D=LOGD;A=LOGA;F=LOGF;;
-d) D=LOGD;;
-a) A=LOGA;;
-f) F=LOGF;;
Modified: branches/Cog/build.macos32x86/newspeak.stack.v3/mvm
===================================================================
--- branches/Cog/build.macos32x86/newspeak.stack.v3/mvm 2015-01-09 21:59:06 UTC (rev 3225)
+++ branches/Cog/build.macos32x86/newspeak.stack.v3/mvm 2015-01-09 22:03:52 UTC (rev 3226)
@@ -5,7 +5,7 @@
H=
while [ -n "$1" ]; do
case $1 in
- -A|-AS) D=LOGD;A=LOGA;F=LOGS;;
+ -A|-AS) D=LOGD;A=LOGA;F=LOGF;;
-d) D=LOGD;;
-a) A=LOGA;;
-f) F=LOGF;;
Modified: branches/Cog/build.macos32x86/squeak.cog.spur/mvm
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/mvm 2015-01-09 21:59:06 UTC (rev 3225)
+++ branches/Cog/build.macos32x86/squeak.cog.spur/mvm 2015-01-09 22:03:52 UTC (rev 3226)
@@ -10,10 +10,10 @@
while [ -n "$1" ]; do
case $1 in
-c) C=-c;; #-c == Core VM only
-# -A) D=LOGD;A=LOGA;F=LOGS;DT=LOGTD;AT=LOGTA;FT=LOGTS;;
-# -AS) D=LOGD;A=LOGA;F=LOGS;;
- -A|-AS) D=LOGD;A=LOGA;F=LOGS;;
- -AT) DT=LOGTD;AT=LOGTA;FT=LOGTS;;
+# -A) D=LOGD;A=LOGA;F=LOGF;DT=LOGTD;AT=LOGTA;FT=LOGTF;;
+# -AS) D=LOGD;A=LOGA;F=LOGF;;
+ -A|-AS) D=LOGD;A=LOGA;F=LOGF;;
+ -AT) DT=LOGTD;AT=LOGTA;FT=LOGTF;;
-d) D=LOGD;;
-dt) DT=LOGTD;;
-a) A=LOGA;;
Modified: branches/Cog/build.macos32x86/squeak.cog.v3/mvm
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.v3/mvm 2015-01-09 21:59:06 UTC (rev 3225)
+++ branches/Cog/build.macos32x86/squeak.cog.v3/mvm 2015-01-09 22:03:52 UTC (rev 3226)
@@ -10,9 +10,9 @@
while [ -n "$1" ]; do
case $1 in
-c) C=-c;; #-c == Core VM only
- -A) D=LOGD;A=LOGA;F=LOGS;DT=LOGTD;AT=LOGTA;FT=LOGTS;;
- -AS) D=LOGD;A=LOGA;F=LOGS;;
- -AT) DT=LOGTD;AT=LOGTA;FT=LOGTS;;
+ -A) D=LOGD;A=LOGA;F=LOGF;DT=LOGTD;AT=LOGTA;FT=LOGTF;;
+ -AS) D=LOGD;A=LOGA;F=LOGF;;
+ -AT) DT=LOGTD;AT=LOGTA;FT=LOGTF;;
-d) D=LOGD;;
-dt) DT=LOGTD;;
-a) A=LOGA;;
Modified: branches/Cog/build.macos32x86/squeak.sista.spur/mvm
===================================================================
--- branches/Cog/build.macos32x86/squeak.sista.spur/mvm 2015-01-09 21:59:06 UTC (rev 3225)
+++ branches/Cog/build.macos32x86/squeak.sista.spur/mvm 2015-01-09 22:03:52 UTC (rev 3226)
@@ -7,7 +7,7 @@
while [ -n "$1" ]; do
case $1 in
-c) C=-c;; #-c == Core VM only
- -A) D=LOGD;A=LOGA;F=LOGS;;
+ -A) D=LOGD;A=LOGA;F=LOGF;;
-d) D=LOGD;;
-a) A=LOGA;;
-f) F=LOGF;;
Modified: branches/Cog/build.macos32x86/squeak.sista.v3/mvm
===================================================================
--- branches/Cog/build.macos32x86/squeak.sista.v3/mvm 2015-01-09 21:59:06 UTC (rev 3225)
+++ branches/Cog/build.macos32x86/squeak.sista.v3/mvm 2015-01-09 22:03:52 UTC (rev 3226)
@@ -7,7 +7,7 @@
while [ -n "$1" ]; do
case $1 in
-c) C=-c;; #-c == Core VM only
- -A) D=LOGD;A=LOGA;F=LOGS;;
+ -A) D=LOGD;A=LOGA;F=LOGF;;
-d) D=LOGD;;
-a) A=LOGA;;
-f) F=LOGF;;
Modified: branches/Cog/build.macos32x86/squeak.stack.v3/mvm
===================================================================
--- branches/Cog/build.macos32x86/squeak.stack.v3/mvm 2015-01-09 21:59:06 UTC (rev 3225)
+++ branches/Cog/build.macos32x86/squeak.stack.v3/mvm 2015-01-09 22:03:52 UTC (rev 3226)
@@ -7,7 +7,7 @@
while [ -n "$1" ]; do
case $1 in
-c) C=-c;; #-c == Core VM only
- -A) D=LOGD;A=LOGA;F=LOGS;;
+ -A) D=LOGD;A=LOGA;F=LOGF;;
-d) D=LOGD;;
-a) A=LOGA;;
-f) F=LOGF;;
Modified: branches/Cog/build.macos64x64/newspeak.cog.spur/mvm
===================================================================
--- branches/Cog/build.macos64x64/newspeak.cog.spur/mvm 2015-01-09 21:59:06 UTC (rev 3225)
+++ branches/Cog/build.macos64x64/newspeak.cog.spur/mvm 2015-01-09 22:03:52 UTC (rev 3226)
@@ -5,7 +5,7 @@
H=
while [ -n "$1" ]; do
case $1 in
- -A|-AS) D=LOGD;A=LOGA;F=LOGS;;
+ -A|-AS) D=LOGD;A=LOGA;F=LOGF;;
-d) D=LOGD;;
-a) A=LOGA;;
-f) F=LOGF;;
Modified: branches/Cog/build.macos64x64/newspeak.stack.spur/mvm
===================================================================
--- branches/Cog/build.macos64x64/newspeak.stack.spur/mvm 2015-01-09 21:59:06 UTC (rev 3225)
+++ branches/Cog/build.macos64x64/newspeak.stack.spur/mvm 2015-01-09 22:03:52 UTC (rev 3226)
@@ -5,7 +5,7 @@
H=
while [ -n "$1" ]; do
case $1 in
- -A|-AS) D=LOGD;A=LOGA;F=LOGS;;
+ -A|-AS) D=LOGD;A=LOGA;F=LOGF;;
-d) D=LOGD;;
-a) A=LOGA;;
-f) F=LOGF;;
Modified: branches/Cog/build.macos64x64/squeak.cog.spur/mvm
===================================================================
--- branches/Cog/build.macos64x64/squeak.cog.spur/mvm 2015-01-09 21:59:06 UTC (rev 3225)
+++ branches/Cog/build.macos64x64/squeak.cog.spur/mvm 2015-01-09 22:03:52 UTC (rev 3226)
@@ -10,10 +10,10 @@
while [ -n "$1" ]; do
case $1 in
-c) C=-c;; #-c == Core VM only
-# -A) D=LOGD;A=LOGA;F=LOGS;DT=LOGTD;AT=LOGTA;FT=LOGTS;;
-# -AS) D=LOGD;A=LOGA;F=LOGS;;
- -A|-AS) D=LOGD;A=LOGA;F=LOGS;;
- -AT) DT=LOGTD;AT=LOGTA;FT=LOGTS;;
+# -A) D=LOGD;A=LOGA;F=LOGF;DT=LOGTD;AT=LOGTA;FT=LOGTF;;
+# -AS) D=LOGD;A=LOGA;F=LOGF;;
+ -A|-AS) D=LOGD;A=LOGA;F=LOGF;;
+ -AT) DT=LOGTD;AT=LOGTA;FT=LOGTF;;
-d) D=LOGD;;
-dt) DT=LOGTD;;
-a) A=LOGA;;
Modified: branches/Cog/build.macos64x64/squeak.sista.spur/mvm
===================================================================
--- branches/Cog/build.macos64x64/squeak.sista.spur/mvm 2015-01-09 21:59:06 UTC (rev 3225)
+++ branches/Cog/build.macos64x64/squeak.sista.spur/mvm 2015-01-09 22:03:52 UTC (rev 3226)
@@ -7,7 +7,7 @@
while [ -n "$1" ]; do
case $1 in
-c) C=-c;; #-c == Core VM only
- -A) D=LOGD;A=LOGA;F=LOGS;;
+ -A) D=LOGD;A=LOGA;F=LOGF;;
-d) D=LOGD;;
-a) A=LOGA;;
-f) F=LOGF;;
Modified: branches/Cog/nscogsrc/vm/cogit.c
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.c 2015-01-09 21:59:06 UTC (rev 3225)
+++ branches/Cog/nscogsrc/vm/cogit.c 2015-01-09 22:03:52 UTC (rev 3226)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188
+ CCodeGenerator VMMaker.oscog-eem.1016 uuid: 656d7591-7ea4-4c5f-9d13-c6a0bd8b8286
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1016 uuid: 656d7591-7ea4-4c5f-9d13-c6a0bd8b8286
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1016 uuid: 656d7591-7ea4-4c5f-9d13-c6a0bd8b8286 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -522,7 +522,7 @@
static sqInt hasPCDependentInstructions(AbstractInstruction * self_in_hasPCDependentInstructions) NoDbgRegParms;
static sqInt hasSSE2Instructions(AbstractInstruction * self_in_hasSSE2Instructions) NoDbgRegParms;
static sqInt hasSSEInstructions(AbstractInstruction * self_in_hasSSEInstructions) NoDbgRegParms;
-static sqInt implicitReceiveCacheAt(AbstractInstruction * self_in_implicitReceiveCacheAt, sqInt callSiteReturnAddress) NoDbgRegParms;
+static sqInt implicitReceiveCacheAt(AbstractInstruction * self_in_implicitReceiveCacheAt, char *callSiteReturnAddress) NoDbgRegParms;
static sqInt inlineCacheTagAt(AbstractInstruction * self_in_inlineCacheTagAt, sqInt callSiteReturnAddress) NoDbgRegParms;
static sqInt instructionSizeAt(AbstractInstruction * self_in_instructionSizeAt, sqInt pc) NoDbgRegParms;
static sqInt isBigEndian(AbstractInstruction * self_in_isBigEndian) NoDbgRegParms;
@@ -787,7 +787,7 @@
void unlinkSendsToFree(void);
void unlinkSendsToandFreeIf(sqInt targetMethodObject, sqInt freeIfTrue);
static sqInt updateMaybeObjRefAt(sqInt mcpc) NoDbgRegParms;
-static void voidImplicitReceiverCacheAt(sqInt mcpc) NoDbgRegParms;
+static void voidImplicitReceiverCacheAt(char *mcpc) NoDbgRegParms;
static AbstractInstruction * gXorCwR(sqInt wordConstant, sqInt reg) NoDbgRegParms;
static void zeroOpcodeIndex(void);
void addAllToYoungReferrers(void);
@@ -7439,9 +7439,9 @@
of a call to the ceImplicitReceiverTrampoline. */
static sqInt
-implicitReceiveCacheAt(AbstractInstruction * self_in_implicitReceiveCacheAt, sqInt callSiteReturnAddress)
+implicitReceiveCacheAt(AbstractInstruction * self_in_implicitReceiveCacheAt, char *callSiteReturnAddress)
{
- return literalBeforeFollowingAddress(self_in_implicitReceiveCacheAt, callSiteReturnAddress - 10);
+ return literalBeforeFollowingAddress(self_in_implicitReceiveCacheAt, (((usqInt)callSiteReturnAddress)) - 10);
}
@@ -14622,7 +14622,7 @@
and Lclass: .word; Lmixin: .word is somewhere on the heap. */
static void
-voidImplicitReceiverCacheAt(sqInt mcpc)
+voidImplicitReceiverCacheAt(char *mcpc)
{
usqInt cacheAddress;
@@ -14684,7 +14684,7 @@
assert((unpairedMethodList == null)
|| ((((((CogMethod *) unpairedMethodList))->cmType)) == CMMethod));
(aCogMethod->nextMethodOrIRCs = unpairedMethodList);
- unpairedMethodList = aCogMethod;
+ unpairedMethodList = ((usqInt)aCogMethod);
}
static void
Modified: branches/Cog/nscogsrc/vm/cogit.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.h 2015-01-09 21:59:06 UTC (rev 3225)
+++ branches/Cog/nscogsrc/vm/cogit.h 2015-01-09 22:03:52 UTC (rev 3226)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188
+ CCodeGenerator VMMaker.oscog-eem.1016 uuid: 656d7591-7ea4-4c5f-9d13-c6a0bd8b8286
*/
Modified: branches/Cog/nsspursrc/vm/cogit.c
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.c 2015-01-09 21:59:06 UTC (rev 3225)
+++ branches/Cog/nsspursrc/vm/cogit.c 2015-01-09 22:03:52 UTC (rev 3226)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188
+ CCodeGenerator VMMaker.oscog-eem.1016 uuid: 656d7591-7ea4-4c5f-9d13-c6a0bd8b8286
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1016 uuid: 656d7591-7ea4-4c5f-9d13-c6a0bd8b8286
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1016 uuid: 656d7591-7ea4-4c5f-9d13-c6a0bd8b8286 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -517,7 +517,7 @@
static sqInt hasPCDependentInstructions(AbstractInstruction * self_in_hasPCDependentInstructions) NoDbgRegParms;
static sqInt hasSSE2Instructions(AbstractInstruction * self_in_hasSSE2Instructions) NoDbgRegParms;
static sqInt hasSSEInstructions(AbstractInstruction * self_in_hasSSEInstructions) NoDbgRegParms;
-static sqInt implicitReceiveCacheAt(AbstractInstruction * self_in_implicitReceiveCacheAt, sqInt callSiteReturnAddress) NoDbgRegParms;
+static sqInt implicitReceiveCacheAt(AbstractInstruction * self_in_implicitReceiveCacheAt, char *callSiteReturnAddress) NoDbgRegParms;
static sqInt inlineCacheTagAt(AbstractInstruction * self_in_inlineCacheTagAt, sqInt callSiteReturnAddress) NoDbgRegParms;
static sqInt instructionSizeAt(AbstractInstruction * self_in_instructionSizeAt, sqInt pc) NoDbgRegParms;
static sqInt isBigEndian(AbstractInstruction * self_in_isBigEndian) NoDbgRegParms;
@@ -788,7 +788,7 @@
void unlinkSendsToFree(void);
void unlinkSendsToandFreeIf(sqInt targetMethodObject, sqInt freeIfTrue);
static sqInt updateMaybeObjRefAt(sqInt mcpc) NoDbgRegParms;
-static void voidImplicitReceiverCacheAt(sqInt mcpc) NoDbgRegParms;
+static void voidImplicitReceiverCacheAt(char *mcpc) NoDbgRegParms;
static AbstractInstruction * gXorCwR(sqInt wordConstant, sqInt reg) NoDbgRegParms;
static void zeroOpcodeIndex(void);
void addAllToYoungReferrers(void);
@@ -7458,9 +7458,9 @@
of a call to the ceImplicitReceiverTrampoline. */
static sqInt
-implicitReceiveCacheAt(AbstractInstruction * self_in_implicitReceiveCacheAt, sqInt callSiteReturnAddress)
+implicitReceiveCacheAt(AbstractInstruction * self_in_implicitReceiveCacheAt, char *callSiteReturnAddress)
{
- return literalBeforeFollowingAddress(self_in_implicitReceiveCacheAt, callSiteReturnAddress - 10);
+ return literalBeforeFollowingAddress(self_in_implicitReceiveCacheAt, (((usqInt)callSiteReturnAddress)) - 10);
}
@@ -12655,7 +12655,7 @@
cacheAddress = ((usqInt)(implicitReceiveCacheAt(backEnd, mcpc)));
if (((class = unalignedLongAt(backEnd, cacheAddress))) != 0) {
if (((mixin = unalignedLongAt(backEnd, cacheAddress + BytesPerOop))) != 0) {
- markAndTraceLiteralinat(mixin, ((CogMethod *) cogMethod), (cacheAddress + BytesPerOop));
+ markAndTraceLiteralinat(mixin, ((CogMethod *) cogMethod), (((void *)(cacheAddress + BytesPerOop))));
}
}
@@ -14646,7 +14646,7 @@
and Lclass: .word; Lmixin: .word is somewhere on the heap. */
static void
-voidImplicitReceiverCacheAt(sqInt mcpc)
+voidImplicitReceiverCacheAt(char *mcpc)
{
usqInt cacheAddress;
@@ -14707,7 +14707,7 @@
assert((unpairedMethodList == null)
|| ((((((CogMethod *) unpairedMethodList))->cmType)) == CMMethod));
(aCogMethod->nextMethodOrIRCs = unpairedMethodList);
- unpairedMethodList = aCogMethod;
+ unpairedMethodList = ((usqInt)aCogMethod);
}
static void
Modified: branches/Cog/nsspursrc/vm/cogit.h
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.h 2015-01-09 21:59:06 UTC (rev 3225)
+++ branches/Cog/nsspursrc/vm/cogit.h 2015-01-09 22:03:52 UTC (rev 3226)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188
+ CCodeGenerator VMMaker.oscog-eem.1016 uuid: 656d7591-7ea4-4c5f-9d13-c6a0bd8b8286
*/
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Fri Jan 9 13:02:24 PST 2015
+ Fri Jan 9 14:03:48 PST 2015
More information about the Vm-dev
mailing list