Skip to content

Commit

Permalink
CogVM source as per VMMaker.oscog-eem.3497
Browse files Browse the repository at this point in the history 
Ancestors: VMMaker.oscog-eem.3496

Fix slang type inference for the type of backEnd, which is
"AbstractInstruction * const". Not stripping the trailing
const caused type inference to fail and hence the windows
builds to fail for VMMaker.oscog-eem.3494.
  • Loading branch information
@eliotmiranda
eliotmiranda committed Jan 1, 2025
1 parent 481d81f commit 986b48d
Show file tree
Hide file tree
Showing 24 changed files with 393 additions and 399 deletions.
2 changes: 1 addition & 1 deletion src/spur32.cog.lowcode/cogit.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Automatically generated by
CCodeGenerator VMMaker.oscog-eem.3494 uuid: c7100ca0-4813-448e-805a-e19823c5991b
CCodeGenerator VMMaker.oscog-eem.3497 uuid: 0026bd79-6c6f-4506-8a6e-7c4b53a05d53
(* Compiler-eem.512)
*/

Expand Down
48 changes: 24 additions & 24 deletions src/spur32.cog.lowcode/cogitARMv5.c
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/* Automatically generated by
CCodeGenerator VMMaker.oscog-eem.3494 uuid: c7100ca0-4813-448e-805a-e19823c5991b
CCodeGenerator VMMaker.oscog-eem.3497 uuid: 0026bd79-6c6f-4506-8a6e-7c4b53a05d53
(* Compiler-eem.512)
from
StackToRegisterMappingCogit VMMaker.oscog-eem.3494 uuid: c7100ca0-4813-448e-805a-e19823c5991b
StackToRegisterMappingCogit VMMaker.oscog-eem.3497 uuid: 0026bd79-6c6f-4506-8a6e-7c4b53a05d53
*/
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3494 uuid: c7100ca0-4813-448e-805a-e19823c5991b " __DATE__ ;
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3497 uuid: 0026bd79-6c6f-4506-8a6e-7c4b53a05d53 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;


