Skip to content

Commit 8e81821

Browse files
eliotmirandaeliotmiranda
committed
CogVM source as per VMMaker.oscog-eem.3661
Fix a slip in assertValidExternalFrameWithIP:.
1 parent 2d329f2 commit 8e81821

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+637
-629
lines changed

‎src/spur32.cog.lowcode/cogit.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.3660 uuid: e11b031c-e0f4-4561-a732-0fe07bb0183c
2+
CCodeGenerator VMMaker.oscog-eem.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08
33
(Cog-eem.502, Compiler-eem.520)
44
*/
55

‎src/spur32.cog.lowcode/cogitARMv5.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.3660 uuid: e11b031c-e0f4-4561-a732-0fe07bb0183c
2+
CCodeGenerator VMMaker.oscog-eem.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08
33
(Cog-eem.502, Compiler-eem.520)
44
from
5-
StackToRegisterMappingCogit VMMaker.oscog-eem.3660 uuid: e11b031c-e0f4-4561-a732-0fe07bb0183c
5+
StackToRegisterMappingCogit VMMaker.oscog-eem.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08
66
*/
7-
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3660 uuid: e11b031c-e0f4-4561-a732-0fe07bb0183c " __DATE__ ;
7+
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08 " __DATE__ ;
88
char *__cogitBuildInfo = __buildInfo;
99

1010

