Skip to content

Commit 8ff511c

Browse files
eliotmirandaeliotmiranda
committed
CogVM source as per VMMaker.oscog-eem.3654
Fix a bug in SimpleStackBasedCogit>>cogMethodImports:into:detailCPICs:. The lookup of the function pointer used the stale methodObj, not the primitiveCogitMethod receiver's method obj.
1 parent 240976c commit 8ff511c

File tree

14 files changed

+72
-72
lines changed

14 files changed

+72
-72
lines changed

‎src/spur32.cog/cogit.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.3653 uuid: 3e9e73e3-c46f-4b85-9492-5e8152620749
3-
(Cog-eem.499, * Compiler-ct.519)
2+
CCodeGenerator VMMaker.oscog-eem.3654 uuid: 7a31043c-4b68-4ea9-a61e-e6e63aa0fe5c
3+
(Cog-eem.500, * Compiler-ct.519)
44
*/
55

66

‎src/spur32.cog/cogitARMv5.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.3653 uuid: 3e9e73e3-c46f-4b85-9492-5e8152620749
3-
(Cog-eem.499, * Compiler-ct.519)
2+
CCodeGenerator VMMaker.oscog-eem.3654 uuid: 7a31043c-4b68-4ea9-a61e-e6e63aa0fe5c
3+
(Cog-eem.500, * Compiler-ct.519)
44
from
5-
StackToRegisterMappingCogit VMMaker.oscog-eem.3653 uuid: 3e9e73e3-c46f-4b85-9492-5e8152620749
5+
StackToRegisterMappingCogit VMMaker.oscog-eem.3654 uuid: 7a31043c-4b68-4ea9-a61e-e6e63aa0fe5c
66
*/
7-
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3653 uuid: 3e9e73e3-c46f-4b85-9492-5e8152620749 " __DATE__ ;
7+
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3654 uuid: 7a31043c-4b68-4ea9-a61e-e6e63aa0fe5c " __DATE__ ;
88
char *__cogitBuildInfo = __buildInfo;
99

1010

