[Vm-dev] [commit][3621] CogVM source as per VMMaker.oscog-eem.1688
commits at squeakvm.org
commits at squeakvm.org
Sun Feb 21 03:17:16 UTC 2016
Revision: 3621
Author: eliot
Date: 2016-02-20 19:17:14 -0800 (Sat, 20 Feb 2016)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.1688
X64 Cogit:
Make sure that literal32BeforeFollowingAddress: answrs unsigned. Otherwise
16rBABE1F1(5H) causes an assert faul in expectedClosedPICPrototype at startup.
Introduce an abstraction for unlinked inline cache tags holding selector
indices (when will I ever learn??).
Unix makefiles: Add dependencies for cogit.c on the included cogitFoo.c's.
Update a script.
Modified Paths:
--------------
branches/Cog/nsspur64src/vm/cogit.h
branches/Cog/nsspur64src/vm/cogitX64.c
branches/Cog/nsspursrc/vm/cogit.h
branches/Cog/nsspursrc/vm/cogitARMv5.c
branches/Cog/nsspursrc/vm/cogitIA32.c
branches/Cog/nsspursrc/vm/cogitMIPSEL.c
branches/Cog/platforms/unix/vm/Makefile.in
branches/Cog/scripts/findUnofficialFiles
branches/Cog/spur64src/vm/cogit.h
branches/Cog/spur64src/vm/cogitX64.c
branches/Cog/spursistasrc/vm/cogit.h
branches/Cog/spursistasrc/vm/cogitARMv5.c
branches/Cog/spursistasrc/vm/cogitIA32.c
branches/Cog/spursistasrc/vm/cogitMIPSEL.c
branches/Cog/spursrc/vm/cogit.h
branches/Cog/spursrc/vm/cogitARMv5.c
branches/Cog/spursrc/vm/cogitIA32.c
branches/Cog/spursrc/vm/cogitMIPSEL.c
branches/Cog/src/vm/cogit.h
branches/Cog/src/vm/cogitARMv5.c
branches/Cog/src/vm/cogitIA32.c
branches/Cog/src/vm/cogitMIPSEL.c
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nsspur64src/vm/cogit.h
===================================================================
--- branches/Cog/nsspur64src/vm/cogit.h 2016-02-21 01:35:03 UTC (rev 3620)
+++ branches/Cog/nsspur64src/vm/cogit.h 2016-02-21 03:17:14 UTC (rev 3621)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
*/
Modified: branches/Cog/nsspur64src/vm/cogitX64.c
===================================================================
--- branches/Cog/nsspur64src/vm/cogitX64.c 2016-02-21 01:35:03 UTC (rev 3620)
+++ branches/Cog/nsspur64src/vm/cogitX64.c 2016-02-21 03:17:14 UTC (rev 3621)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -423,9 +423,9 @@
static sqInt NoDbgRegParms computeSizeOfArithCwR(AbstractInstruction * self_in_computeSizeOfArithCwR);
static usqInt NoDbgRegParms concretizeArithCwR(AbstractInstruction * self_in_concretizeArithCwR, sqInt x64opcode);
static usqInt NoDbgRegParms concretizeMoveCwR(AbstractInstruction * self_in_concretizeMoveCwR);
-static sqInt NoDbgRegParms inlineCacheTagAt(AbstractInstruction * self_in_inlineCacheTagAt, sqInt callSiteReturnAddress);
+static usqInt NoDbgRegParms inlineCacheTagAt(AbstractInstruction * self_in_inlineCacheTagAt, sqInt callSiteReturnAddress);
static sqInt NoDbgRegParms isPCDependent(AbstractInstruction * self_in_isPCDependent);
-static sqInt NoDbgRegParms literal32BeforeFollowingAddress(AbstractInstruction * self_in_literal32BeforeFollowingAddress, sqInt followingAddress);
+static usqInt NoDbgRegParms literal32BeforeFollowingAddress(AbstractInstruction * self_in_literal32BeforeFollowingAddress, sqInt followingAddress);
static sqInt NoDbgRegParms literalBeforeFollowingAddress(AbstractInstruction * self_in_literalBeforeFollowingAddress, sqInt followingAddress);
static sqInt NoDbgRegParms loadLiteralByteSize(AbstractInstruction * self_in_loadLiteralByteSize);
static usqInt NoDbgRegParms sizePCDependentInstructionAt(AbstractInstruction * self_in_sizePCDependentInstructionAt, sqInt eventualAbsoluteAddress);
@@ -2323,7 +2323,7 @@
/* Answer the inline cache tag for the return address of a send. */
/* CogInLineLiteralsX64Compiler>>#inlineCacheTagAt: */
-static sqInt NoDbgRegParms
+static usqInt NoDbgRegParms
inlineCacheTagAt(AbstractInstruction * self_in_inlineCacheTagAt, sqInt callSiteReturnAddress)
{
return literal32BeforeFollowingAddress(self_in_inlineCacheTagAt, callSiteReturnAddress - 5);
@@ -2346,10 +2346,10 @@
*/
/* CogInLineLiteralsX64Compiler>>#literal32BeforeFollowingAddress: */
-static sqInt NoDbgRegParms
+static usqInt NoDbgRegParms
literal32BeforeFollowingAddress(AbstractInstruction * self_in_literal32BeforeFollowingAddress, sqInt followingAddress)
{
- return unalignedLong32At(self_in_literal32BeforeFollowingAddress, followingAddress - 4);
+ return ((unsigned int) (unalignedLong32At(self_in_literal32BeforeFollowingAddress, followingAddress - 4)));
}
@@ -3296,7 +3296,7 @@
{
usqInt cacheAddress;
sqInt cacheTag;
- sqInt cacheTag1;
+ usqInt cacheTag1;
sqInt classTag;
sqInt enclosingObject;
sqInt entryPoint;
@@ -3370,10 +3370,7 @@
Note that selectors can be immediate so there is no guarantee that they
are markable/remappable objects. */
entryPoint2 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc));
- tagCouldBeObj = (entryPoint2 < methodZoneBase)
- || (((entryPoint2 & entryPointMask) == uncheckedEntryAlignment)
- || (((entryPoint2 & entryPointMask) == checkedEntryAlignment)
- && ((((((CogMethod *) (entryPoint2 - cmEntryOffset)))->cmType)) == CMOpenPIC)));
+ tagCouldBeObj = 0;
if (tagCouldBeObj) {
if (couldBeObject(cacheTag1)) {
if (!(asserta(checkValidOopReference(cacheTag1)))) {
@@ -3454,7 +3451,7 @@
sqInt off;
sqInt offset;
sqInt offset1;
- sqInt selectorOrCacheTag;
+ usqInt selectorOrCacheTag;
sqInt *sendTable;
sqInt table;
@@ -3703,7 +3700,7 @@
closedPICRefersToUnmarkedObject(CogMethod *cPIC)
{
sqInt i;
- sqInt object;
+ usqInt object;
sqInt pc;
if (!((isImmediate((cPIC->selector)))
@@ -4823,7 +4820,7 @@
static sqInt NoDbgRegParms
cPICHasForwardedClass(CogMethod *cPIC)
{
- sqInt classIndex;
+ usqInt classIndex;
sqInt i;
sqInt pc;
@@ -5025,7 +5022,7 @@
static sqInt NoDbgRegParms
expectedClosedPICPrototype(CogMethod *cPIC)
{
- sqInt classTag;
+ usqInt classTag;
usqInt classTagPC;
sqInt entryPoint;
sqInt errors;
@@ -5886,12 +5883,12 @@
generateMapAtstart(sqInt addressOrNull, sqInt startAddress)
{
unsigned char annotation;
- usqInt delta;
+ sqInt delta;
sqInt i;
AbstractInstruction *instruction;
sqInt length;
- usqInt location;
- usqInt mapEntry;
+ sqInt location;
+ sqInt mapEntry;
sqInt maxDelta;
usqInt mcpc;
@@ -7820,7 +7817,7 @@
{
usqInt cacheAddress;
sqInt cacheTag;
- sqInt cacheTag1;
+ usqInt cacheTag1;
sqInt cacheTagMarked;
sqInt entryPoint;
sqInt entryPoint1;
@@ -7900,10 +7897,7 @@
Note that selectors can be immediate so there is no guarantee that they
are markable/remappable objects. */
entryPoint2 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc));
- tagCouldBeObj1 = (entryPoint2 < methodZoneBase)
- || (((entryPoint2 & entryPointMask) == uncheckedEntryAlignment)
- || (((entryPoint2 & entryPointMask) == checkedEntryAlignment)
- && ((((((CogMethod *) (entryPoint2 - cmEntryOffset)))->cmType)) == CMOpenPIC)));
+ tagCouldBeObj1 = 0;
cacheTagMarked = tagCouldBeObj1
&& (cacheTagIsMarked(cacheTag1));
if (entryPoint2 > methodZoneBase) {
@@ -7964,7 +7958,7 @@
{
usqInt cacheAddress;
sqInt cacheTag;
- sqInt cacheTag1;
+ usqInt cacheTag1;
sqInt entryPoint;
sqInt entryPoint1;
sqInt entryPoint2;
@@ -8024,10 +8018,7 @@
Note that selectors can be immediate so there is no guarantee that they
are markable/remappable objects. */
entryPoint2 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc));
- tagCouldBeObj1 = (entryPoint2 < methodZoneBase)
- || (((entryPoint2 & entryPointMask) == uncheckedEntryAlignment)
- || (((entryPoint2 & entryPointMask) == checkedEntryAlignment)
- && ((((((CogMethod *) (entryPoint2 - cmEntryOffset)))->cmType)) == CMOpenPIC)));
+ tagCouldBeObj1 = 0;
if (tagCouldBeObj1) {
}
@@ -8914,7 +8905,7 @@
{
usqInt cacheAddress;
sqInt cacheTag;
- sqInt cacheTag1;
+ usqInt cacheTag1;
sqInt entryPoint;
sqInt entryPoint1;
sqInt entryPoint2;
@@ -8987,10 +8978,7 @@
Note that selectors can be immediate so there is no guarantee that they
are markable/remappable objects. */
entryPoint2 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc));
- tagCouldBeObj1 = (entryPoint2 < methodZoneBase)
- || (((entryPoint2 & entryPointMask) == uncheckedEntryAlignment)
- || (((entryPoint2 & entryPointMask) == checkedEntryAlignment)
- && ((((((CogMethod *) (entryPoint2 - cmEntryOffset)))->cmType)) == CMOpenPIC)));
+ tagCouldBeObj1 = 0;
if (tagCouldBeObj1
&& (couldBeObject(cacheTag1))) {
mappedCacheTag = remapObject(cacheTag1);
@@ -16101,6 +16089,7 @@
static sqInt NoDbgRegParms
remapObject(sqInt objOop)
{
+ assert(addressCouldBeObj(objOop));
return (shouldRemapObj(objOop)
? remapObj(objOop)
: objOop);
@@ -16390,7 +16379,7 @@
static sqInt NoDbgRegParms
callTargetFromReturnAddress(AbstractInstruction * self_in_callTargetFromReturnAddress, sqInt callSiteReturnAddress)
{
- sqInt callDistance;
+ usqInt callDistance;
callDistance = literal32BeforeFollowingAddress(self_in_callTargetFromReturnAddress, callSiteReturnAddress);
return callSiteReturnAddress + (((int) callDistance));
Modified: branches/Cog/nsspursrc/vm/cogit.h
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.h 2016-02-21 01:35:03 UTC (rev 3620)
+++ branches/Cog/nsspursrc/vm/cogit.h 2016-02-21 03:17:14 UTC (rev 3621)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
*/
Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c
===================================================================
--- branches/Cog/nsspursrc/vm/cogitARMv5.c 2016-02-21 01:35:03 UTC (rev 3620)
+++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2016-02-21 03:17:14 UTC (rev 3621)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -21383,6 +21383,7 @@
static sqInt NoDbgRegParms
remapObject(sqInt objOop)
{
+ assert(addressCouldBeObj(objOop));
return (shouldRemapObj(objOop)
? remapObj(objOop)
: objOop);
Modified: branches/Cog/nsspursrc/vm/cogitIA32.c
===================================================================
--- branches/Cog/nsspursrc/vm/cogitIA32.c 2016-02-21 01:35:03 UTC (rev 3620)
+++ branches/Cog/nsspursrc/vm/cogitIA32.c 2016-02-21 03:17:14 UTC (rev 3621)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -19491,6 +19491,7 @@
static sqInt NoDbgRegParms
remapObject(sqInt objOop)
{
+ assert(addressCouldBeObj(objOop));
return (shouldRemapObj(objOop)
? remapObj(objOop)
: objOop);
Modified: branches/Cog/nsspursrc/vm/cogitMIPSEL.c
===================================================================
--- branches/Cog/nsspursrc/vm/cogitMIPSEL.c 2016-02-21 01:35:03 UTC (rev 3620)
+++ branches/Cog/nsspursrc/vm/cogitMIPSEL.c 2016-02-21 03:17:14 UTC (rev 3621)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -4693,7 +4693,7 @@
static sqInt NoDbgRegParms
cPICHasFreedTargets(CogMethod *cPIC)
{
- usqInt entryPoint;
+ sqInt entryPoint;
sqInt i;
sqInt pc;
CogMethod *targetMethod;
@@ -5738,12 +5738,12 @@
generateMapAtstart(sqInt addressOrNull, sqInt startAddress)
{
unsigned char annotation;
- usqInt delta;
+ sqInt delta;
sqInt i;
AbstractInstruction *instruction;
sqInt length;
- usqInt location;
- usqInt mapEntry;
+ sqInt location;
+ sqInt mapEntry;
sqInt maxDelta;
usqInt mcpc;
@@ -19724,6 +19724,7 @@
static sqInt NoDbgRegParms
remapObject(sqInt objOop)
{
+ assert(addressCouldBeObj(objOop));
return (shouldRemapObj(objOop)
? remapObj(objOop)
: objOop);
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Sat Feb 20 13:24:43 PST 2016
+ Sat Feb 20 19:15:29 PST 2016
Modified: branches/Cog/platforms/unix/vm/Makefile.in
===================================================================
--- branches/Cog/platforms/unix/vm/Makefile.in 2016-02-21 01:35:03 UTC (rev 3620)
+++ branches/Cog/platforms/unix/vm/Makefile.in 2016-02-21 03:17:14 UTC (rev 3621)
@@ -73,7 +73,7 @@
# cogit.c merely includes specific a specific cogitPROCESSOR.c
# e.g. cogitARMv5.c cogitIA32.c cogitMIPSEL.c cogitX64.c
-cogit$o : $(srcdir)/vm/cogit.c
+cogit$o : $(srcdir)/vm/cogit.c $(wildcard $(srcdir)/vm/cogit[A-Z]*.c)
# sqUnixHeartbeat.c includes sqSCCSVersion.h
sqUnixHeartbeat$o : $(topdir)/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/scripts/findUnofficialFiles
===================================================================
--- branches/Cog/scripts/findUnofficialFiles 2016-02-21 01:35:03 UTC (rev 3620)
+++ branches/Cog/scripts/findUnofficialFiles 2016-02-21 03:17:14 UTC (rev 3621)
@@ -1,4 +1,4 @@
#!/bin/sh
# List any files with an un-checked-in package version comment "* VMMaker-..."
-find ${@-src stacksrc spursrc spurstacksrc spurstack64src nsspursrc nsspurstacksrc spursistasrc} -name .svn -prune -o \( -type f -a -name '*.[ch]' \) \
+find ${@-src stacksrc spursrc spurstacksrc spurstack64src spur64src nsspursrc nsspur64src nsspurstacksrc spursistasrc} -name .svn -prune -o \( -type f -a -name '*.[ch]' \) \
-exec egrep -l '\* VMMaker|\* VMConstruction|\* Freetype-Plugin|\* Cog-' {} \;
Modified: branches/Cog/spur64src/vm/cogit.h
===================================================================
--- branches/Cog/spur64src/vm/cogit.h 2016-02-21 01:35:03 UTC (rev 3620)
+++ branches/Cog/spur64src/vm/cogit.h 2016-02-21 03:17:14 UTC (rev 3621)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
*/
Modified: branches/Cog/spur64src/vm/cogitX64.c
===================================================================
--- branches/Cog/spur64src/vm/cogitX64.c 2016-02-21 01:35:03 UTC (rev 3620)
+++ branches/Cog/spur64src/vm/cogitX64.c 2016-02-21 03:17:14 UTC (rev 3621)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -414,9 +414,9 @@
static sqInt NoDbgRegParms computeSizeOfArithCwR(AbstractInstruction * self_in_computeSizeOfArithCwR);
static usqInt NoDbgRegParms concretizeArithCwR(AbstractInstruction * self_in_concretizeArithCwR, sqInt x64opcode);
static usqInt NoDbgRegParms concretizeMoveCwR(AbstractInstruction * self_in_concretizeMoveCwR);
-static sqInt NoDbgRegParms inlineCacheTagAt(AbstractInstruction * self_in_inlineCacheTagAt, sqInt callSiteReturnAddress);
+static usqInt NoDbgRegParms inlineCacheTagAt(AbstractInstruction * self_in_inlineCacheTagAt, sqInt callSiteReturnAddress);
static sqInt NoDbgRegParms isPCDependent(AbstractInstruction * self_in_isPCDependent);
-static sqInt NoDbgRegParms literal32BeforeFollowingAddress(AbstractInstruction * self_in_literal32BeforeFollowingAddress, sqInt followingAddress);
+static usqInt NoDbgRegParms literal32BeforeFollowingAddress(AbstractInstruction * self_in_literal32BeforeFollowingAddress, sqInt followingAddress);
static sqInt NoDbgRegParms literalBeforeFollowingAddress(AbstractInstruction * self_in_literalBeforeFollowingAddress, sqInt followingAddress);
static sqInt NoDbgRegParms loadLiteralByteSize(AbstractInstruction * self_in_loadLiteralByteSize);
static usqInt NoDbgRegParms sizePCDependentInstructionAt(AbstractInstruction * self_in_sizePCDependentInstructionAt, sqInt eventualAbsoluteAddress);
@@ -1993,7 +1993,7 @@
/* Answer the inline cache tag for the return address of a send. */
/* CogInLineLiteralsX64Compiler>>#inlineCacheTagAt: */
-static sqInt NoDbgRegParms
+static usqInt NoDbgRegParms
inlineCacheTagAt(AbstractInstruction * self_in_inlineCacheTagAt, sqInt callSiteReturnAddress)
{
return literal32BeforeFollowingAddress(self_in_inlineCacheTagAt, callSiteReturnAddress - 5);
@@ -2016,10 +2016,10 @@
*/
/* CogInLineLiteralsX64Compiler>>#literal32BeforeFollowingAddress: */
-static sqInt NoDbgRegParms
+static usqInt NoDbgRegParms
literal32BeforeFollowingAddress(AbstractInstruction * self_in_literal32BeforeFollowingAddress, sqInt followingAddress)
{
- return unalignedLong32At(self_in_literal32BeforeFollowingAddress, followingAddress - 4);
+ return ((unsigned int) (unalignedLong32At(self_in_literal32BeforeFollowingAddress, followingAddress - 4)));
}
@@ -2971,7 +2971,7 @@
checkIfValidOopRefAndTargetpccogMethod(sqInt annotation, char *mcpc, sqInt cogMethod)
{
sqInt cacheTag;
- sqInt cacheTag1;
+ usqInt cacheTag1;
sqInt entryPoint;
sqInt entryPoint1;
sqInt literal;
@@ -3009,10 +3009,7 @@
Note that selectors can be immediate so there is no guarantee that they
are markable/remappable objects. */
entryPoint1 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc));
- tagCouldBeObj = (entryPoint1 < methodZoneBase)
- || (((entryPoint1 & entryPointMask) == uncheckedEntryAlignment)
- || (((entryPoint1 & entryPointMask) == checkedEntryAlignment)
- && ((((((CogMethod *) (entryPoint1 - cmEntryOffset)))->cmType)) == CMOpenPIC)));
+ tagCouldBeObj = 0;
if (tagCouldBeObj) {
if (couldBeObject(cacheTag1)) {
if (!(asserta(checkValidOopReference(cacheTag1)))) {
@@ -3078,7 +3075,7 @@
sqInt off;
sqInt offset;
sqInt offset1;
- sqInt selectorOrCacheTag;
+ usqInt selectorOrCacheTag;
sqInt *sendTable;
sqInt table;
@@ -3289,7 +3286,7 @@
closedPICRefersToUnmarkedObject(CogMethod *cPIC)
{
sqInt i;
- sqInt object;
+ usqInt object;
sqInt pc;
if (!((isImmediate((cPIC->selector)))
@@ -4388,7 +4385,7 @@
static sqInt NoDbgRegParms
cPICHasForwardedClass(CogMethod *cPIC)
{
- sqInt classIndex;
+ usqInt classIndex;
sqInt i;
sqInt pc;
@@ -4596,7 +4593,7 @@
static sqInt NoDbgRegParms
expectedClosedPICPrototype(CogMethod *cPIC)
{
- sqInt classTag;
+ usqInt classTag;
usqInt classTagPC;
sqInt entryPoint;
sqInt errors;
@@ -7197,7 +7194,7 @@
markLiteralsAndUnlinkIfUnmarkedSendpcmethod(sqInt annotation, char *mcpc, sqInt cogMethod)
{
sqInt cacheTag;
- sqInt cacheTag1;
+ usqInt cacheTag1;
sqInt cacheTagMarked;
sqInt entryPoint;
sqInt entryPoint1;
@@ -7230,10 +7227,7 @@
Note that selectors can be immediate so there is no guarantee that they
are markable/remappable objects. */
entryPoint1 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc));
- tagCouldBeObj1 = (entryPoint1 < methodZoneBase)
- || (((entryPoint1 & entryPointMask) == uncheckedEntryAlignment)
- || (((entryPoint1 & entryPointMask) == checkedEntryAlignment)
- && ((((((CogMethod *) (entryPoint1 - cmEntryOffset)))->cmType)) == CMOpenPIC)));
+ tagCouldBeObj1 = 0;
cacheTagMarked = tagCouldBeObj1
&& (cacheTagIsMarked(cacheTag1));
if (entryPoint1 > methodZoneBase) {
@@ -7283,7 +7277,7 @@
markLiteralspcmethod(sqInt annotation, char *mcpc, sqInt cogMethod)
{
sqInt cacheTag;
- sqInt cacheTag1;
+ usqInt cacheTag1;
sqInt entryPoint;
sqInt entryPoint1;
sqInt literal;
@@ -7308,10 +7302,7 @@
Note that selectors can be immediate so there is no guarantee that they
are markable/remappable objects. */
entryPoint1 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc));
- tagCouldBeObj1 = (entryPoint1 < methodZoneBase)
- || (((entryPoint1 & entryPointMask) == uncheckedEntryAlignment)
- || (((entryPoint1 & entryPointMask) == checkedEntryAlignment)
- && ((((((CogMethod *) (entryPoint1 - cmEntryOffset)))->cmType)) == CMOpenPIC)));
+ tagCouldBeObj1 = 0;
if (tagCouldBeObj1) {
}
@@ -8139,7 +8130,7 @@
remapIfObjectRefpchasYoung(sqInt annotation, char *mcpc, sqInt hasYoungPtr)
{
sqInt cacheTag;
- sqInt cacheTag1;
+ usqInt cacheTag1;
sqInt entryPoint;
sqInt entryPoint1;
sqInt ignored;
@@ -8178,10 +8169,7 @@
Note that selectors can be immediate so there is no guarantee that they
are markable/remappable objects. */
entryPoint1 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc));
- tagCouldBeObj1 = (entryPoint1 < methodZoneBase)
- || (((entryPoint1 & entryPointMask) == uncheckedEntryAlignment)
- || (((entryPoint1 & entryPointMask) == checkedEntryAlignment)
- && ((((((CogMethod *) (entryPoint1 - cmEntryOffset)))->cmType)) == CMOpenPIC)));
+ tagCouldBeObj1 = 0;
if (tagCouldBeObj1
&& (couldBeObject(cacheTag1))) {
mappedCacheTag = remapObject(cacheTag1);
@@ -14495,6 +14483,7 @@
static sqInt NoDbgRegParms
remapObject(sqInt objOop)
{
+ assert(addressCouldBeObj(objOop));
return (shouldRemapObj(objOop)
? remapObj(objOop)
: objOop);
@@ -14784,7 +14773,7 @@
static sqInt NoDbgRegParms
callTargetFromReturnAddress(AbstractInstruction * self_in_callTargetFromReturnAddress, sqInt callSiteReturnAddress)
{
- sqInt callDistance;
+ usqInt callDistance;
callDistance = literal32BeforeFollowingAddress(self_in_callTargetFromReturnAddress, callSiteReturnAddress);
return callSiteReturnAddress + (((int) callDistance));
Modified: branches/Cog/spursistasrc/vm/cogit.h
===================================================================
--- branches/Cog/spursistasrc/vm/cogit.h 2016-02-21 01:35:03 UTC (rev 3620)
+++ branches/Cog/spursistasrc/vm/cogit.h 2016-02-21 03:17:14 UTC (rev 3621)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
*/
Modified: branches/Cog/spursistasrc/vm/cogitARMv5.c
===================================================================
--- branches/Cog/spursistasrc/vm/cogitARMv5.c 2016-02-21 01:35:03 UTC (rev 3620)
+++ branches/Cog/spursistasrc/vm/cogitARMv5.c 2016-02-21 03:17:14 UTC (rev 3621)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
from
- SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
*/
-static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -10421,12 +10421,12 @@
generateMapAtstart(sqInt addressOrNull, sqInt startAddress)
{
unsigned char annotation;
- usqInt delta;
+ sqInt delta;
sqInt i;
AbstractInstruction *instruction;
sqInt length;
- usqInt location;
- usqInt mapEntry;
+ sqInt location;
+ sqInt mapEntry;
sqInt maxDelta;
usqInt mcpc;
@@ -20255,6 +20255,7 @@
static sqInt NoDbgRegParms
remapObject(sqInt objOop)
{
+ assert(addressCouldBeObj(objOop));
return (shouldRemapObj(objOop)
? remapObj(objOop)
: objOop);
Modified: branches/Cog/spursistasrc/vm/cogitIA32.c
===================================================================
--- branches/Cog/spursistasrc/vm/cogitIA32.c 2016-02-21 01:35:03 UTC (rev 3620)
+++ branches/Cog/spursistasrc/vm/cogitIA32.c 2016-02-21 03:17:14 UTC (rev 3621)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
from
- SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
*/
-static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -18465,6 +18465,7 @@
static sqInt NoDbgRegParms
remapObject(sqInt objOop)
{
+ assert(addressCouldBeObj(objOop));
return (shouldRemapObj(objOop)
? remapObj(objOop)
: objOop);
Modified: branches/Cog/spursistasrc/vm/cogitMIPSEL.c
===================================================================
--- branches/Cog/spursistasrc/vm/cogitMIPSEL.c 2016-02-21 01:35:03 UTC (rev 3620)
+++ branches/Cog/spursistasrc/vm/cogitMIPSEL.c 2016-02-21 03:17:14 UTC (rev 3621)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
from
- SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
*/
-static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -5602,12 +5602,12 @@
generateMapAtstart(sqInt addressOrNull, sqInt startAddress)
{
unsigned char annotation;
- usqInt delta;
+ sqInt delta;
sqInt i;
AbstractInstruction *instruction;
sqInt length;
- usqInt location;
- usqInt mapEntry;
+ sqInt location;
+ sqInt mapEntry;
sqInt maxDelta;
usqInt mcpc;
@@ -18705,6 +18705,7 @@
static sqInt NoDbgRegParms
remapObject(sqInt objOop)
{
+ assert(addressCouldBeObj(objOop));
return (shouldRemapObj(objOop)
? remapObj(objOop)
: objOop);
Modified: branches/Cog/spursrc/vm/cogit.h
===================================================================
--- branches/Cog/spursrc/vm/cogit.h 2016-02-21 01:35:03 UTC (rev 3620)
+++ branches/Cog/spursrc/vm/cogit.h 2016-02-21 03:17:14 UTC (rev 3621)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
*/
Modified: branches/Cog/spursrc/vm/cogitARMv5.c
===================================================================
--- branches/Cog/spursrc/vm/cogitARMv5.c 2016-02-21 01:35:03 UTC (rev 3620)
+++ branches/Cog/spursrc/vm/cogitARMv5.c 2016-02-21 03:17:14 UTC (rev 3621)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -19618,6 +19618,7 @@
static sqInt NoDbgRegParms
remapObject(sqInt objOop)
{
+ assert(addressCouldBeObj(objOop));
return (shouldRemapObj(objOop)
? remapObj(objOop)
: objOop);
Modified: branches/Cog/spursrc/vm/cogitIA32.c
===================================================================
--- branches/Cog/spursrc/vm/cogitIA32.c 2016-02-21 01:35:03 UTC (rev 3620)
+++ branches/Cog/spursrc/vm/cogitIA32.c 2016-02-21 03:17:14 UTC (rev 3621)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -17851,6 +17851,7 @@
static sqInt NoDbgRegParms
remapObject(sqInt objOop)
{
+ assert(addressCouldBeObj(objOop));
return (shouldRemapObj(objOop)
? remapObj(objOop)
: objOop);
Modified: branches/Cog/spursrc/vm/cogitMIPSEL.c
===================================================================
--- branches/Cog/spursrc/vm/cogitMIPSEL.c 2016-02-21 01:35:03 UTC (rev 3620)
+++ branches/Cog/spursrc/vm/cogitMIPSEL.c 2016-02-21 03:17:14 UTC (rev 3621)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -18074,6 +18074,7 @@
static sqInt NoDbgRegParms
remapObject(sqInt objOop)
{
+ assert(addressCouldBeObj(objOop));
return (shouldRemapObj(objOop)
? remapObj(objOop)
: objOop);
Modified: branches/Cog/src/vm/cogit.h
===================================================================
--- branches/Cog/src/vm/cogit.h 2016-02-21 01:35:03 UTC (rev 3620)
+++ branches/Cog/src/vm/cogit.h 2016-02-21 03:17:14 UTC (rev 3621)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
*/
Modified: branches/Cog/src/vm/cogitARMv5.c
===================================================================
--- branches/Cog/src/vm/cogitARMv5.c 2016-02-21 01:35:03 UTC (rev 3620)
+++ branches/Cog/src/vm/cogitARMv5.c 2016-02-21 03:17:14 UTC (rev 3621)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -869,7 +869,7 @@
static void NoDbgRegParms markAndTraceLiteral(sqInt literal);
extern sqInt numRegArgs(void);
static sqInt numSmallIntegerBits(void);
-static sqInt NoDbgRegParms remapObject(sqInt oop);
+static sqInt NoDbgRegParms remapObject(sqInt objOop);
static sqInt NoDbgRegParms remapOop(sqInt oop);
static sqInt NoDbgRegParms shouldAnnotateObjectReference(sqInt anOop);
static sqInt NoDbgRegParms slotOffsetOfInstVarIndex(sqInt index);
@@ -9817,12 +9817,12 @@
generateMapAtstart(sqInt addressOrNull, sqInt startAddress)
{
unsigned char annotation;
- usqInt delta;
+ sqInt delta;
sqInt i;
AbstractInstruction *instruction;
sqInt length;
- usqInt location;
- usqInt mapEntry;
+ sqInt location;
+ sqInt mapEntry;
sqInt maxDelta;
usqInt mcpc;
@@ -16800,9 +16800,10 @@
/* CogObjectRepresentationForSqueakV3>>#remapObject: */
static sqInt NoDbgRegParms
-remapObject(sqInt oop)
+remapObject(sqInt objOop)
{
- return remap(oop);
+ assert(addressCouldBeObj(objOop));
+ return remap(objOop);
}
/* CogObjectRepresentationForSqueakV3>>#remapOop: */
Modified: branches/Cog/src/vm/cogitIA32.c
===================================================================
--- branches/Cog/src/vm/cogitIA32.c 2016-02-21 01:35:03 UTC (rev 3620)
+++ branches/Cog/src/vm/cogitIA32.c 2016-02-21 03:17:14 UTC (rev 3621)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -818,7 +818,7 @@
static void NoDbgRegParms markAndTraceLiteral(sqInt literal);
extern sqInt numRegArgs(void);
static sqInt numSmallIntegerBits(void);
-static sqInt NoDbgRegParms remapObject(sqInt oop);
+static sqInt NoDbgRegParms remapObject(sqInt objOop);
static sqInt NoDbgRegParms remapOop(sqInt oop);
static sqInt NoDbgRegParms shouldAnnotateObjectReference(sqInt anOop);
static sqInt NoDbgRegParms slotOffsetOfInstVarIndex(sqInt index);
@@ -8891,12 +8891,12 @@
generateMapAtstart(sqInt addressOrNull, sqInt startAddress)
{
unsigned char annotation;
- sqInt delta;
+ usqInt delta;
sqInt i;
AbstractInstruction *instruction;
sqInt length;
- sqInt location;
- sqInt mapEntry;
+ usqInt location;
+ usqInt mapEntry;
sqInt maxDelta;
usqInt mcpc;
@@ -15514,9 +15514,10 @@
/* CogObjectRepresentationForSqueakV3>>#remapObject: */
static sqInt NoDbgRegParms
-remapObject(sqInt oop)
+remapObject(sqInt objOop)
{
- return remap(oop);
+ assert(addressCouldBeObj(objOop));
+ return remap(objOop);
}
/* CogObjectRepresentationForSqueakV3>>#remapOop: */
Modified: branches/Cog/src/vm/cogitMIPSEL.c
===================================================================
--- branches/Cog/src/vm/cogitMIPSEL.c 2016-02-21 01:35:03 UTC (rev 3620)
+++ branches/Cog/src/vm/cogitMIPSEL.c 2016-02-21 03:17:14 UTC (rev 3621)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -1015,7 +1015,7 @@
static void NoDbgRegParms markAndTraceLiteral(sqInt literal);
extern sqInt numRegArgs(void);
static sqInt numSmallIntegerBits(void);
-static sqInt NoDbgRegParms remapObject(sqInt oop);
+static sqInt NoDbgRegParms remapObject(sqInt objOop);
static sqInt NoDbgRegParms remapOop(sqInt oop);
static sqInt NoDbgRegParms shouldAnnotateObjectReference(sqInt anOop);
static sqInt NoDbgRegParms slotOffsetOfInstVarIndex(sqInt index);
@@ -4160,7 +4160,7 @@
static sqInt NoDbgRegParms
cPICHasFreedTargets(CogMethod *cPIC)
{
- sqInt entryPoint;
+ usqInt entryPoint;
sqInt i;
sqInt pc;
CogMethod *targetMethod;
@@ -4349,7 +4349,7 @@
{
sqInt classTag;
usqInt classTagPC;
- sqInt entryPoint;
+ usqInt entryPoint;
sqInt errors;
sqInt i;
usqInt methodObjPC;
@@ -7577,7 +7577,7 @@
relocateCallsInClosedPIC(CogMethod *cPIC)
{
sqInt callDelta;
- sqInt entryPoint;
+ usqInt entryPoint;
sqInt i;
sqInt pc;
sqInt refDelta;
@@ -15724,9 +15724,10 @@
/* CogObjectRepresentationForSqueakV3>>#remapObject: */
static sqInt NoDbgRegParms
-remapObject(sqInt oop)
+remapObject(sqInt objOop)
{
- return remap(oop);
+ assert(addressCouldBeObj(objOop));
+ return remap(objOop);
}
/* CogObjectRepresentationForSqueakV3>>#remapOop: */
More information about the Vm-dev
mailing list