Skip to content

Commit 8508f9f

Browse files
eliotmirandaeliotmiranda
committed
VMMaker.oscog-eem.3680
Use a convenient arg type for isPCWithinMethodZone: to placate newer clang versions.
1 parent b943781 commit 8508f9f

61 files changed

Lines changed: 738 additions & 758 deletions

Some content is hidden

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.3675 uuid: 4b2d2b05-7985-4fbc-9eb5-ebbc0f408b65
3-
(Cog-eem.504, * Compiler-eem.523)
2+
CCodeGenerator VMMaker.oscog-eem.3680 uuid: a9ad06c5-1c8d-4efc-b2a6-1516f7d64803
3+
(Cog-eem.504, * Compiler-nice.525)
44
*/
55

66

@@ -47,7 +47,7 @@ extern void freeUnmarkedMachineCode(void);
4747
extern usqInt getMethodZoneBase(void);
4848
#endif /* VMInvestigations */
4949
extern void initializeCodeZoneFromupTo(sqInt startAddress, sqInt endAddress);
50-
extern int isPCWithinMethodZone(void *address);
50+
extern int isPCWithinMethodZone(usqInt address);
5151
extern sqInt isSendReturnPC(sqInt retpc);
5252
extern void linkSendAtintooffsetreceiver(sqInt callSiteReturnAddress, CogMethod *sendingMethod, CogMethod *targetMethod, sqInt theEntryOffset, sqInt receiver);
5353
extern void mapObjectReferencesInMachineCode(sqInt gcMode);

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.3675 uuid: 4b2d2b05-7985-4fbc-9eb5-ebbc0f408b65
3-
(Cog-eem.504, * Compiler-eem.523)
2+
CCodeGenerator VMMaker.oscog-eem.3680 uuid: a9ad06c5-1c8d-4efc-b2a6-1516f7d64803
3+
(Cog-eem.504, * Compiler-nice.525)
44
from
5-
StackToRegisterMappingCogit VMMaker.oscog-eem.3675 uuid: 4b2d2b05-7985-4fbc-9eb5-ebbc0f408b65
5+
StackToRegisterMappingCogit VMMaker.oscog-eem.3680 uuid: a9ad06c5-1c8d-4efc-b2a6-1516f7d64803
66
*/
7-
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3675 uuid: 4b2d2b05-7985-4fbc-9eb5-ebbc0f408b65 " __DATE__ ;
7+
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3680 uuid: a9ad06c5-1c8d-4efc-b2a6-1516f7d64803 " __DATE__ ;
88
char *__cogitBuildInfo = __buildInfo;
99

1010

