|
1 | 1 | /* Automatically generated by |
2 | | - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2893 uuid: 80846f05-27f9-4e14-a97e-11dcde420a0b |
| 2 | + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2905 uuid: b2778a08-d45d-4f84-8467-21a8eccf46dc |
3 | 3 | from |
4 | | - CoInterpreter VMMaker.oscog-eem.2893 uuid: 80846f05-27f9-4e14-a97e-11dcde420a0b |
| 4 | + CoInterpreter VMMaker.oscog-eem.2905 uuid: b2778a08-d45d-4f84-8467-21a8eccf46dc |
5 | 5 | */ |
6 | | -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2893 uuid: 80846f05-27f9-4e14-a97e-11dcde420a0b " __DATE__ ; |
| 6 | +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2905 uuid: b2778a08-d45d-4f84-8467-21a8eccf46dc " __DATE__ ; |
7 | 7 | char *__interpBuildInfo = __buildInfo; |
8 | 8 |
|
9 | 9 |
|
@@ -467,7 +467,7 @@ extern sqInt ceCannotAssignTowithIndexvalueToAssign(sqInt immutableObject, sqInt |
467 | 467 | #endif /* IMMUTABILITY */ |
468 | 468 | extern sqInt ceCannotResume(void); |
469 | 469 | extern void ceCheckAndMaybeRetryPrimitive(sqInt primIndex); |
470 | | -extern void ceCheckForInterrupts(void); |
| 470 | +extern void ceCheckForInterrupt(void); |
471 | 471 | extern void ceCheckProfileTick(void); |
472 | 472 | extern sqInt ceContextinstVar(sqInt maybeContext, sqInt slotIndex); |
473 | 473 | extern sqInt ceContextinstVarvalue(sqInt maybeMarriedContext, sqInt slotIndex, sqInt anOop); |
@@ -2627,7 +2627,7 @@ sqInt debugCallbackInvokes; |
2627 | 2627 | sqInt debugCallbackReturns; |
2628 | 2628 | sqInt ffiExceptionResponse; |
2629 | 2629 | sqInt checkedPluginName; |
2630 | | -const char *interpreterVersion = "Newspeak Virtual Machine [ Open Smalltalk, Spur] CoInterpreterPrimitives_VMMaker.oscog-eem.2893"; |
| 2630 | +const char *interpreterVersion = "Newspeak Virtual Machine [ Open Smalltalk, Spur] CoInterpreterPrimitives_VMMaker.oscog-eem.2905"; |
2631 | 2631 | sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; |
2632 | 2632 | int displayWidth; |
2633 | 2633 | int displayDepth; |
@@ -15130,6 +15130,8 @@ callbackEnter(sqInt *callbackID) |
15130 | 15130 | assert(0); |
15131 | 15131 | } |
15132 | 15132 | /* begin setCFramePointer:setCStackPointer: */ |
| 15133 | + assert(!(((currentCFramePointer == null) |
| 15134 | + || (currentCStackPointer == null)))); |
15133 | 15135 | GIV(CStackPointer) = currentCStackPointer; |
15134 | 15136 | GIV(CFramePointer) = currentCFramePointer; |
15135 | 15137 | putToSleepyieldingIf(fetchPointerofObject(ActiveProcessIndex, schedulerPointer()), GIV(preemptionYields)); |
@@ -15522,9 +15524,9 @@ ceCheckAndMaybeRetryPrimitive(sqInt primIndex) |
15522 | 15524 | } |
15523 | 15525 | } |
15524 | 15526 |
|
15525 | | - /* CoInterpreter>>#ceCheckForInterrupts */ |
| 15527 | + /* CoInterpreter>>#ceCheckForInterrupt */ |
15526 | 15528 | void |
15527 | | -ceCheckForInterrupts(void) |
| 15529 | +ceCheckForInterrupt(void) |
15528 | 15530 | { |
15529 | 15531 | sqInt switched; |
15530 | 15532 |
|
@@ -20880,7 +20882,7 @@ markActiveMethodsAndReferents(void) |
20880 | 20882 | if (GIV(instructionPointer) != 0) { |
20881 | 20883 | primCogMethod = cogMethodContaining(GIV(instructionPointer)); |
20882 | 20884 | if (!(primCogMethod == null)) { |
20883 | | - markMethodAndReferents(primCogMethod); |
| 20885 | + markMethodAndReferents(((CogBlockMethod *) primCogMethod)); |
20884 | 20886 | } |
20885 | 20887 | } |
20886 | 20888 | for (i = 0; i < GIV(numStackPages); i += 1) { |
@@ -62254,7 +62256,7 @@ prepareForSnapshot(void) |
62254 | 62256 | sqInt limit; |
62255 | 62257 | sqInt newEndOfMemory; |
62256 | 62258 | sqInt next; |
62257 | | - sqInt node; |
| 62259 | + usqInt node; |
62258 | 62260 | SpurSegmentInfo *seg; |
62259 | 62261 | sqInt smallChild; |
62260 | 62262 | sqInt treeNode; |
@@ -66068,8 +66070,8 @@ static sqInt |
66068 | 66070 | getErrorObjectFromPrimFailCode(void) |
66069 | 66071 | { DECL_MAYBE_SQ_GLOBAL_STRUCT |
66070 | 66072 | sqInt classIndex; |
66071 | | - sqInt clone; |
66072 | | - sqInt errObj; |
| 66073 | + usqInt clone; |
| 66074 | + usqInt errObj; |
66073 | 66075 | sqInt fieldIndex; |
66074 | 66076 | sqInt i; |
66075 | 66077 | usqInt newObj; |
@@ -71080,7 +71082,7 @@ printCallStackOf(sqInt aContextOrProcessOrFrame) |
71080 | 71082 | return printCallStackFP(((char *) aContextOrProcessOrFrame)); |
71081 | 71083 | } |
71082 | 71084 | if (aContextOrProcessOrFrame == (activeProcess())) { |
71083 | | - return printCallStackOf(GIV(framePointer)); |
| 71085 | + return printCallStackOf(((sqInt)GIV(framePointer))); |
71084 | 71086 | } |
71085 | 71087 | if (couldBeProcess(aContextOrProcessOrFrame)) { |
71086 | 71088 | return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + (((sqInt)((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); |
@@ -73870,6 +73872,8 @@ returnAsThroughCallbackContext(sqInt returnTypeOop, VMCallbackContext *vmCallbac |
73870 | 73872 | /* begin restoreCStackStateForCallbackContext: */ |
73871 | 73873 | cFramePointer = ((sqInt) ((vmCallbackContext->savedCFramePointer))); |
73872 | 73874 | cStackPointer = ((sqInt) ((vmCallbackContext->savedCStackPointer))); |
| 73875 | + assert(!(((cFramePointer == null) |
| 73876 | + || (cStackPointer == null)))); |
73873 | 73877 | GIV(CStackPointer) = cStackPointer; |
73874 | 73878 | GIV(CFramePointer) = cFramePointer; |
73875 | 73879 | /* begin assertValidExecutionPointe:r:s: */ |
@@ -73943,6 +73947,8 @@ returnAsThroughCallbackContext(sqInt returnTypeOop, VMCallbackContext *vmCallbac |
73943 | 73947 | /* begin restoreCStackStateForCallbackContext: */ |
73944 | 73948 | cFramePointer1 = ((sqInt) ((vmCallbackContext->savedCFramePointer))); |
73945 | 73949 | cStackPointer1 = ((sqInt) ((vmCallbackContext->savedCStackPointer))); |
| 73950 | + assert(!(((cFramePointer1 == null) |
| 73951 | + || (cStackPointer1 == null)))); |
73946 | 73952 | GIV(CStackPointer) = cStackPointer1; |
73947 | 73953 | GIV(CFramePointer) = cFramePointer1; |
73948 | 73954 |
|
|
0 commit comments