Skip to content

Commit 3ee100b

Browse files
eliotmirandaeliotmiranda
committed
CogVM source as per VMMaker.oscog-eem.3696
Fix a couple of uses of positiveMachineIntegerFor: on pointers in the MTVM.
1 parent 473bd6f commit 3ee100b

File tree

4 files changed

+42
-42
lines changed

4 files changed

+42
-42
lines changed

‎src/spur32.cog/cointerpmt.c‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* Automatically generated by
2-
CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3695 uuid: e373444c-c70c-4dcc-b572-e94579e4eb81
2+
CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3696 uuid: 345649c8-061f-4460-b84a-6b3aeaa4c5bc
33
(Cog-eem.504, Compiler-eem.526)
44
from
5-
CoInterpreterMT VMMaker.oscog-eem.3695 uuid: e373444c-c70c-4dcc-b572-e94579e4eb81
5+
CoInterpreterMT VMMaker.oscog-eem.3696 uuid: 345649c8-061f-4460-b84a-6b3aeaa4c5bc
66
*/
7-
static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.3695 uuid: e373444c-c70c-4dcc-b572-e94579e4eb81 " __DATE__ ;
7+
static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.3696 uuid: 345649c8-061f-4460-b84a-6b3aeaa4c5bc " __DATE__ ;
88
char *__interpBuildInfo = __buildInfo;
99

1010

@@ -695,7 +695,7 @@ static NoDbgRegParms int isTemporaryAffinedProcess(sqInt aProcess);
695695
extern void loadInitialContext(void);
696696
static void mapInterpreterOops(void);
697697
static sqInt ownVMFromUnidentifiedThread(void);
698-
extern sqInt ownVM(void *vmThreadHandle);
698+
extern usqInt ownVM(void *vmThreadHandle);
699699
static void preemptDisowningThread(void);
700700
static void primitiveForceDisplayUpdate(void);
701701
EXPORT(void) primitiveGetOwnerLog(void);
@@ -2795,7 +2795,7 @@ sqInt suppressHeartbeatFlag;
27952795
sqInt cannotDeferDisplayUpdates;
27962796
sqInt enableOwnerLog;
27972797
sqInt checkedPluginName;
2798-
const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.3695]";
2798+
const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.3696]";
27992799
const char * leakCheckFlagsMeanings[] = {
28002800
"1: check full GC", "2: check new space GC", "4: check incremental GC", "8: check become",
28012801
"16: check image segment", "32: check free space", "64: check shorten", "128: check prim call",
@@ -23805,7 +23805,7 @@ ownVMFromUnidentifiedThread(void)
2380523805
to take ownership. */
2380623806

2380723807
/* CoInterpreterMT>>#ownVM: */
23808-
sqInt
23808+
usqInt
2380923809
ownVM(void *vmThreadHandle)
2381023810
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
2381123811
sqInt activeContext;
@@ -24614,14 +24614,14 @@ primitiveGetOwnerLog(void)
2461424614
&& (!(isForwarded(array))));
2461524615
assert(validStorePointerUncheckedArgs(0, array, valuePointer));
2461624616
longAtput((void *)((array + BaseHeaderSize) + (0U << (shiftForWord()))),valuePointer);
24617-
valuePointer = positive32BitIntegerFor((&(GIV(ownerLog))));
24617+
valuePointer = positive32BitIntegerFor(((usqInt)((&(GIV(ownerLog))))));
2461824618

2461924619
/* begin storePointerUnchecked:ofObject:withValue: */
2462024620
assert((isNonImmediate(array))
2462124621
&& (!(isForwarded(array))));
2462224622
assert(validStorePointerUncheckedArgs(1, array, valuePointer));
2462324623
longAtput((void *)((array + BaseHeaderSize) + (1U << (shiftForWord()))),valuePointer);
24624-
valuePointer = positive32BitIntegerFor((&(GIV(ownerLogIndex))));
24624+
valuePointer = positive32BitIntegerFor(((usqInt)((&(GIV(ownerLogIndex))))));
2462524625