@@ -1021,7 +1021,7 @@ static sqInt genPrimitiveStringAtPut(void);
10211021
static NoDbgRegParms sqInt genRemoveSmallIntegerTagsInScratchReg(sqInt scratchReg);
10221022
static NoDbgRegParms sqInt genShiftAwaySmallIntegerTagsInScratchReg(sqInt scratchReg);
10231023
static NoDbgRegParms sqInt getLiteralCountOfplusOneinBytesintoscratch(sqInt methodReg, sqInt plusOne, sqInt inBytes, sqInt litCountReg, sqInt scratchReg);
1024-
static NoDbgRegParms usqInt inlineCacheTagForInstance(sqInt oop);
1024+
static NoDbgRegParms sqInt inlineCacheTagForInstance(sqInt oop);
10251025
static NoDbgRegParms AbstractInstruction * jumpNotSmallIntegerUnsignedValueInRegister(sqInt reg);
10261026
static NoDbgRegParms sqInt markAndTraceCacheTagLiteralinatpc(sqInt literal, CogMethod *cogMethodOrNil, usqInt address);
10271027
static sqInt numSmallIntegerBits(void);
@@ -8566,7 +8566,7 @@ callCogCodePopReceiverAndClassRegs(void)
85668566
static NoDbgRegParms sqInt
85678567
ceCPICMissreceiver(CogMethod *cPIC, sqInt receiver)
85688568
{
8569-
usqInt cacheTag;
8569+
sqInt cacheTag;
85708570
int errorSelectorOrNil;
85718571
sqInt methodOrSelectorIndex;
85728572
sqInt newTargetMethodOrNil;
@@ -8701,7 +8701,7 @@ ceMalloc(size_t size)
87018701
static NoDbgRegParms sqInt
87028702
ceSICMiss(sqInt receiver)
87038703
{
8704-
usqInt cacheTag;
8704+
sqInt cacheTag;
87058705
sqInt entryPoint;
87068706
int errorSelectorOrNil;
87078707
sqInt extent;
@@ -14389,7 +14389,7 @@ void
1438914389
linkSendAtintooffsetreceiver(sqInt callSiteReturnAddress, CogMethod *sendingMethod, CogMethod *targetMethod, sqInt theEntryOffset, sqInt receiver)
1439014390
{
1439114391
sqInt extent;
14392-
usqInt inlineCacheTag;
14392+
sqInt inlineCacheTag;
1439314393

1439414394
assert((theEntryOffset == cmEntryOffset)
1439514395
|| (theEntryOffset == cmNoCheckEntryOffset));
@@ -23391,7 +23391,7 @@ getLiteralCountOfplusOneinBytesintoscratch(sqInt methodReg, sqInt plusOne, sqInt
2339123391
c.f. getInlineCacheClassTagFrom:into: & inlineCacheTagForClass: */
2339223392

2339323393
/* CogObjectRepresentationFor32BitSpur>>#inlineCacheTagForInstance: */
23394-
static NoDbgRegParms usqInt
23394+
static NoDbgRegParms sqInt
2339523395
inlineCacheTagForInstance(sqInt oop)
2339623396
{
2339723397
return (isImmediate(oop)

‎src/spur32.cog.lowcode/cogitIA32.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.3660 uuid: e11b031c-e0f4-4561-a732-0fe07bb0183c
2+
CCodeGenerator VMMaker.oscog-eem.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08
33
(Cog-eem.502, Compiler-eem.520)
44
from
5-
StackToRegisterMappingCogit VMMaker.oscog-eem.3660 uuid: e11b031c-e0f4-4561-a732-0fe07bb0183c
5+
StackToRegisterMappingCogit VMMaker.oscog-eem.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08
66
*/
7-
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3660 uuid: e11b031c-e0f4-4561-a732-0fe07bb0183c " __DATE__ ;
7+
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08 " __DATE__ ;
88
char *__cogitBuildInfo = __buildInfo;
99

1010

@@ -511,7 +511,7 @@ static NoDbgRegParms sqInt callTargetFromReturnAddress(AbstractInstruction *self
511511
static NoDbgRegParms AbstractInstruction * cFloatResultToRd(AbstractInstruction *self_in_CogIA32Compiler, sqInt reg);
512512
static NoDbgRegParms AbstractInstruction * cFloatResultToRs(AbstractInstruction *self_in_CogIA32Compiler, sqInt reg);
513513
static NoDbgRegParms sqInt cmpC32RTempByteSize(AbstractInstruction *self_in_CogIA32Compiler);
514-
static NoDbgRegParms int computeMaximumSize(AbstractInstruction *self_in_CogIA32Compiler);
514+
static NoDbgRegParms sqInt computeMaximumSize(AbstractInstruction *self_in_CogIA32Compiler);
515515
static NoDbgRegParms int computeShiftRRSize(AbstractInstruction *self_in_CogIA32Compiler);
516516
static NoDbgRegParms sqInt concretizeFill32(AbstractInstruction *self_in_CogIA32Compiler);
517517
static NoDbgRegParms sqInt concretizeMovePerfCnt64RRL(AbstractInstruction *self_in_CogIA32Compiler);
@@ -3332,7 +3332,7 @@ cmpC32RTempByteSize(AbstractInstruction *self_in_CogIA32Compiler)
33323332
limits which are exceeded when each case jumps around the otherwise. */
33333333

33343334
/* CogIA32Compiler>>#computeMaximumSize */
3335-
static NoDbgRegParms int
3335+
static NoDbgRegParms sqInt
33363336
computeMaximumSize(AbstractInstruction *self_in_CogIA32Compiler)
33373337
{
33383338
switch ((self_in_CogIA32Compiler->opcode)) {

‎src/spur32.cog.lowcode/cointerp.c‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* Automatically generated by
2-
CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3660 uuid: e11b031c-e0f4-4561-a732-0fe07bb0183c
2+
CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08
33
(Cog-eem.502, Compiler-eem.520)
44
from
5-
CoInterpreter VMMaker.oscog-eem.3660 uuid: e11b031c-e0f4-4561-a732-0fe07bb0183c
5+
CoInterpreter VMMaker.oscog-eem.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08
66
*/
7-
static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3660 uuid: e11b031c-e0f4-4561-a732-0fe07bb0183c " __DATE__ ;
7+
static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08 " __DATE__ ;
88
char *__interpBuildInfo = __buildInfo;
99

1010

@@ -622,7 +622,7 @@ extern char * whereIs(sqInt anOop);
622622
static NoDbgRegParms NeverInline void widowOrForceToBytecodePC(sqInt ctxt);
623623
static NoDbgRegParms int frameIsMarked(sqInt theFPInt);
624624
#if VMInvestigations
625-
EXPORT(sqInt) primitiveAllMethodsCompiledToMachineCode(void);
625+
EXPORT(int) primitiveAllMethodsCompiledToMachineCode(void);
626626
#endif /* VMInvestigations */
627627
#if VMInvestigations
628628
EXPORT(void) primitiveBenchmarkFollowForwardersInStackZone(void);
@@ -1246,7 +1246,7 @@ extern sqInt numBytesOf(sqInt objOop);
12461246
static NoDbgRegParms usqInt numPointerSlotsOf(sqInt objOop);
12471247
static NoDbgRegParms sqInt numSlotsForBytes(sqInt numBytes);
12481248
static NoDbgRegParms usqInt numSlotsOfAny(sqInt objOop);
1249-
static NoDbgRegParms sqInt numSlotsOfIndexablePointerObj(sqInt objOop);
1249+
static NoDbgRegParms usqInt numSlotsOfIndexablePointerObj(sqInt objOop);
12501250
extern usqInt numSlotsOf(sqInt objOop);
12511251
static NoDbgRegParms sqInt numStrongSlotsOfInephemeral(sqInt objOop);
12521252
static NoDbgRegParms sqInt numStrongSlotsOfWeakling(sqInt objOop);
@@ -2707,7 +2707,7 @@ sqInt debugCallbackReturns;
27072707
sqInt suppressHeartbeatFlag;
27082708
sqInt cannotDeferDisplayUpdates;
27092709
sqInt checkedPluginName;
2710-
const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3660]";
2710+
const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3661]";
27112711
const char * leakCheckFlagsMeanings[] = {
27122712
"1: check full GC", "2: check new space GC", "4: check incremental GC", "8: check become",
27132713
"16: check image segment", "32: check free space", "64: check shorten", "128: check prim call",
@@ -36758,7 +36758,7 @@ transferTofrom(sqInt newProcOrNil, sqInt sourceCode)
3675836758
char *theFrame;
3675936759
StackPage *thePage;
3676036760
char *toDoLimit;
36761-
int toDoLimit1;
36761+
char *toDoLimit1;
3676236762
sqInt top;
3676336763

3676436764
GIV(statProcessSwitch) += 1;
@@ -36787,11 +36787,11 @@ transferTofrom(sqInt newProcOrNil, sqInt sourceCode)
3678736787

3678836788
/* begin assertValidExternalFrameWithIP: */
3678936789
assertValidExecutionPointersimbarline(ip, GIV(framePointer), GIV(stackPointer), !((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())), __LINE__);
36790-
toDoLimit = /* frameReceiverLocation: */
36790+
toDoLimit1 = /* frameReceiverLocation: */
3679136791
((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())
3679236792
? GIV(framePointer) + FoxMFReceiver
3679336793
: GIV(framePointer) + FoxIFReceiver);
36794-
for (ptr = (GIV(stackPointer) + BytesPerWord); ptr <= toDoLimit; ptr += BytesPerWord) {
36794+
for (ptr = (GIV(stackPointer) + BytesPerWord); ptr <= toDoLimit1; ptr += BytesPerWord) {
3679536795
assert(addressCouldBeOop(longAt(ptr)));
3679636796
}
3679736797

@@ -36803,11 +36803,11 @@ transferTofrom(sqInt newProcOrNil, sqInt sourceCode)
3680336803
: (byteAt((GIV(framePointer) + FoxIFrameFlags) + 2)) != 0)) {
3680436804
assert(!((isForwarded(frameContext(GIV(framePointer))))));
3680536805
}
36806-
toDoLimit1 = (FoxCallerSavedIP + BytesPerWord) + ((((usqInt)((/* frameNumArgs: */
36806+
toDoLimit = GIV(framePointer) + ((FoxCallerSavedIP + BytesPerWord) + ((((usqInt)((/* frameNumArgs: */
3680736807
((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())
3680836808
? ((mframeCogMethod(GIV(framePointer)))->cmNumArgs)
36809-
: byteAt((GIV(framePointer) + FoxIFrameFlags) + 1)))) << (shiftForWord()))));
36810-
for (ptr = ((GIV(framePointer) + FoxCallerSavedIP) + BytesPerWord); ptr <= toDoLimit1; ptr += BytesPerWord) {
36809+
: byteAt((GIV(framePointer) + FoxIFrameFlags) + 1)))) << (shiftForWord())))));
36810+
for (ptr = ((GIV(framePointer) + FoxCallerSavedIP) + BytesPerWord); ptr <= toDoLimit; ptr += BytesPerWord) {
3681136811
assert(addressCouldBeOop(longAt(ptr)));
3681236812
}
3681336813

@@ -37399,7 +37399,7 @@ frameIsMarked(sqInt theFPInt)
3739937399

3740037400
/* CoInterpreterPrimitives>>#primitiveAllMethodsCompiledToMachineCode */
3740137401
#if VMInvestigations
37402-
EXPORT(sqInt)
37402+
EXPORT(int)
3740337403
primitiveAllMethodsCompiledToMachineCode(void)
3740437404
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
3740537405
sqInt arrayObj;
@@ -70020,7 +70020,7 @@ numSlotsOfAny(sqInt objOop)
7002070020
*/
7002170021

7002270022
/* SpurMemoryManager>>#numSlotsOfIndexablePointerObj: */
70023-
static NoDbgRegParms sqInt
70023+
static NoDbgRegParms usqInt
7002470024
numSlotsOfIndexablePointerObj(sqInt objOop)
7002570025
{
7002670026
usqInt numSlots;
@@ -77565,7 +77565,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr)
7756577565
contextSize = (sp >> 1);
7756677566
/* end fetchStackPointerOf: */
7756777567
l2:
77568-
numPointerSlots = CtxtTempFrameStart + contextSize;
77568+
numPointerSlots = ((usqInt) (CtxtTempFrameStart + contextSize));
7756977569
goto l3;
7757077570
}
7757177571

@@ -77928,7 +77928,7 @@ bridgeFor(SpurSegmentInfo *aSegment)
7792877928
static NoDbgRegParms void
7792977929
bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
7793077930
{
77931-
sqInt bridgeSpan;
77931+
int bridgeSpan;
7793277932
sqInt clifton;
7793377933
usqInt segEnd;
7793477934

‎src/spur32.cog.lowcode/cointerp.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Automatically generated by
2-
CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3660 uuid: e11b031c-e0f4-4561-a732-0fe07bb0183c
2+
CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08
33
(Cog-eem.502, Compiler-eem.520)
44
*/
55

‎src/spur32.cog.lowcode/gcc3x-cointerp.c‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33

44
/* Automatically generated by
5-
CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3660 uuid: e11b031c-e0f4-4561-a732-0fe07bb0183c
5+
CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08
66
(Cog-eem.502, Compiler-eem.520)
77
from
8-
CoInterpreter VMMaker.oscog-eem.3660 uuid: e11b031c-e0f4-4561-a732-0fe07bb0183c
8+
CoInterpreter VMMaker.oscog-eem.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08
99
*/
10-
static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3660 uuid: e11b031c-e0f4-4561-a732-0fe07bb0183c " __DATE__ ;
10+
static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08 " __DATE__ ;
1111
char *__interpBuildInfo = __buildInfo;
1212

1313

@@ -625,7 +625,7 @@ extern char * whereIs(sqInt anOop);
625625
static NoDbgRegParms NeverInline void widowOrForceToBytecodePC(sqInt ctxt);
626626
static NoDbgRegParms int frameIsMarked(sqInt theFPInt);
627627
#if VMInvestigations
628-
EXPORT(sqInt) primitiveAllMethodsCompiledToMachineCode(void);
628+
EXPORT(int) primitiveAllMethodsCompiledToMachineCode(void);
629629
#endif /* VMInvestigations */
630630
#if VMInvestigations
631631
EXPORT(void) primitiveBenchmarkFollowForwardersInStackZone(void);
@@ -1249,7 +1249,7 @@ extern sqInt numBytesOf(sqInt objOop);
12491249
static NoDbgRegParms usqInt numPointerSlotsOf(sqInt objOop);
12501250
static NoDbgRegParms sqInt numSlotsForBytes(sqInt numBytes);
12511251
static NoDbgRegParms usqInt numSlotsOfAny(sqInt objOop);
1252-
static NoDbgRegParms sqInt numSlotsOfIndexablePointerObj(sqInt objOop);
1252+
static NoDbgRegParms usqInt numSlotsOfIndexablePointerObj(sqInt objOop);
12531253
extern usqInt numSlotsOf(sqInt objOop);
12541254
static NoDbgRegParms sqInt numStrongSlotsOfInephemeral(sqInt objOop);
12551255
static NoDbgRegParms sqInt numStrongSlotsOfWeakling(sqInt objOop);
@@ -2710,7 +2710,7 @@ sqInt debugCallbackReturns;
27102710
sqInt suppressHeartbeatFlag;
27112711
sqInt cannotDeferDisplayUpdates;
27122712
sqInt checkedPluginName;
2713-
const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3660]";
2713+
const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3661]";
27142714
const char * leakCheckFlagsMeanings[] = {
27152715
"1: check full GC", "2: check new space GC", "4: check incremental GC", "8: check become",
27162716
"16: check image segment", "32: check free space", "64: check shorten", "128: check prim call",
@@ -36765,7 +36765,7 @@ transferTofrom(sqInt newProcOrNil, sqInt sourceCode)
3676536765
char *theFrame;
3676636766
StackPage *thePage;
3676736767
char *toDoLimit;
36768-
int toDoLimit1;
36768+
char *toDoLimit1;
3676936769
sqInt top;
3677036770

3677136771
GIV(statProcessSwitch) += 1;
@@ -36794,11 +36794,11 @@ transferTofrom(sqInt newProcOrNil, sqInt sourceCode)
3679436794

3679536795
/* begin assertValidExternalFrameWithIP: */
3679636796
assertValidExecutionPointersimbarline(ip, GIV(framePointer), GIV(stackPointer), !((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())), __LINE__);
36797-
toDoLimit = /* frameReceiverLocation: */
36797+
toDoLimit1 = /* frameReceiverLocation: */
3679836798
((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())
3679936799
? GIV(framePointer) + FoxMFReceiver
3680036800
: GIV(framePointer) + FoxIFReceiver);
36801-
for (ptr = (GIV(stackPointer) + BytesPerWord); ptr <= toDoLimit; ptr += BytesPerWord) {
36801+
for (ptr = (GIV(stackPointer) + BytesPerWord); ptr <= toDoLimit1; ptr += BytesPerWord) {
3680236802
assert(addressCouldBeOop(longAt(ptr)));
3680336803
}
3680436804

@@ -36810,11 +36810,11 @@ transferTofrom(sqInt newProcOrNil, sqInt sourceCode)
3681036810
: (byteAt((GIV(framePointer) + FoxIFrameFlags) + 2)) != 0)) {
3681136811
assert(!((isForwarded(frameContext(GIV(framePointer))))));
3681236812
}
36813-
toDoLimit1 = (FoxCallerSavedIP + BytesPerWord) + ((((usqInt)((/* frameNumArgs: */
36813+
toDoLimit = GIV(framePointer) + ((FoxCallerSavedIP + BytesPerWord) + ((((usqInt)((/* frameNumArgs: */
3681436814
((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())
3681536815
? ((mframeCogMethod(GIV(framePointer)))->cmNumArgs)
36816-
: byteAt((GIV(framePointer) + FoxIFrameFlags) + 1)))) << (shiftForWord()))));
36817-
for (ptr = ((GIV(framePointer) + FoxCallerSavedIP) + BytesPerWord); ptr <= toDoLimit1; ptr += BytesPerWord) {
36816+
: byteAt((GIV(framePointer) + FoxIFrameFlags) + 1)))) << (shiftForWord())))));
36817+
for (ptr = ((GIV(framePointer) + FoxCallerSavedIP) + BytesPerWord); ptr <= toDoLimit; ptr += BytesPerWord) {
3681836818
assert(addressCouldBeOop(longAt(ptr)));
3681936819
}
3682036820

@@ -37406,7 +37406,7 @@ frameIsMarked(sqInt theFPInt)
3740637406

3740737407
/* CoInterpreterPrimitives>>#primitiveAllMethodsCompiledToMachineCode */
3740837408
#if VMInvestigations
37409-
EXPORT(sqInt)
37409+
EXPORT(int)
3741037410
primitiveAllMethodsCompiledToMachineCode(void)
3741137411
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
3741237412
sqInt arrayObj;
@@ -70027,7 +70027,7 @@ numSlotsOfAny(sqInt objOop)
7002770027
*/
7002870028

7002970029
/* SpurMemoryManager>>#numSlotsOfIndexablePointerObj: */
70030-
static NoDbgRegParms sqInt
70030+
static NoDbgRegParms usqInt
7003170031
numSlotsOfIndexablePointerObj(sqInt objOop)
7003270032
{
7003370033
usqInt numSlots;
@@ -77572,7 +77572,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr)
7757277572
contextSize = (sp >> 1);
7757377573
/* end fetchStackPointerOf: */
7757477574
l2:
77575-
numPointerSlots = CtxtTempFrameStart + contextSize;
77575+
numPointerSlots = ((usqInt) (CtxtTempFrameStart + contextSize));
7757677576
goto l3;
7757777577
}
7757877578

@@ -77935,7 +77935,7 @@ bridgeFor(SpurSegmentInfo *aSegment)
7793577935
static NoDbgRegParms void
7793677936
bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
7793777937
{
77938-
sqInt bridgeSpan;
77938+
int bridgeSpan;
7793977939
sqInt clifton;
7794077940
usqInt segEnd;
7794177941

‎src/spur32.cog/cogit.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.3660 uuid: e11b031c-e0f4-4561-a732-0fe07bb0183c
2+
CCodeGenerator VMMaker.oscog-eem.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08
33
(Cog-eem.502, Compiler-eem.520)
44
*/
55

‎src/spur32.cog/cogitARMv5.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.3660 uuid: e11b031c-e0f4-4561-a732-0fe07bb0183c
2+
CCodeGenerator VMMaker.oscog-eem.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08
33
(Cog-eem.502, Compiler-eem.520)
44
from
5-
StackToRegisterMappingCogit VMMaker.oscog-eem.3660 uuid: e11b031c-e0f4-4561-a732-0fe07bb0183c
5+
StackToRegisterMappingCogit VMMaker.oscog-eem.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08
66
*/
7-
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3660 uuid: e11b031c-e0f4-4561-a732-0fe07bb0183c " __DATE__ ;
7+
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08 " __DATE__ ;
88
char *__cogitBuildInfo = __buildInfo;
99

1010

0 commit comments

Comments
 (0)