Skip to content

Commit c1d5724

Browse files
eliotmirandaeliotmiranda
committed
CogVM as per VMMaker.oscog-eem.3662
Be more principled with the receiver of struct sends when inlining. This affects just concretizeLabel, eliminating an unnecessary assignment and local.
1 parent 8e81821 commit c1d5724

File tree

24 files changed

+141
-180
lines changed

24 files changed

+141
-180
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.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08
2+
CCodeGenerator VMMaker.oscog-eem.3662 uuid: 26a00cbc-315d-4ced-ae5b-650351163c37
33
(Cog-eem.502, Compiler-eem.520)
44
*/
55

‎src/spur32.cog.lowcode/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.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08
2+
CCodeGenerator VMMaker.oscog-eem.3662 uuid: 26a00cbc-315d-4ced-ae5b-650351163c37
33
(Cog-eem.502, Compiler-eem.520)
44
from
5-
StackToRegisterMappingCogit VMMaker.oscog-eem.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08
5+
StackToRegisterMappingCogit VMMaker.oscog-eem.3662 uuid: 26a00cbc-315d-4ced-ae5b-650351163c37
66
*/
7-
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08 " __DATE__ ;
7+
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3662 uuid: 26a00cbc-315d-4ced-ae5b-650351163c37 " __DATE__ ;
88
char *__cogitBuildInfo = __buildInfo;
99