2462624626
/* begin storePointerUnchecked:ofObject:withValue: */
2462724627
assert((isNonImmediate(array))
@@ -59251,8 +59251,8 @@ oldSpaceObjectAfter(sqInt objOop)
5925159251
static NoDbgRegParms NeverInline void
5925259252
outOfPlaceBecomeandcopyHashFlag(sqInt obj1, sqInt obj2, sqInt copyHashFlag)
5925359253
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
59254-
sqInt clone1;
59255-
sqInt clone2;
59254+
usqInt clone1;
59255+
usqInt clone2;
5925659256
sqInt hash;
5925759257

5925859258
clone1 = (((longAt((void *)(obj1))) & (classIndexMask())) == ClassMethodContextCompactIndex
@@ -66249,7 +66249,7 @@ bridgeFor(SpurSegmentInfo *aSegment)
6624966249
static NoDbgRegParms void
6625066250
bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
6625166251
{
66252-
sqInt bridgeSpan;
66252+
int bridgeSpan;
6625366253
sqInt clifton;
6625466254
usqInt segEnd;
6625566255

@@ -83216,7 +83216,7 @@ primitiveInvokeObjectAsMethod(void)
8321683216
sqInt lookupClassTag;
8321783217
usqInt newObj;
8321883218
usqInt numBytes;
83219-
sqInt runArgs;
83219+
usqInt runArgs;
8322083220
sqInt runReceiver;
8322183221
char *sp;
8322283222
sqInt tagBits;

‎src/spur32.cog/gcc3x-cointerpmt.c‎

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

33

44
/* Automatically generated by
5-
CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3695 uuid: e373444c-c70c-4dcc-b572-e94579e4eb81
5+
CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3696 uuid: 345649c8-061f-4460-b84a-6b3aeaa4c5bc
66
(Cog-eem.504, Compiler-eem.526)
77
from
8-
CoInterpreterMT VMMaker.oscog-eem.3695 uuid: e373444c-c70c-4dcc-b572-e94579e4eb81
8+
CoInterpreterMT VMMaker.oscog-eem.3696 uuid: 345649c8-061f-4460-b84a-6b3aeaa4c5bc
99
*/
10-
static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.3695 uuid: e373444c-c70c-4dcc-b572-e94579e4eb81 " __DATE__ ;
10+
static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.3696 uuid: 345649c8-061f-4460-b84a-6b3aeaa4c5bc " __DATE__ ;
1111
char *__interpBuildInfo = __buildInfo;
1212

1313

@@ -698,7 +698,7 @@ static NoDbgRegParms int isTemporaryAffinedProcess(sqInt aProcess);
698698
extern void loadInitialContext(void);
699699
static void mapInterpreterOops(void);
700700
static sqInt ownVMFromUnidentifiedThread(void);
701-
extern sqInt ownVM(void *vmThreadHandle);
701+
extern usqInt ownVM(void *vmThreadHandle);
702702
static void preemptDisowningThread(void);
703703
static void primitiveForceDisplayUpdate(void);
704704
EXPORT(void) primitiveGetOwnerLog(void);
@@ -2798,7 +2798,7 @@ sqInt suppressHeartbeatFlag;
27982798
sqInt cannotDeferDisplayUpdates;
27992799
sqInt enableOwnerLog;
28002800
sqInt checkedPluginName;
2801-
const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.3695]";
2801+
const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.3696]";
28022802
const char * leakCheckFlagsMeanings[] = {
28032803
"1: check full GC", "2: check new space GC", "4: check incremental GC", "8: check become",
28042804
"16: check image segment", "32: check free space", "64: check shorten", "128: check prim call",
@@ -23812,7 +23812,7 @@ ownVMFromUnidentifiedThread(void)
2381223812
to take ownership. */
2381323813

2381423814
/* CoInterpreterMT>>#ownVM: */
23815-
sqInt
23815+
usqInt
2381623816
ownVM(void *vmThreadHandle)
2381723817
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
2381823818
sqInt activeContext;
@@ -24621,14 +24621,14 @@ primitiveGetOwnerLog(void)
2462124621
&& (!(isForwarded(array))));
2462224622
assert(validStorePointerUncheckedArgs(0, array, valuePointer));
2462324623
longAtput((void *)((array + BaseHeaderSize) + (0U << (shiftForWord()))),valuePointer);
24624-
valuePointer = positive32BitIntegerFor((&(GIV(ownerLog))));
24624+
valuePointer = positive32BitIntegerFor(((usqInt)((&(GIV(ownerLog))))));
2462524625

2462624626
/* begin storePointerUnchecked:ofObject:withValue: */
2462724627
assert((isNonImmediate(array))
2462824628
&& (!(isForwarded(array))));
2462924629
assert(validStorePointerUncheckedArgs(1, array, valuePointer));
2463024630
longAtput((void *)((array + BaseHeaderSize) + (1U << (shiftForWord()))),valuePointer);
24631-
valuePointer = positive32BitIntegerFor((&(GIV(ownerLogIndex))));
24631+
valuePointer = positive32BitIntegerFor(((usqInt)((&(GIV(ownerLogIndex))))));
2463224632

2463324633
/* begin storePointerUnchecked:ofObject:withValue: */
2463424634
assert((isNonImmediate(array))
@@ -59258,8 +59258,8 @@ oldSpaceObjectAfter(sqInt objOop)
5925859258
static NoDbgRegParms NeverInline void
5925959259
outOfPlaceBecomeandcopyHashFlag(sqInt obj1, sqInt obj2, sqInt copyHashFlag)
5926059260
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
59261-
sqInt clone1;
59262-
sqInt clone2;
59261+
usqInt clone1;
59262+
usqInt clone2;
5926359263
sqInt hash;
5926459264

5926559265
clone1 = (((longAt((void *)(obj1))) & (classIndexMask())) == ClassMethodContextCompactIndex
@@ -66256,7 +66256,7 @@ bridgeFor(SpurSegmentInfo *aSegment)
6625666256
static NoDbgRegParms void
6625766257
bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
6625866258
{
66259-
sqInt bridgeSpan;
66259+
int bridgeSpan;
6626066260
sqInt clifton;
6626166261
usqInt segEnd;
6626266262

@@ -83223,7 +83223,7 @@ primitiveInvokeObjectAsMethod(void)
8322383223
sqInt lookupClassTag;
8322483224
usqInt newObj;
8322583225
usqInt numBytes;
83226-
sqInt runArgs;
83226+
usqInt runArgs;
8322783227
sqInt runReceiver;
8322883228
char *sp;
8322983229
sqInt tagBits;

‎src/spur64.cog/cointerpmt.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* Automatically generated by
2-
CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3695 uuid: e373444c-c70c-4dcc-b572-e94579e4eb81
2+
CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3696 uuid: 345649c8-061f-4460-b84a-6b3aeaa4c5bc
33
(Cog-eem.504, Compiler-eem.526)
44
from
5-
CoInterpreterMT VMMaker.oscog-eem.3695 uuid: e373444c-c70c-4dcc-b572-e94579e4eb81
5+
CoInterpreterMT VMMaker.oscog-eem.3696 uuid: 345649c8-061f-4460-b84a-6b3aeaa4c5bc
66
*/
7-
static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.3695 uuid: e373444c-c70c-4dcc-b572-e94579e4eb81 " __DATE__ ;
7+
static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.3696 uuid: 345649c8-061f-4460-b84a-6b3aeaa4c5bc " __DATE__ ;
88
char *__interpBuildInfo = __buildInfo;
99

1010

@@ -2818,7 +2818,7 @@ sqInt suppressHeartbeatFlag;
28182818
sqInt cannotDeferDisplayUpdates;
28192819
sqInt enableOwnerLog;
28202820
sqInt checkedPluginName;
2821-
const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.3695]";
2821+
const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.3696]";
28222822
const char * leakCheckFlagsMeanings[] = {
28232823
"1: check full GC", "2: check new space GC", "4: check incremental GC", "8: check become",
28242824
"16: check image segment", "32: check free space", "64: check shorten", "128: check prim call",
@@ -24511,14 +24511,14 @@ primitiveGetOwnerLog(void)
2451124511
&& (!(isForwarded(array))));
2451224512
assert(validStorePointerUncheckedArgs(0, array, valuePointer));
2451324513
longAtput((void *)((array + BaseHeaderSize) + (0U << (shiftForWord()))),valuePointer);
24514-
valuePointer = positive64BitIntegerFor((&(GIV(ownerLog))));
24514+
valuePointer = positive64BitIntegerFor(((usqInt)((&(GIV(ownerLog))))));
2451524515

2451624516
/* begin storePointerUnchecked:ofObject:withValue: */
2451724517
assert((isNonImmediate(array))
2451824518
&& (!(isForwarded(array))));
2451924519
assert(validStorePointerUncheckedArgs(1, array, valuePointer));
2452024520
longAtput((void *)((array + BaseHeaderSize) + (1U << (shiftForWord()))),valuePointer);
24521-
valuePointer = positive64BitIntegerFor((&(GIV(ownerLogIndex))));
24521+
valuePointer = positive64BitIntegerFor(((usqInt)((&(GIV(ownerLogIndex))))));
2452224522

2452324523
/* begin storePointerUnchecked:ofObject:withValue: */
2452424524
assert((isNonImmediate(array))
@@ -67549,7 +67549,7 @@ prepareForSnapshot(void)
6754967549
sqInt largeChild;
6755067550
sqInt newEndOfMemory;
6755167551
sqInt next;
67552-
usqInt node;
67552+
sqInt node;
6755367553
SpurSegmentInfo *seg;
6755467554
SpurSegmentInfo *selfOfSegSize;
6755567555
sqInt smallChild;
@@ -84262,7 +84262,7 @@ primitiveInvokeObjectAsMethod(void)
8426284262
sqInt lookupClassTag;
8426384263
usqInt newObj;
8426484264
usqInt numBytes;
84265-
sqInt runArgs;
84265+
usqInt runArgs;
8426684266
sqInt runReceiver;
8426784267
char *sp;
8426884268
sqInt tagBits;
@@ -84277,7 +84277,7 @@ primitiveInvokeObjectAsMethod(void)
8427784277
/* begin allocateNewSpaceSlots:format:classIndex: */
8427884278
if (GIV(argumentCount) >= (numSlotsMask())) {
8427984279
if (GIV(argumentCount) > 0xFFFFFFFFU) {
84280-
runArgs = ((usqInt) null);
84280+
runArgs = null;
8428184281
goto l1;
8428284282
}
8428384283
newObj = GIV(freeStart) + BaseHeaderSize;

‎src/spur64.cog/gcc3x-cointerpmt.c‎

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

33

44
/* Automatically generated by
5-
CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3695 uuid: e373444c-c70c-4dcc-b572-e94579e4eb81
5+
CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3696 uuid: 345649c8-061f-4460-b84a-6b3aeaa4c5bc
66
(Cog-eem.504, Compiler-eem.526)
77
from
8-
CoInterpreterMT VMMaker.oscog-eem.3695 uuid: e373444c-c70c-4dcc-b572-e94579e4eb81
8+
CoInterpreterMT VMMaker.oscog-eem.3696 uuid: 345649c8-061f-4460-b84a-6b3aeaa4c5bc
99
*/
10-
static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.3695 uuid: e373444c-c70c-4dcc-b572-e94579e4eb81 " __DATE__ ;
10+
static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.3696 uuid: 345649c8-061f-4460-b84a-6b3aeaa4c5bc " __DATE__ ;
1111
char *__interpBuildInfo = __buildInfo;
1212

1313

@@ -2821,7 +2821,7 @@ sqInt suppressHeartbeatFlag;
28212821
sqInt cannotDeferDisplayUpdates;
28222822
sqInt enableOwnerLog;
28232823
sqInt checkedPluginName;
2824-
const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.3695]";
2824+
const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.3696]";
28252825
const char * leakCheckFlagsMeanings[] = {
28262826
"1: check full GC", "2: check new space GC", "4: check incremental GC", "8: check become",
28272827
"16: check image segment", "32: check free space", "64: check shorten", "128: check prim call",
@@ -24518,14 +24518,14 @@ primitiveGetOwnerLog(void)
2451824518
&& (!(isForwarded(array))));
2451924519
assert(validStorePointerUncheckedArgs(0, array, valuePointer));
2452024520
longAtput((void *)((array + BaseHeaderSize) + (0U << (shiftForWord()))),valuePointer);
24521-
valuePointer = positive64BitIntegerFor((&(GIV(ownerLog))));
24521+
valuePointer = positive64BitIntegerFor(((usqInt)((&(GIV(ownerLog))))));
2452224522

2452324523
/* begin storePointerUnchecked:ofObject:withValue: */
2452424524
assert((isNonImmediate(array))
2452524525
&& (!(isForwarded(array))));
2452624526
assert(validStorePointerUncheckedArgs(1, array, valuePointer));
2452724527
longAtput((void *)((array + BaseHeaderSize) + (1U << (shiftForWord()))),valuePointer);
24528-
valuePointer = positive64BitIntegerFor((&(GIV(ownerLogIndex))));
24528+
valuePointer = positive64BitIntegerFor(((usqInt)((&(GIV(ownerLogIndex))))));
2452924529

2453024530
/* begin storePointerUnchecked:ofObject:withValue: */
2453124531
assert((isNonImmediate(array))
@@ -67556,7 +67556,7 @@ prepareForSnapshot(void)
6755667556
sqInt largeChild;
6755767557
sqInt newEndOfMemory;
6755867558
sqInt next;
67559-
usqInt node;
67559+
sqInt node;
6756067560
SpurSegmentInfo *seg;
6756167561
SpurSegmentInfo *selfOfSegSize;
6756267562
sqInt smallChild;
@@ -84269,7 +84269,7 @@ primitiveInvokeObjectAsMethod(void)
8426984269
sqInt lookupClassTag;
8427084270
usqInt newObj;
8427184271
usqInt numBytes;
84272-
sqInt runArgs;
84272+
usqInt runArgs;
8427384273
sqInt runReceiver;
8427484274
char *sp;
8427584275
sqInt tagBits;
@@ -84284,7 +84284,7 @@ primitiveInvokeObjectAsMethod(void)
8428484284
/* begin allocateNewSpaceSlots:format:classIndex: */
8428584285
if (GIV(argumentCount) >= (numSlotsMask())) {
8428684286
if (GIV(argumentCount) > 0xFFFFFFFFU) {
84287-
runArgs = ((usqInt) null);
84287+
runArgs = null;
8428884288
goto l1;
8428984289
}
8429084290
newObj = GIV(freeStart) + BaseHeaderSize;

0 commit comments

Comments
 (0)