@@ -27462,7 +27462,7 @@ cogMethodImportsintodetailCPICs(CogMethod *cogMethod, sqInt data, sqInt detailCP
2746227462
for the abort */
2746327463
if ((((primitiveIndex = primitiveIndexOf((cogMethod->methodObject)))) > 0)
2746427464
&& ((!(isQuickPrimitiveIndex(primitiveIndex)))
27465-
&& (((pfp = functionPointerForCompiledMethodprimitiveIndexprimitivePropertyFlagsInto(methodObj, primitiveIndex, null))) != 0))) {
27465+
&& (((pfp = functionPointerForCompiledMethodprimitiveIndexprimitivePropertyFlagsInto((cogMethod->methodObject), primitiveIndex, null))) != 0))) {
2746627466
importCount += 1;
2746727467
}
2746827468
else {

‎src/spur32.cog/cogitIA32.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.3653 uuid: 3e9e73e3-c46f-4b85-9492-5e8152620749
3-
(Cog-eem.499, * Compiler-ct.519)
2+
CCodeGenerator VMMaker.oscog-eem.3654 uuid: 7a31043c-4b68-4ea9-a61e-e6e63aa0fe5c
3+
(Cog-eem.500, * Compiler-ct.519)
44
from
5-
StackToRegisterMappingCogit VMMaker.oscog-eem.3653 uuid: 3e9e73e3-c46f-4b85-9492-5e8152620749
5+
StackToRegisterMappingCogit VMMaker.oscog-eem.3654 uuid: 7a31043c-4b68-4ea9-a61e-e6e63aa0fe5c
66
*/
7-
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3653 uuid: 3e9e73e3-c46f-4b85-9492-5e8152620749 " __DATE__ ;
7+
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3654 uuid: 7a31043c-4b68-4ea9-a61e-e6e63aa0fe5c " __DATE__ ;
88
char *__cogitBuildInfo = __buildInfo;
99

1010

@@ -475,7 +475,7 @@ static NoDbgRegParms sqInt callTargetFromReturnAddress(AbstractInstruction *self
475475
static NoDbgRegParms AbstractInstruction * cFloatResultToRd(AbstractInstruction *self_in_CogIA32Compiler, sqInt reg);
476476
static NoDbgRegParms AbstractInstruction * cFloatResultToRs(AbstractInstruction *self_in_CogIA32Compiler, sqInt reg);
477477
static NoDbgRegParms sqInt cmpC32RTempByteSize(AbstractInstruction *self_in_CogIA32Compiler);
478-
static NoDbgRegParms sqInt computeMaximumSize(AbstractInstruction *self_in_CogIA32Compiler);
478+
static NoDbgRegParms int computeMaximumSize(AbstractInstruction *self_in_CogIA32Compiler);
479479
static NoDbgRegParms int computeShiftRRSize(AbstractInstruction *self_in_CogIA32Compiler);
480480
static NoDbgRegParms sqInt concretizeFill32(AbstractInstruction *self_in_CogIA32Compiler);
481481
static NoDbgRegParms sqInt concretizeMovePerfCnt64RRL(AbstractInstruction *self_in_CogIA32Compiler);
@@ -501,7 +501,7 @@ static NoDbgRegParms AbstractInstruction * genSwapRRScratch(AbstractInstruction
501501
static NoDbgRegParms int hasSSE2Instructions(AbstractInstruction *self_in_CogIA32Compiler);
502502
static NoDbgRegParms int hasSSEInstructions(AbstractInstruction *self_in_CogIA32Compiler);
503503
static NoDbgRegParms sqInt inlineCacheTagAt(AbstractInstruction *self_in_CogIA32Compiler, sqInt callSiteReturnAddress);
504-
static NoDbgRegParms int instructionSizeAt(AbstractInstruction *self_in_CogIA32Compiler, sqInt pc);
504+
static NoDbgRegParms sqInt instructionSizeAt(AbstractInstruction *self_in_CogIA32Compiler, sqInt pc);
505505
static NoDbgRegParms int isCallPrecedingReturnPC(AbstractInstruction *self_in_CogIA32Compiler, sqInt mcpc);
506506
static NoDbgRegParms sqInt isJumpAt(AbstractInstruction *self_in_CogIA32Compiler, sqInt pc);
507507
static NoDbgRegParms sqInt isPCDependent(AbstractInstruction *self_in_CogIA32Compiler);
@@ -3158,7 +3158,7 @@ cmpC32RTempByteSize(AbstractInstruction *self_in_CogIA32Compiler)
31583158
limits which are exceeded when each case jumps around the otherwise. */
31593159

31603160
/* CogIA32Compiler>>#computeMaximumSize */
3161-
static NoDbgRegParms sqInt
3161+
static NoDbgRegParms int
31623162
computeMaximumSize(AbstractInstruction *self_in_CogIA32Compiler)
31633163
{
31643164
switch ((self_in_CogIA32Compiler->opcode)) {
@@ -6825,7 +6825,7 @@ inlineCacheTagAt(AbstractInstruction *self_in_CogIA32Compiler, sqInt callSiteRet
68256825
It only has to cope with the instructions generated in a block dispatch. */
68266826

68276827
/* CogIA32Compiler>>#instructionSizeAt: */
6828-
static NoDbgRegParms int
6828+
static NoDbgRegParms sqInt
68296829
instructionSizeAt(AbstractInstruction *self_in_CogIA32Compiler, sqInt pc)
68306830
{
68316831
sqInt op;
@@ -6997,7 +6997,7 @@ jumpTargetPCAt(AbstractInstruction *self_in_CogIA32Compiler, sqInt pc)
69976997
{
69986998
sqInt byte;
69996999
sqInt offset;
7000-
int size;
7000+
sqInt size;
70017001

70027002
size = instructionSizeAt(self_in_CogIA32Compiler, pc);
70037003
if (size == 2) {

‎src/spur32.sista/cogit.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.3653 uuid: 3e9e73e3-c46f-4b85-9492-5e8152620749
3-
(Cog-eem.499, * Compiler-ct.519)
2+
CCodeGenerator VMMaker.oscog-eem.3654 uuid: 7a31043c-4b68-4ea9-a61e-e6e63aa0fe5c
3+
(Cog-eem.500, * Compiler-ct.519)
44
*/
55

66

‎src/spur32.sista/cogitARMv5.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.3653 uuid: 3e9e73e3-c46f-4b85-9492-5e8152620749
3-
(Cog-eem.499, * Compiler-ct.519)
2+
CCodeGenerator VMMaker.oscog-eem.3654 uuid: 7a31043c-4b68-4ea9-a61e-e6e63aa0fe5c
3+
(Cog-eem.500, * Compiler-ct.519)
44
from
5-
SistaCogit VMMaker.oscog-eem.3653 uuid: 3e9e73e3-c46f-4b85-9492-5e8152620749
5+
SistaCogit VMMaker.oscog-eem.3654 uuid: 7a31043c-4b68-4ea9-a61e-e6e63aa0fe5c
66
*/
7-
static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.3653 uuid: 3e9e73e3-c46f-4b85-9492-5e8152620749 " __DATE__ ;
7+
static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.3654 uuid: 7a31043c-4b68-4ea9-a61e-e6e63aa0fe5c " __DATE__ ;
88
char *__cogitBuildInfo = __buildInfo;
99

1010

@@ -28511,7 +28511,7 @@ cogMethodImportsintodetailCPICs(CogMethod *cogMethod, sqInt data, sqInt detailCP
2851128511
for the abort */
2851228512
if ((((primitiveIndex = primitiveIndexOf((cogMethod->methodObject)))) > 0)
2851328513
&& ((!(isQuickPrimitiveIndex(primitiveIndex)))
28514-
&& (((pfp = functionPointerForCompiledMethodprimitiveIndexprimitivePropertyFlagsInto(methodObj, primitiveIndex, null))) != 0))) {
28514+
&& (((pfp = functionPointerForCompiledMethodprimitiveIndexprimitivePropertyFlagsInto((cogMethod->methodObject), primitiveIndex, null))) != 0))) {
2851528515
importCount += 1;
2851628516
}
2851728517
else {

‎src/spur32.sista/cogitIA32.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.3653 uuid: 3e9e73e3-c46f-4b85-9492-5e8152620749
3-
(Cog-eem.499, * Compiler-ct.519)
2+
CCodeGenerator VMMaker.oscog-eem.3654 uuid: 7a31043c-4b68-4ea9-a61e-e6e63aa0fe5c
3+
(Cog-eem.500, * Compiler-ct.519)
44
from
5-
SistaCogit VMMaker.oscog-eem.3653 uuid: 3e9e73e3-c46f-4b85-9492-5e8152620749
5+
SistaCogit VMMaker.oscog-eem.3654 uuid: 7a31043c-4b68-4ea9-a61e-e6e63aa0fe5c
66
*/
7-
static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.3653 uuid: 3e9e73e3-c46f-4b85-9492-5e8152620749 " __DATE__ ;
7+
static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.3654 uuid: 7a31043c-4b68-4ea9-a61e-e6e63aa0fe5c " __DATE__ ;
88
char *__cogitBuildInfo = __buildInfo;
99

1010

@@ -479,7 +479,7 @@ static NoDbgRegParms sqInt canDivQuoRem(AbstractInstruction *self_in_CogIA32Comp
479479
static NoDbgRegParms AbstractInstruction * cFloatResultToRd(AbstractInstruction *self_in_CogIA32Compiler, sqInt reg);
480480
static NoDbgRegParms AbstractInstruction * cFloatResultToRs(AbstractInstruction *self_in_CogIA32Compiler, sqInt reg);
481481
static NoDbgRegParms sqInt cmpC32RTempByteSize(AbstractInstruction *self_in_CogIA32Compiler);
482-
static NoDbgRegParms sqInt computeMaximumSize(AbstractInstruction *self_in_CogIA32Compiler);
482+
static NoDbgRegParms int computeMaximumSize(AbstractInstruction *self_in_CogIA32Compiler);
483483
static NoDbgRegParms int computeShiftRRSize(AbstractInstruction *self_in_CogIA32Compiler);
484484
static NoDbgRegParms sqInt concretizeFill32(AbstractInstruction *self_in_CogIA32Compiler);
485485
static NoDbgRegParms sqInt concretizeMovePerfCnt64RRL(AbstractInstruction *self_in_CogIA32Compiler);
@@ -918,7 +918,7 @@ static sqInt genPrimitiveStringAtPut(void);
918918
static NoDbgRegParms sqInt genRemoveSmallIntegerTagsInScratchReg(sqInt scratchReg);
919919
static NoDbgRegParms sqInt genShiftAwaySmallIntegerTagsInScratchReg(sqInt scratchReg);
920920
static NoDbgRegParms sqInt getLiteralCountOfplusOneinBytesintoscratch(sqInt methodReg, sqInt plusOne, sqInt inBytes, sqInt litCountReg, sqInt scratchReg);
921-
static NoDbgRegParms usqInt inlineCacheTagForInstance(sqInt oop);
921+
static NoDbgRegParms sqInt inlineCacheTagForInstance(sqInt oop);
922922
static NoDbgRegParms AbstractInstruction * jumpNotSmallIntegerUnsignedValueInRegister(sqInt reg);
923923
static NoDbgRegParms sqInt markAndTraceCacheTagLiteralinatpc(sqInt literal, CogMethod *cogMethodOrNil, usqInt address);
924924
static NoDbgRegParms usqInt numCountersFor(usqInt theCounters);
@@ -3257,7 +3257,7 @@ cmpC32RTempByteSize(AbstractInstruction *self_in_CogIA32Compiler)
32573257
limits which are exceeded when each case jumps around the otherwise. */
32583258

32593259
/* CogIA32Compiler>>#computeMaximumSize */
3260-
static NoDbgRegParms sqInt
3260+
static NoDbgRegParms int
32613261
computeMaximumSize(AbstractInstruction *self_in_CogIA32Compiler)
32623262
{
32633263
switch ((self_in_CogIA32Compiler->opcode)) {
@@ -8205,7 +8205,7 @@ callCogCodePopReceiverAndClassRegs(void)
82058205
static NoDbgRegParms sqInt
82068206
ceCPICMissreceiver(CogMethod *cPIC, sqInt receiver)
82078207
{
8208-
usqInt cacheTag;
8208+
sqInt cacheTag;
82098209
int errorSelectorOrNil;
82108210
sqInt methodOrSelectorIndex;
82118211
sqInt newTargetMethodOrNil;
@@ -8316,7 +8316,7 @@ l1:;
83168316
static NoDbgRegParms sqInt
83178317
ceSICMiss(sqInt receiver)
83188318
{
8319-
usqInt cacheTag;
8319+
sqInt cacheTag;
83208320
sqInt entryPoint;
83218321
int errorSelectorOrNil;
83228322
sqInt extent;
@@ -13245,7 +13245,7 @@ void
1324513245
linkSendAtintooffsetreceiver(sqInt callSiteReturnAddress, CogMethod *sendingMethod, CogMethod *targetMethod, sqInt theEntryOffset, sqInt receiver)
1324613246
{
1324713247
sqInt extent;
13248-
usqInt inlineCacheTag;
13248+
sqInt inlineCacheTag;
1324913249

1325013250
assert((theEntryOffset == cmEntryOffset)
1325113251
|| (theEntryOffset == cmNoCheckEntryOffset));
@@ -21538,7 +21538,7 @@ getLiteralCountOfplusOneinBytesintoscratch(sqInt methodReg, sqInt plusOne, sqInt
2153821538
c.f. getInlineCacheClassTagFrom:into: & inlineCacheTagForClass: */
2153921539

2154021540
/* CogObjectRepresentationFor32BitSpur>>#inlineCacheTagForInstance: */
21541-
static NoDbgRegParms usqInt
21541+
static NoDbgRegParms sqInt
2154221542
inlineCacheTagForInstance(sqInt oop)
2154321543
{
2154421544
return (isImmediate(oop)

‎src/spur64.cog/cogit.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.3653 uuid: 3e9e73e3-c46f-4b85-9492-5e8152620749
3-
(Cog-eem.499, * Compiler-ct.519)
2+
CCodeGenerator VMMaker.oscog-eem.3654 uuid: 7a31043c-4b68-4ea9-a61e-e6e63aa0fe5c
3+
(Cog-eem.500, * Compiler-ct.519)
44
*/
55

66

‎src/spur64.cog/cogitARMv8.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.3653 uuid: 3e9e73e3-c46f-4b85-9492-5e8152620749
3-
(Cog-eem.499, * Compiler-ct.519)
2+
CCodeGenerator VMMaker.oscog-eem.3654 uuid: 7a31043c-4b68-4ea9-a61e-e6e63aa0fe5c
3+
(Cog-eem.500, * Compiler-ct.519)
44
from
5-
StackToRegisterMappingCogit VMMaker.oscog-eem.3653 uuid: 3e9e73e3-c46f-4b85-9492-5e8152620749
5+
StackToRegisterMappingCogit VMMaker.oscog-eem.3654 uuid: 7a31043c-4b68-4ea9-a61e-e6e63aa0fe5c
66
*/
7-
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3653 uuid: 3e9e73e3-c46f-4b85-9492-5e8152620749 " __DATE__ ;
7+
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3654 uuid: 7a31043c-4b68-4ea9-a61e-e6e63aa0fe5c " __DATE__ ;
88
char *__cogitBuildInfo = __buildInfo;
99

1010

@@ -29657,7 +29657,7 @@ cogMethodImportsintodetailCPICs(CogMethod *cogMethod, sqInt data, sqInt detailCP
2965729657
for the abort */
2965829658
if ((((primitiveIndex = primitiveIndexOf((cogMethod->methodObject)))) > 0)
2965929659
&& ((!(isQuickPrimitiveIndex(primitiveIndex)))
29660-
&& (((pfp = functionPointerForCompiledMethodprimitiveIndexprimitivePropertyFlagsInto(methodObj, primitiveIndex, null))) != 0))) {
29660+
&& (((pfp = functionPointerForCompiledMethodprimitiveIndexprimitivePropertyFlagsInto((cogMethod->methodObject), primitiveIndex, null))) != 0))) {
2966129661
importCount += 1;
2966229662
}
2966329663
else {

‎src/spur64.cog/cogitX64SysV.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.3653 uuid: 3e9e73e3-c46f-4b85-9492-5e8152620749
3-
(Cog-eem.499, * Compiler-ct.519)
2+
CCodeGenerator VMMaker.oscog-eem.3654 uuid: 7a31043c-4b68-4ea9-a61e-e6e63aa0fe5c
3+
(Cog-eem.500, * Compiler-ct.519)
44
from
5-
StackToRegisterMappingCogit VMMaker.oscog-eem.3653 uuid: 3e9e73e3-c46f-4b85-9492-5e8152620749
5+
StackToRegisterMappingCogit VMMaker.oscog-eem.3654 uuid: 7a31043c-4b68-4ea9-a61e-e6e63aa0fe5c
66
*/
7-
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3653 uuid: 3e9e73e3-c46f-4b85-9492-5e8152620749 " __DATE__ ;
7+
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3654 uuid: 7a31043c-4b68-4ea9-a61e-e6e63aa0fe5c " __DATE__ ;
88
char *__cogitBuildInfo = __buildInfo;
99

1010

@@ -1032,7 +1032,7 @@ static NoDbgRegParms sqInt genSaveRegs(AbstractInstruction *self_in_CogX64Compil
10321032
static NoDbgRegParms AbstractInstruction * genSubstituteReturnAddress(AbstractInstruction *self_in_CogX64Compiler, sqInt retpc);
10331033
static NoDbgRegParms AbstractInstruction * genSwapRRScratch(AbstractInstruction *self_in_CogX64Compiler, sqInt regA, sqInt regB, sqInt regTmp);
10341034
static NoDbgRegParms sqInt hasVarBaseRegister(AbstractInstruction *self_in_CogX64Compiler);
1035-
static NoDbgRegParms sqInt instructionSizeAt(AbstractInstruction *self_in_CogX64Compiler, sqInt pc);
1035+
static NoDbgRegParms int instructionSizeAt(AbstractInstruction *self_in_CogX64Compiler, sqInt pc);
10361036
static NoDbgRegParms int is32BitSignedImmediate(AbstractInstruction *self_in_CogX64Compiler, sqInt a64BitUnsignedOperand);
10371037
static NoDbgRegParms int isCallPrecedingReturnPC(AbstractInstruction *self_in_CogX64Compiler, sqInt mcpc);
10381038
static NoDbgRegParms sqInt isJumpAt(AbstractInstruction *self_in_CogX64Compiler, sqInt pc);
@@ -26336,7 +26336,7 @@ hasVarBaseRegister(AbstractInstruction *self_in_CogX64Compiler)
2633626336
occur within a larger method. This is very far from a full decode. */
2633726337

2633826338
/* CogX64Compiler>>#instructionSizeAt: */
26339-
static NoDbgRegParms sqInt
26339+
static NoDbgRegParms int
2634026340
instructionSizeAt(AbstractInstruction *self_in_CogX64Compiler, sqInt pc)
2634126341
{
2634226342
sqInt op;
@@ -26529,7 +26529,7 @@ jumpTargetPCAt(AbstractInstruction *self_in_CogX64Compiler, sqInt pc)
2652926529
{
2653026530
sqInt byte;
2653126531
sqInt offset;
26532-
sqInt size;
26532+
int size;
2653326533

2653426534
size = instructionSizeAt(self_in_CogX64Compiler, pc);
2653526535
if (size == 2) {
@@ -27063,7 +27063,7 @@ cogMethodImportsintodetailCPICs(CogMethod *cogMethod, sqInt data, sqInt detailCP
2706327063
for the abort */
2706427064
if ((((primitiveIndex = primitiveIndexOf((cogMethod->methodObject)))) > 0)
2706527065
&& ((!(isQuickPrimitiveIndex(primitiveIndex)))
27066-
&& (((pfp = functionPointerForCompiledMethodprimitiveIndexprimitivePropertyFlagsInto(methodObj, primitiveIndex, null))) != 0))) {
27066+
&& (((pfp = functionPointerForCompiledMethodprimitiveIndexprimitivePropertyFlagsInto((cogMethod->methodObject), primitiveIndex, null))) != 0))) {
2706727067
importCount += 1;
2706827068
}
2706927069
else {

‎src/spur64.cog/cogitX64WIN64.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.3653 uuid: 3e9e73e3-c46f-4b85-9492-5e8152620749
3-
(Cog-eem.499, * Compiler-ct.519)
2+
CCodeGenerator VMMaker.oscog-eem.3654 uuid: 7a31043c-4b68-4ea9-a61e-e6e63aa0fe5c
3+
(Cog-eem.500, * Compiler-ct.519)
44
from
5-
StackToRegisterMappingCogit VMMaker.oscog-eem.3653 uuid: 3e9e73e3-c46f-4b85-9492-5e8152620749
5+
StackToRegisterMappingCogit VMMaker.oscog-eem.3654 uuid: 7a31043c-4b68-4ea9-a61e-e6e63aa0fe5c
66
*/
7-
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3653 uuid: 3e9e73e3-c46f-4b85-9492-5e8152620749 " __DATE__ ;
7+
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3654 uuid: 7a31043c-4b68-4ea9-a61e-e6e63aa0fe5c " __DATE__ ;
88
char *__cogitBuildInfo = __buildInfo;
99

1010

@@ -27089,7 +27089,7 @@ cogMethodImportsintodetailCPICs(CogMethod *cogMethod, sqInt data, sqInt detailCP
2708927089
for the abort */
2709027090
if ((((primitiveIndex = primitiveIndexOf((cogMethod->methodObject)))) > 0)
2709127091
&& ((!(isQuickPrimitiveIndex(primitiveIndex)))
27092-
&& (((pfp = functionPointerForCompiledMethodprimitiveIndexprimitivePropertyFlagsInto(methodObj, primitiveIndex, null))) != 0))) {
27092+
&& (((pfp = functionPointerForCompiledMethodprimitiveIndexprimitivePropertyFlagsInto((cogMethod->methodObject), primitiveIndex, null))) != 0))) {
2709327093
importCount += 1;
2709427094
}
2709527095
else {

0 commit comments

Comments
 (0)