@@ -789,7 +789,7 @@ static NoDbgRegParms sqInt investigationArrayForClosedPIC(CogMethod *cPIC);
789789
#if VMInvestigations
790790
static NoDbgRegParms sqInt investigationTargetForEntryPointin(sqInt entryPoint, CogMethod *cPIC);
791791
#endif /* VMInvestigations */
792-
extern int isPCWithinMethodZone(void *address);
792+
extern int isPCWithinMethodZone(usqInt address);
793793
extern sqInt isSendReturnPC(sqInt retpc);
794794
static NoDbgRegParms AbstractInstruction * gJumpFPEqual(void *jumpTarget);
795795
static NoDbgRegParms AbstractInstruction * gJumpFPGreaterOrEqual(void *jumpTarget);
@@ -1022,7 +1022,7 @@ static sqInt genPrimitiveStringAtPut(void);
10221022
static NoDbgRegParms sqInt genRemoveSmallIntegerTagsInScratchReg(sqInt scratchReg);
10231023
static NoDbgRegParms sqInt genShiftAwaySmallIntegerTagsInScratchReg(sqInt scratchReg);
10241024
static NoDbgRegParms sqInt getLiteralCountOfplusOneinBytesintoscratch(sqInt methodReg, sqInt plusOne, sqInt inBytes, sqInt litCountReg, sqInt scratchReg);
1025-
static NoDbgRegParms sqInt inlineCacheTagForInstance(sqInt oop);
1025+
static NoDbgRegParms usqInt inlineCacheTagForInstance(sqInt oop);
10261026
static NoDbgRegParms AbstractInstruction * jumpNotSmallIntegerUnsignedValueInRegister(sqInt reg);
10271027
static NoDbgRegParms sqInt markAndTraceCacheTagLiteralinatpc(sqInt literal, CogMethod *cogMethodOrNil, usqInt address);
10281028
static sqInt numSmallIntegerBits(void);
@@ -8541,7 +8541,7 @@ callCogCodePopReceiverAndClassRegs(void)
85418541
static NoDbgRegParms sqInt
85428542
ceCPICMissreceiver(CogMethod *cPIC, sqInt receiver)
85438543
{
8544-
sqInt cacheTag;
8544+
usqInt cacheTag;
85458545
int errorSelectorOrNil;
85468546
sqInt methodOrSelectorIndex;
85478547
sqInt newTargetMethodOrNil;
@@ -8674,7 +8674,7 @@ ceMalloc(size_t size)
86748674
static NoDbgRegParms sqInt
86758675
ceSICMiss(sqInt receiver)
86768676
{
8677-
sqInt cacheTag;
8677+
usqInt cacheTag;
86788678
int errorSelectorOrNil;
86798679
sqInt extent;
86808680
usqInt innerReturn;
@@ -14232,13 +14232,13 @@ investigationTargetForEntryPointin(sqInt entryPoint, CogMethod *cPIC)
1423214232
#endif /* VMInvestigations */
1423314233

1423414234

14235-
/* Useful for debugging. Marked <api> so the code generator won't delete it. */
14235+
/* Useful for debugging, asserts, etc */
1423614236

1423714237
/* Cogit>>#isPCWithinMethodZone: */
1423814238
int
14239-
isPCWithinMethodZone(void *address)
14239+
isPCWithinMethodZone(usqInt address)
1424014240
{
14241-
return (((((usqInt)address)) >= methodZoneBase) && ((((usqInt)address)) <= (freeStart())));
14241+
return ((address >= methodZoneBase) && (address <= (freeStart())));
1424214242
}
1424314243

1424414244

@@ -14364,7 +14364,7 @@ void
1436414364
linkSendAtintooffsetreceiver(sqInt callSiteReturnAddress, CogMethod *sendingMethod, CogMethod *targetMethod, sqInt theEntryOffset, sqInt receiver)
1436514365
{
1436614366
sqInt extent;
14367-
sqInt inlineCacheTag;
14367+
usqInt inlineCacheTag;
1436814368

1436914369
assert((theEntryOffset == cmEntryOffset)
1437014370
|| (theEntryOffset == cmNoCheckEntryOffset));
@@ -23385,7 +23385,7 @@ getLiteralCountOfplusOneinBytesintoscratch(sqInt methodReg, sqInt plusOne, sqInt
2338523385
c.f. getInlineCacheClassTagFrom:into: & inlineCacheTagForClass: */
2338623386

2338723387
/* CogObjectRepresentationFor32BitSpur>>#inlineCacheTagForInstance: */
23388-
static NoDbgRegParms sqInt
23388+
static NoDbgRegParms usqInt
2338923389
inlineCacheTagForInstance(sqInt oop)
2339023390
{
2339123391
return (isImmediate(oop)

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.3675 uuid: 4b2d2b05-7985-4fbc-9eb5-ebbc0f408b65
3-
(Cog-eem.504, * Compiler-eem.523)
2+
CCodeGenerator VMMaker.oscog-eem.3680 uuid: a9ad06c5-1c8d-4efc-b2a6-1516f7d64803
3+
(Cog-eem.504, * Compiler-nice.525)
44
from
5-
StackToRegisterMappingCogit VMMaker.oscog-eem.3675 uuid: 4b2d2b05-7985-4fbc-9eb5-ebbc0f408b65
5+
StackToRegisterMappingCogit VMMaker.oscog-eem.3680 uuid: a9ad06c5-1c8d-4efc-b2a6-1516f7d64803
66
*/
7-
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3675 uuid: 4b2d2b05-7985-4fbc-9eb5-ebbc0f408b65 " __DATE__ ;
7+
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3680 uuid: a9ad06c5-1c8d-4efc-b2a6-1516f7d64803 " __DATE__ ;
88
char *__cogitBuildInfo = __buildInfo;
99

1010

@@ -744,7 +744,7 @@ static NoDbgRegParms sqInt investigationArrayForClosedPIC(CogMethod *cPIC);
744744
#if VMInvestigations
745745
static NoDbgRegParms sqInt investigationTargetForEntryPointin(sqInt entryPoint, CogMethod *cPIC);
746746
#endif /* VMInvestigations */
747-
extern int isPCWithinMethodZone(void *address);
747+
extern int isPCWithinMethodZone(usqInt address);
748748
extern sqInt isSendReturnPC(sqInt retpc);
749749
static NoDbgRegParms AbstractInstruction * gJumpFPEqual(void *jumpTarget);
750750
static NoDbgRegParms AbstractInstruction * gJumpFPGreaterOrEqual(void *jumpTarget);
@@ -973,7 +973,7 @@ static sqInt genPrimitiveStringAtPut(void);
973973
static NoDbgRegParms sqInt genRemoveSmallIntegerTagsInScratchReg(sqInt scratchReg);
974974
static NoDbgRegParms sqInt genShiftAwaySmallIntegerTagsInScratchReg(sqInt scratchReg);
975975
static NoDbgRegParms sqInt getLiteralCountOfplusOneinBytesintoscratch(sqInt methodReg, sqInt plusOne, sqInt inBytes, sqInt litCountReg, sqInt scratchReg);
976-
static NoDbgRegParms sqInt inlineCacheTagForInstance(sqInt oop);
976+
static NoDbgRegParms usqInt inlineCacheTagForInstance(sqInt oop);
977977
static NoDbgRegParms AbstractInstruction * jumpNotSmallIntegerUnsignedValueInRegister(sqInt reg);
978978
static NoDbgRegParms sqInt markAndTraceCacheTagLiteralinatpc(sqInt literal, CogMethod *cogMethodOrNil, usqInt address);
979979
static sqInt numSmallIntegerBits(void);
@@ -8284,7 +8284,7 @@ callCogCodePopReceiverAndClassRegs(void)
82848284
static NoDbgRegParms sqInt
82858285
ceCPICMissreceiver(CogMethod *cPIC, sqInt receiver)
82868286
{
8287-
sqInt cacheTag;
8287+
usqInt cacheTag;
82888288
int errorSelectorOrNil;
82898289
sqInt methodOrSelectorIndex;
82908290
sqInt newTargetMethodOrNil;
@@ -8417,7 +8417,7 @@ ceMalloc(size_t size)
84178417
static NoDbgRegParms sqInt
84188418
ceSICMiss(sqInt receiver)
84198419
{
8420-
sqInt cacheTag;
8420+
usqInt cacheTag;
84218421
int errorSelectorOrNil;
84228422
sqInt extent;
84238423
usqInt innerReturn;
@@ -13779,13 +13779,13 @@ investigationTargetForEntryPointin(sqInt entryPoint, CogMethod *cPIC)
1377913779
#endif /* VMInvestigations */
1378013780

1378113781

13782-
/* Useful for debugging. Marked <api> so the code generator won't delete it. */
13782+
/* Useful for debugging, asserts, etc */
1378313783

1378413784
/* Cogit>>#isPCWithinMethodZone: */
1378513785
int
13786-
isPCWithinMethodZone(void *address)
13786+
isPCWithinMethodZone(usqInt address)
1378713787
{
13788-
return (((((usqInt)address)) >= methodZoneBase) && ((((usqInt)address)) <= (freeStart())));
13788+
return ((address >= methodZoneBase) && (address <= (freeStart())));
1378913789
}
1379013790

1379113791

@@ -13951,7 +13951,7 @@ void
1395113951
linkSendAtintooffsetreceiver(sqInt callSiteReturnAddress, CogMethod *sendingMethod, CogMethod *targetMethod, sqInt theEntryOffset, sqInt receiver)
1395213952
{
1395313953
sqInt extent;
13954-
sqInt inlineCacheTag;
13954+
usqInt inlineCacheTag;
1395513955

1395613956
assert((theEntryOffset == cmEntryOffset)
1395713957
|| (theEntryOffset == cmNoCheckEntryOffset));
@@ -22179,7 +22179,7 @@ getLiteralCountOfplusOneinBytesintoscratch(sqInt methodReg, sqInt plusOne, sqInt
2217922179
c.f. getInlineCacheClassTagFrom:into: & inlineCacheTagForClass: */
2218022180

2218122181
/* CogObjectRepresentationFor32BitSpur>>#inlineCacheTagForInstance: */
22182-
static NoDbgRegParms sqInt
22182+
static NoDbgRegParms usqInt
2218322183
inlineCacheTagForInstance(sqInt oop)
2218422184
{
2218522185
return (isImmediate(oop)

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

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* Automatically generated by
2-
CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3675 uuid: 4b2d2b05-7985-4fbc-9eb5-ebbc0f408b65
3-
(Cog-eem.504, * Compiler-eem.523)
2+
CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3680 uuid: a9ad06c5-1c8d-4efc-b2a6-1516f7d64803
3+
(Cog-eem.504, * Compiler-nice.525)
44
from
5-
CoInterpreter VMMaker.oscog-eem.3675 uuid: 4b2d2b05-7985-4fbc-9eb5-ebbc0f408b65
5+
CoInterpreter VMMaker.oscog-eem.3680 uuid: a9ad06c5-1c8d-4efc-b2a6-1516f7d64803
66
*/
7-
static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3675 uuid: 4b2d2b05-7985-4fbc-9eb5-ebbc0f408b65 " __DATE__ ;
7+
static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3680 uuid: a9ad06c5-1c8d-4efc-b2a6-1516f7d64803 " __DATE__ ;
88
char *__interpBuildInfo = __buildInfo;
99

1010

@@ -2700,7 +2700,7 @@ sqInt debugCallbackReturns;
27002700
sqInt suppressHeartbeatFlag;
27012701
sqInt cannotDeferDisplayUpdates;
27022702
sqInt checkedPluginName;
2703-
const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3675]";
2703+
const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3680]";
27042704
const char * leakCheckFlagsMeanings[] = {
27052705
"1: check full GC", "2: check new space GC", "4: check incremental GC", "8: check become",
27062706
"16: check image segment", "32: check free space", "64: check shorten", "128: check prim call",
@@ -5035,7 +5035,7 @@ interpret(void)
50355035
assert((((usqInt)localIP)) < (startOfMemory()));
50365036
assert(isMachineCodeFrame(localFP));
50375037
assertValidExecutionPointersimbarline(((usqInt)localIP), localFP, localSP, 0, __LINE__);
5038-
assert(isPCWithinMethodZone(localIP));
5038+
assert(isPCWithinMethodZone(((usqInt)localIP)));
50395039

50405040
/* internalStackTopPut: */
50415041
longAtput(localSP,((usqInt)localIP));
@@ -5333,7 +5333,7 @@ l136:;
53335333
assert((((usqInt)localIP)) < (startOfMemory()));
53345334
assert(isMachineCodeFrame(localFP));
53355335
assertValidExecutionPointersimbarline(((usqInt)localIP), localFP, localSP, 0, __LINE__);
5336-
assert(isPCWithinMethodZone(localIP));
5336+
assert(isPCWithinMethodZone(((usqInt)localIP)));
53375337

53385338
/* internalStackTopPut: */
53395339
longAtput(localSP,((usqInt)localIP));
@@ -5397,7 +5397,7 @@ l136:;
53975397
assert((((usqInt)localIP)) < (startOfMemory()));
53985398
assert(isMachineCodeFrame(localFP));
53995399
assertValidExecutionPointersimbarline(((usqInt)localIP), localFP, localSP, 0, __LINE__);
5400-
assert(isPCWithinMethodZone(localIP));
5400+
assert(isPCWithinMethodZone(((usqInt)localIP)));
54015401

54025402
/* internalStackTopPut: */
54035403
longAtput(localSP,((usqInt)localIP));
@@ -82468,14 +82468,13 @@ static sqInt
8246882468
getErrorObjectFromPrimFailCode(void)
8246982469
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
8247082470
sqInt classIndex;
82471-
usqInt clone;
82472-
usqInt errObj;
82471+
sqInt clone;
82472+
sqInt errObj;
8247382473
sqInt i;
8247482474
usqInt newObj;
8247582475
usqInt numBytes;
8247682476
usqInt numSlots;
8247782477
usqInt numSlotsUsqInt;
82478-
sqInt objOop;
8247982478
sqInt table;
8248082479
sqInt valuePointer;
8248182480

@@ -82487,13 +82486,12 @@ getErrorObjectFromPrimFailCode(void)
8248782486
? longAt((void *)(table - BaseHeaderSize))
8248882487
: numSlots)))) {
8248982488
/* begin followField:ofObject: */
82490-
objOop = longAt((void *)((table + BaseHeaderSize) + ((((usqInt)((GIV(primFailCode) - 1)) << (shiftForWord()))))));
82489+
errObj = longAt((void *)((table + BaseHeaderSize) + ((((usqInt)((GIV(primFailCode) - 1)) << (shiftForWord()))))));
8249182490
if (/* isOopForwarded: */
82492-
((!(objOop & (tagMask()))))
82493-
&& ((!((longAt((void *)(objOop))) & ((classIndexMask()) - (isForwardedObjectClassIndexPun())))))) {
82494-
objOop = fixFollowedFieldofObjectwithInitialValue(GIV(primFailCode) - 1, table, objOop);
82491+
((!(errObj & (tagMask()))))
82492+
&& ((!((longAt((void *)(errObj))) & ((classIndexMask()) - (isForwardedObjectClassIndexPun())))))) {
82493+
errObj = fixFollowedFieldofObjectwithInitialValue(GIV(primFailCode) - 1, table, errObj);
8249582494
}
82496-
errObj = objOop;
8249782495

8249882496
/* If there's a clonable object in the table at that index,
8249982497
answer a clone of the error object with the second slot set to the value of secondaryErrorCode. */

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* Automatically generated by
2-
CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3675 uuid: 4b2d2b05-7985-4fbc-9eb5-ebbc0f408b65
3-
(Cog-eem.504, * Compiler-eem.523)
2+
CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3680 uuid: a9ad06c5-1c8d-4efc-b2a6-1516f7d64803
3+
(Cog-eem.504, * Compiler-nice.525)
44
*/
55

66

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

Lines changed: 14 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.3675 uuid: 4b2d2b05-7985-4fbc-9eb5-ebbc0f408b65
6-
(Cog-eem.504, * Compiler-eem.523)
5+
CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3680 uuid: a9ad06c5-1c8d-4efc-b2a6-1516f7d64803
6+
(Cog-eem.504, * Compiler-nice.525)
77
from
8-
CoInterpreter VMMaker.oscog-eem.3675 uuid: 4b2d2b05-7985-4fbc-9eb5-ebbc0f408b65
8+
CoInterpreter VMMaker.oscog-eem.3680 uuid: a9ad06c5-1c8d-4efc-b2a6-1516f7d64803
99
*/
10-
static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3675 uuid: 4b2d2b05-7985-4fbc-9eb5-ebbc0f408b65 " __DATE__ ;
10+
static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3680 uuid: a9ad06c5-1c8d-4efc-b2a6-1516f7d64803 " __DATE__ ;
1111
char *__interpBuildInfo = __buildInfo;
1212

1313

@@ -2703,7 +2703,7 @@ sqInt debugCallbackReturns;
27032703
sqInt suppressHeartbeatFlag;
27042704
sqInt cannotDeferDisplayUpdates;
27052705
sqInt checkedPluginName;
2706-
const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3675]";
2706+
const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3680]";
27072707
const char * leakCheckFlagsMeanings[] = {
27082708
"1: check full GC", "2: check new space GC", "4: check incremental GC", "8: check become",
27092709
"16: check image segment", "32: check free space", "64: check shorten", "128: check prim call",
@@ -5042,7 +5042,7 @@ interpret(void)
50425042
assert((((usqInt)localIP)) < (startOfMemory()));
50435043
assert(isMachineCodeFrame(localFP));
50445044
assertValidExecutionPointersimbarline(((usqInt)localIP), localFP, localSP, 0, __LINE__);
5045-
assert(isPCWithinMethodZone(localIP));
5045+
assert(isPCWithinMethodZone(((usqInt)localIP)));
50465046

50475047
/* internalStackTopPut: */
50485048
longAtput(localSP,((usqInt)localIP));
@@ -5340,7 +5340,7 @@ l136:;
53405340
assert((((usqInt)localIP)) < (startOfMemory()));
53415341
assert(isMachineCodeFrame(localFP));
53425342
assertValidExecutionPointersimbarline(((usqInt)localIP), localFP, localSP, 0, __LINE__);
5343-
assert(isPCWithinMethodZone(localIP));
5343+
assert(isPCWithinMethodZone(((usqInt)localIP)));
53445344

53455345
/* internalStackTopPut: */
53465346
longAtput(localSP,((usqInt)localIP));
@@ -5404,7 +5404,7 @@ l136:;
54045404
assert((((usqInt)localIP)) < (startOfMemory()));
54055405
assert(isMachineCodeFrame(localFP));
54065406
assertValidExecutionPointersimbarline(((usqInt)localIP), localFP, localSP, 0, __LINE__);
5407-
assert(isPCWithinMethodZone(localIP));
5407+
assert(isPCWithinMethodZone(((usqInt)localIP)));
54085408

54095409
/* internalStackTopPut: */
54105410
longAtput(localSP,((usqInt)localIP));
@@ -82475,14 +82475,13 @@ static sqInt
8247582475
getErrorObjectFromPrimFailCode(void)
8247682476
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
8247782477
sqInt classIndex;
82478-
usqInt clone;
82479-
usqInt errObj;
82478+
sqInt clone;
82479+
sqInt errObj;
8248082480
sqInt i;
8248182481
usqInt newObj;
8248282482
usqInt numBytes;
8248382483
usqInt numSlots;
8248482484
usqInt numSlotsUsqInt;
82485-
sqInt objOop;
8248682485
sqInt table;
8248782486
sqInt valuePointer;
8248882487

@@ -82494,13 +82493,12 @@ getErrorObjectFromPrimFailCode(void)
8249482493
? longAt((void *)(table - BaseHeaderSize))
8249582494
: numSlots)))) {
8249682495
/* begin followField:ofObject: */
82497-
objOop = longAt((void *)((table + BaseHeaderSize) + ((((usqInt)((GIV(primFailCode) - 1)) << (shiftForWord()))))));
82496+
errObj = longAt((void *)((table + BaseHeaderSize) + ((((usqInt)((GIV(primFailCode) - 1)) << (shiftForWord()))))));
8249882497
if (/* isOopForwarded: */
82499-
((!(objOop & (tagMask()))))
82500-
&& ((!((longAt((void *)(objOop))) & ((classIndexMask()) - (isForwardedObjectClassIndexPun())))))) {
82501-
objOop = fixFollowedFieldofObjectwithInitialValue(GIV(primFailCode) - 1, table, objOop);
82498+
((!(errObj & (tagMask()))))
82499+
&& ((!((longAt((void *)(errObj))) & ((classIndexMask()) - (isForwardedObjectClassIndexPun())))))) {
82500+
errObj = fixFollowedFieldofObjectwithInitialValue(GIV(primFailCode) - 1, table, errObj);
8250282501
}
82503-
errObj = objOop;
8250482502

8250582503
/* If there's a clonable object in the table at that index,
8250682504
answer a clone of the error object with the second slot set to the value of secondaryErrorCode. */

‎src/spur32.cog/cogit.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.3675 uuid: 4b2d2b05-7985-4fbc-9eb5-ebbc0f408b65
3-
(Cog-eem.504, * Compiler-eem.523)
2+
CCodeGenerator VMMaker.oscog-eem.3680 uuid: a9ad06c5-1c8d-4efc-b2a6-1516f7d64803
3+
(Cog-eem.504, * Compiler-nice.525)
44
*/
55

66

@@ -47,7 +47,7 @@ extern void freeUnmarkedMachineCode(void);
4747
extern usqInt getMethodZoneBase(void);
4848
#endif /* VMInvestigations */
4949
extern void initializeCodeZoneFromupTo(sqInt startAddress, sqInt endAddress);
50-
extern int isPCWithinMethodZone(void *address);
50+
extern int isPCWithinMethodZone(usqInt address);
5151
extern sqInt isSendReturnPC(sqInt retpc);
5252
extern void linkSendAtintooffsetreceiver(sqInt callSiteReturnAddress, CogMethod *sendingMethod, CogMethod *targetMethod, sqInt theEntryOffset, sqInt receiver);
5353
extern void mapObjectReferencesInMachineCode(sqInt gcMode);

0 commit comments

Comments
 (0)