|
1 | 1 | /* Automatically generated by
|
2 |
| - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3350 uuid: b14d789f-780b-49f2-91aa-d50085ca62e6 |
| 2 | + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3351 uuid: ee0e1c44-4495-48cb-aa70-ca668d8bd20d |
3 | 3 | from
|
4 |
| - CoInterpreter VMMaker.oscog-eem.3350 uuid: b14d789f-780b-49f2-91aa-d50085ca62e6 |
| 4 | + CoInterpreter VMMaker.oscog-eem.3351 uuid: ee0e1c44-4495-48cb-aa70-ca668d8bd20d |
5 | 5 | */
|
6 |
| -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3350 uuid: b14d789f-780b-49f2-91aa-d50085ca62e6 " __DATE__ ; |
| 6 | +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3351 uuid: ee0e1c44-4495-48cb-aa70-ca668d8bd20d " __DATE__ ; |
7 | 7 | char *__interpBuildInfo = __buildInfo;
|
8 | 8 |
|
9 | 9 |
|
@@ -2027,7 +2027,7 @@ static signed short primitiveMetadataTable[MaxPrimitiveIndex + 2 /* 584 */] = {
|
2027 | 2027 | /*78*/ 0, 0,
|
2028 | 2028 | /*80*/ -256,-256,-256, 4, 4, 0, 0x100, 0, 0x200,-256,-256, 0, 0, 0, 0x100,-256, 0,-256,
|
2029 | 2029 | /*98*/ 0, 0,
|
2030 |
| -/*100*/ 260, 0x200, 0x100, 0x200,-256, 513,-256,-256,-256,-256, 0, 0x100, 0, 0,-256, |
| 2030 | +/*100*/ 260, 0x200, 0x200, 0x200,-256, 513,-256,-256,-256,-256, 0, 0x100, 0, 0,-256, |
2031 | 2031 | /*115*/ 0x100, 0, 12, 260, 0,
|
2032 | 2032 | /*120*/ 524, 0x100,-256,-256, 1, 0, 0, 0, 0,-255,-256,-256, 0, 0, 0,-256, 0,-256,-256,
|
2033 | 2033 | /*139*/ 0,
|
@@ -2701,7 +2701,7 @@ sqInt debugCallbackReturns;
|
2701 | 2701 | sqInt suppressHeartbeatFlag;
|
2702 | 2702 | sqInt cannotDeferDisplayUpdates;
|
2703 | 2703 | sqInt checkedPluginName;
|
2704 |
| -const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3350]"; |
| 2704 | +const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3351]"; |
2705 | 2705 | sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
|
2706 | 2706 | char expensiveAsserts = 0;
|
2707 | 2707 | int (*showSurfaceFn)(sqIntptr_t, int, int, int, int);
|
@@ -80555,7 +80555,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr)
|
80555 | 80555 | assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(obj)));
|
80556 | 80556 | contextSize = (sp >> 1);
|
80557 | 80557 | l6: /* end fetchStackPointerOf: */;
|
80558 |
| - numPointerSlots = ((usqInt) (CtxtTempFrameStart + contextSize)); |
| 80558 | + numPointerSlots = CtxtTempFrameStart + contextSize; |
80559 | 80559 | goto l10;
|
80560 | 80560 | }
|
80561 | 80561 | /* begin numSlotsOf: */
|
@@ -80585,7 +80585,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr)
|
80585 | 80585 | /* begin literalCountOfMethodHeader: */
|
80586 | 80586 | assert((header & 1));
|
80587 | 80587 | numLiterals = ((header >> 1)) & AlternateHeaderNumLiteralsMask;
|
80588 |
| - numPointerSlots = ((usqInt) (numLiterals + LiteralStart)); |
| 80588 | + numPointerSlots = numLiterals + LiteralStart; |
80589 | 80589 | l10: /* end numPointerSlotsWhileCompactingOf:withFormat:savedFirstFieldPointer: */;
|
80590 | 80590 | if ((fmt <= 5 /* lastPointerFormat */)
|
80591 | 80591 | && (numPointerSlots > 0)) {
|
@@ -82946,7 +82946,7 @@ disownVM(sqInt flags)
|
82946 | 82946 |
|
82947 | 82947 | assert(GIV(primFailCode) == 0);
|
82948 | 82948 | if (flags == DisownVMForThreading) {
|
82949 |
| - return 0; |
| 82949 | + return flags; |
82950 | 82950 | }
|
82951 | 82951 | assert((isImmediate(flags)
|
82952 | 82952 | ? ((flags & 1))
|
@@ -88536,6 +88536,9 @@ ownVM(sqInt threadIndexAndFlags)
|
88536 | 88536 |
|
88537 | 88537 | assert((isOopCompiledMethod(GIV(newMethod)))
|
88538 | 88538 | && ((argumentCountOf(GIV(newMethod))) == GIV(argumentCount)));
|
| 88539 | + if (threadIndexAndFlags == DisownVMForThreading) { |
| 88540 | + return threadIndexAndFlags; |
| 88541 | + } |
88539 | 88542 | if (((threadIndexAndFlags & DisownVMForFFICall) != 0)) {
|
88540 | 88543 | GIV(inFFIFlags) = 0;
|
88541 | 88544 | return threadIndexAndFlags;
|
|
0 commit comments