Expand Down Expand Up @@ -1012,7 +1012,7 @@ static sqInt genPrimitiveStringAtPut(void);
static NoDbgRegParms sqInt genRemoveSmallIntegerTagsInScratchReg(sqInt scratchReg);
static NoDbgRegParms sqInt genShiftAwaySmallIntegerTagsInScratchReg(sqInt scratchReg);
static NoDbgRegParms sqInt getLiteralCountOfplusOneinBytesintoscratch(sqInt methodReg, sqInt plusOne, sqInt inBytes, sqInt litCountReg, sqInt scratchReg);
static NoDbgRegParms usqInt inlineCacheTagForInstance(sqInt oop);
static NoDbgRegParms sqInt inlineCacheTagForInstance(sqInt oop);
static NoDbgRegParms AbstractInstruction * jumpNotSmallIntegerUnsignedValueInRegister(sqInt reg);
static NoDbgRegParms sqInt markAndTraceCacheTagLiteralinatpc(sqInt literal, CogMethod *cogMethodOrNil, usqInt address);
static sqInt numSmallIntegerBits(void);
Expand Down Expand Up @@ -8569,7 +8569,7 @@ callCogCodePopReceiverAndClassRegs(void)
static NoDbgRegParms sqInt
ceCPICMissreceiver(CogMethod *cPIC, sqInt receiver)
{
usqInt cacheTag;
sqInt cacheTag;
sqInt errorSelectorOrNil;
sqInt methodOrSelectorIndex;
sqInt newTargetMethodOrNil;
Expand Down Expand Up @@ -8713,7 +8713,7 @@ ceMalloc(size_t size)
static NoDbgRegParms sqInt
ceSICMiss(sqInt receiver)
{
usqInt cacheTag;
sqInt cacheTag;
sqInt entryPoint;
sqInt errorSelectorOrNil;
sqInt extent;
Expand Down Expand Up @@ -9448,7 +9448,7 @@ cogExtendPICCaseNMethodtagisMNUCase(CogMethod *cPIC, sqInt caseNMethod, sqInt ca
jumpTargetAddr = address - cPICCaseSize;

/* begin rewriteCPICJumpAt:target: */
rewriteTransferAttarget(((AbstractInstruction *) backEnd), addressFollowingJump, jumpTargetAddr);
rewriteTransferAttarget(backEnd, addressFollowingJump, jumpTargetAddr);

/* and update the header flag for the number of cases */
((((CogMethod *) ((((usqInt)cPIC)) + codeToDataDelta)))->cPICNumCases = ((cPIC->cPICNumCases)) + 1);
Expand Down Expand Up @@ -10436,10 +10436,10 @@ compileCallFornumArgsargargargargfloatResultRegregsToSave(void *aRoutine, sqInt
regMaskCopy = ((regMaskCopy) >> 1);
}
if ((numRegsPushed == 0)
&& ((numIntRegArgs(((AbstractInstruction *) backEnd))) >= numArgs)) {
&& ((numIntRegArgs(backEnd)) >= numArgs)) {
goto l1;
}
wordsPushedModAlignment = (numRegsPushed + ((((numArgs - (numIntRegArgs(((AbstractInstruction *) backEnd)))) < 0) ? 0 : (numArgs - (numIntRegArgs(((AbstractInstruction *) backEnd))))))) % (cStackAlignment / BytesPerWord);
wordsPushedModAlignment = (numRegsPushed + ((((numArgs - (numIntRegArgs(backEnd))) < 0) ? 0 : (numArgs - (numIntRegArgs(backEnd)))))) % (cStackAlignment / BytesPerWord);
if (wordsPushedModAlignment) {
delta = (cStackAlignment / BytesPerWord) - wordsPushedModAlignment;

Expand Down Expand Up @@ -10515,10 +10515,10 @@ compileCallFornumArgsargargargargresultRegregsToSave(void *aRoutine, sqInt numAr
regMaskCopy = ((regMaskCopy) >> 1);
}
if ((numRegsPushed == 0)
&& ((numIntRegArgs(((AbstractInstruction *) backEnd))) >= numArgs)) {
&& ((numIntRegArgs(backEnd)) >= numArgs)) {
goto l1;
}
wordsPushedModAlignment = (numRegsPushed + ((((numArgs - (numIntRegArgs(((AbstractInstruction *) backEnd)))) < 0) ? 0 : (numArgs - (numIntRegArgs(((AbstractInstruction *) backEnd))))))) % (cStackAlignment / BytesPerWord);
wordsPushedModAlignment = (numRegsPushed + ((((numArgs - (numIntRegArgs(backEnd))) < 0) ? 0 : (numArgs - (numIntRegArgs(backEnd)))))) % (cStackAlignment / BytesPerWord);
if (wordsPushedModAlignment) {
delta = (cStackAlignment / BytesPerWord) - wordsPushedModAlignment;

Expand Down Expand Up @@ -10592,10 +10592,10 @@ compileCallFornumArgsargargargargresultRegresultRegregsToSave(void *aRoutine, sq
regMaskCopy = ((regMaskCopy) >> 1);
}
if ((numRegsPushed == 0)
&& ((numIntRegArgs(((AbstractInstruction *) backEnd))) >= numArgs)) {
&& ((numIntRegArgs(backEnd)) >= numArgs)) {
goto l1;
}
wordsPushedModAlignment = (numRegsPushed + ((((numArgs - (numIntRegArgs(((AbstractInstruction *) backEnd)))) < 0) ? 0 : (numArgs - (numIntRegArgs(((AbstractInstruction *) backEnd))))))) % (cStackAlignment / BytesPerWord);
wordsPushedModAlignment = (numRegsPushed + ((((numArgs - (numIntRegArgs(backEnd))) < 0) ? 0 : (numArgs - (numIntRegArgs(backEnd)))))) % (cStackAlignment / BytesPerWord);
if (wordsPushedModAlignment) {
delta = (cStackAlignment / BytesPerWord) - wordsPushedModAlignment;

Expand Down Expand Up @@ -10668,10 +10668,10 @@ compileCallFornumArgsfloatArgfloatArgfloatArgfloatArgresultRegregsToSave(void *a
regMaskCopy = ((regMaskCopy) >> 1);
}
if ((numRegsPushed == 0)
&& ((numIntRegArgs(((AbstractInstruction *) backEnd))) >= numArgs)) {
&& ((numIntRegArgs(backEnd)) >= numArgs)) {
goto l1;
}
wordsPushedModAlignment = (numRegsPushed + ((((numArgs - (numIntRegArgs(((AbstractInstruction *) backEnd)))) < 0) ? 0 : (numArgs - (numIntRegArgs(((AbstractInstruction *) backEnd))))))) % (cStackAlignment / BytesPerWord);
wordsPushedModAlignment = (numRegsPushed + ((((numArgs - (numIntRegArgs(backEnd))) < 0) ? 0 : (numArgs - (numIntRegArgs(backEnd)))))) % (cStackAlignment / BytesPerWord);
if (wordsPushedModAlignment) {
delta = (cStackAlignment / BytesPerWord) - wordsPushedModAlignment;

Expand Down Expand Up @@ -11286,7 +11286,7 @@ configureMNUCPICmethodOperandnumArgsdelta(CogMethod *cPIC, sqInt methodOperand,
jumpTargetAddr = target;

/* begin rewriteCPICJumpAt:target: */
rewriteTransferAttarget(((AbstractInstruction *) backEnd), addressFollowingJump, jumpTargetAddr);
rewriteTransferAttarget(backEnd, addressFollowingJump, jumpTargetAddr);
return 0;
}

Expand Down Expand Up @@ -11358,7 +11358,7 @@ cPICCompactAndIsNowEmpty(CogMethod *cPIC)
jumpTargetAddr = pc;

/* begin rewriteCPICJumpAt:target: */
rewriteTransferAttarget(((AbstractInstruction *) backEnd), addressFollowingJump, jumpTargetAddr);
rewriteTransferAttarget(backEnd, addressFollowingJump, jumpTargetAddr);
return 0;
}

Expand All @@ -11375,7 +11375,7 @@ cPICCompactAndIsNowEmpty(CogMethod *cPIC)
jumpTargetAddr = pc - cPICCaseSize;

/* begin rewriteCPICJumpAt:target: */
rewriteTransferAttarget(((AbstractInstruction *) backEnd), addressFollowingJump, jumpTargetAddr);
rewriteTransferAttarget(backEnd, addressFollowingJump, jumpTargetAddr);
return 0;
}

Expand Down Expand Up @@ -13936,7 +13936,7 @@ void
linkSendAtintooffsetreceiver(sqInt callSiteReturnAddress, CogMethod *sendingMethod, CogMethod *targetMethod, sqInt theEntryOffset, sqInt receiver)
{
sqInt extent;
usqInt inlineCacheTag;
sqInt inlineCacheTag;

assert((theEntryOffset == cmEntryOffset)
|| (theEntryOffset == cmNoCheckEntryOffset));
Expand Down Expand Up @@ -15794,7 +15794,7 @@ remapIfObjectRefpchasYoung(sqInt annotation, char *mcpc, CogMethod *hasYoungPtr)


/* begin rewriteInlineCacheTag:at: */
longAtput(pcRelativeAddressAt(((AbstractInstruction *) backEnd), (((usqInt)mcpc)) - 8), mappedCacheTag);
longAtput(pcRelativeAddressAt(backEnd, (((usqInt)mcpc)) - 8), mappedCacheTag);
}
if ((hasYoungPtr != 0)
&& (isYoung(mappedCacheTag))) {
Expand Down Expand Up @@ -15888,7 +15888,7 @@ rewriteCPICCaseAttagobjReftarget(sqInt followingAddress, sqInt newTag, sqInt new
/* rewite the tag via the first ldr */

/* begin storeLiteral32:beforeFollowingAddress: */
storeLiteralbeforeFollowingAddress(((AbstractInstruction *) backEnd), newTag, classTagPC);
storeLiteralbeforeFollowingAddress(backEnd, newTag, classTagPC);

/* write the jump address for the new target address */
rewriteConditionalJumpLongAttarget(backEnd, followingAddress, newTarget);
Expand Down Expand Up @@ -22981,7 +22981,7 @@ getLiteralCountOfplusOneinBytesintoscratch(sqInt methodReg, sqInt plusOne, sqInt
c.f. getInlineCacheClassTagFrom:into: & inlineCacheTagForClass: */

/* CogObjectRepresentationFor32BitSpur>>#inlineCacheTagForInstance: */
static NoDbgRegParms usqInt
static NoDbgRegParms sqInt
inlineCacheTagForInstance(sqInt oop)
{
return (isImmediate(oop)
Expand Down Expand Up @@ -23032,7 +23032,7 @@ markAndTraceCacheTagLiteralinatpc(sqInt literal, CogMethod *cogMethodOrNil, usqI
codeModified = 1;
# endif

self_in_CogOutOfLineLiteralsARMCompiler = ((AbstractInstruction *) (backEnd));
self_in_CogOutOfLineLiteralsARMCompiler = backEnd;

/* begin rewriteInlineCacheTag:at: */
longAtput(pcRelativeAddressAt(self_in_CogOutOfLineLiteralsARMCompiler, address - 8), objOop);
Expand Down Expand Up @@ -23081,7 +23081,7 @@ checkValidOopReference(sqInt anOop)
static void
compileInvokeCENewHashOf(void)
{
sqInt cascade0;
AbstractInstruction *cascade0;
AbstractInstruction *inst;

backEnd;
Expand Down
22 changes: 11 additions & 11 deletions src/spur32.cog.lowcode/cogitIA32.c
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/* Automatically generated by
CCodeGenerator VMMaker.oscog-eem.3494 uuid: c7100ca0-4813-448e-805a-e19823c5991b
CCodeGenerator VMMaker.oscog-eem.3497 uuid: 0026bd79-6c6f-4506-8a6e-7c4b53a05d53
(* Compiler-eem.512)
from
StackToRegisterMappingCogit VMMaker.oscog-eem.3494 uuid: c7100ca0-4813-448e-805a-e19823c5991b
StackToRegisterMappingCogit VMMaker.oscog-eem.3497 uuid: 0026bd79-6c6f-4506-8a6e-7c4b53a05d53
*/
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3494 uuid: c7100ca0-4813-448e-805a-e19823c5991b " __DATE__ ;
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3497 uuid: 0026bd79-6c6f-4506-8a6e-7c4b53a05d53 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;


Expand Down Expand Up @@ -11123,7 +11123,7 @@ configureCPICCase0Case1MethodtagisMNUCasenumArgsdelta(CogMethod *cPIC, CogMethod
pc = ((((sqInt)cPIC)) + cPICEndOfCodeOffset) - (jumpLongByteSize(backEnd));

/* begin relocateMethodReferenceBeforeAddress:by: */
relocateCallBeforeReturnPCby(((AbstractInstruction *) backEnd), pc, addrDelta);
relocateCallBeforeReturnPCby(backEnd, pc, addrDelta);

/* write the final desperate jump to cePICMissXArgs */
rewriteJumpLongAttarget(backEnd, (((sqInt)cPIC)) + cPICEndOfCodeOffset, cPICMissTrampolineFor(numArgs));
Expand Down Expand Up @@ -11165,7 +11165,7 @@ configureMNUCPICmethodOperandnumArgsdelta(CogMethod *cPIC, sqInt methodOperand,
pc = ((((sqInt)cPIC)) + cPICEndOfCodeOffset) - (jumpLongByteSize(backEnd));

/* begin relocateMethodReferenceBeforeAddress:by: */
relocateCallBeforeReturnPCby(((AbstractInstruction *) backEnd), pc, addrDelta);
relocateCallBeforeReturnPCby(backEnd, pc, addrDelta);

/* finally, rewrite the jump 3 instr before firstCPICCaseOffset to jump to the end of case 2, missing the actual case */
target = addressOfEndOfCaseinCPIC(2, cPIC);
Expand Down Expand Up @@ -15324,7 +15324,7 @@ relocateCallsInClosedPIC(CogMethod *cPIC)
pcSqInt = (addressOfEndOfCaseinCPIC(2, cPIC)) + (loadLiteralByteSize(backEnd));

/* begin relocateMethodReferenceBeforeAddress:by: */
relocateCallBeforeReturnPCby(((AbstractInstruction *) backEnd), pcSqInt, refDelta);
relocateCallBeforeReturnPCby(backEnd, pcSqInt, refDelta);
relocateJumpLongBeforeFollowingAddressby(backEnd, (((sqInt)cPIC)) + cPICEndOfCodeOffset, -callDelta);
}

Expand Down Expand Up @@ -15399,7 +15399,7 @@ relocateIfCallOrMethodReferencemcpcdelta(sqInt annotation, char *mcpc, CogMethod
}
if (annotation == IsAbsPCReference) {
/* begin relocateMethodReferenceBeforeAddress:by: */
relocateCallBeforeReturnPCby(((AbstractInstruction *) backEnd), ((sqInt)mcpc), refDelta);
relocateCallBeforeReturnPCby(backEnd, ((sqInt)mcpc), refDelta);
}
return 0;
}
Expand Down Expand Up @@ -15560,7 +15560,7 @@ rewriteCPICCaseAttagobjReftarget(sqInt followingAddress, sqInt newTag, sqInt new
/* rewite the tag via the first ldr */

/* begin storeLiteral32:beforeFollowingAddress: */
storeLiteralbeforeFollowingAddress(((AbstractInstruction *) backEnd), newTag, classTagPC);
storeLiteralbeforeFollowingAddress(backEnd, newTag, classTagPC);

/* write the jump address for the new target address */
rewriteConditionalJumpLongAttarget(backEnd, followingAddress, newTarget);
Expand Down Expand Up @@ -18740,7 +18740,7 @@ genPrimitiveHighBit(void)


/* remove excess tag bits from the receiver oop */
self_in_CogAbstractInstruction = ((AbstractInstruction *) (backEnd));
self_in_CogAbstractInstruction = backEnd;

/* begin genHighBitIn:ofSmallIntegerOopWithSingleTagBit: */
if ((((cpuidWord1(self_in_CogAbstractInstruction)) & (32)) != 0)) {
Expand Down Expand Up @@ -20738,7 +20738,7 @@ genPrimitiveAtSigned(sqInt signedVersion)
static sqInt
genPrimitiveIdentityHash(void)
{
sqInt cascade0;
AbstractInstruction *cascade0;
AbstractInstruction *jumpImm;
AbstractInstruction *jumpNotSet;
AbstractInstruction *jumpSI;
Expand Down Expand Up @@ -20774,7 +20774,7 @@ genPrimitiveIdentityHash(void)
}

/* begin compileInvokeCENewHashOf */
self_in_CogIA32Compiler = ((AbstractInstruction *) (backEnd));
self_in_CogIA32Compiler = backEnd;

/* PushR: */
genoperand(PushR, ReceiverResultReg);
Expand Down
2 changes: 1 addition & 1 deletion src/spur32.cog/cogit.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Automatically generated by
CCodeGenerator VMMaker.oscog-eem.3494 uuid: c7100ca0-4813-448e-805a-e19823c5991b
CCodeGenerator VMMaker.oscog-eem.3497 uuid: 0026bd79-6c6f-4506-8a6e-7c4b53a05d53
(* Compiler-eem.512)
*/

Expand Down
26 changes: 13 additions & 13 deletions src/spur32.cog/cogitARMv5.c
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/* Automatically generated by
CCodeGenerator VMMaker.oscog-eem.3494 uuid: c7100ca0-4813-448e-805a-e19823c5991b
CCodeGenerator VMMaker.oscog-eem.3497 uuid: 0026bd79-6c6f-4506-8a6e-7c4b53a05d53
(* Compiler-eem.512)
from
StackToRegisterMappingCogit VMMaker.oscog-eem.3494 uuid: c7100ca0-4813-448e-805a-e19823c5991b
StackToRegisterMappingCogit VMMaker.oscog-eem.3497 uuid: 0026bd79-6c6f-4506-8a6e-7c4b53a05d53
*/
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3494 uuid: c7100ca0-4813-448e-805a-e19823c5991b " __DATE__ ;
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3497 uuid: 0026bd79-6c6f-4506-8a6e-7c4b53a05d53 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;


Expand Down Expand Up @@ -9260,7 +9260,7 @@ cogExtendPICCaseNMethodtagisMNUCase(CogMethod *cPIC, sqInt caseNMethod, sqInt ca
jumpTargetAddr = address - cPICCaseSize;

/* begin rewriteCPICJumpAt:target: */
rewriteTransferAttarget(((AbstractInstruction *) backEnd), addressFollowingJump, jumpTargetAddr);
rewriteTransferAttarget(backEnd, addressFollowingJump, jumpTargetAddr);

/* and update the header flag for the number of cases */
((((CogMethod *) ((((usqInt)cPIC)) + codeToDataDelta)))->cPICNumCases = ((cPIC->cPICNumCases)) + 1);
Expand Down Expand Up @@ -10249,10 +10249,10 @@ compileCallFornumArgsargargargargresultRegregsToSave(void *aRoutine, sqInt numAr
regMaskCopy = ((regMaskCopy) >> 1);
}
if ((numRegsPushed == 0)
&& ((numIntRegArgs(((AbstractInstruction *) backEnd))) >= numArgs)) {
&& ((numIntRegArgs(backEnd)) >= numArgs)) {
goto l1;
}
wordsPushedModAlignment = (numRegsPushed + ((((numArgs - (numIntRegArgs(((AbstractInstruction *) backEnd)))) < 0) ? 0 : (numArgs - (numIntRegArgs(((AbstractInstruction *) backEnd))))))) % (cStackAlignment / BytesPerWord);
wordsPushedModAlignment = (numRegsPushed + ((((numArgs - (numIntRegArgs(backEnd))) < 0) ? 0 : (numArgs - (numIntRegArgs(backEnd)))))) % (cStackAlignment / BytesPerWord);
if (wordsPushedModAlignment) {
delta = (cStackAlignment / BytesPerWord) - wordsPushedModAlignment;

Expand Down Expand Up @@ -10812,7 +10812,7 @@ configureMNUCPICmethodOperandnumArgsdelta(CogMethod *cPIC, sqInt methodOperand,
jumpTargetAddr = target;

/* begin rewriteCPICJumpAt:target: */
rewriteTransferAttarget(((AbstractInstruction *) backEnd), addressFollowingJump, jumpTargetAddr);
rewriteTransferAttarget(backEnd, addressFollowingJump, jumpTargetAddr);
return 0;
}

Expand Down Expand Up @@ -10884,7 +10884,7 @@ cPICCompactAndIsNowEmpty(CogMethod *cPIC)
jumpTargetAddr = pc;

/* begin rewriteCPICJumpAt:target: */
rewriteTransferAttarget(((AbstractInstruction *) backEnd), addressFollowingJump, jumpTargetAddr);
rewriteTransferAttarget(backEnd, addressFollowingJump, jumpTargetAddr);
return 0;
}

Expand All @@ -10901,7 +10901,7 @@ cPICCompactAndIsNowEmpty(CogMethod *cPIC)
jumpTargetAddr = pc - cPICCaseSize;

/* begin rewriteCPICJumpAt:target: */
rewriteTransferAttarget(((AbstractInstruction *) backEnd), addressFollowingJump, jumpTargetAddr);
rewriteTransferAttarget(backEnd, addressFollowingJump, jumpTargetAddr);
return 0;
}

Expand Down Expand Up @@ -15124,7 +15124,7 @@ remapIfObjectRefpchasYoung(sqInt annotation, char *mcpc, CogMethod *hasYoungPtr)


/* begin rewriteInlineCacheTag:at: */
longAtput(pcRelativeAddressAt(((AbstractInstruction *) backEnd), (((usqInt)mcpc)) - 8), mappedCacheTag);
longAtput(pcRelativeAddressAt(backEnd, (((usqInt)mcpc)) - 8), mappedCacheTag);
}
if ((hasYoungPtr != 0)
&& (isYoung(mappedCacheTag))) {
Expand Down Expand Up @@ -15218,7 +15218,7 @@ rewriteCPICCaseAttagobjReftarget(sqInt followingAddress, sqInt newTag, sqInt new
/* rewite the tag via the first ldr */

/* begin storeLiteral32:beforeFollowingAddress: */
storeLiteralbeforeFollowingAddress(((AbstractInstruction *) backEnd), newTag, classTagPC);
storeLiteralbeforeFollowingAddress(backEnd, newTag, classTagPC);

/* write the jump address for the new target address */
rewriteConditionalJumpLongAttarget(backEnd, followingAddress, newTarget);
Expand Down Expand Up @@ -21831,7 +21831,7 @@ markAndTraceCacheTagLiteralinatpc(sqInt literal, CogMethod *cogMethodOrNil, usqI
codeModified = 1;
# endif

self_in_CogOutOfLineLiteralsARMCompiler = ((AbstractInstruction *) (backEnd));
self_in_CogOutOfLineLiteralsARMCompiler = backEnd;

/* begin rewriteInlineCacheTag:at: */
longAtput(pcRelativeAddressAt(self_in_CogOutOfLineLiteralsARMCompiler, address - 8), objOop);
Expand Down Expand Up @@ -21880,7 +21880,7 @@ checkValidOopReference(sqInt anOop)
static void
compileInvokeCENewHashOf(void)
{
sqInt cascade0;
AbstractInstruction *cascade0;
AbstractInstruction *inst;

backEnd;
Expand Down
Loading

0 comments on commit 986b48d

Please sign in to comment.