1010

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

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08
2+
CCodeGenerator VMMaker.oscog-eem.3662 uuid: 26a00cbc-315d-4ced-ae5b-650351163c37
33
(Cog-eem.502, Compiler-eem.520)
44
from
5-
StackToRegisterMappingCogit VMMaker.oscog-eem.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08
5+
StackToRegisterMappingCogit VMMaker.oscog-eem.3662 uuid: 26a00cbc-315d-4ced-ae5b-650351163c37
66
*/
7-
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08 " __DATE__ ;
7+
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3662 uuid: 26a00cbc-315d-4ced-ae5b-650351163c37 " __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 sqInt computeMaximumSize(AbstractInstruction *self_in_CogIA32Compiler);
514+
static NoDbgRegParms int 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);
@@ -538,7 +538,7 @@ static NoDbgRegParms AbstractInstruction * genSwapRRScratch(AbstractInstruction
538538
static NoDbgRegParms int hasSSE2Instructions(AbstractInstruction *self_in_CogIA32Compiler);
539539
static NoDbgRegParms int hasSSEInstructions(AbstractInstruction *self_in_CogIA32Compiler);
540540
static NoDbgRegParms sqInt inlineCacheTagAt(AbstractInstruction *self_in_CogIA32Compiler, sqInt callSiteReturnAddress);
541-
static NoDbgRegParms sqInt instructionSizeAt(AbstractInstruction *self_in_CogIA32Compiler, sqInt pc);
541+
static NoDbgRegParms int instructionSizeAt(AbstractInstruction *self_in_CogIA32Compiler, sqInt pc);
542542
static NoDbgRegParms int isCallPrecedingReturnPC(AbstractInstruction *self_in_CogIA32Compiler, sqInt mcpc);
543543
static NoDbgRegParms sqInt isJumpAt(AbstractInstruction *self_in_CogIA32Compiler, sqInt pc);
544544
static NoDbgRegParms sqInt isPCDependent(AbstractInstruction *self_in_CogIA32Compiler);
@@ -971,7 +971,7 @@ static sqInt genPrimitiveStringAtPut(void);
971971
static NoDbgRegParms sqInt genRemoveSmallIntegerTagsInScratchReg(sqInt scratchReg);
972972
static NoDbgRegParms sqInt genShiftAwaySmallIntegerTagsInScratchReg(sqInt scratchReg);
973973
static NoDbgRegParms sqInt getLiteralCountOfplusOneinBytesintoscratch(sqInt methodReg, sqInt plusOne, sqInt inBytes, sqInt litCountReg, sqInt scratchReg);
974-
static NoDbgRegParms usqInt inlineCacheTagForInstance(sqInt oop);
974+
static NoDbgRegParms sqInt inlineCacheTagForInstance(sqInt oop);
975975
static NoDbgRegParms AbstractInstruction * jumpNotSmallIntegerUnsignedValueInRegister(sqInt reg);
976976
static NoDbgRegParms sqInt markAndTraceCacheTagLiteralinatpc(sqInt literal, CogMethod *cogMethodOrNil, usqInt address);
977977
static sqInt numSmallIntegerBits(void);
@@ -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 sqInt
3335+
static NoDbgRegParms int
33363336
computeMaximumSize(AbstractInstruction *self_in_CogIA32Compiler)
33373337
{
33383338
switch ((self_in_CogIA32Compiler->opcode)) {
@@ -3930,7 +3930,6 @@ dispatchConcretize(AbstractInstruction *self_in_CogIA32Compiler)
39303930
sqInt regLHS;
39313931
sqInt regRHS;
39323932
int regToShift;
3933-
AbstractInstruction *self_in_CogAbstractInstruction1;
39343933
sqInt shiftCount;
39353934
sqInt shiftCountReg;
39363935
sqInt src;
@@ -3947,12 +3946,10 @@ dispatchConcretize(AbstractInstruction *self_in_CogIA32Compiler)
39473946
/* begin concretizeLabel */
39483947
dependentChain = (self_in_CogIA32Compiler->dependent);
39493948
while (!(!dependentChain)) {
3950-
self_in_CogAbstractInstruction1 = dependentChain;
3951-
39523949
/* begin updateLabel: */
3953-
assert((((self_in_CogAbstractInstruction1->opcode)) == MoveCwR)
3954-
|| (((self_in_CogAbstractInstruction1->opcode)) == PushCw));
3955-
((self_in_CogAbstractInstruction1->operands))[0] = (((self_in_CogIA32Compiler->address)) + (((self_in_CogIA32Compiler->operands))[1]));
3950+
assert((((dependentChain->opcode)) == MoveCwR)
3951+
|| (((dependentChain->opcode)) == PushCw));
3952+
((dependentChain->operands))[0] = (((self_in_CogIA32Compiler->address)) + (((self_in_CogIA32Compiler->operands))[1]));
39563953
dependentChain = (dependentChain->dependent);
39573954
}
39583955
return 0;
@@ -7015,7 +7012,7 @@ inlineCacheTagAt(AbstractInstruction *self_in_CogIA32Compiler, sqInt callSiteRet
70157012
It only has to cope with the instructions generated in a block dispatch. */
70167013

70177014
/* CogIA32Compiler>>#instructionSizeAt: */
7018-
static NoDbgRegParms sqInt
7015+
static NoDbgRegParms int
70197016
instructionSizeAt(AbstractInstruction *self_in_CogIA32Compiler, sqInt pc)
70207017
{
70217018
sqInt op;
@@ -7187,7 +7184,7 @@ jumpTargetPCAt(AbstractInstruction *self_in_CogIA32Compiler, sqInt pc)
71877184
{
71887185
sqInt byte;
71897186
sqInt offset;
7190-
sqInt size;
7187+
int size;
71917188

71927189
size = instructionSizeAt(self_in_CogIA32Compiler, pc);
71937190
if (size == 2) {
@@ -8253,7 +8250,7 @@ callCogCodePopReceiverAndClassRegs(void)
82538250
static NoDbgRegParms sqInt
82548251
ceCPICMissreceiver(CogMethod *cPIC, sqInt receiver)
82558252
{
8256-
usqInt cacheTag;
8253+
sqInt cacheTag;
82578254
int errorSelectorOrNil;
82588255
sqInt methodOrSelectorIndex;
82598256
sqInt newTargetMethodOrNil;
@@ -8388,7 +8385,7 @@ ceMalloc(size_t size)
83888385
static NoDbgRegParms sqInt
83898386
ceSICMiss(sqInt receiver)
83908387
{
8391-
usqInt cacheTag;
8388+
sqInt cacheTag;
83928389
sqInt entryPoint;
83938390
int errorSelectorOrNil;
83948391
sqInt extent;
@@ -13926,7 +13923,7 @@ void
1392613923
linkSendAtintooffsetreceiver(sqInt callSiteReturnAddress, CogMethod *sendingMethod, CogMethod *targetMethod, sqInt theEntryOffset, sqInt receiver)
1392713924
{
1392813925
sqInt extent;
13929-
usqInt inlineCacheTag;
13926+
sqInt inlineCacheTag;
1393013927

1393113928
assert((theEntryOffset == cmEntryOffset)
1393213929
|| (theEntryOffset == cmNoCheckEntryOffset));
@@ -22135,7 +22132,7 @@ getLiteralCountOfplusOneinBytesintoscratch(sqInt methodReg, sqInt plusOne, sqInt
2213522132
c.f. getInlineCacheClassTagFrom:into: & inlineCacheTagForClass: */
2213622133

2213722134
/* CogObjectRepresentationFor32BitSpur>>#inlineCacheTagForInstance: */
22138-
static NoDbgRegParms usqInt
22135+
static NoDbgRegParms sqInt
2213922136
inlineCacheTagForInstance(sqInt oop)
2214022137
{
2214122138
return (isImmediate(oop)

‎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.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08
2+
CCodeGenerator VMMaker.oscog-eem.3662 uuid: 26a00cbc-315d-4ced-ae5b-650351163c37
33
(Cog-eem.502, Compiler-eem.520)
44
*/
55

‎src/spur32.cog/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.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08
2+
CCodeGenerator VMMaker.oscog-eem.3662 uuid: 26a00cbc-315d-4ced-ae5b-650351163c37
33
(Cog-eem.502, Compiler-eem.520)
44
from
5-
StackToRegisterMappingCogit VMMaker.oscog-eem.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08
5+
StackToRegisterMappingCogit VMMaker.oscog-eem.3662 uuid: 26a00cbc-315d-4ced-ae5b-650351163c37
66
*/
7-
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08 " __DATE__ ;
7+
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3662 uuid: 26a00cbc-315d-4ced-ae5b-650351163c37 " __DATE__ ;
88
char *__cogitBuildInfo = __buildInfo;
99

1010

@@ -936,7 +936,7 @@ static sqInt genPrimitiveStringAtPut(void);
936936
static NoDbgRegParms sqInt genRemoveSmallIntegerTagsInScratchReg(sqInt scratchReg);
937937
static NoDbgRegParms sqInt genShiftAwaySmallIntegerTagsInScratchReg(sqInt scratchReg);
938938
static NoDbgRegParms sqInt getLiteralCountOfplusOneinBytesintoscratch(sqInt methodReg, sqInt plusOne, sqInt inBytes, sqInt litCountReg, sqInt scratchReg);
939-
static NoDbgRegParms usqInt inlineCacheTagForInstance(sqInt oop);
939+
static NoDbgRegParms sqInt inlineCacheTagForInstance(sqInt oop);
940940
static NoDbgRegParms AbstractInstruction * jumpNotSmallIntegerUnsignedValueInRegister(sqInt reg);
941941
static NoDbgRegParms sqInt markAndTraceCacheTagLiteralinatpc(sqInt literal, CogMethod *cogMethodOrNil, usqInt address);
942942
static sqInt numSmallIntegerBits(void);
@@ -8366,7 +8366,7 @@ callCogCodePopReceiverAndClassRegs(void)
83668366
static NoDbgRegParms sqInt
83678367
ceCPICMissreceiver(CogMethod *cPIC, sqInt receiver)
83688368
{
8369-
usqInt cacheTag;
8369+
sqInt cacheTag;
83708370
int errorSelectorOrNil;
83718371
sqInt methodOrSelectorIndex;
83728372
sqInt newTargetMethodOrNil;
@@ -8477,7 +8477,7 @@ l1:;
84778477
static NoDbgRegParms sqInt
84788478
ceSICMiss(sqInt receiver)
84798479
{
8480-
usqInt cacheTag;
8480+
sqInt cacheTag;
84818481
sqInt entryPoint;
84828482
int errorSelectorOrNil;
84838483
sqInt extent;
@@ -13669,7 +13669,7 @@ void
1366913669
linkSendAtintooffsetreceiver(sqInt callSiteReturnAddress, CogMethod *sendingMethod, CogMethod *targetMethod, sqInt theEntryOffset, sqInt receiver)
1367013670
{
1367113671
sqInt extent;
13672-
usqInt inlineCacheTag;
13672+
sqInt inlineCacheTag;
1367313673

1367413674
assert((theEntryOffset == cmEntryOffset)
1367513675
|| (theEntryOffset == cmNoCheckEntryOffset));
@@ -22551,7 +22551,7 @@ getLiteralCountOfplusOneinBytesintoscratch(sqInt methodReg, sqInt plusOne, sqInt
2255122551
c.f. getInlineCacheClassTagFrom:into: & inlineCacheTagForClass: */
2255222552

2255322553
/* CogObjectRepresentationFor32BitSpur>>#inlineCacheTagForInstance: */
22554-
static NoDbgRegParms usqInt
22554+
static NoDbgRegParms sqInt
2255522555
inlineCacheTagForInstance(sqInt oop)
2255622556
{
2255722557
return (isImmediate(oop)

‎src/spur32.cog/cogitIA32.c‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08
2+
CCodeGenerator VMMaker.oscog-eem.3662 uuid: 26a00cbc-315d-4ced-ae5b-650351163c37
33
(Cog-eem.502, Compiler-eem.520)
44
from
5-
StackToRegisterMappingCogit VMMaker.oscog-eem.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08
5+
StackToRegisterMappingCogit VMMaker.oscog-eem.3662 uuid: 26a00cbc-315d-4ced-ae5b-650351163c37
66
*/
7-
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08 " __DATE__ ;
7+
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3662 uuid: 26a00cbc-315d-4ced-ae5b-650351163c37 " __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 int computeMaximumSize(AbstractInstruction *self_in_CogIA32Compiler);
478+
static NoDbgRegParms sqInt 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);
@@ -910,7 +910,7 @@ static sqInt genPrimitiveStringAtPut(void);
910910
static NoDbgRegParms sqInt genRemoveSmallIntegerTagsInScratchReg(sqInt scratchReg);
911911
static NoDbgRegParms sqInt genShiftAwaySmallIntegerTagsInScratchReg(sqInt scratchReg);
912912
static NoDbgRegParms sqInt getLiteralCountOfplusOneinBytesintoscratch(sqInt methodReg, sqInt plusOne, sqInt inBytes, sqInt litCountReg, sqInt scratchReg);
913-
static NoDbgRegParms sqInt inlineCacheTagForInstance(sqInt oop);
913+
static NoDbgRegParms usqInt inlineCacheTagForInstance(sqInt oop);
914914
static NoDbgRegParms AbstractInstruction * jumpNotSmallIntegerUnsignedValueInRegister(sqInt reg);
915915
static NoDbgRegParms sqInt markAndTraceCacheTagLiteralinatpc(sqInt literal, CogMethod *cogMethodOrNil, usqInt address);
916916
static sqInt numSmallIntegerBits(void);
@@ -3157,7 +3157,7 @@ cmpC32RTempByteSize(AbstractInstruction *self_in_CogIA32Compiler)
31573157
limits which are exceeded when each case jumps around the otherwise. */
31583158

31593159
/* CogIA32Compiler>>#computeMaximumSize */
3160-
static NoDbgRegParms int
3160+
static NoDbgRegParms sqInt
31613161
computeMaximumSize(AbstractInstruction *self_in_CogIA32Compiler)
31623162
{
31633163
switch ((self_in_CogIA32Compiler->opcode)) {
@@ -3755,7 +3755,6 @@ dispatchConcretize(AbstractInstruction *self_in_CogIA32Compiler)
37553755
sqInt regLHS;
37563756
sqInt regRHS;
37573757
int regToShift;
3758-
AbstractInstruction *self_in_CogAbstractInstruction1;
37593758
sqInt shiftCount;
37603759
sqInt shiftCountReg;
37613760
sqInt src;
@@ -3772,12 +3771,10 @@ dispatchConcretize(AbstractInstruction *self_in_CogIA32Compiler)
37723771
/* begin concretizeLabel */
37733772
dependentChain = (self_in_CogIA32Compiler->dependent);
37743773
while (!(!dependentChain)) {
3775-
self_in_CogAbstractInstruction1 = dependentChain;
3776-
37773774
/* begin updateLabel: */
3778-
assert((((self_in_CogAbstractInstruction1->opcode)) == MoveCwR)
3779-
|| (((self_in_CogAbstractInstruction1->opcode)) == PushCw));
3780-
((self_in_CogAbstractInstruction1->operands))[0] = (((self_in_CogIA32Compiler->address)) + (((self_in_CogIA32Compiler->operands))[1]));
3775+
assert((((dependentChain->opcode)) == MoveCwR)
3776+
|| (((dependentChain->opcode)) == PushCw));
3777+
((dependentChain->operands))[0] = (((self_in_CogIA32Compiler->address)) + (((self_in_CogIA32Compiler->operands))[1]));
37813778
dependentChain = (dependentChain->dependent);
37823779
}
37833780
return 0;
@@ -8051,7 +8048,7 @@ callCogCodePopReceiverAndClassRegs(void)
80518048
static NoDbgRegParms sqInt
80528049
ceCPICMissreceiver(CogMethod *cPIC, sqInt receiver)
80538050
{
8054-
sqInt cacheTag;
8051+
usqInt cacheTag;
80558052
int errorSelectorOrNil;
80568053
sqInt methodOrSelectorIndex;
80578054
sqInt newTargetMethodOrNil;
@@ -8162,7 +8159,7 @@ l1:;
81628159
static NoDbgRegParms sqInt
81638160
ceSICMiss(sqInt receiver)
81648161
{
8165-
sqInt cacheTag;
8162+
usqInt cacheTag;
81668163
sqInt entryPoint;
81678164
int errorSelectorOrNil;
81688165
sqInt extent;
@@ -13116,7 +13113,7 @@ void
1311613113
linkSendAtintooffsetreceiver(sqInt callSiteReturnAddress, CogMethod *sendingMethod, CogMethod *targetMethod, sqInt theEntryOffset, sqInt receiver)
1311713114
{
1311813115
sqInt extent;
13119-
sqInt inlineCacheTag;
13116+
usqInt inlineCacheTag;
1312013117

1312113118
assert((theEntryOffset == cmEntryOffset)
1312213119
|| (theEntryOffset == cmNoCheckEntryOffset));
@@ -21219,7 +21216,7 @@ getLiteralCountOfplusOneinBytesintoscratch(sqInt methodReg, sqInt plusOne, sqInt
2121921216
c.f. getInlineCacheClassTagFrom:into: & inlineCacheTagForClass: */
2122021217

2122121218
/* CogObjectRepresentationFor32BitSpur>>#inlineCacheTagForInstance: */
21222-
static NoDbgRegParms sqInt
21219+
static NoDbgRegParms usqInt
2122321220
inlineCacheTagForInstance(sqInt oop)
2122421221
{
2122521222
return (isImmediate(oop)

‎src/spur32.sista/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.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08
2+
CCodeGenerator VMMaker.oscog-eem.3662 uuid: 26a00cbc-315d-4ced-ae5b-650351163c37
33
(Cog-eem.502, Compiler-eem.520)
44
*/
55

‎src/spur32.sista/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.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08
2+
CCodeGenerator VMMaker.oscog-eem.3662 uuid: 26a00cbc-315d-4ced-ae5b-650351163c37
33
(Cog-eem.502, Compiler-eem.520)
44
from
5-
SistaCogit VMMaker.oscog-eem.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08
5+
SistaCogit VMMaker.oscog-eem.3662 uuid: 26a00cbc-315d-4ced-ae5b-650351163c37
66
*/
7-
static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.3661 uuid: 36aba232-031c-4e89-9ec2-16e8aaea8b08 " __DATE__ ;
7+
static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.3662 uuid: 26a00cbc-315d-4ced-ae5b-650351163c37 " __DATE__ ;
88
char *__cogitBuildInfo = __buildInfo;
99

1010

@@ -940,7 +940,7 @@ static sqInt genPrimitiveStringAtPut(void);
940940
static NoDbgRegParms sqInt genRemoveSmallIntegerTagsInScratchReg(sqInt scratchReg);
941941
static NoDbgRegParms sqInt genShiftAwaySmallIntegerTagsInScratchReg(sqInt scratchReg);
942942
static NoDbgRegParms sqInt getLiteralCountOfplusOneinBytesintoscratch(sqInt methodReg, sqInt plusOne, sqInt inBytes, sqInt litCountReg, sqInt scratchReg);
943-
static NoDbgRegParms usqInt inlineCacheTagForInstance(sqInt oop);
943+
static NoDbgRegParms sqInt inlineCacheTagForInstance(sqInt oop);
944944
static NoDbgRegParms AbstractInstruction * jumpNotSmallIntegerUnsignedValueInRegister(sqInt reg);
945945
static NoDbgRegParms sqInt markAndTraceCacheTagLiteralinatpc(sqInt literal, CogMethod *cogMethodOrNil, usqInt address);
946946
static NoDbgRegParms usqInt numCountersFor(usqInt theCounters);
@@ -8506,7 +8506,7 @@ callCogCodePopReceiverAndClassRegs(void)
85068506
static NoDbgRegParms sqInt
85078507
ceCPICMissreceiver(CogMethod *cPIC, sqInt receiver)
85088508
{
8509-
usqInt cacheTag;
8509+
sqInt cacheTag;
85108510
int errorSelectorOrNil;
85118511
sqInt methodOrSelectorIndex;
85128512
sqInt newTargetMethodOrNil;
@@ -8617,7 +8617,7 @@ l1:;
86178617
static NoDbgRegParms sqInt
86188618
ceSICMiss(sqInt receiver)
86198619
{
8620-
usqInt cacheTag;
8620+
sqInt cacheTag;
86218621
sqInt entryPoint;
86228622
int errorSelectorOrNil;
86238623
sqInt extent;
@@ -13736,7 +13736,7 @@ void
1373613736
linkSendAtintooffsetreceiver(sqInt callSiteReturnAddress, CogMethod *sendingMethod, CogMethod *targetMethod, sqInt theEntryOffset, sqInt receiver)
1373713737
{
1373813738
sqInt extent;
13739-
usqInt inlineCacheTag;
13739+
sqInt inlineCacheTag;
1374013740

1374113741
assert((theEntryOffset == cmEntryOffset)
1374213742
|| (theEntryOffset == cmNoCheckEntryOffset));
@@ -22762,7 +22762,7 @@ getLiteralCountOfplusOneinBytesintoscratch(sqInt methodReg, sqInt plusOne, sqInt
2276222762
c.f. getInlineCacheClassTagFrom:into: & inlineCacheTagForClass: */
2276322763

2276422764
/* CogObjectRepresentationFor32BitSpur>>#inlineCacheTagForInstance: */
22765-
static NoDbgRegParms usqInt
22765+
static NoDbgRegParms sqInt
2276622766
inlineCacheTagForInstance(sqInt oop)
2276722767
{
2276822768
return (isImmediate(oop)

0 commit comments

Comments
 (0)